github-linguist 2.11.3 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261be2db38bc4cb745e0daa40d88828b4da7d4b8
-  data.tar.gz: 8a4d226fbae6ffedb7802cef37bc8d05a5e53cc3
+  metadata.gz: 8f1b2179b6949740dc4c3d8b0fab689633393961
+  data.tar.gz: e732ad717a78ae1bf3ef8a590c5f353b23287e71
 SHA512:
-  metadata.gz: b091e44a42a0cf2aaa35de7976460d125dbccea7d7955b51191cc80ae394c065d0a39cbfa2b5cea0d80d2989155cb11d3fedbda2e3d60ad98cd080ee6727ea59
-  data.tar.gz: 2b9953cb4bf6e268c31c6e38af6ab024a754db16c6bd90e8cba1802abde97ee8ba90c24bcebe598eed2c572cc3743d42be31729362286bdfd95f733d33f2a863
+  metadata.gz: 907ab1f0c3ddede302f0b6323b270e6a8bb33a333ac62247da6ac1c90825649390ddef233c4990ca664e8edd61604506b1d3f4d1fb769bbccff1450b5633ad00
+  data.tar.gz: 09952ee3c893389cbd2412387431f54e52b06db259496e1771f4aeaad14d563d7802d55e820d3e565eb8de0f17fc8e451fe2a30b47c155525d80e296862a3a52

data/lib/linguist/blob_helper.rb

@@ -112,6 +112,12 @@ module Linguist
       end
     end
 
+    def ruby_encoding
+      if hash = detect_encoding
+        hash[:ruby_encoding]
+      end
+    end
+
     # Try to guess the encoding
     #
     # Returns: a Hash, with :encoding, :confidence, :type
@@ -258,7 +264,7 @@ module Linguist
           # large) strings.
           begin
             encoded_newlines = ["\r\n", "\r", "\n"].
-              map { |nl| nl.encode(encoding, "ASCII-8BIT").force_encoding(data.encoding) }
+              map { |nl| nl.encode(ruby_encoding, "ASCII-8BIT").force_encoding(data.encoding) }
 
             data.split(Regexp.union(encoded_newlines), -1)
           rescue Encoding::ConverterNotFoundError

data/lib/linguist/languages.yml

@@ -430,6 +430,14 @@ Common Lisp:
   - clisp
   - ecl
 
+Component Pascal:
+  type: programming
+  lexer: Delphi
+  color: "#b0ce4e"
+  extensions:
+  - .cp
+  - .cps
+
 Coq:
   type: programming
   extensions:
@@ -2017,8 +2025,9 @@ Standard ML:
   aliases:
   - sml
   extensions:
-  - .sml
+  - .ML
   - .fun
+  - .sml
 
 Stata:
   type: programming

data/lib/linguist/samples.json

@@ -92,6 +92,10 @@
       ".cl",
       ".lisp"
     ],
+    "Component Pascal": [
+      ".cp",
+      ".cps"
+    ],
     "Coq": [
       ".v"
     ],
@@ -562,6 +566,7 @@
       ".nut"
     ],
     "Standard ML": [
+      ".ML",
       ".fun",
       ".sig",
       ".sml"
@@ -729,8 +734,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 612725,
-  "languages_total": 799,
+  "tokens_total": 613712,
+  "languages_total": 802,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -15336,6 +15341,181 @@
       "line": 2,
       "After": 1
     },
