Merge branch 'master' into FS-samples

lib/linguist/languages.yml

@@ -2383,7 +2383,6 @@ Sass:
   group: CSS
   extensions:
   - .sass
-  - .scss
 
 Scala:
   type: programming

lib/linguist/shebang.rb

@@ -19,7 +19,7 @@ module Linguist
     # Returns a String or nil
     def self.interpreter(data)
       lines = data.lines
-      return unless match = /^#! ?(.*)$/.match(lines.first)
+      return unless match = /^#! ?(.+)$/.match(lines.first)
 
       tokens = match[1].split(' ')
       script = tokens.first.split('/').last

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.2.1"
+  VERSION = "4.2.2"
 end

samples/Sass/demo.scss

@@ -1,12 +0,0 @@
-$blue: #3bbfce;
-$margin: 16px;
-
-.content_navigation {
-  color: $blue;
-}
-
-.border {
-  padding: $margin / 2;
-  margin: $margin / 2;
-  border: 2px $blue solid;
-}

script/cibuild

@@ -13,6 +13,9 @@ set +x
 
 mkdir -p ./vendor/gems
 
+# Clean out any unversioned files
+git clean -fd
+
 bundle install --local --path ./vendor/gems
 bundle exec rake samples
 bundle exec rake

test/test_shebang.rb

@@ -16,6 +16,7 @@ class TestShebang < Test::Unit::TestCase
     assert_interpreter nil, "\n\n\n\n\n"
     assert_interpreter nil, " #!/usr/sbin/ruby"
     assert_interpreter nil, "\n#!/usr/sbin/ruby"
+    assert_interpreter nil, "#!"
 
     assert_interpreter "ruby", "#!/usr/sbin/ruby\n# bar"
     assert_interpreter "ruby", "#!/usr/bin/ruby\n# foo"