github-linguist 3.0.0b2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe4025454480bdad3b942c6201c14b41e3de683
-  data.tar.gz: 8fdafd734bd12b04536c2a8df23aca666a8ad451
+  metadata.gz: ac52d6c6ea94fe5bd2e524ab0ef7e2ca9514db9a
+  data.tar.gz: bceefdfc56bc096a82f7c51d63d57b89f3d69573
 SHA512:
-  metadata.gz: 86f7ce92a03ac15f8d68f4cfd6cd8be14656c3312a208152d0d2b3c646f795ae5bb886e1ce8a9b57b4faa94177f6734136c499f4e96af373bfded52be4c534d0
-  data.tar.gz: 16bd39eed1dbe1f773ad01cbc709f9aaf4baf1b2700c46b1868061bf8b1b69bc94941384c73f4c535edc667bd29542b4f4fa6090cdd511a01cf9313f1de6d5be
+  metadata.gz: 22b0bdbd4ad70bacca38c0773f49ea560e0ba18eb0f047abbc7db78b2979066878ee5ca310bfad8571831a401077d76d5ad91607560d3f4418eb0f46fecb6a9c
+  data.tar.gz: f63bd7ba70658cea43c668cad35fceef3ddbea9a1bf8ad19040f72907086cf542d3f11529104f3327975e4698226f2ac7584eebe1cab363ed656d8ec445fd63e

data/lib/linguist/languages.yml

@@ -735,12 +735,14 @@ GLSL:
   - .glsl
   - .fp
   - .frag
+  - .frg
   - .fshader
   - .geom
   - .glslv
   - .gshader
   - .shader
   - .vert
+  - .vrx
   - .vshader
 
 Genshi:

data/lib/linguist/repository.rb

@@ -131,8 +131,11 @@ module Linguist
         next if delta.binary
 
         if [:added, :modified].include? delta.status
-          mode = delta.new_file[:mode].to_s(8)
-          blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode)
+          # Skip submodules
+          mode = delta.new_file[:mode]
+          next if (mode & 040000) != 0
+
+          blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))
 
           # Skip vendored or generated blobs
           next if blob.vendored? || blob.generated? || blob.language.nil?

data/lib/linguist/samples.json

@@ -170,7 +170,9 @@
     "GLSL": [
       ".fp",
       ".frag",
-      ".glsl"
+      ".frg",
+      ".glsl",
+      ".vrx"
     ],
     "Game Maker Language": [
       ".gml"
@@ -781,8 +783,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 643487,
-  "languages_total": 843,
+  "tokens_total": 643530,
+  "languages_total": 845,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -23553,14 +23555,14 @@
       "////": 4,
       "High": 1,
       "quality": 2,
-      "(": 435,
+      "(": 437,
       "Some": 1,
       "browsers": 1,
       "may": 1,
       "freeze": 1,
       "or": 1,
       "crash": 1,
-      ")": 435,
+      ")": 437,
       "//#define": 10,
       "HIGHQUALITY": 2,
       "Medium": 1,
@@ -23602,7 +23604,7 @@
       "eps": 5,
       "e": 4,
       "-": 108,
-      ";": 383,
+      ";": 391,
       "PI": 3,
       "vec3": 165,
       "sunDir": 5,
@@ -23621,13 +23623,13 @@
       "tonemapping": 1,
       "mod289": 4,
       "x": 11,
-      "{": 82,
+      "{": 84,
       "return": 47,
       "floor": 8,
-      "*": 115,
+      "*": 116,
       "/": 24,
-      "}": 82,
-      "vec4": 73,
+      "}": 84,
+      "vec4": 77,
       "permute": 4,
       "x*34.0": 1,
       "+": 108,
@@ -23743,7 +23745,7 @@
       "p*0.5": 1,
       "Other": 1,
       "bump": 2,
-      "pos": 42,
+      "pos": 43,
       "rayDir": 43,
       "s": 23,
       "Fade": 1,
@@ -23931,8 +23933,8 @@
       "iResolution.x/iResolution.y*0.5": 1,
       "rd.x": 1,
       "rd.y": 1,
-      "void": 31,
-      "main": 5,
+      "void": 33,
+      "main": 7,
       "gl_FragCoord.xy": 7,
       "*0.25": 4,
       "*0.5": 1,
@@ -23944,7 +23946,16 @@
       "col*exposure": 1,
       "x*": 2,
       ".5": 1,
-      "gl_FragColor": 3,
+      "gl_FragColor": 4,
+      "varying": 6,
+      "v_color": 4,
+      "uniform": 8,
+      "mat4": 1,
+      "u_MVPMatrix": 2,
+      "attribute": 2,
+      "a_position": 1,
+      "a_color": 2,
+      "gl_Position": 1,
       "#version": 2,
       "core": 1,
       "cbar": 2,
@@ -23980,11 +23991,9 @@
       "AMBIENT": 2,
       "MAX_DIST": 3,
       "MAX_DIST_SQUARED": 3,
-      "uniform": 7,
       "lightColor": 3,
       "[": 29,
       "]": 29,
-      "varying": 4,
       "fragmentNormal": 2,
       "cameraVector": 2,
       "lightVector": 4,
@@ -69657,7 +69666,7 @@
     "GAMS": 363,
     "GAP": 9944,
     "GAS": 133,
-    "GLSL": 4033,
+    "GLSL": 4076,
     "Game Maker Language": 13310,
     "Gnuplot": 1023,
     "Gosu": 410,
@@ -69854,7 +69863,7 @@
     "GAMS": 1,
     "GAP": 7,
     "GAS": 1,
-    "GLSL": 5,
+    "GLSL": 7,
     "Game Maker Language": 13,
     "Gnuplot": 6,
     "Gosu": 4,
@@ -70004,5 +70013,5 @@
     "fish": 3,
     "wisp": 1
   },
-  "md5": "59afe9ab875947c5df3590aef023152d"
+  "md5": "bb637c5d1f457edff3f8c2676d10807a"
 }

data/lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.0.0b2"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 3.0.0b2
+  version: 3.0.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
@@ -178,9 +178,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3