+    "Component Pascal": {
+      "MODULE": 2,
+      "ObxControls": 1,
+      ";": 123,
+      "IMPORT": 2,
+      "Dialog": 1,
+      "Ports": 1,
+      "Properties": 1,
+      "Views": 1,
+      "CONST": 1,
+      "beginner": 5,
+      "advanced": 3,
+      "expert": 1,
+      "guru": 2,
+      "TYPE": 1,
+      "View": 6,
+      "POINTER": 2,
+      "TO": 2,
+      "RECORD": 2,
+      "(": 91,
+      "Views.View": 2,
+      ")": 94,
+      "size": 1,
+      "INTEGER": 10,
+      "END": 31,
+      "VAR": 9,
+      "data*": 1,
+      "class*": 1,
+      "list*": 1,
+      "Dialog.List": 1,
+      "width*": 1,
+      "predef": 12,
+      "ARRAY": 2,
+      "OF": 2,
+      "PROCEDURE": 12,
+      "SetList": 4,
+      "BEGIN": 13,
+      "IF": 11,
+      "data.class": 5,
+      "THEN": 12,
+      "data.list.SetLen": 3,
+      "data.list.SetItem": 11,
+      "ELSIF": 1,
+      "ELSE": 3,
+      "v": 6,
+      "CopyFromSimpleView": 2,
+      "source": 2,
+      "v.size": 10,
+      ".size": 1,
+      "Restore": 2,
+      "f": 1,
+      "Views.Frame": 1,
+      "l": 1,
+      "t": 1,
+      "r": 7,
+      "b": 1,
+      "[": 13,
+      "]": 13,
+      "f.DrawRect": 1,
+      "Ports.fill": 1,
+      "Ports.red": 1,
+      "HandlePropMsg": 2,
+      "msg": 2,
+      "Views.PropMessage": 1,
+      "WITH": 1,
+      "Properties.SizePref": 1,
+      "DO": 4,
+      "msg.w": 1,
+      "msg.h": 1,
+      "ClassNotify*": 1,
+      "op": 4,
+      "from": 2,
+      "to": 5,
+      "Dialog.changed": 2,
+      "OR": 4,
+      "&": 8,
+      "data.list.index": 3,
+      "data.width": 4,
+      "Dialog.Update": 2,
+      "data": 2,
+      "Dialog.UpdateList": 1,
+      "data.list": 1,
+      "ClassNotify": 1,
+      "ListNotify*": 1,
+      "ListNotify": 1,
+      "ListGuard*": 1,
+      "par": 2,
+      "Dialog.Par": 2,
+      "par.disabled": 1,
+      "ListGuard": 1,
+      "WidthGuard*": 1,
+      "par.readOnly": 1,
+      "#": 3,
+      "WidthGuard": 1,
+      "Open*": 1,
+      "NEW": 2,
+      "*": 1,
+      "Ports.mm": 1,
+      "Views.OpenAux": 1,
+      "Open": 1,
+      "ObxControls.": 1,
+      "ObxFact": 1,
+      "Stores": 1,
+      "Models": 1,
+      "TextModels": 1,
+      "TextControllers": 1,
+      "Integers": 1,
+      "Read": 3,
+      "TextModels.Reader": 2,
+      "x": 15,
+      "Integers.Integer": 3,
+      "i": 17,
+      "len": 5,
+      "beg": 11,
+      "ch": 14,
+      "CHAR": 3,
+      "buf": 5,
+      "r.ReadChar": 5,
+      "WHILE": 3,
+      "r.eot": 4,
+      "<=>": 1,
+      "ReadChar": 1,
+      "ASSERT": 1,
+      "eot": 1,
+      "<": 8,
+      "r.Pos": 2,
+      "-": 1,
+      "REPEAT": 3,
+      "INC": 4,
+      "UNTIL": 3,
+      "+": 1,
+      "r.SetPos": 2,
+      "X": 1,
+      "Integers.ConvertFromString": 1,
+      "Write": 3,
+      "w": 4,
+      "TextModels.Writer": 2,
+      "Integers.Sign": 2,
+      "w.WriteChar": 3,
+      "Integers.Digits10Of": 1,
+      "DEC": 1,
+      "Integers.ThisDigit10": 1,
+      "Compute*": 1,
+      "end": 6,
+      "n": 3,
+      "s": 3,
+      "Stores.Operation": 1,
+      "attr": 3,
+      "TextModels.Attributes": 1,
+      "c": 3,
+      "TextControllers.Controller": 1,
+      "TextControllers.Focus": 1,
+      "NIL": 3,
+      "c.HasSelection": 1,
+      "c.GetSelection": 1,
+      "c.text.NewReader": 1,
+      "r.ReadPrev": 2,
+      "r.attr": 1,
+      "Integers.Compare": 1,
+      "Integers.Long": 3,
+      "MAX": 1,
+      "LONGINT": 1,
+      "SHORT": 1,
+      "Integers.Short": 1,
+      "Integers.Product": 1,
+      "Models.BeginScript": 1,
+      "c.text": 2,
+      "c.text.Delete": 1,
+      "c.text.NewWriter": 1,
+      "w.SetPos": 1,
+      "w.SetAttr": 1,
+      "Models.EndScript": 1,
+      "Compute": 1,
+      "ObxFact.": 1
+    },
     "Coq": {
       "Inductive": 41,
       "day": 9,
@@ -60661,67 +60841,67 @@
       "newplayer.MoveTo": 1
     },
     "Standard ML": {
+      "structure": 15,
+      "LazyBase": 4,
+      "LAZY_BASE": 5,
+      "struct": 13,
+      "type": 6,
+      "a": 78,
+      "exception": 2,
+      "Undefined": 6,
+      "fun": 60,
+      "delay": 6,
+      "f": 46,
+      "force": 18,
+      "(": 840,
+      ")": 845,
+      "val": 147,
+      "undefined": 2,
+      "fn": 127,
+      "raise": 6,
+      "end": 55,
+      "LazyMemoBase": 4,
+      "datatype": 29,
+      "|": 226,
+      "Done": 2,
+      "of": 91,
+      "lazy": 13,
+      "unit": 7,
+      "-": 20,
+      "let": 44,
+      "open": 9,
+      "B": 2,
+      "inject": 5,
+      "x": 74,
+      "isUndefined": 4,
+      "ignore": 3,
+      ";": 21,
+      "false": 32,
+      "handle": 4,
+      "true": 36,
+      "toString": 4,
+      "if": 51,
+      "then": 51,
+      "else": 51,
+      "eqBy": 5,
+      "p": 10,
+      "y": 50,
+      "eq": 3,
+      "op": 2,
+      "compare": 8,
+      "Ops": 3,
+      "map": 3,
+      "Lazy": 2,
+      "LazyFn": 4,
+      "LazyMemo": 2,
       "signature": 2,
-      "LAZY_BASE": 3,
       "sig": 2,
-      "type": 5,
-      "a": 74,
-      "lazy": 12,
-      "-": 19,
-      ")": 826,
-      "end": 52,
       "LAZY": 1,
       "bool": 9,
-      "val": 143,
-      "inject": 3,
-      "toString": 3,
-      "(": 822,
       "string": 14,
-      "eq": 2,
       "*": 9,
-      "eqBy": 3,
-      "compare": 7,
       "order": 2,
-      "map": 2,
       "b": 58,
-      "structure": 10,
-      "Ops": 2,
-      "LazyBase": 2,
-      "struct": 9,
-      "exception": 1,
-      "Undefined": 3,
-      "fun": 51,
-      "delay": 3,
-      "f": 37,
-      "force": 9,
-      "undefined": 1,
-      "fn": 124,
-      "raise": 5,
-      "LazyMemoBase": 2,
-      "datatype": 28,
-      "|": 225,
-      "Done": 1,
-      "of": 90,
-      "unit": 6,
-      "let": 43,
-      "open": 8,
-      "B": 1,
-      "x": 59,
-      "isUndefined": 2,
-      "ignore": 2,
-      ";": 20,
-      "false": 31,
-      "handle": 3,
-      "true": 35,
-      "if": 50,
-      "then": 50,
-      "else": 50,
-      "p": 6,
-      "y": 44,
-      "op": 1,
-      "Lazy": 1,
-      "LazyFn": 2,
-      "LazyMemo": 1,
       "functor": 2,
       "Main": 1,
       "S": 2,
@@ -66642,6 +66822,7 @@
     "COBOL": 90,
     "CoffeeScript": 2951,
     "Common Lisp": 2186,
+    "Component Pascal": 825,
     "Coq": 18259,
     "Creole": 134,
     "Crystal": 1506,
@@ -66775,7 +66956,7 @@
     "SourcePawn": 2080,
     "SQL": 1485,
     "Squirrel": 130,
-    "Standard ML": 6405,
+    "Standard ML": 6567,
     "Stata": 3133,
     "Stylus": 76,
     "SuperCollider": 133,
@@ -66829,6 +67010,7 @@
     "COBOL": 4,
     "CoffeeScript": 9,
     "Common Lisp": 3,
+    "Component Pascal": 2,
     "Coq": 12,
     "Creole": 1,
     "Crystal": 3,
@@ -66962,7 +67144,7 @@
     "SourcePawn": 1,
     "SQL": 5,
     "Squirrel": 1,
-    "Standard ML": 4,
+    "Standard ML": 5,
     "Stata": 7,
     "Stylus": 1,
     "SuperCollider": 1,
@@ -66991,5 +67173,5 @@
     "Zephir": 2,
     "Zimpl": 1
   },
-  "md5": "482e5e1de8ec47e0b556809c8fe6f62b"
+  "md5": "4754c31a712c5e22354851fd14d4d4fa"
 }

data/lib/linguist/vendor.yml

@@ -168,6 +168,9 @@
 - (^|/)extjs/src/
 - (^|/)extjs/welcome/
 
+# Html5shiv
+- (^|/)html5shiv(\.min)?\.js$
+
 # Samples folders
 - ^[Ss]amples/
 

data/lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "2.11.3"
+  VERSION = "2.11.4"
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.11.4
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 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.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !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.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !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,
@@ -131,8 +131,6 @@ 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
@@ -148,6 +146,8 @@ 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
@@ -158,17 +158,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.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: GitHub Language detection