git_fame 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa907cac405078c8f5abb7ed8fbfc88287a697c
-  data.tar.gz: 47376faa0102f406245338f2b6bd06f39759db2d
+  metadata.gz: 04200942414c95c6ec6c73bd9c6274d974c4e4ab
+  data.tar.gz: 290528caaf2d7ea37a707177b1a4cfa54ffa3401
 SHA512:
-  metadata.gz: be9bf2ff037c1d694a77b7f85cca6fac75f90d0e3020120283a03a0e0d39e987e20a7c545451f8b04a5ac9a86b8f00887fff9150b01ab816bd7d46eb0b530d5a
-  data.tar.gz: 34aa7cf88a69a5547d5b790254f4567bc06b1071f066301285f19ec2353e4878de6bd708a9cc7281bd737341f99b6f1ad87f4207137a06a11ebf3ee6168abafe
+  metadata.gz: 0f9138e9bde7548b928b85adaaf6a45b2821e055c8f77058cdceb01065390abb3b661c2e9a2f7e6edd2add5f6dfe8a49ce18c6bff129cb54a26b51af9d67b7aa
+  data.tar.gz: 4d8c8f0d4545b5f189179f9fc30f05cfd3ef62f6e3f37405f2903ce4972fef5f0c0baf8154c0aa010175b0e81fb301db8312d4d971c278b8224d3f8834404750

data/README.md

@@ -122,7 +122,7 @@ The list of authors may include what you perceive to be duplicate people. If a g
 
 ## Requirements
 
-*GitFame* is tested in *OS X 10.7.4* using Ruby *1.9.2*.
+*GitFame* should work on all Unix based operating system with Git installed.
 
 ## License
 

data/git_fame.gemspec

@@ -28,7 +28,9 @@ Generates data like:
   gem.add_dependency("trollop")
   gem.add_dependency("hirb")
   gem.add_dependency("mimer_plus")
+  gem.add_dependency("string-scrub")
   
   gem.add_development_dependency("rspec")
+  gem.add_development_dependency("rake")
   gem.required_ruby_version = ">= 1.9.2"
 end

data/lib/git_fame/author.rb

@@ -1,7 +1,9 @@
 module GitFame
   class Author
     include GitFame::Helper
-    attr_accessor :name, :raw_files, :raw_commits, :raw_loc, :files_list, :file_type_counts
+    attr_accessor :name, :raw_files, :raw_commits, 
+      :raw_loc, :files_list, :file_type_counts
+
     #
     # @args Hash
     #
@@ -36,6 +38,5 @@ module GitFame
     def method_missing(m, *args, &block)
       file_type_counts[m.to_s]
     end
-
   end
 end

data/lib/git_fame/base.rb

@@ -1,3 +1,5 @@
+require "string-scrub"
+
 module GitFame
   class Base
     include GitFame::Helper
@@ -6,7 +8,8 @@ module GitFame
     # @args[:repository] String Absolute path to git repository
     # @args[:sort] String What should #authors be sorted by?
     # @args[:bytype] Boolean Should counts be grouped by file extension?
-    # @args[:exclude] String Comma-separated list of paths in the repo which should be excluded
+    # @args[:exclude] String Comma-separated list of paths in the repo 
+    #   which should be excluded
     #
     def initialize(args)
       @sort         = "loc"
@@ -19,7 +22,7 @@ module GitFame
       args.keys.each do |name| 
         instance_variable_set "@" + name.to_s, args[name]
       end
-      convert_exclude_paths_to_array
+      @exclude = convert_exclude_paths_to_array
     end
 
     #
@@ -33,7 +36,10 @@ module GitFame
       puts "Total number of commits: #{number_with_delimiter(commits)}\n"
 
       fields = [:name, :loc, :commits, :files, :distribution]
-      fields << populate.instance_variable_get("@file_extensions").uniq.sort if @bytype
+      if @bytype
+        fields << populate.instance_variable_get("@file_extensions").
+          uniq.sort
+      end
       table(authors, fields: fields.flatten)
     end
 
@@ -62,7 +68,8 @@ module GitFame
     # @return Fixnum Total number of lines
     #
     def loc
-      populate.authors.inject(0){ |result, author| author.raw_loc + result }
+      populate.authors.
+        inject(0){ |result, author| author.raw_loc + result }
     end
 
     #
@@ -70,13 +77,17 @@ module GitFame
     #
     def authors
       authors = populate.instance_variable_get("@authors").values
-      @sort ? authors.sort_by do |author|
-        if @sort == "name"
-          author.send(@sort)
-        else
-          -1 * author.send("raw_#{@sort}")
+      if @sort
+        authors.sort_by do |author|
+          if @sort == "name"
+            author.send(@sort)
+          else
+            -1 * author.send("raw_#{@sort}")
+          end
         end
-      end : authors
+      else
+        authors
+      end
     end
 
     #
@@ -93,7 +104,7 @@ module GitFame
     #
     def execute(command)
       Dir.chdir(@repository) do
-        return `#{command}`
+        return `#{command}`.scrub
       end
     end
 
@@ -122,27 +133,44 @@ module GitFame
     # @return GitFame
     #
     def populate
