Merge branch 'master' into cut-release-v3.0.4

lib/linguist/generated.rb

@@ -54,7 +54,7 @@ module Linguist
       name == 'Gemfile.lock' ||
         minified_files? ||
         compiled_coffeescript? ||
-        xcode_project_file? ||
+        xcode_file? ||
         generated_parser? ||
         generated_net_docfile? ||
         generated_net_designer_file? ||
@@ -67,14 +67,14 @@ module Linguist
         generated_by_zephir?
     end
 
-    # Internal: Is the blob an XCode project file?
+    # Internal: Is the blob an Xcode file?
     #
-    # Generated if the file extension is an XCode project
+    # Generated if the file extension is an Xcode 
     # file extension.
     #
     # Returns true of false.
-    def xcode_project_file?
-      ['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname)
+    def xcode_file?
+      ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
     end
 
     # Internal: Is the blob minified files?
@@ -256,3 +256,4 @@ module Linguist
     end
   end
 end
+

lib/linguist/languages.yml

@@ -1345,7 +1345,7 @@ MiniD: # Legacy
 Mirah:
   type: programming
   lexer: Ruby
-  search_term: ruby
+  search_term: mirah
   color: "#c7a938"
   extensions:
   - .druby

test/test_language.rb

@@ -167,7 +167,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal 'pot',           Language['Gettext Catalog'].search_term
     assert_equal 'irc',           Language['IRC log'].search_term
     assert_equal 'lhs',           Language['Literate Haskell'].search_term
-    assert_equal 'ruby',          Language['Mirah'].search_term
+    assert_equal 'mirah',         Language['Mirah'].search_term
     assert_equal 'raw',           Language['Raw token data'].search_term
     assert_equal 'bash',          Language['Shell'].search_term
     assert_equal 'vim',           Language['VimL'].search_term