github-linguist 2.3.1 → 2.3.3

data/lib/linguist/blob_helper.rb

@@ -160,7 +160,7 @@ module Linguist
     #
     # Return true or false
     def safe_to_colorize?
-      text? && !large? && !high_ratio_of_long_lines?
+      !large? && text? && !high_ratio_of_long_lines?
     end
 
     # Internal: Does the blob have a ratio of long lines?
@@ -250,7 +250,9 @@ module Linguist
     #
     # Return true or false
     def indexable?
-      if binary?
+      if size > 100 * 1024
+        false
+      elsif binary?
         false
       elsif extname == '.txt'
         true
@@ -260,8 +262,6 @@ module Linguist
         false
       elsif generated?
         false
-      elsif size > 100 * 1024
-        false
       else
         true
       end

data/lib/linguist/samples.json

@@ -257,8 +257,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 269398,
-  "languages_total": 274,
+  "tokens_total": 270906,
+  "languages_total": 275,
   "tokens": {
     "Apex": {
       "global": 70,
@@ -25170,23 +25170,23 @@
       "/": 2
     },
     "Shell": {
-      "SHEBANG#!bash": 5,
-      "echo": 20,
+      "SHEBANG#!bash": 6,
+      "echo": 52,
       "export": 6,
       "PATH": 5,
       "pkgname": 1,
       "stud": 4,
-      "-": 42,
+      "-": 182,
       "git": 9,
       "pkgver": 1,
       "pkgrel": 1,
       "pkgdesc": 1,
       "arch": 1,
-      "(": 16,
+      "(": 89,
       "i686": 1,
       "x86_64": 1,
-      ")": 19,
-      "url": 1,
+      ")": 134,
+      "url": 4,
       "license": 1,
       "depends": 1,
       "libev": 1,
@@ -25198,26 +25198,26 @@
       "https": 1,
       "//github.com/bumptech/stud.git": 1,
       "_gitname": 1,
-      "build": 1,
-      "{": 5,
+      "build": 2,
+      "{": 49,
       "cd": 4,
       "msg": 4,
-      "if": 15,
-      "[": 24,
-      "d": 4,
-      "]": 24,
-      ";": 16,
-      "then": 17,
-      "&&": 4,
+      "if": 27,
+      "[": 70,
+      "d": 7,
+      "]": 70,
+      ";": 115,
+      "then": 29,
+      "&&": 54,
       "pull": 3,
       "origin": 1,
-      "else": 6,
+      "else": 10,
       "clone": 2,
-      "fi": 15,
+      "fi": 24,
       "rm": 2,
       "rf": 1,
       "make": 2,
-      "}": 5,
+      "}": 47,
       "package": 1,
       "PREFIX": 1,
       "/usr": 1,
@@ -25225,21 +25225,21 @@
       "install": 2,
       "Dm755": 1,
       "init.stud": 1,
-      "mkdir": 1,
-      "p": 1,
-      "#": 9,
+      "mkdir": 2,
+      "p": 2,
+      "#": 11,
       "Bash": 1,
       "script": 1,
-      "to": 4,
-      "the": 3,
+      "to": 15,
+      "the": 9,
       "dotfile": 1,
-      "repository": 2,
+      "repository": 3,
       "does": 1,
-      "a": 2,
+      "a": 7,
       "lot": 1,
-      "of": 1,
+      "of": 2,
       "fun": 2,
-      "stuff": 2,
+      "stuff": 3,
       "like": 1,
       "turning": 1,
       "normal": 1,
@@ -25248,11 +25248,11 @@
       ".bashrc": 1,
       "into": 1,
       "symlinks": 1,
-      "this": 1,
+      "this": 4,
       "away": 1,
       "optionally": 1,
       "moving": 1,
-      "old": 1,
+      "old": 4,
       "files": 1,
       "so": 1,
       "that": 1,
@@ -25260,7 +25260,7 @@
       "can": 1,
       "be": 1,
       "preserved": 1,
-      "setting": 1,
+      "setting": 2,
       "up": 1,
       "cron": 1,
       "job": 1,
@@ -25271,38 +25271,38 @@
       "some": 1,
       "more": 1,
       "shopt": 1,
-      "s": 2,
+      "s": 6,
       "nocasematch": 1,
       "This": 1,
       "makes": 1,
       "pattern": 1,
       "matching": 1,
-      "case": 2,
+      "case": 8,
       "insensitive": 1,
       "POSTFIX": 1,
       "URL": 1,
       "PUSHURL": 1,
       "overwrite": 3,
-      "true": 1,
+      "true": 2,
       "print_help": 2,
-      "e": 2,
-      "exit": 7,
-      "for": 3,
-      "opt": 2,
-      "in": 4,
-      "@": 1,
-      "do": 3,
+      "e": 4,
+      "exit": 9,
+      "for": 5,
+      "opt": 3,
+      "in": 14,
+      "@": 3,
+      "do": 7,
       "k": 1,
-      "|": 2,
+      "|": 14,
       "keep": 1,
-      "local": 3,
+      "local": 22,
       "false": 2,
-      "h": 1,
-      "help": 1,
-      "esac": 1,
-      "done": 3,
-      "f": 3,
-      ".*": 1,
+      "h": 3,
+      "help": 3,
+      "esac": 6,
+      "done": 7,
+      "f": 11,
+      ".*": 2,
       "o": 3,
       "continue": 1,
       "mv": 1,
@@ -25314,35 +25314,296 @@
       ".jobs.cron": 1,
       "source": 3,
       "/.bashrc": 1,
-      "set": 2,
-      "n": 2,
+      "set": 9,
+      "n": 7,
       "x": 1,
-      "unset": 3,
+      "unset": 6,
       "system": 1,
-      "exec": 1,
+      "exec": 3,
       "rbenv": 2,
       "versions": 1,
       "bare": 1,
-      "version": 1,
-      "z": 3,
-      "&": 4,
+      "version": 11,
+      "z": 4,
+      "&": 5,
       "prefix": 1,
-      "/dev/null": 2,
+      "/dev/null": 6,
       "rvm_ignore_rvmrc": 1,
-      "declare": 1,
+      "declare": 22,
       "rvmrc": 3,
       "rvm_rvmrc_files": 3,
       "ef": 1,
       "+": 1,
       "GREP_OPTIONS": 1,
-      "grep": 1,
-      "printf": 1,
+      "grep": 6,
+      "printf": 4,
       "rvm_path": 4,
       "UID": 1,
-      "elif": 2,
+      "elif": 4,
       "rvm_is_not_a_shell_function": 2,
       "rvm_path/scripts": 1,
       "rvm": 1,
+      "r": 15,
+      "sbt_release_version": 2,
+      "sbt_snapshot_version": 2,
+      "SNAPSHOT": 3,
+      "sbt_jar": 3,
+      "sbt_dir": 2,
+      "sbt_create": 2,
+      "sbt_snapshot": 1,
+      "sbt_launch_dir": 3,
+      "scala_version": 3,
+      "java_home": 1,
+      "sbt_explicit_version": 7,
+      "verbose": 6,
+      "debug": 11,
+      "quiet": 6,
+      "build_props_sbt": 3,
+      "project/build.properties": 9,
+      "versionLine": 2,
+      "sbt.version": 3,
+      "versionString": 3,
+      "versionLine##sbt.version": 1,
+      "update_build_props_sbt": 2,
+      "ver": 5,
+      "return": 3,
+      "perl": 3,
+      "pi": 1,
+      "q": 4,
+      "||": 12,
+      "Updated": 1,
+      "file": 3,
+      "Previous": 1,
+      "value": 1,
+      "was": 1,
+      "sbt_version": 8,
+      "v": 5,
+      "echoerr": 3,
+      "vlog": 1,
+      "dlog": 8,
+      "get_script_path": 2,
+      "path": 11,
+      "L": 1,
+      "target": 1,
+      "readlink": 1,
+      "get_mem_opts": 3,
+      "mem": 4,
+      "perm": 6,
+      "/": 2,
+      "<": 2,
+      "codecache": 1,
+      "die": 2,
+      "make_url": 3,
+      "groupid": 1,
+      "category": 1,
+      "default_jvm_opts": 1,
+      "default_sbt_opts": 1,
+      "default_sbt_mem": 2,
+      "noshare_opts": 1,
+      "sbt_opts_file": 1,
+      "jvm_opts_file": 1,
+      "latest_28": 1,
+      "latest_29": 1,
+      "latest_210": 1,
+      "script_path": 1,
+      "script_dir": 1,
+      "script_name": 2,
+      "java_cmd": 2,
+      "java": 2,
+      "sbt_mem": 5,
+      "residual_args": 4,
+      "java_args": 3,
+      "scalac_args": 4,
+      "sbt_commands": 2,
+      "build_props_scala": 1,
+      "build.scala.versions": 1,
+      "versionLine##build.scala.versions": 1,
+      "%": 3,
+      "execRunner": 2,
+      "arg": 3,
+      "sbt_groupid": 3,
+      "*": 11,
+      "org.scala": 4,
+      "tools.sbt": 3,
+      "sbt": 18,
+      "sbt_artifactory_list": 2,
+      "version0": 2,
+      "curl": 4,
+      "list": 1,
+      "only": 2,
+      "F": 1,
+      "pe": 1,
+      "make_release_url": 2,
+      "releases": 1,
+      "make_snapshot_url": 2,
+      "snapshots": 1,
+      "head": 1,
+      "jar_url": 1,
+      "jar_file": 1,
+      "download_url": 2,
+      "jar": 3,
+      "dirname": 1,
+      "which": 4,
+      "fail": 1,
+      "silent": 1,
+      "output": 1,
+      "wget": 2,
+      "O": 1,
+      "acquire_sbt_jar": 1,
+      "sbt_url": 1,
+      "usage": 2,
+      "cat": 3,
+      "<<": 2,
+      "EOM": 3,
+      "Usage": 1,
+      "options": 4,
+      "print": 1,
+      "message": 1,
+      "runner": 1,
+      "is": 5,
+      "chattier": 1,
+      "log": 2,
+      "level": 2,
+      "Debug": 1,
+      "Error": 1,
+      "no": 9,
+      "colors": 2,
+      "disable": 1,
+      "ANSI": 1,
+      "color": 1,
+      "codes": 1,
+      "create": 2,
+      "start": 1,
+      "even": 1,
+      "current": 1,
+      "directory": 3,
+      "contains": 2,
+      "project": 1,
+      "dir": 3,
+      "<path>": 3,
+      "global": 1,
+      "settings/plugins": 1,
+      "default": 4,
+      "/.sbt/": 1,
+      "<version>": 1,
+      "boot": 3,
+      "shared": 1,
+      "/.sbt/boot": 1,
+      "series": 1,
+      "ivy": 2,
+      "Ivy": 1,
+      "/.ivy2": 1,
+      "<integer>": 1,
+      "memory": 1,
+      "share": 2,
+      "use": 1,
+      "all": 1,
+      "caches": 1,
+      "sharing": 1,
+      "offline": 3,
+      "put": 1,
+      "mode": 2,
+      "jvm": 2,
+      "<port>": 1,
+      "Turn": 1,
+      "on": 2,
+      "JVM": 1,
+      "debugging": 1,
+      "open": 1,
+      "at": 1,
+      "given": 2,
+      "port.": 1,
+      "batch": 2,
+      "Disable": 1,
+      "interactive": 1,
+      "The": 1,
+      "way": 1,
+      "accomplish": 1,
+      "pre": 1,
+      "there": 2,
+      "build.properties": 1,
+      "an": 1,
+      "property": 1,
+      "update": 1,
+      "disk.": 1,
+      "That": 1,
+      "scalacOptions": 3,
+      "S": 2,
+      "stripped": 1,
+      "In": 1,
+      "duplicated": 1,
+      "or": 1,
+      "conflicting": 1,
+      "order": 1,
+      "above": 1,
+      "shows": 1,
+      "precedence": 1,
+      "JAVA_OPTS": 1,
+      "lowest": 1,
+      "command": 1,
+      "line": 1,
+      "highest.": 1,
+      "addJava": 9,
+      "addSbt": 12,
+      "addScalac": 2,
+      "addResidual": 2,
+      "addResolver": 1,
+      "addDebugger": 2,
+      "get_jvm_opts": 2,
+      "process_args": 2,
+      "require_arg": 12,
+      "type": 1,
+      "while": 2,
+      "gt": 1,
+      "shift": 28,
+      "integer": 1,
+      "inc": 1,
+      "port": 1,
+      "snapshot": 1,
+      "launch": 1,
+      "scala": 3,
+      "home": 2,
+      "D*": 1,
+      "J*": 1,
+      "S*": 1,
+      "sbtargs": 3,
+      "IFS": 1,
+      "read": 1,
+      "<\"$sbt_opts_file\">": 1,
+      "process": 1,
+      "combined": 1,
+      "args": 2,
+      "reset": 1,
+      "residuals": 1,
+      "argumentCount=": 1,
+      "we": 1,
+      "were": 1,
+      "any": 1,
+      "opts": 1,
+      "eq": 1,
+      "0": 1,
+      "ThisBuild": 1,
+      "Update": 1,
+      "properties": 1,
+      "disk": 1,
+      "explicit": 1,
+      "gives": 1,
+      "us": 1,
+      "choice": 1,
+      "Detected": 1,
+      "Overriding": 1,
+      "alert": 1,
+      "them": 1,
+      "here": 1,
+      "argumentCount": 1,
+      "./build.sbt": 1,
+      "./project": 1,
+      "pwd": 1,
+      "doesn": 1,
+      "t": 1,
+      "understand": 1,
+      "iflast": 1,
+      "#residual_args": 1,
       "SHEBANG#!sh": 2,
       "SHEBANG#!zsh": 2
     },
@@ -27452,7 +27713,7 @@
     "Scheme": 3478,
     "Scilab": 69,
     "SCSS": 39,
-    "Shell": 500,
+    "Shell": 2008,
     "Standard ML": 243,
     "SuperCollider": 135,
     "Tea": 3,
@@ -27522,7 +27783,7 @@
     "Scheme": 1,
     "Scilab": 3,
     "SCSS": 1,
-    "Shell": 15,
+    "Shell": 16,
     "Standard ML": 2,
     "SuperCollider": 1,
     "Tea": 1,
@@ -27537,5 +27798,5 @@
     "XSLT": 1,
     "YAML": 1
   },
-  "md5": "ca1d189ca79aa9c52370da78f2c2b4dd"
+  "md5": "73937d71c79ba8a2f9e085431017cb2d"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.13
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: GitHub Language detection