github-linguist 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838570607a936e2f174977152ff0bbae10bb1b1e
-  data.tar.gz: 9b39ccd935fca2893fa6a162f88bc362aebd32f3
+  metadata.gz: 4e8e9371bbc9d3eaaed04808599b7eda3940c7eb
+  data.tar.gz: d9a79084660829b6b1c8c88a8caeceb23e07e679
 SHA512:
-  metadata.gz: b971f10f9b9881da94090dd011ae9b9fc66dac2bb46eac71987a52ace700e896a5cef6abd58090811aaf3ba90252cde733e9eacfb87a37f0e392a1fc1af53eaf
-  data.tar.gz: 42d581654c0c7d8a1262739b499ad198b34841c51ce8e8f07a5a02d5fef690306274a23d73efa9dbb811e929c79d22d303541753af7aabb8d37ed42684045d54
+  metadata.gz: 932921bdc28d09e5919c9cba0fbc59dfda61a601bdfb887346c3be22d6490300d59492713d0e9c8c129f5c523d42a37d7db04e7aff72fc17efbd28ac621f5aa6
+  data.tar.gz: d40cc99df0f8fa0f0742bbb94f486dfd51da08ba45dc97c6915efad72029cd896b522be507c09bf50039acac1c24500087808bf637894bb83181daa5b35959c2

data/lib/linguist/blob_helper.rb

@@ -1,5 +1,4 @@
 require 'linguist/generated'
-require 'linguist/language'
 
 require 'charlock_holmes'
 require 'escape_utils'

data/lib/linguist/file_blob.rb

@@ -52,5 +52,20 @@ module Linguist
     def size
       File.size(@path)
     end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      # File.extname returns nil if the filename is an extension.
+      extension = File.extname(name)
+      basename = File.basename(name)
+      # Checks if the filename is an extension.
+      if extension.empty? && basename[0] == "."
+        basename
+      else
+        extension
+      end
+    end
   end
 end

data/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
+

data/lib/linguist/language.rb

@@ -9,6 +9,8 @@ end
 require 'linguist/classifier'
 require 'linguist/heuristics'
 require 'linguist/samples'
+require 'linguist/file_blob'
+require 'linguist/blob_helper'
 
 module Linguist
   # Language names that are recognizable by GitHub. Defined languages
@@ -109,7 +111,8 @@ module Linguist
       # A bit of an elegant hack. If the file is executable but extensionless,
       # append a "magic" extension so it can be classified with other
       # languages that have shebang scripts.
-      if File.extname(name).empty? && blob.mode && (blob.mode.to_i(8) & 05) == 05
+      extension = FileBlob.new(name).extension
+      if extension.empty? && blob.mode && (blob.mode.to_i(8) & 05) == 05
         name += ".script!"
       end
 
@@ -189,7 +192,8 @@ module Linguist
     #
     # Returns all matching Languages or [] if none were found.
     def self.find_by_filename(filename)
-      basename, extname = File.basename(filename), File.extname(filename)
+      basename = File.basename(filename)
+      extname = FileBlob.new(filename).extension
       langs = @filename_index[basename] +
               @extension_index[extname]
       langs.compact.uniq

data/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

data/lib/linguist/samples.json

@@ -740,6 +740,9 @@
     "Nginx": [
       "nginx.conf"
     ],
+    "PHP": [
+      ".php"
+    ],
     "Perl": [
       "ack"
     ],
@@ -782,6 +785,9 @@
       ".gvimrc",
       ".vimrc"
     ],
+    "XML": [
+      ".cproject"
+    ],
     "YAML": [
       ".gemrc"
     ],