-      @_pop ||= lambda {
+      @_populate ||= begin
         @files = execute("git ls-files").split("\n")
         @file_extensions = []
         remove_excluded_files
-        progressbar = SilentProgressbar.new("Blame", @files.count, @progressbar)
+        progressbar = SilentProgressbar.new(
+          "Blame", 
+          @files.count, 
+          @progressbar
+        )
         blame_opts = @whitespace ? "-w" : ""
         @files.each do |file|
           progressbar.inc
           if @bytype
-            file_extension = File.extname(file).sub(/\A\./,"")
+            file_extension = File.extname(file).gsub(/^\./, "")
             file_extension = "unknown" if file_extension.empty?
           end
-          if type = Mimer.identify(File.join(@repository, file)) and not type.mime_type.match(/binary/)
-            @file_extensions << file_extension # only count extensions that aren't binary!
-            begin
-              execute("git blame '#{file}' #{blame_opts} --line-porcelain").scan(/^author (.+)$/).each do |author|
-                fetch(author.first).raw_loc += 1
-                @file_authors[author.first][file] ||= 1
-                fetch(author.first).file_type_counts[file_extension] += 1 if @bytype
-              end
-            rescue ArgumentError; end # Encoding error
+
+          unless type = Mimer.identify(File.join(@repository, file))
+            next
+          end
+
+          if type.binary?
+            next
+          end
+
+          # only count extensions that aren't binary
+          @file_extensions << file_extension
+
+          output = execute(
+            "git blame '#{file}' #{blame_opts} --line-porcelain"
+          )
+          output.scan(/^author (.+)$/).each do |author|
+            fetch(author.first).raw_loc += 1
+            @file_authors[author.first][file] ||= 1
+            if @bytype
+              fetch(author.first).
+                file_type_counts[file_extension] += 1
+            end
           end
         end
 
@@ -169,7 +197,7 @@ module GitFame
 
         progressbar.finish
 
-      }.call
+      end
       return self
     end
 
@@ -177,7 +205,7 @@ module GitFame
     # Converts @exclude argument to an array and removes leading slash
     #
     def convert_exclude_paths_to_array
-      @exclude = @exclude.split(",").map{|path| path.strip.sub(/\A\//, "") }
+      @exclude.split(",").map{|path| path.strip.sub(/\A\//, "") }
     end
 
     #
@@ -190,6 +218,5 @@ module GitFame
         path
       end.compact
     end
-
   end
 end

data/lib/git_fame/version.rb

@@ -1,3 +1,3 @@
 module GitFame
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/spec/git_fame_spec.rb

@@ -60,23 +60,42 @@ describe GitFame::Base do
 
   describe "sort" do
     it "should be able to sort #authors by name" do
-      authors = GitFame::Base.new({repository: @repository, sort: "name"}).authors
-      authors.map(&:name).should eq(["7rans", "Linus Oleander", "Magnus Holm"])
+      authors = GitFame::Base.new({
+        repository: @repository, 
+        sort: "name"
+      }).authors
+      authors.map(&:name).
+        should eq(["7rans", "Linus Oleander", "Magnus Holm"])
     end
 
     it "should be able to sort #authors by commits" do
-      authors = GitFame::Base.new({repository: @repository, sort: "commits"}).authors
-      authors.map(&:name).should eq(["Magnus Holm", "Linus Oleander", "7rans"])
+      authors = GitFame::Base.new({
+        repository: @repository, 
+        sort: "commits"
+      }).authors
+      authors.map(&:name).
+        should eq(["Magnus Holm", "Linus Oleander", "7rans"])
     end
 
     it "should be able to sort #authors by files" do
-      authors = GitFame::Base.new({repository: @repository, sort: "files"}).authors
-      authors.map(&:name).should eq(["7rans", "Linus Oleander", "Magnus Holm"])
+      authors = GitFame::Base.new({
+        repository: @repository, 
+        sort: "files"
+      }).authors
+      authors.map(&:name).
+        should eq(["7rans", "Linus Oleander", "Magnus Holm"])
     end
   end
 
   describe "#command_line_arguments" do
-    let(:subject) { GitFame::Base.new({repository: @repository, exclude: "lib", bytype: true }) }
+    let(:subject) do 
+      GitFame::Base.new({
+        repository: @repository, 
+        exclude: "lib", 
+        bytype: true
+      }) 
+    end
+
     it "should exclude the lib folder" do
       subject.file_list.include?("lib/gash.rb").should be_false
     end
@@ -105,7 +124,8 @@ describe GitFame::Base do
     end
 
     it "should know if a folder exists or not [absolute path]" do
-      GitFame::Base.git_repository?("/f67c2bcbfcfa30fccb36f72dca22a817").should be_false
+      GitFame::Base.git_repository?("/f67c2bcbfcfa30fccb36f72dca22a817").
+        should be_false
     end
 
     it "should know if a folder is a git repository [relative path]" do
@@ -113,7 +133,8 @@ describe GitFame::Base do
     end
 
     it "should know if a folder exists or not [relative path]" do
-      GitFame::Base.git_repository?("f67c2bcbfcfa30fccb36f72dca22a817").should be_false
+      GitFame::Base.git_repository?("f67c2bcbfcfa30fccb36f72dca22a817").
+        should be_false
     end
   end
 end

metadata

@@ -1,83 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: git_fame
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mimer_plus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: string-scrub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: Generates some awesome stats from git-blame
@@ -88,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -114,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Generates some awesome stats from git-blame  A Ruby wrapper for git-blame.