git_fame 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f60cc8e1ebb619b563a10256cd86549fdd59a901
-  data.tar.gz: 93a5887855e265c463bd3c8ab1a48c24a107cfa1
+  metadata.gz: 9d14b517588cbb66c5ee322ffc1a1ffc1a0da758
+  data.tar.gz: 319dedff1fd52b79a5d7efbcd875dfb81baf9fd4
 SHA512:
-  metadata.gz: 20cbb0c37d9d3637c0b9c3e73241c4a10e73ffa877e76e97014e7ddcfab064d03c1f2932b3d1b6e441ce298bdb8b7d96dffb9530f570a1ac19c75f844cb63673
-  data.tar.gz: 86e2e53e6f36480ec4bb3b9f99925a77429c4c9d5af99809558ff65b49fab52f82b523a7aea5219f7ae5e8f72ae4169d7f431f8e87c7887d52fb7ab56cea9569
+  metadata.gz: 872d9eaa67f0e3f7fc8fd6f61d387247a9e2dbc29a62d63e541d3a478b4f3d32a5fa9e4edf1047051b53a96def45c16f28516a8ca8b00c3d1d49d2c89947b9ad
+  data.tar.gz: ac02d50b811a68ff8d2f51c7ab7f413814371c92906fbe127e36537468946b2b0d8b5e7846d616c38a2dcf401d24d1a14eccc4d7176aa5bbdb4c58b1de5db453

data/README.md

@@ -45,7 +45,7 @@ From a git repository run `git fame`.
 - `git fame --repository=/path/to/repo` Git repository to be used. Default is the current folder.
 - `git fame --branch=master` Branch to run on. Default is what `HEAD` points to.
 - `git fame --format=output` Output format. Default is `pretty`. Additional: `csv`.
-- `git fame --after=2010-01-01` Only use commmits after this date. Format: yyyy-mm-dd. Note that the given date is included.
+- `git fame --after=2010-01-01` Only use commits after this date. Format: yyyy-mm-dd. Note that the given date is included.
 - `git fame --before=2016-02-01` Only use commits before this date. Format: yyyy-mm-dd. Note that the given date is included.
 - `git fame --verbose` Print shell commands used by `git-fame`.
 - `git fame --everything` Images and binaries are ignored by default. Include them as well.
@@ -133,4 +133,4 @@ Visit `spec/spec_helper.rb` to enable it again.
 
 ## License
 
-*GitFame* is released under the *MIT license*.
+*GitFame* is released under the *MIT license*.

data/git_fame.gemspec

@@ -35,6 +35,9 @@ Generates data like:
   gem.add_development_dependency("rspec-collection_matchers", "~> 1.1.2")
   gem.add_development_dependency("rake", "~> 10.4.2")
   gem.add_development_dependency("coveralls", "~> 0.8.1")
+  gem.add_development_dependency("json", "~> 1.8.3")
+  gem.add_development_dependency("tins", "~> 1.6.0")
+  gem.add_development_dependency("term-ansicolor", "~> 1.3.2")
 
   gem.required_ruby_version = ">= 1.9.2"
 end

data/lib/git_fame/base.rb

@@ -365,19 +365,24 @@ module GitFame
     end
 
     def author_by_email(email, name = nil)
-      @authors[email.strip] ||= Author.new({ parent: self, name: name })
+      @authors[(email || "").strip] ||= Author.new({ parent: self, name: name })
     end
 
     # List all files in current git directory, excluding
     # extensions in @extensions defined by the user
     def current_files
       if commit_range.is_range?
-        execute("git #{git_directory_params} -c diff.renames=0 -c diff.renameLimit=1000 diff -M -C -c --name-only --diff-filter=AM #{encoding_opt} #{default_params} #{commit_range.to_s}") do |result|
-          filter_files(result)
+        execute("git #{git_directory_params} -c diff.renames=0 -c diff.renameLimit=1000 diff -M -C -c --name-only --ignore-submodules=all --diff-filter=AM #{encoding_opt} #{default_params} #{commit_range.to_s}") do |result|
+          filter_files(result.to_s.split(/\n/))
         end
       else
-        execute("git #{git_directory_params} ls-tree --name-only -r #{commit_range.to_s}") do |result|
-          filter_files(result)
+        execute("git #{git_directory_params} ls-tree -r #{commit_range.to_s}") do |result|
+          lines = result.to_s.split(/\n/).inject([]) do |lines, line|
+            # Ignore submodules
+            next lines if line.strip.match(/^160000/)
+            next [line.split(/\s+/).last] + lines
+          end
+          filter_files(lines)
         end
       end
     end
@@ -394,8 +399,7 @@ module GitFame
       "--encoding=UTF-8"
     end
 
-    def filter_files(result)
-      raw_files = result.to_s.split("\n")
+    def filter_files(raw_files)
       files = remove_excluded_files(raw_files)
       files = keep_included_files(files)
       files = files.map { |file| GitFame::FileUnit.new(file) }

data/lib/git_fame/version.rb

@@ -1,3 +1,3 @@
 module GitFame
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/spec/git_fame_spec.rb

@@ -22,7 +22,7 @@ describe GitFame::Base do
       end
 
       it "should have a number of locs" do
-        author.raw(:loc).should eq(579)
+        author.raw(:loc).should eq(575)
       end
 
       it "should have a number of files" do
@@ -30,7 +30,7 @@ describe GitFame::Base do
       end
 
       it "should have a distribution" do
-        author.distribution.should eq("53.9 / 58.6 / 25.0")
+        author.distribution.should eq("53.7 / 58.6 / 25.0")
       end
     end
 
@@ -61,7 +61,7 @@ describe GitFame::Base do
     it "should respond to #loc, #commits and #files" do
       subject.files.should eq(16)
       subject.commits.should eq(70)
-      subject.loc.should eq(1075)
+      subject.loc.should eq(1071)
     end
   end
 
@@ -204,8 +204,8 @@ describe GitFame::Base do
     it "should be equal to" do
       subject.to_csv.should eq([
         "name,loc,commits,files,distribution\n",
-        "Magnus Holm,579,41,4,53.9 / 58.6 / 25.0\n",
-        "7rans,360,6,10,33.5 /  8.6 / 62.5\n",
+        "Magnus Holm,575,41,4,53.7 / 58.6 / 25.0\n",
+        "7rans,360,6,10,33.6 /  8.6 / 62.5\n",
         "Linus Oleander,136,23,7,12.7 / 32.9 / 43.8\n",
       ].join)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_fame
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -150,6 +150,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: Generates awesome stats from git-blame
 email:
 - linus@oleander.nu
@@ -202,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Generates awesome stats from git-blame  A Ruby wrapper for git-blame. Generates