Merge branch 'master' into 1304-local

Conflicts:
	grammars.yml

lib/linguist/heuristics.rb

@@ -61,6 +61,14 @@ module Linguist
       @heuristic.call(data)
     end
 
+    disambiguate "BitBake", "BlitzBasic" do |data|
+      if /^\s*; /.match(data) || data.include?("End Function")
+        Language["BlitzBasic"]
+      elsif /^\s*(# |include|require)\b/.match(data)
+        Language["BitBake"]
+      end
+    end
+
     disambiguate "Objective-C", "C++", "C" do |data|
       if (/@(interface|class|protocol|property|end|synchronised|selector|implementation)\b/.match(data))
         Language["Objective-C"]
@@ -129,7 +137,7 @@ module Linguist
     disambiguate "FORTRAN", "Forth" do |data|
       if /^: /.match(data)
         Language["Forth"]
-      elsif /^([c*][^a-z]|      subroutine\s)/i.match(data)
+      elsif /^([c*][^a-z]|      (subroutine|program)\s|!)/i.match(data)
         Language["FORTRAN"]
       end
     end
@@ -156,5 +164,22 @@ module Linguist
       end
     end
 
+    disambiguate "TypeScript", "XML" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
+
+    disambiguate "Frege", "Forth", "Text" do |data|
+      if /^(: |also |new-device|previous )/.match(data)
+        Language["Forth"]
+      elsif /\s*(import|module|package|data|type) /.match(data)
+        Language["Frege"]
+      else
+        Language["Text"]
+      end
+    end
   end
 end

lib/linguist/language.rb

@@ -269,8 +269,12 @@ module Linguist
 
     # Public: A List of languages compatible with Ace.
     #
+    # TODO: Remove this method in a 5.x release. Every language now needs an ace_mode
+    # key, so this function isn't doing anything unique anymore.
+    #
     # Returns an Array of Languages.
     def self.ace_modes
+      warn "This method will be deprecated in a future 5.x release. Every language now has an `ace_mode` set."
       @ace_modes ||= all.select(&:ace_mode).sort_by { |lang| lang.name.downcase }
     end
 

lib/linguist/popular.yml

@@ -3,7 +3,6 @@
 # This file should only be edited by GitHub staff
 
 - ActionScript
-- Bash
 - C
 - C#
 - C++
@@ -27,3 +26,4 @@
 - SQL
 - Scala
 - Scheme
+- Shell

lib/linguist/samples.rb

@@ -34,10 +34,6 @@ module Linguist
       Dir.entries(ROOT).sort!.each do |category|
         next if category == '.' || category == '..'
 
-        # Skip text and binary for now
-        # Possibly reconsider this later
-        next if category == 'Text' || category == 'Binary'
-
         dirname = File.join(ROOT, category)
         Dir.entries(dirname).each do |filename|
           next if filename == '.' || filename == '..'

lib/linguist/shebang.rb

@@ -18,23 +18,32 @@ module Linguist
     #
     # Returns a String or nil
     def self.interpreter(data)
-      lines = data.lines
-      return unless match = /^#! ?(.+)$/.match(lines.first)
+      shebang = data.lines.first
 
-      tokens = match[1].split(' ')
-      script = tokens.first.split('/').last
+      # First line must start with #!
+      return unless shebang && shebang.start_with?("#!")
 
+      # Get the parts of the shebang without the #!
+      tokens = shebang.sub(/^#!\s*/, '').strip.split(' ')
+
+      # There was nothing after the #!
+      return if tokens.empty?
+
+      # Get the name of the interpreter
+      script = File.basename(tokens.first)
+
+      # Get next argument if interpreter was /usr/bin/env
       script = tokens[1] if script == 'env'
 
-      # If script has an invalid shebang, we might get here
+      # Interpreter was /usr/bin/env with no arguments
       return unless script
 
       # "python2.6" -> "python2"
-      script.sub! $1, '' if script =~ /(\.\d+)$/
+      script.sub! /(\.\d+)$/, ''
 
       # Check for multiline shebang hacks that call `exec`
       if script == 'sh' &&
-        lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
+        data.lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
         script = $1
       end
 

lib/linguist/vendor.yml

@@ -32,6 +32,7 @@
 
 # Erlang bundles
 - ^rebar$
+- erlang.mk
 
 # Go dependencies
 - Godeps/_workspace/

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.2.3"
+  VERSION = "4.2.5"
 end