github-linguist 4.6.0 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e908297a23747b75632757998f7e16e3daa923
-  data.tar.gz: d4421c50a81f0360941bd3d92ffb76702edd7136
+  metadata.gz: f0a7e76588573f7975f1ed31cc621400170ebb21
+  data.tar.gz: f9529b2c29986e3493c3d5512c70c6aa3ddaa6c6
 SHA512:
-  metadata.gz: 1603a43de2817ceff7a9512524a24010b5a649b7fb8236331677821152729f2f6fda13d00b6a3f787b6363f7a00d64bfbc12f9a7700880d838ed681b61fd7a67
-  data.tar.gz: 38f1e50a2006ee6e5b29ec073ed4741a4638c4ee806656fa17654b77bde270b6eaa1e65bae8cfdd82bbc20539f9604f389fdd0efcc65e853c00015a752defb5c
+  metadata.gz: 8b3bfae66561aca83ffd529619c36a7100b035f5d840d4a4d15e0e5ce2aa7afca93bbf26db42bec8117581401b48724cc3a0f009df2790e13ebb9db65052f998
+  data.tar.gz: dae8a3ed00c63957a34c3b0106409f863e9ee029ede1e000f54a49446d645f81b76dfa312312adeb7c71be81ee387e0e6a12af02294f84ea56927a1ff8ef4704

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2011-2015 GitHub, Inc.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/bin/git-linguist

@@ -8,20 +8,19 @@ require 'tmpdir'
 require 'zlib'
 
 class GitLinguist
-  attr_reader :repo_path
-  attr_reader :commit_oid
-  attr_reader :incremental
-
   def initialize(path, commit_oid, incremental = true)
     @repo_path = path
-    @commit_oid = commit_oid || rugged.head.target_id
+    @commit_oid = commit_oid
     @incremental = incremental
   end
 
   def linguist
-    repo = Linguist::Repository.new(rugged, commit_oid)
+    if @commit_oid.nil?
+      raise "git-linguist must be called with a specific commit OID to perform language computation"
+    end
+    repo = Linguist::Repository.new(rugged, @commit_oid)
 
-    if incremental && stats = load_language_stats
+    if @incremental && stats = load_language_stats
       old_commit_oid, old_stats = stats
 
       # A cache with NULL oid means that we want to froze
@@ -33,19 +32,19 @@ class GitLinguist
 
     result = yield repo
 
-    save_language_stats(commit_oid, repo.cache)
+    save_language_stats(@commit_oid, repo.cache)
     result
   end
 
   def load_language_stats
-    version, commit_oid, stats = load_cache
-    if version == LANGUAGE_STATS_CACHE_VERSION && commit_oid && stats
-      [commit_oid, stats]
+    version, oid, stats = load_cache
+    if version == LANGUAGE_STATS_CACHE_VERSION && oid && stats
+      [oid, stats]
     end
   end
 
-  def save_language_stats(commit_oid, stats)
-    cache = [LANGUAGE_STATS_CACHE_VERSION, commit_oid, stats]
+  def save_language_stats(oid, stats)
+    cache = [LANGUAGE_STATS_CACHE_VERSION, oid, stats]
     write_cache(cache)
   end
 
@@ -64,25 +63,28 @@ class GitLinguist
   LANGUAGE_STATS_CACHE_VERSION = "v3:#{Linguist::VERSION}"
 
   def rugged
-    @rugged ||= Rugged::Repository.bare(repo_path)
+    @rugged ||= Rugged::Repository.bare(@repo_path)
   end
 
   def cache_file
-    File.join(repo_path, LANGUAGE_STATS_CACHE)
+    File.join(@repo_path, LANGUAGE_STATS_CACHE)
   end
 
   def write_cache(object)
-    tmp_path = Dir::Tmpname.make_tmpname(cache_file, nil)
-
-    File.open(tmp_path, "wb") do |f|
-      marshal = Marshal.dump(object)
-      f.write(Zlib::Deflate.deflate(marshal))
+    return unless File.directory? @repo_path
+
+    begin
+      tmp_path = Dir::Tmpname.make_tmpname(cache_file, nil)
+      File.open(tmp_path, "wb") do |f|
+        marshal = Marshal.dump(object)
+        f.write(Zlib::Deflate.deflate(marshal))
+      end
+
+      File.rename(tmp_path, cache_file)
+    rescue => e
+      (File.unlink(tmp_path) rescue nil)
+      raise e
     end
-
-    File.rename(tmp_path, cache_file)
-    tmp_path = nil
-  ensure
-    (File.unlink(tmp_path) rescue nil) if tmp_path
   end
 
   def load_cache
@@ -97,24 +99,18 @@ end
 def git_linguist(args)
   incremental = true
   commit = nil
-  git_dir = nil
 
   parser = OptionParser.new do |opts|
     opts.banner = "Usage: git-linguist [OPTIONS] stats|breakdown|dump-cache|clear|disable"
 
     opts.on("-f", "--force", "Force a full rescan") { incremental = false }
-    opts.on("--git-dir=DIR", "Path to the git repository") { |v| git_dir = v }
     opts.on("--commit=COMMIT", "Commit to index") { |v| commit = v}
   end
 
   parser.parse!(args)
 
-  git_dir ||= begin
-    pwd = Dir.pwd
-    dotgit = File.join(pwd, ".git")
-    File.directory?(dotgit) ? dotgit : pwd
-  end
-
+  git_dir = `git rev-parse --git-dir`.strip
+  raise "git-linguist must be ran in a Git repository" unless $?.success?
   wrapper = GitLinguist.new(git_dir, commit, incremental)
 
   case args.pop

data/lib/linguist/languages.yml

@@ -8,7 +8,8 @@
 #                     Use "text" if a mode does not exist.
 # wrap              - Boolean wrap to enable line wrapping (default: false)
 # extensions        - An Array of associated extensions (the first one is
-#                     considered the primary extension)
+#                     considered the primary extension, the others should be
+#                     listed alphabetically)
 # interpreters      - An Array of associated interpreters
 # searchable        - Boolean flag to enable searching (defaults to true)
 # search_term       - Deprecated: Some languages maybe indexed under a

data/lib/linguist/repository.rb

@@ -126,12 +126,13 @@ module Linguist
     end
 
     protected
+    MAX_TREE_SIZE = 100_000
 
     def compute_stats(old_commit_oid, cache = nil)
-      old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
+      return {} if current_tree.count_recursive(MAX_TREE_SIZE) >= MAX_TREE_SIZE
 
+      old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
       read_index
-
       diff = Rugged::Tree.diff(repository, old_tree, current_tree)
 
       # Clear file map and fetch full diff if any .gitattributes files are changed

data/lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.6.0"
+  VERSION = "4.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.3
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
@@ -174,6 +174,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - bin/git-linguist
 - bin/linguist
 - lib/linguist.rb