git_statistics 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2c8d9e4ff4611dfa6c6b2f9f664fb874a7201f
-  data.tar.gz: 9da9f644f174806900bd8b2a2921906bfc3e3989
+  metadata.gz: 73f7fc388f1d121e11c2699b107138fee200da9b
+  data.tar.gz: b87b3b4c7cfbc545df2e7d933142289d0665c1e5
 SHA512:
-  metadata.gz: 381f1532eee3178c8a1459ec2f5ca37f1429786c56e4bae54c6139e2e9ed4fea6253fc4960d6b426e360e777c6adad1c48bffac53b1ce4fe9f93b5de27f5e51f
-  data.tar.gz: b7bb4f77e58b6f1bf73cfd09219651c0256a59a8a9b3de25a50c11948063a66c3df88856b14210709a6353f1fd0bf97d5eeaafea95f3d36d0a7587bf4d5fd7cf
+  metadata.gz: 6c531508caedd57a36a3c0ef0ecb40db56483b17e28d765967496e3220b1752ff2091f349da6058f88ecdf41d6cb98cb97b1b7585c25c2db6da5520dbb2ad27e
+  data.tar.gz: 80370289c3c487d77af7b89bba761311654c622786f7b3326fa7ca97c6250514278a33977fc89b4ab890f353ca18f4d295bd36dcc034e27577f8abd0842e598a

data/bin/git-statistics

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'git_statistics'
 
 GitStatistics::CLI.new(Dir.pwd).execute

data/bin/git_statistics

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'git_statistics'
 
 GitStatistics::CLI.new(Dir.pwd).execute

data/lib/git_statistics.rb

@@ -4,11 +4,10 @@ module GitStatistics
   class CLI
     attr_reader :repository, :options
 
-    DEFAULT_BRANCH = "master"
+    DEFAULT_BRANCH = 'master'
 
     def initialize(dir)
