git_fame 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0f291251379ffd12d8d5a82f8185cacaefa0f8
-  data.tar.gz: 6cc2c5ffda6a473f738d8d00072f493ed878bdd1
+  metadata.gz: d193069cf48839443661210c94fd812dd1490568
+  data.tar.gz: e3fe0a34dacc2719ccb40cd641fbf3ec5024cfc1
 SHA512:
-  metadata.gz: c3412be9da9e3e78cda2b4da3fa5f446692f496f19c49487e7f52866d3aed6647cec40133eb9e655c7aeeedb740e6aa05a0dd9c25a9c8259dae0dc00026c6539
-  data.tar.gz: 63b0da5c88dff9c8925a0d647d17acae01006972e9481e64e6c7fd90d505d08788fa00dfcc3dab2d9b112b76f23cfcf5f9a8d0d968fb0f26d79f595ca62f8988
+  metadata.gz: 75453bb3d6694ccb3d934a3cb234278c6dfecbcd9f9f2550f5edce1a10c776d345d50a077cc4c33b94b5aba2c7d8ebd59c874fd2f80b642e07062daa3393bece
+  data.tar.gz: 645e9ccb6e9bf43b8fc7d39a3ab953bc16de8c927579f7647f24db4a755ccc02613a3fc945cf9db9753e64e8cef1caf5c9d0d584c98d37db87d5619976cd1be9

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "spec/fixtures/gash"]
 	path = spec/fixtures/gash
-	url = git://github.com/water/gash.git
+	url = https://github.com/water/gash.git

data/.travis.yml

@@ -6,16 +6,11 @@ rvm:
 - 2.0.0
 - 1.9.3
 script:
- - 'rspec spec'
+ - bundle exec rspec spec
 notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/e2b034ea2dbc919b02f7
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: change  # options: [always|never|change] default: always
-    on_start: false     # default: false
-before_install:
-  - sudo add-apt-repository ppa:git-core/ppa -y
-  - sudo apt-get update -q
-  - sudo apt-get install git -y
-  - gem install bundler
+    on_success: change
+    on_failure: change
+    on_start: false

data/git_fame.gemspec

@@ -36,6 +36,7 @@ Generates stats like:
   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.add_development_dependency("colorize")
 
   gem.required_ruby_version = ">= 1.9.2"
 end

data/lib/git_fame/base.rb

@@ -88,7 +88,6 @@ module GitFame
       ]
       @wopt = args.fetch(:whitespace, false) ? "-w" : ""
       @authors = {}
-      @cache = {}
       @verbose = args.fetch(:verbose, false)
       populate
     end
@@ -368,6 +367,13 @@ module GitFame
       @authors[(email || "").strip] ||= Author.new({ parent: self, name: name })
     end
 
+    # Lists the paths to contained git submodules
+    def current_submodules
+      execute("git config --file .gitmodules --get-regexp path | awk '{ print $2 }'") do |result|
+        result.to_s.split(/\n/)
+      end
+    end
+
     # List all files in current git directory, excluding
     # extensions in @extensions defined by the user
     def current_files
@@ -376,13 +382,9 @@ module GitFame
           filter_files(result.to_s.split(/\n/))
         end
       else
-        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)
+        submodules = current_submodules
+        execute("git #{git_directory_params} ls-tree -r #{commit_range.to_s} --name-only") do |result|
+          filter_files(result.to_s.split(/\n/).select { |f| !submodules.index(f) })
         end
       end
     end

data/lib/git_fame/version.rb

@@ -1,3 +1,3 @@
 module GitFame
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/spec/git_fame_spec.rb

@@ -134,8 +134,8 @@ describe GitFame::Base do
       })
     end
 
-    let(:author) do 
-      subject.authors.find do |author| 
+    let(:author) do
+      subject.authors.find do |author|
         author.name == "7rans"
       end
     end
@@ -461,4 +461,28 @@ describe GitFame::Base do
       }).commits.should eq(4)
     end
   end
+
+  describe "sub modules" do
+    it "should ignore any sub modules" do
+      before = GitFame::Base.new({repository: repository})
+      Dir.chdir(repository) do
+        `git submodule deinit levenshteinish 2>&1`
+        `git rm levenshteinish 2>&1`
+        `git submodule add https://github.com/oleander/levenshteinish.git`
+        `git submodule init`
+        `git add . && git commit -m "Add submodule"`
+      end
+      after = GitFame::Base.new({repository: repository})
+
+      before.authors.count.should eq(after.authors.count)
+      before.authors.zip(after.authors).each do |authors|
+        [:name, :raw_files, :raw_commits,
+          :raw_loc, :files_list,
+          :file_type_counts
+        ].each do |field|
+          authors[0].send(field).should eq(authors[1].send(field))
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "coveralls"
 require "rspec/collection_matchers"
 require "rspec/expectations"
 require "pp"
+require "colorize"
 require_relative "./support/startup"
 
 Coveralls.wear!
@@ -41,18 +42,18 @@ RSpec.configure do |config|
     mocks.syntax = :should
   end
   config.fail_fast = false
-  config.before(:all) do
+  config.before(:each) do
     Dir.chdir(repository) { system "git checkout 7ab01bc5a720 > /dev/null 2>&1" }
   end
   config.before(:suite) do
     ENV["TZ"] = "GMT-2"
     warn "-----------"
-    warn "Current environment:"
+    warn "Current environment:".yellow
     warn "\t#{`git --version`.strip}"
     warn "\t#{`grep --version`.strip}"
-    warn "Spec notes:"
+    warn "Spec notes:".yellow
     if suppress_stdout
-      warn "\tMessages to STDOUT has been suppressed. See spec/spec_helper.rb"
+      warn "\tMessages to STDOUT has been suppressed. See spec/spec_helper.rb".red
     end
     warn "\tRequires git 2.x for specs to pass"
     warn "\tTime zone during testing is set to #{ENV["TZ"]}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_fame
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: A command-line tool that helps you summarize and pretty-print collaborators
   in a git repository based on contributions
 email: