Merge pull request #1787 from github/move-shebang

Move shebang (updated)

test/test_language.rb

@@ -223,34 +223,21 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal [Language['Chapel']], Language.find_by_filename('examples/hello.chpl')
   end
 
-  def test_find_by_shebang
-    assert_equal 'ruby', Linguist.interpreter_from_shebang("#!/usr/bin/ruby\n# baz")
-    { []         => ["",
-                     "foo",
-                     "#bar",
-                     "#baz",
-                     "///",
-                     "\n\n\n\n\n",
-                     " #!/usr/sbin/ruby",
-                     "\n#!/usr/sbin/ruby"],
-      ['Ruby']   => ["#!/usr/bin/env ruby\n# baz",
-                     "#!/usr/sbin/ruby\n# bar",
-                     "#!/usr/bin/ruby\n# foo",
-                     "#!/usr/sbin/ruby",
-                     "#!/usr/sbin/ruby foo bar baz\n"],
-      ['R']      => ["#!/usr/bin/env Rscript\n# example R script\n#\n"],
-      ['Shell']  => ["#!/usr/bin/bash\n", "#!/bin/sh"],
-      ['Python'] => ["#!/bin/python\n# foo\n# bar\n# baz",
-                     "#!/usr/bin/python2.7\n\n\n\n",
-                     "#!/usr/bin/python3\n\n\n\n"],
-      ["Common Lisp"] => ["#!/usr/bin/sbcl --script\n\n"]
-    }.each do |languages, bodies|
-      bodies.each do |body|
-        assert_equal([body, languages.map{|l| Language[l]}],
-                     [body, Language.find_by_shebang(body)])
-
-      end
+  def test_find_by_interpreter
+    {
+      "ruby" => "Ruby",
+      "Rscript" => "R",
+      "sh" => "Shell",
+      "bash" => "Shell",
+      "python" => "Python",
+      "python2" => "Python",
+      "python3" => "Python",
+      "sbcl" => "Common Lisp"
+    }.each do |interpreter, language|
+      assert_equal [Language[language]], Language.find_by_interpreter(interpreter)
     end
+
+    assert_equal [], Language.find_by_interpreter(nil)
   end
 
   def test_find

test/test_samples.rb

@@ -82,9 +82,4 @@ class TestSamples < Test::Unit::TestCase
       end
     end
   end
-
-  def test_shebang
-    assert_equal "crystal", Linguist.interpreter_from_shebang("#!/usr/bin/env bin/crystal")
-    assert_equal "python2", Linguist.interpreter_from_shebang("#!/usr/bin/python2.4")
-  end
 end

test/test_shebang.rb

@@ -0,0 +1,38 @@
+require_relative "./helper"
+
+class TestShebang < Test::Unit::TestCase
+  include Linguist
+
+  def assert_interpreter(interpreter, body)
+    assert_equal interpreter, Shebang.interpreter(body)
+  end
+
+  def test_shebangs
+    assert_interpreter nil, ""
+    assert_interpreter nil, "foo"
+    assert_interpreter nil, "#bar"
+    assert_interpreter nil, "#baz"
+    assert_interpreter nil, "///"
+    assert_interpreter nil, "\n\n\n\n\n"
+    assert_interpreter nil, " #!/usr/sbin/ruby"
+    assert_interpreter nil, "\n#!/usr/sbin/ruby"
+
+    assert_interpreter "ruby", "#!/usr/sbin/ruby\n# bar"
+    assert_interpreter "ruby", "#!/usr/bin/ruby\n# foo"
+    assert_interpreter "ruby", "#!/usr/sbin/ruby"
+    assert_interpreter "ruby", "#!/usr/sbin/ruby foo bar baz\n"
+
+    assert_interpreter "Rscript", "#!/usr/bin/env Rscript\n# example R script\n#\n"
+    assert_interpreter "crystal", "#!/usr/bin/env bin/crystal"
+    assert_interpreter "ruby", "#!/usr/bin/env ruby\n# baz"
+
+    assert_interpreter "bash", "#!/usr/bin/bash\n"
+    assert_interpreter "sh", "#!/bin/sh"
+    assert_interpreter "python", "#!/bin/python\n# foo\n# bar\n# baz"
+    assert_interpreter "python2", "#!/usr/bin/python2.7\n\n\n\n"
+    assert_interpreter "python3", "#!/usr/bin/python3\n\n\n\n"
+    assert_interpreter "sbcl", "#!/usr/bin/sbcl --script\n\n"
+    assert_interpreter "perl", "#! perl"
+  end
+
+end