Merge branch 'master' into 950

Conflicts:
	lib/linguist/languages.yml

test/test_blob.rb

@@ -211,6 +211,9 @@ class TestBlob < Test::Unit::TestCase
     assert !blob("CSS/bootstrap.css").generated?
     assert blob("CSS/bootstrap.min.css").generated?
 
+    # Generated VCR
+    assert blob("YAML/vcr_cassette.yml").generated?
+
     assert Linguist::Generated.generated?("node_modules/grunt/lib/grunt.js", nil)
   end
 
@@ -303,6 +306,10 @@ class TestBlob < Test::Unit::TestCase
     assert blob("public/javascripts/angular.js").vendored?
     assert blob("public/javascripts/angular.min.js").vendored?
 
+    # D3.js
+    assert blob("public/javascripts/d3.v3.js").vendored?
+    assert blob("public/javascripts/d3.v3.min.js").vendored?
+
     # Fabric
     assert blob("fabfile.py").vendored?
 
@@ -343,6 +350,14 @@ class TestBlob < Test::Unit::TestCase
 
     # Vagrant
     assert blob("Vagrantfile").vendored?
+
+    # Gradle
+    assert blob("gradlew").vendored?
+    assert blob("gradlew.bat").vendored?
+    assert blob("gradle/wrapper/gradle-wrapper.properties").vendored?
+    assert blob("subproject/gradlew").vendored?
+    assert blob("subproject/gradlew.bat").vendored?
+    assert blob("subproject/gradle/wrapper/gradle-wrapper.properties").vendored?
   end
 
   def test_language

test/test_language.rb

@@ -10,6 +10,7 @@ class TestLanguage < Test::Unit::TestCase
 
   def test_lexer
     assert_equal Lexer['ActionScript 3'], Language['ActionScript'].lexer
+    assert_equal Lexer['AspectJ'], Language['AspectJ'].lexer
     assert_equal Lexer['Bash'], Language['Gentoo Ebuild'].lexer
     assert_equal Lexer['Bash'], Language['Gentoo Eclass'].lexer
     assert_equal Lexer['Bash'], Language['Shell'].lexer
@@ -322,7 +323,7 @@ class TestLanguage < Test::Unit::TestCase
   def test_color
     assert_equal '#701516', Language['Ruby'].color
     assert_equal '#3581ba', Language['Python'].color
-    assert_equal '#f15501', Language['JavaScript'].color
+    assert_equal '#f1e05a', Language['JavaScript'].color
     assert_equal '#31859c', Language['TypeScript'].color
   end
 
@@ -385,6 +386,15 @@ class TestLanguage < Test::Unit::TestCase
 <div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span>
   <span class="s1">&#39;foo&#39;</span>
 <span class="k">end</span>
+</pre></div>
+    HTML
+  end
+
+  def test_colorize_with_options
+    assert_equal <<-HTML.chomp, Language['Ruby'].colorize("def foo\n  'foo'\nend\n", :options => { :cssclass => "highlight highlight-ruby" })
+<div class="highlight highlight-ruby"><pre><span class="k">def</span> <span class="nf">foo</span>
+  <span class="s1">&#39;foo&#39;</span>
+<span class="k">end</span>
 </pre></div>
     HTML
   end

test/test_pedantic.rb

@@ -22,10 +22,10 @@ class TestPedantic < Test::Unit::TestCase
     file("languages.yml").lines.each do |line|
       if line =~ /^  extensions:$/
         extensions = []
-      elsif extensions && line =~ /^  - \.(\w+)$/
+      elsif extensions && line =~ /^  - \.([\w-]+)( *#.*)?$/
         extensions << $1
       else
-        assert_sorted extensions if extensions
+        assert_sorted extensions[1..-1] if extensions
         extensions = nil
       end
     end

test/test_samples.rb

@@ -1,7 +1,7 @@
 require 'linguist/samples'
+require 'linguist/language'
 require 'tempfile'
 require 'yajl'
-
 require 'test/unit'
 
 class TestSamples < Test::Unit::TestCase
@@ -35,4 +35,22 @@ class TestSamples < Test::Unit::TestCase
     assert_equal data['tokens_total'], data['language_tokens'].inject(0) { |n, (_, c)| n += c }
     assert_equal data['tokens_total'], data['tokens'].inject(0) { |n, (_, ts)| n += ts.inject(0) { |m, (_, c)| m += c } }
   end
+  
+  # If a language extension isn't globally unique then make sure there are samples
+  def test_presence
+    Linguist::Language.all.each do |language|
+      language.all_extensions.each do |extension|
+        language_matches = Language.find_by_filename("foo#{extension}")
+        
+        # If there is more than one language match for a given extension
+        # then check that there are examples for that language with the extension 
+        if language_matches.length > 1
+          language_matches.each do |language|
+            assert File.directory?("samples/#{language.name}"), "#{language.name} is missing a samples directory"
+            assert Dir.glob("samples/#{language.name}/*#{extension}").any?, "#{language.name} is missing samples for extension #{extension}"
+          end
+        end
+      end
+    end
+  end
 end