@@ -791,8 +797,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 629226,
-  "languages_total": 867,
+  "tokens_total": 630435,
+  "languages_total": 869,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -49935,7 +49941,7 @@
     },
     "PHP": {
       "<": 11,
-      "php": 12,
+      "php": 14,
       "namespace": 28,
       "Symfony": 24,
       "Component": 24,
@@ -50659,6 +50665,19 @@
       "base_url": 1,
       "php_filter_info": 1,
       "filters": 2,
+      "SHEBANG#!php": 4,
+      "<?>": 1,
+      "aMenuLinks": 1,
+      "Array": 13,
+      "Blog": 1,
+      "SITE_DIR": 4,
+      "Photos": 1,
+      "photo": 1,
+      "About": 1,
+      "me": 1,
+      "about": 1,
+      "Contact": 1,
+      "contacts": 1,
       "Field": 9,
       "FormField": 3,
       "ArrayAccess": 1,
@@ -50953,7 +50972,6 @@
       "isUnique": 1,
       "is_bool": 1,
       "sql": 1,
-      "SHEBANG#!php": 3,
       "echo": 2,
       "Yii": 3,
       "console": 3,
@@ -67048,9 +67066,9 @@
       "return": 1
     },
     "XML": {
-      "<?xml>": 11,
-      "version=": 17,
-      "encoding=": 7,
+      "<?xml>": 12,
+      "version=": 21,
+      "encoding=": 8,
       "<Project>": 7,
       "ToolsVersion=": 6,
       "DefaultTargets=": 5,
@@ -67127,6 +67145,94 @@
       "<Compile>": 10,
       "<None>": 5,
       "</Project>": 7,
+      "standalone=": 1,
+      "<?fileVersion>": 1,
+      "4": 1,
+      "0": 2,
+      "<cproject>": 1,
+      "storage_type_id=": 1,
+      "<storageModule>": 14,
+      "moduleId=": 14,
+      "<cconfiguration>": 2,
+      "id=": 141,
+      "buildSystemId=": 2,
+      "name=": 270,
+      "<externalSettings/>": 2,
+      "<extensions>": 2,
+      "<extension>": 12,
+      "point=": 12,
+      "</extensions>": 2,
+      "</storageModule>": 7,
+      "<configuration>": 2,
+      "artifactName=": 2,
+      "buildArtefactType=": 2,
+      "buildProperties=": 2,
+      "cleanCommand=": 2,
+      "description=": 4,
+      "cdt": 2,
+      "managedbuild": 2,
+      "config": 2,
+      "gnu": 2,
+      "exe": 2,
+      "debug": 1,
+      "1803931088": 1,
+      "parent=": 2,
+      "<folderInfo>": 2,
+      "resourcePath=": 2,
+      "<toolChain>": 2,
+      "superClass=": 42,
+      "<targetPlatform>": 2,
+      "<builder>": 2,
+      "buildPath=": 2,
+      "keepEnvironmentInBuildfile=": 2,
+      "managedBuildOn=": 2,
+      "<tool>": 12,
+      "<option>": 16,
+      "value=": 11,
+      "valueType=": 12,
+      "<listOptionValue>": 4,
+      "builtIn=": 4,
+      "</option>": 4,
+      "<inputType>": 8,
+      "</tool>": 8,
+      "defaultValue=": 2,
+      "<additionalInput>": 4,
+      "kind=": 6,
+      "paths=": 4,
+      "</inputType>": 2,
+      "</toolChain>": 2,
+      "</folderInfo>": 2,
+      "<sourceEntries>": 2,
+      "<entry>": 2,
+      "flags=": 2,
+      "</sourceEntries>": 2,
+      "</configuration>": 2,
+      "</cconfiguration>": 2,
+      "release": 1,
+      "32754498": 1,
+      "<project>": 2,
+      "projectType=": 1,
+      "<autodiscovery>": 5,
+      "enabled=": 125,
+      "problemReportingEnabled=": 5,
+      "selectedProfileId=": 5,
+      "<profile>": 40,
+      "<buildOutputProvider>": 40,
+      "<openAction>": 40,
+      "filePath=": 40,
+      "<parser>": 80,
+      "</buildOutputProvider>": 40,
+      "<scannerInfoProvider>": 40,
+      "<runAction>": 40,
+      "arguments=": 40,
+      "command=": 40,
+      "useDefault=": 40,
+      "</scannerInfoProvider>": 40,
+      "</profile>": 40,
+      "<scannerConfigBuildInfo>": 4,
+      "instanceId=": 4,
+      "</scannerConfigBuildInfo>": 4,
+      "</cproject>": 1,
       "<SchemaVersion>": 2,
       "</SchemaVersion>": 2,
       "cfa7a11": 1,
@@ -67174,8 +67280,6 @@
       "FSharp": 1,
       "</Otherwise>": 1,
       "</Choose>": 1,
-      "<project>": 1,
-      "name=": 227,
       "xmlns": 2,
       "ea=": 2,
       "<description>": 4,
@@ -67230,14 +67334,12 @@
       "application": 2,
       "<ea:build>": 1,
       "<ea:property>": 1,
-      "value=": 1,
       "<ea:plugin>": 1,
       "</ea:build>": 1,
       "</info>": 1,
       "<configurations>": 1,
       "<conf>": 2,
       "visibility=": 2,
-      "description=": 2,
       "</configurations>": 1,
       "<dependencies>": 1,
       "<dependency>": 4,
@@ -69756,7 +69858,7 @@
     "Ox": 1006,
     "Oxygene": 157,
     "PAWN": 3263,
-    "PHP": 20724,
+    "PHP": 20754,
     "Pan": 130,
     "Parrot Assembly": 6,
     "Parrot Internal Representation": 5,
@@ -69822,7 +69924,7 @@
     "Visual Basic": 581,
     "Volt": 388,
     "XC": 24,
-    "XML": 7057,
+    "XML": 8236,
     "XProc": 22,
     "XQuery": 801,
     "XSLT": 44,
@@ -69956,7 +70058,7 @@
     "Ox": 3,
     "Oxygene": 1,
     "PAWN": 1,
-    "PHP": 9,
+    "PHP": 10,
     "Pan": 1,
     "Parrot Assembly": 1,
     "Parrot Internal Representation": 1,
@@ -70022,7 +70124,7 @@
     "Visual Basic": 3,
     "Volt": 1,
     "XC": 1,
-    "XML": 13,
+    "XML": 14,
     "XProc": 1,
     "XQuery": 1,
     "XSLT": 1,
@@ -70035,5 +70137,5 @@
     "fish": 3,
     "wisp": 1
   },
-  "md5": "cedc5d3fde7e7b87467bdf820d674b95"
+  "md5": "1edee1d2c454fb877027ae980cd163ef"
 }

data/lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.0.3"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: We use this library at GitHub to detect blob languages, highlight code,
@@ -145,6 +145,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/linguist
+- lib/linguist.rb
 - lib/linguist/blob_helper.rb
 - lib/linguist/classifier.rb
 - lib/linguist/file_blob.rb
@@ -161,8 +163,6 @@ files:
 - lib/linguist/tokenizer.rb
 - lib/linguist/vendor.yml
 - lib/linguist/version.rb
-- lib/linguist.rb
-- bin/linguist
 homepage: https://github.com/github/linguist
 licenses:
 - MIT
@@ -173,17 +173,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: GitHub Language detection