-      repository_location = dir.nil? ? Rugged::Repository.discover(Dir.pwd) : Rugged::Repository.discover(dir)
-      @repository = Rugged::Repository.new(repository_location)
+      @repository = dir.nil? ? Rugged::Repository.discover(Dir.pwd) : Rugged::Repository.discover(dir)
       @collected = false
       @collector = nil
       @options = OpenStruct.new(
@@ -16,7 +15,7 @@ module GitStatistics
         merges: false,
         pretty: false,
         update: false,
-        sort: "commits",
+        sort: 'commits',
         top: 0,
         branch: DEFAULT_BRANCH,
         verbose: false,
@@ -35,19 +34,19 @@ module GitStatistics
     end
 
     def collect_and_only_update
-      if options.update
-        # Ensure commit directory is present
-        @collector = Collector.new(repository, options.limit, false, options.pretty)
-        commits_directory = repository.workdir + ".git_statistics/"
-        FileUtils.mkdir_p(commits_directory)
-        file_count = Utilities.number_of_matching_files(commits_directory, /\d+\.json/) - 1
+      return unless options.update
 
-        if file_count >= 0
-          time_since = Utilities.get_modified_time(commits_directory + "#{file_count}.json").to_s
-          @collector.collect({:branch => options.branch, :time_since => time_since})
-          @collected = true
-        end
-      end
+      # Ensure commit directory is present
+      @collector = Collector.new(repository, options.limit, false, options.pretty)
+      commits_directory = repository.workdir + '.git_statistics/'
+      FileUtils.mkdir_p(commits_directory)
+      file_count = Utilities.number_of_matching_files(commits_directory, /\d+\.json/) - 1
+
+      return unless file_count >= 0
+
+      time_since = Utilities.get_modified_time(commits_directory + "#{file_count}.json").to_s
+      @collector.collect(branch: options.branch, time_since: time_since)
+      @collected = true
     end
 
     def calculate!
@@ -61,40 +60,40 @@ module GitStatistics
 
     def fresh_collect!
       @collector = Collector.new(repository, options.limit, true, options.pretty)
-      @collector.collect({:branch => options.branch})
+      @collector.collect(branch: options.branch)
     end
 
     def parse_options
       OptionParser.new do |opt|
         opt.version = VERSION
-        opt.on "-e", "--email", "Use author's email instead of name" do
+        opt.on '-e', '--email', "Use author's email instead of name" do
           options.email = true
         end
-        opt.on "-m", "--merges", "Factor in merges when calculating statistics" do
+        opt.on '-m', '--merges', 'Factor in merges when calculating statistics' do
           options.merges = true
         end
-        opt.on "-p", "--pretty", "Save the commits in git_repo/.git_statistics in pretty print (larger file size)" do
+        opt.on '-p', '--pretty', 'Save the commits in git_repo/.git_statistics in pretty print (larger file size)' do
           options.pretty = true
         end
-        opt.on "-u", "--update", "Update saved commits with new data" do
+        opt.on '-u', '--update', 'Update saved commits with new data' do
           options.update = true
         end
-        opt.on "-s", "--sort TYPE", "Sort authors by {commits, additions, deletions, create, delete, rename, copy, merges}" do |type|
+        opt.on '-s', '--sort TYPE', 'Sort authors by {commits, additions, deletions, create, delete, rename, copy, merges}' do |type|
           options.sort = type
         end
-        opt.on "-t", "--top N", Float,"Show the top N authors in results" do |value|
+        opt.on '-t', '--top N', Float, 'Show the top N authors in results' do |value|
           options.top = value
         end
-        opt.on "-b", "--branch BRANCH", "Use the specified branch for statistics (otherwise the master branch is used)" do |branch|
+        opt.on '-b', '--branch BRANCH', 'Use the specified branch for statistics (otherwise the master branch is used)' do |branch|
           options.branch = branch
         end
-        opt.on "-v", "--verbose", "Verbose output (shows INFO level log statements)" do
+        opt.on '-v', '--verbose', 'Verbose output (shows INFO level log statements)' do
           options.verbose = true
         end
-        opt.on "-d", "--debug", "Debug output (shows DEBUG level log statements)" do
+        opt.on '-d', '--debug', 'Debug output (shows DEBUG level log statements)' do
           options.debug = true
         end
-        opt.on "-l", "--limit MAX_COMMITS", Float, "The maximum limit of commits to hold in memory at a time" do |number|
+        opt.on '-l', '--limit MAX_COMMITS', Float, 'The maximum limit of commits to hold in memory at a time' do |number|
           options.limit = number
         end
       end.parse!
@@ -102,14 +101,13 @@ module GitStatistics
 
     private
 
-      def determine_log_level
-        if options.debug
-          Log.level = Logger::DEBUG
-          Log.use_debug
-        elsif options.verbose
-          Log.level = Logger::INFO
-        end
+    def determine_log_level
+      if options.debug
+        Log.level = Logger::DEBUG
+        Log.use_debug
+      elsif options.verbose
+        Log.level = Logger::INFO
       end
-
+    end
   end
 end

data/lib/git_statistics/collector.rb

@@ -1,41 +1,39 @@
 module GitStatistics
   class Collector
-
     attr_accessor :repo, :commits_path, :commits
 
     def initialize(repo, limit, fresh, pretty)
       @repo = repo
-      @commits_path = repo.workdir + ".git_statistics"
+      @commits_path = repo.workdir + '.git_statistics'
       @commits = Commits.new(@commits_path, fresh, limit, pretty)
     end
 
     def collect(options = {})
-      branch = options[:branch] ? options[:branch] : CLI::DEFAULT_BRANCH
-      branch_head = Rugged::Branch.lookup(repo, branch).tip
+      branch_name = options[:branch] ? options[:branch] : CLI::DEFAULT_BRANCH
 
       walker = Rugged::Walker.new(repo)
-      walker.push(branch_head)
+      walker.push(repo.branches[branch_name].target)
 
       walker.each_with_index do |commit, count|
-        if valid_commit?(commit, options)
-          extract_commit(commit, count + 1)
-          @commits.flush_commits
-        end
+        next unless valid_commit?(commit, options)
+
+        extract_commit(commit, count + 1)
+        @commits.flush_commits
       end
 
       @commits.flush_commits(true)
     end
 
     def valid_commit?(commit, options)
-      if !options[:time_since].nil?
+      unless options[:time_since].nil?
         return false unless commit.author[:time] > DateTime.parse(options[:time_since].to_s).to_time
       end
 
-      if !options[:time_until].nil?
+      unless options[:time_until].nil?
         return false unless commit.author[:time] < DateTime.parse(options[:time_until].to_s).to_time
       end
 
-      return true
+      true
     end
 
     def acquire_commit_meta(commit_summary)
@@ -52,9 +50,9 @@ module GitStatistics
       data[:added_files] = commit_summary.added_files
       data[:deleted_files] = commit_summary.deleted_files
       data[:modified_files] = commit_summary.modified_files
-      data[:files] = commit_summary.file_stats.map{ |file| file.to_json }
+      data[:files] = commit_summary.file_stats.map(&:to_json)
 
-      return data
+      data
     end
 
     def extract_commit(commit, count)
@@ -64,8 +62,7 @@ module GitStatistics
       # Acquire meta information about commit
       commit_data = acquire_commit_meta(commit_summary)
 
-      return commit_data
+      commit_data
     end
-
   end
 end

data/lib/git_statistics/commit_summary.rb

@@ -1,5 +1,7 @@
 module GitStatistics
   class CommitSummary < SimpleDelegator
+    attr_reader :patches
+
     def initialize(repo, commit)
       super(commit)
       @repo = repo
@@ -14,17 +16,17 @@ module GitStatistics
 
     # How many files were removed in this commit
     def deleted_files
-      file_stats.select { |file| file.status == :deleted }.count
+      file_stats.count { |file| file.status == :deleted }
     end
 
     # How many files were added in this commit
     def added_files
-      file_stats.select { |file| file.status == :added }.count
+      file_stats.count { |file| file.status == :added }
     end
 
     # How many files were modified (not added/deleted) in this commit
     def modified_files
-      file_stats.select { |file| file.status == :modified }.count
+      file_stats.count { |file| file.status == :modified }
     end
 
     # How many total additions in this commit?
@@ -43,14 +45,14 @@ module GitStatistics
     end
 
     def file_stats
-      @cached_file_stats ||= diffstats.map { |diff| DiffSummary.new(@repo, diff) }
+      @cached_file_stats ||= @patches.map { |diff| DiffSummary.new(@repo, diff) }
     end
 
     LanguageSummary = Struct.new(:name, :additions, :deletions, :net, :added_files, :deleted_files, :modified_files)
 
     # Array of LanguageSummary objects (one for each language) for simple calculations
     def languages
-      grouped_language_files.collect do |language, stats|
+      grouped_language_files.map do |language, stats|
         additions = summarize(stats, :additions)
         deletions = summarize(stats, :deletions)
         net       = summarize(stats, :net)
@@ -70,17 +72,12 @@ module GitStatistics
 
     private
 
-      def summarize(stats, what)
-        stats.map(&what).inject(0, :+)
-      end
-
-      def commit_summary(what)
-        summarize(file_stats, what)
-      end
-
-      def diffstats
-        @patches
-      end
+    def summarize(stats, what)
+      stats.map(&what).inject(0, :+)
+    end
 
+    def commit_summary(what)
+      summarize(file_stats, what)
+    end
   end
 end

data/lib/git_statistics/commits.rb

@@ -1,6 +1,5 @@
 module GitStatistics
   class Commits < Hash
-
     attr_accessor :stats, :totals, :path, :fresh, :limit, :pretty
 
     def initialize(path, fresh, limit, pretty)
@@ -30,23 +29,23 @@ module GitStatistics
     end
 
     def files_in_path
-      Dir.entries(path).reject { |file| %w[. ..].include?(file) }
+      Dir.entries(path).reject { |file| %w(. ..).include?(file) }
     end
 
-    def flush_commits(force=false)
-      if size >= limit || force
-        file_count = Utilities.number_of_matching_files(path, /\d+\.json/)
-        save(File.join(path, "#{file_count}.json"), @pretty)
-        clear
-      end
+    def flush_commits(force = false)
+      return unless size >= limit || force
+
+      file_count = Utilities.number_of_matching_files(path, /\d+\.json/)
+      save(File.join(path, "#{file_count}.json"), @pretty)
+      clear
     end
 
     def author_top_n_type(type, top_n = 0)
       top_n = 0 if top_n < 0
-      if @stats.empty? || !@stats.first[1].has_key?(type)
+      if @stats.empty? || !@stats.first[1].key?(type)
         nil
       else
-        Hash[*@stats.sorted_hash {|a,b| b[1][type.to_sym] <=> a[1][type]}.to_a[0..top_n-1].flatten]
+        Hash[*@stats.sorted_hash { |a, b| b[1][type.to_sym] <=> a[1][type] }.to_a[0..top_n - 1].flatten]
       end
     end
 
@@ -55,24 +54,24 @@ module GitStatistics
       type = email ? :author_email : :author
 
       # Process the commits from file or memory
-      files = Dir.entries(path) - [".", ".."]
+      files = Dir.entries(path) - ['.', '..']
       if files.size == 0
-          process_commits(type, merge)
+        process_commits(type, merge)
       else
-        #Load commit file and extract the commits
+        # Load commit file and extract the commits
         files.each do |file|
-          if file =~ /\d+\.json/
-            load(File.join(path, file))
-            process_commits(type, merge)
-            clear
-          end
+          next unless file =~ /\d+\.json/
+
+          load(File.join(path, file))
+          process_commits(type, merge)
+          clear
         end
       end
     end
 
     def process_commits(type, merge)
       # Collect the stats from each commit
-      each do |key,value|
+      each do |key, value|
         next if !merge && value[:merge]
         # If there are no changed files move to next commit
         next if value[:files].empty?
@@ -88,7 +87,6 @@ module GitStatistics
 
         # Collect language stats
         value[:files].each do |file|
-
           # Add to author's languages
           add_language_stats(author, file)
 
@@ -118,11 +116,11 @@ module GitStatistics
       data[:languages][file[:language].to_sym][:deletions] += file[:deletions]
 
       # Keep count of languages status (i.e., added, deleted) and keep keys consistent (i.e., added_files, deleted_files)
-      if file[:status] != nil
-        data[:languages][file[:language].to_sym][(file[:status]+'_files').to_sym] += 1
+      unless file[:status].nil?
+        data[:languages][file[:language].to_sym][(file[:status] + '_files').to_sym] += 1
       end
 
-      return data
+      data
     end
 
     def add_commit_stats(data, commit)
@@ -131,25 +129,25 @@ module GitStatistics
       data[:commits] += 1
       data[:additions] += commit[:additions]
       data[:deletions] += commit[:deletions]
-      data[:added_files] += commit[:added_files] if !commit[:added_files].nil?
-      data[:deleted_files] += commit[:deleted_files] if !commit[:deleted_files].nil?
-      return data
+      data[:added_files] += commit[:added_files] unless commit[:added_files].nil?
+      data[:deleted_files] += commit[:deleted_files] unless commit[:deleted_files].nil?
+      data
     end
 
     def load(file)
-      merge!(JSON.parse(File.read(file), :symbolize_names => true))
+      merge!(JSON.parse(File.read(file), symbolize_names: true))
     end
 
     def save(file, pretty)
-      # Don't save if there is no information (i.e., using updates)
-      unless empty?
-        # Ensure the path to the file exists
-        FileUtils.mkdir_p(File.dirname(file))
-        # Save file in a simple or pretty format
-        File.open(file, 'w') do |f|
-          json_content = pretty ? JSON.pretty_generate(self) : self.to_json
-          f.write(json_content)
-        end
+      return if empty?
+
+      # Ensure the path to the file exists
+      FileUtils.mkdir_p(File.dirname(file))
+
+      # Save file in a simple or pretty format
+      File.open(file, 'w') do |f|
+        json_content = pretty ? JSON.pretty_generate(self) : to_json
+        f.write(json_content)
       end
     end
   end

data/lib/git_statistics/diff_summary.rb

@@ -35,7 +35,7 @@ module GitStatistics
     end
 
     def filename
-      if (status == :deleted)
+      if status == :deleted
         delta.old_file[:path]
       else
         delta.new_file[:path]
@@ -44,34 +44,30 @@ module GitStatistics
 
     # We flip these around since we are diffing in the opposite direction -- new.diff(old)
     def blob
-      begin
-        if (status == :deleted)
-          blob = @repo.lookup(delta.new_file[:oid])  # Look at new instead of old
-        else
-          blob = @repo.lookup(delta.old_file[:oid])  # Look at old instead of new
-        end
-      rescue Rugged::OdbError
-        Log.warn "Could not find object (most likely a submodule)"
-        blob = nil
+      if status == :deleted
+        @repo.lookup(delta.new_file[:oid])  # Look at new instead of old
+      else
+        @repo.lookup(delta.old_file[:oid])  # Look at old instead of new
       end
+    rescue Rugged::OdbError
+      Log.warn 'Could not find object (most likely a submodule)'
+      nil
     end
 
     def inspect
-      %Q{<GitStatistics::FileStat @filename=#{filename} @status=#{status} @similarity=#{similarity} @language=#{language} @additions=#{additions}, @deletions=#{deletions}, @net=#{net}>}
+      "<GitStatistics::FileStat @filename=#{filename} @status=#{status} @similarity=#{similarity} @language=#{language} @additions=#{additions}, @deletions=#{deletions}, @net=#{net}>"
     end
 
     def to_json
-      { filename: filename, status: status, similarity: similarity, language: language, additions: additions, deletions: deletions, net: net}
+      { filename: filename, status: status, similarity: similarity, language: language, additions: additions, deletions: deletions, net: net }
     end
 
     # Determine the language of the file from the blob
     def language
-      language = "Unknown"
+      language = 'Unknown'
       unless blob.nil?
-        detected_language = LanguageSniffer.detect(filename, :content => blob.content).language
-        unless detected_language.nil?
-          language = detected_language.name
-        end
+        detected_language = LanguageSniffer.detect(filename, content: blob.content).language
+        language = detected_language.name unless detected_language.nil?
       end
       language
     end