git_statistics 0.4.1 → 0.5.0

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+* [0.5.0 - January 16, 2013](https://github.com/kevinjalbert/git_statistics/compare/v0.4.1...v0.5.0)
 * [0.4.1 - October 9, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.4.0...v0.4.1)
 * [0.4.0 - September 25, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.3.0...v0.4.0)
 * [0.3.0 - September 12, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.2.0...v0.3.0)

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-guard :rspec, :version => 2, :all_on_start => false do
+guard :rspec, :version => 2, :notifications => false, :all_on_start => false do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/git_statistics/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/lib/git_statistics.rb

@@ -2,7 +2,7 @@ require 'git_statistics/initialize'
 
 module GitStatistics
   class GitStatistics
-    def initialize(args=nil)
+    def initialize(args = nil)
       @opts = Trollop::options do
         opt :email, "Use author's email instead of name", :default => false
         opt :merges, "Factor in merges when calculating statistics", :default => false
@@ -23,7 +23,7 @@ module GitStatistics
         collector = Collector.new(@opts[:verbose], @opts[:limit], false, @opts[:pretty])
         commits_directory = collector.repo_path + ".git_statistics" + File::Separator
         FileUtils.mkdir_p(commits_directory)
-        file_count = Utilities.get_number_of_files(commits_directory, /\d+\.json/) - 1
+        file_count = Utilities.number_of_matching_files(commits_directory, /\d+\.json/) - 1
 
         # Only use --since if there is data present
         if file_count >= 0
@@ -34,7 +34,7 @@ module GitStatistics
       end
 
       # If no data was collected as there was no present data then start fresh
-      if !collected
+      unless collected
         collector = Collector.new(@opts[:verbose], @opts[:limit], true, @opts[:pretty])
         collector.collect(@opts[:branch])
       end

data/lib/git_statistics/collector.rb

@@ -7,29 +7,25 @@ module GitStatistics
       @verbose = verbose
       @repo = Utilities.get_repository
 
-      # Abort if no git repository is found
-      if @repo == nil
-        raise ("No git Repository Found")
-      end
+      raise "No Git repository found" if @repo.nil?
 
       @repo_path = File.expand_path("..", @repo.path) + File::Separator
       @commits_path = @repo_path + ".git_statistics" + File::Separator
       @commits = Commits.new(@commits_path, fresh, limit, pretty)
     end
 
-    def collect(branch, time_since="", time_until="")
+    def collect(branch, time_since = "", time_until = "")
       # Create pipe for git log to acquire branches
       pipe = open("|git --no-pager branch --no-color")
 
       # Collect branches to use for git log
-      branches = collect_branches(pipe)
-      branches = ["", ""] if branch
+      branches = branch ? ["", ""] : collect_branches(pipe)
 
       # Create pipe for the git log to acquire commits
       pipe = open("|git --no-pager log #{branches.join(' ')} --date=iso --reverse"\
-                  " --no-color --find-copies-harder --numstat --encoding=utf-8 "\
-                  "--summary #{time_since} #{time_until} "\
-                  "--format=\"%H,%an,%ae,%ad,%p\"")
+                  " --no-color --find-copies-harder --numstat --encoding=utf-8"\
+                  " --summary #{time_since} #{time_until}"\
+                  " --format=\"%H,%an,%ae,%ad,%p\"")
 
       # Use a buffer approach to queue up lines from the log for each commit
       buffer = []
@@ -41,9 +37,9 @@ module GitStatistics
         if line.split(',').size == 5
 
           # Sometimes 'git log' doesn't populate the buffer (i.e., merges), try fallback option if so
-          buffer = fall_back_collect_commit(buffer[0].split(',').first) if buffer.size == 1
+          buffer = fall_back_collect_commit(buffer[0].split(',').first) if buffer.one?
 
-          extract_commit(buffer) if not buffer.empty?
+          extract_commit(buffer) unless buffer.empty?
           buffer = []
 
           # Save commits to file if size exceeds limit or forced
@@ -55,7 +51,7 @@ module GitStatistics
       end
 
       # Extract the last commit
-      extract_commit(buffer) if not buffer.empty?
+      extract_commit(buffer) unless buffer.empty?
       @commits.flush_commits(true)
     end
 
@@ -65,18 +61,13 @@ module GitStatistics
                   " --no-color --find-copies-harder --numstat --encoding=utf-8 "\
                   "--summary --format=\"%H,%an,%ae,%ad,%p\"")
 
-      buffer = []
-      pipe.each do |line|
-        buffer << Utilities.clean_string(line)
-      end
+      buffer = pipe.map { |line| Utilities.clean_string(line) }
 
       # Check that the buffer has valid information (i.e., sha was valid)
-      if buffer.empty?
-        return nil
-      elsif buffer.first.split(',').first == sha
-        return buffer
+      if !buffer.empty? && buffer.first.split(',').first == sha
+        buffer
       else
-        return nil
+        nil
       end
     end
 
@@ -105,7 +96,7 @@ module GitStatistics
       data[:files] = []
 
       # Flag commit as merge if necessary (determined if two parents)
-      if commit_info[4] == nil or commit_info[4].split(' ').size == 1
+      if commit_info[4].nil? || commit_info[4].split(' ').one?
         data[:merge] = false
       else
         data[:merge] = true
@@ -121,7 +112,7 @@ module GitStatistics
       puts "Extracting #{commit_data[:sha]}" if @verbose
 
       # Abort if the commit sha extracted form the buffer is invalid
-      if commit_data[:sha].scan(/[\d|a-f]{40}/)[0] == nil
+      if commit_data[:sha].scan(/[\d|a-f]{40}/)[0].nil?
         puts "Invalid buffer containing commit information"
         return
       end
@@ -130,7 +121,7 @@ module GitStatistics
       files = identify_changed_files(buffer[2..-1])
 
       # No files were changed in this commit, abort commit
-      if files == nil
+      if files.nil?
         puts "No files were changed"
         return
       end
@@ -159,9 +150,9 @@ module GitStatistics
       blob = Utilities.find_blob_in_tree(@repo.tree(sha), file)
 
       # If we cannot find blob in current commit (deleted file), check previous commit
-      if blob == nil || blob.instance_of?(Grit::Tree)
+      if blob.nil? || blob.instance_of?(Grit::Tree)
         prev_commit = @repo.commits(sha).first.parents[0]
-        return nil if prev_commit == nil
+        return nil if prev_commit.nil?
 
         prev_tree = @repo.tree(prev_commit.id)
         blob = Utilities.find_blob_in_tree(prev_tree, file)
@@ -170,54 +161,56 @@ module GitStatistics
     end
 
     def identify_changed_files(buffer)
-      return buffer if buffer == nil
+      return buffer if buffer.nil?
 
       # For each modification extract the details
       changed_files = []
       buffer.each do |line|
+        extracted_line = CommitLineExtractor.new(line)
 
         # Extract changed file information if it exists
-        data = extract_change_file(line)
-        if data != nil
-          changed_files << data
+        changed_file_information = extracted_line.changed
+        if changed_file_information.any?
+          changed_files << changed_file_information
           next  # This line is processed, skip to next
         end
 
         # Extract details of create/delete files if it exists
-        data = extract_create_delete_file(line)
-        if data != nil
+        created_or_deleted = extracted_line.created_or_deleted
+        if created_or_deleted.any?
           augmented = false
           # Augment changed file with create/delete information if possible
           changed_files.each do |file|
-            if file[:file] == data[:file]
-              file[:status] = data[:status]
+            if file[:file] == created_or_deleted[:file]
+              file[:status] = created_or_deleted[:status]
               augmented = true
               break
             end
           end
-          changed_files << data if !augmented
+          changed_files << created_or_deleted unless augmented
           next  # This line is processed, skip to next
         end
 
         # Extract details of rename/copy files if it exists
-        data = extract_rename_copy_file(line)
-        if data != nil
+        renamed_or_copied = extracted_line.renamed_or_copied
+        if renamed_or_copied.any?
           augmented = false
           # Augment changed file with rename/copy information if possible
           changed_files.each do |file|
-            if file[:file] == data[:new_file]
-              file[:status] = data[:status]
-              file[:old_file] = data[:old_file]
-              file[:similar] = data[:similar]
+            if file[:file] == renamed_or_copied[:new_file]
+              file[:status] = renamed_or_copied[:status]
+              file[:old_file] = renamed_or_copied[:old_file]
+              file[:similar] = renamed_or_copied[:similar]
               augmented = true
               break
             end
           end
-          changed_files << data if !augmented
+          changed_files << renamed_or_copied unless augmented
           next  # This line is processed, skip to next
         end
       end
-      return changed_files
+
+      changed_files
     end
 
     def process_blob(data, blob, file)
@@ -240,60 +233,11 @@ module GitStatistics
       file_hash[:generated] = blob.generated?
 
       # Identify the language of the blob if possible
-      if blob.language == nil
-        file_hash[:language] = "Unknown"
-      else
-        file_hash[:language] = blob.language.name
-      end
+      file_hash[:language] = blob.language.nil? ? "Unknown" : blob.language.name
       data[:files] << file_hash
 
       return data
     end
 
-    def extract_change_file(line)
-      # Use regex to detect a rename/copy changed file | 1  2  /path/{test => new}/file.txt
-      changes = line.scan(/^([-|\d]+)\s+([-|\d]+)\s+(.+)\s+=>\s+(.+)/)[0]
-      if changes != nil and changes.size == 4
-        # Split up the file into the old and new file
-        split_file = Utilities.split_old_new_file(changes[2], changes[3])
-        return {:additions => changes[0].to_i,
-                :deletions => changes[1].to_i,
-                :file => Utilities.clean_string(split_file[:new_file]),
-                :old_file => Utilities.clean_string(split_file[:old_file])}
-      end
-
-      # Use regex to detect a changed file | 1  2  /path/test/file.txt
-      changes = line.scan(/^([-|\d]+)\s+([-|\d]+)\s+(.+)/)[0]
-      if changes != nil and changes.size == 3
-        return {:additions => changes[0].to_i,
-                :deletions => changes[1].to_i,
-                :file => Utilities.clean_string(changes[2])}
-      end
-      return nil
-    end
-
-    def extract_create_delete_file(line)
-      # Use regex to detect a create/delete file | create mode 100644 /path/test/file.txt
-      changes = line.scan(/^(create|delete) mode \d+ ([^\\\n]*)/)[0]
-      if changes != nil and changes.size == 2
-        return {:status => Utilities.clean_string(changes[0]),
-                :file => Utilities.clean_string(changes[1])}
-      end
-      return nil
-    end
-
-    def extract_rename_copy_file(line)
-      # Use regex to detect a rename/copy file | copy /path/{test => new}/file.txt
-      changes = line.scan(/^(rename|copy)\s+(.+)\s+=>\s+(.+)\s+\((\d+)/)[0]
-      if changes != nil and changes.size == 4
-        # Split up the file into the old and new file
-        split_file = Utilities.split_old_new_file(changes[1], changes[2])
-        return {:status => Utilities.clean_string(changes[0]),
-                :old_file => Utilities.clean_string(split_file[:old_file]),
-                :new_file => Utilities.clean_string(split_file[:new_file]),
-                :similar => changes[3].to_i}
-      end
-      return nil
-    end
   end
 end

data/lib/git_statistics/commit_line_extractor.rb

@@ -0,0 +1,64 @@
+module GitStatistics
+  class CommitLineExtractor
+
+    RENAMED_OR_COPIED       = /^(rename|copy)\s+(.+)\s+=>\s+(.+)\s+\((\d+)/i
+    CREATED_OR_DELETED      = /^(create|delete) mode \d+ ([^\\\n]*)/i
+    MODIFIED_OR_RENAMED     = /^([-|\d]+)\s+([-|\d]+)\s+(.+)\s+=>\s+(.+)/i
+    ADDITIONS_OR_DELETIONS  = /^([-|\d]+)\s+([-|\d]+)\s+(.+)/i
+
+    attr_reader :line
+
+    def initialize(line)
+      @line = line
+    end
+
+    def changed
+      modified_or_renamed = line.scan(MODIFIED_OR_RENAMED).first
+      modified_or_renamed = changes_are_right_size(modified_or_renamed, 4) do |changes|
+        split_file = Utilities.split_old_new_file(changes[2], changes[3])
+        {:additions => changes[0].to_i,
+          :deletions => changes[1].to_i,
+          :file => Utilities.clean_string(split_file[:new_file]),
+          :old_file => Utilities.clean_string(split_file[:old_file])}
+      end
+      return modified_or_renamed unless modified_or_renamed.empty?
+
+      addition_or_deletion = line.scan(ADDITIONS_OR_DELETIONS).first
+      changes_are_right_size(addition_or_deletion, 3) do |changes|
+        {:additions => changes[0].to_i,
+          :deletions => changes[1].to_i,
+          :file => Utilities.clean_string(changes[2])}
+      end
+    end
+
+    def created_or_deleted
+      changes = line.scan(CREATED_OR_DELETED).first
+      changes_are_right_size(changes, 2) do |changes|
+        {:status => Utilities.clean_string(changes[0]),
+          :file => Utilities.clean_string(changes[1])}
+      end
+    end
+
+    def renamed_or_copied
+      changes = line.scan(RENAMED_OR_COPIED).first
+      changes_are_right_size(changes, 4) do |changes|
+        split_file = Utilities.split_old_new_file(changes[1], changes[2])
+        {:status => Utilities.clean_string(changes[0]),
+          :old_file => Utilities.clean_string(split_file[:old_file]),
+          :new_file => Utilities.clean_string(split_file[:new_file]),
+          :similar => changes[3].to_i}
+      end
+    end
+
+    private
+
+      def changes_are_right_size(changes, size = 4)
+        if !changes.nil? && changes.size == size
+          yield changes
+        else
+          {}
+        end
+      end
+
+  end
+end

data/lib/git_statistics/commits.rb

@@ -19,8 +19,8 @@ module GitStatistics
       # Remove all files within path if saving
       if @fresh
         Dir.entries(@path).each do |file|
-          next if file == "." || file == ".."
-          File.delete(path + File::Separator + file)
+          next if %w[. ..].include? file
+          File.delete(File.join(path, file))
         end
       end
 
@@ -30,85 +30,79 @@ module GitStatistics
       @totals[:languages] = {}
     end
 
-    def flush_commits(force=false)
-      if self.size >= limit || force
-        file_count = Utilities.get_number_of_files(path, /\d+\.json/)
-        save(path + File::Separator + file_count.to_s + ".json", @pretty)
-        self.clear
+    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
     end
 
-    def author_top_n_type(type, top_n=0)
+    def author_top_n_type(type, top_n = 0)
       top_n = 0 if top_n < 0
-      return nil if @stats.size == 0
-      return nil if !@stats.first[1].has_key?(type)
-      return Hash[*@stats.sorted_hash {|a,b| b[1][type.to_sym] <=> a[1][type]}.to_a[0..top_n-1].flatten]
+      if @stats.empty? || !@stats.first[1].has_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]
+      end
     end
 
     def calculate_statistics(email, merge)
       # Identify authors and author type
-      if email
-        type = :author_email
-      else
-        type = :author
-      end
+      type = email ? :author_email : :author
 
       # For all the commit files created
       Dir.entries(path).each do |file|
         # Load commit file and extract the commits
         if file =~ /\d+\.json/
-          load(path + File::Separator + file)
+          load(File.join(path, file))
           process_commits(type, merge)
-          self.clear
+          clear
         end
       end
     end
 
     def process_commits(type, merge)
       # Collect the stats from each commit
-      self.each do |key,value|
-        if !merge && value[:merge]
-          next
-        else
+      each do |key,value|
+        next if !merge && value[:merge]
+        # If there are no changed files move to next commit
+        next if value[:files].empty?
 
-          # Acquire author (make if not seen before)
-          author = @stats[value[type]]
-
-          if author == nil
-            @stats[value[type]] = Hash.new(0)
-            author = @stats[value[type]]
-            author[:languages] = {}
-          end
+        # Acquire author (make if not seen before)
+        author = @stats[value[type]]
 
-          # If there are no changed files move to next commit
-          next if value[:files].size == 0
+        if author.nil?
+          @stats[value[type]] = Hash.new(0)
+          author = @stats[value[type]]
+          author[:languages] = {}
+        end
 
-          # Collect language stats
-          value[:files].each do |file|
+        # Collect language stats
+        value[:files].each do |file|
 
-            # Add to author's languages
-            add_language_stats(author, file)
+          # Add to author's languages
+          add_language_stats(author, file)
 
-            # Add to repository's languages
-            add_language_stats(@totals, file)
-          end
+          # Add to repository's languages
+          add_language_stats(@totals, file)
+        end
 
-          # Add commit stats to author
-          add_commit_stats(author, value)
+        # Add commit stats to author
+        add_commit_stats(author, value)
 
-          # Add commit stats to repository
-          add_commit_stats(@totals, value)
+        # Add commit stats to repository
+        add_commit_stats(@totals, value)
 
-          # Save new changes back to stats
-          @stats[value[type]] = author
-          author = nil
-        end
+        # Save new changes back to stats
+        @stats[value[type]] = author
+        author = nil
       end
     end
 
     def add_language_stats(data, file)
       # Add stats to data's languages
-      if data[:languages][file[:language].to_sym] == nil
+      if data[:languages][file[:language].to_sym].nil?
         data[:languages][file[:language].to_sym] = Hash.new(0)
       end
 
@@ -136,21 +130,19 @@ module GitStatistics
     end
 
     def load(file)
-      self.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)
-      return if self.size == 0
-
-      # Ensure the path to the file exists
-      FileUtils.mkdir_p(File.dirname(file))
-
-      # Save file in a simple or pretty format
-      if pretty
-        File.open(file, 'w') {|file| file.write(JSON.pretty_generate(self))}
-      else
-        File.open(file, 'w') {|file| file.write(self.to_json)}
+      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 |file|
+          json_content = pretty ? JSON.pretty_generate(self) : self.to_json
+          file.write(json_content)
+        end
       end
     end
   end

data/lib/git_statistics/results.rb

@@ -7,20 +7,18 @@ module GitStatistics
       @commits = commits
     end
 
-    def prepare_result_summary(sort, email, top_n=0)
+    def prepare_result_summary(sort, email, top_n = 0)
       # Default to a 0 if given a negative number to display
       top_n = 0 if top_n < 0
 
       # Acquire data based on sort type and top # to show
       data = @commits.author_top_n_type(sort.to_sym, top_n)
-      if data == nil
-        raise "Parameter for --sort is not valid"
-      end
+      raise "Parameter for --sort is not valid" if data.nil?
 
       # Create config
       config = {:data => data,
-                :author_length => Utilities.find_longest_length(data.keys, 17),
-                :language_length => Utilities.find_longest_length(@commits.totals[:languages].keys, 8),
+                :author_length => Utilities.max_length_in_list(data.keys, 17),
+                :language_length => Utilities.max_length_in_list(@commits.totals[:languages].keys, 8),
                 :sort => sort,
                 :email => email,
                 :top_n => top_n}
@@ -31,7 +29,7 @@ module GitStatistics
       return config
     end
 
-    def print_summary(sort, email, top_n=0)
+    def print_summary(sort, email, top_n = 0)
       # Prepare and determine the config for the result summary based on parameters
       config = prepare_result_summary(sort, email, top_n)
 

data/lib/git_statistics/utilities.rb

@@ -1,6 +1,6 @@
 module GitStatistics
   module Utilities
-    def self.get_repository(path=Dir.pwd)
+    def self.get_repository(path = Dir.pwd)
       # Connect to git repository if it exists
       directory = Pathname.new(path)
       repo = nil
@@ -14,26 +14,16 @@ module GitStatistics
       end
     end
 
-    def self.find_longest_length(list, max=nil)
-      return list if list == nil
+    def self.max_length_in_list(list, max = nil)
+      return nil if list.nil?
       list.each do |key,value|
-        max = key.length if max == nil || key.length > max
+        max = key.length if max.nil? || key.length > max
       end
-      return max
-    end
-
-    def self.unique_data_in_hash(data, type)
-      list = []
-      data.each do |key,value|
-        if not list.include?(value[type])
-          list << value[type]
-        end
-      end
-      return list
+      max
     end
 
     def self.clean_string(string)
-      return string.strip.force_encoding("iso-8859-1").encode("utf-8")
+      string.strip.force_encoding("iso-8859-1").encode("utf-8")
     end
 
     def self.split_old_new_file(old, new)
@@ -42,13 +32,13 @@ module GitStatistics
       split_new = new.split('}')
 
       # Handle recombine the file splits into their whole paths)
-      if split_old.size == 1 && split_new.size == 1
+      if split_old.one? && split_new.one?
         old_file = split_old[0]
         new_file = split_new[0]
-      elsif split_new.size == 1
+      elsif split_new.one?
         old_file = split_old[0] + split_old[1]
         new_file = split_old[0] + split_new[0]
-      elsif split_old.size == 1
+      elsif split_old.one?
         old_file = split_old[0] + split_new[1]
         new_file = split_old[0] + split_new[0] + split_new[1]
       else
@@ -63,20 +53,18 @@ module GitStatistics
 
     def self.find_blob_in_tree(tree, file)
       # Check If cannot find tree in commit or if we found a submodule as the changed file
-      if tree == nil
-        return nil
-      elsif file == nil
+      if tree.nil? || file.nil?
         return nil
       elsif tree.instance_of?(Grit::Submodule)
         return tree
       end
 
       # If the blob is within the current directory (tree)
-      if file.size == 1
+      if file.one?
         blob = tree / file.first
 
         # Check if blob is nil (could not find changed file in tree)
-        if blob == nil
+        if blob.nil?
 
           # Try looking for submodules as they cannot be found using tree / file notation
           tree.contents.each do |content|
@@ -96,24 +84,24 @@ module GitStatistics
     end
 
     def self.get_modified_time(file)
-      if OS.mac?
-        Time.at(`stat -f %m #{file}`.to_i)
-      elsif OS.linux?
-        Time.at(`stat -c %Y #{file}`.to_i)
-      else
-        raise "Update on the Windows operating system is not supported"
-      end
+      command = case
+        when OS.mac? then "stat -f %m #{file}"
+        when OS.linux? then "stat -c %Y #{file}"
+        else raise "Update on the Windows operating system is not supported"; end
+      time_at(command)
     end
 
-    def self.get_number_of_files(directory, pattern)
-      count = 0
-      files = Dir.entries(directory)
-
-      files.each do |file|
-        count += 1 if file =~ pattern
-      end
+    def self.time_at(cmd)
+      Time.at(%x{#{cmd}}.to_i)
+    end
 
-      return count
+    def self.number_of_matching_files(directory, pattern)
+      Dir.entries(directory)
+          .select { |file| file =~ pattern }
+          .size
+    rescue SystemCallError
+      ::Kernel.warn "No such directory #{File.expand_path(directory)}"
+      0
     end
   end
 end

data/lib/git_statistics/version.rb

@@ -1,3 +1,3 @@
 module GitStatistics
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/collector_spec.rb

@@ -10,11 +10,9 @@ describe Collector do
 
   # Create buffer which is an array of cleaned lines
   let(:buffer) {
-    buffer = []
-    fixture(fixture_file).readlines.each do |line|
-      buffer << Utilities.clean_string(line)
+    fixture(fixture_file).readlines.collect do |line|
+      Utilities.clean_string(line)
     end
-    buffer
   }
 
   describe "#collect" do
@@ -102,69 +100,6 @@ describe Collector do
     end
   end
 
-  describe "#extract_change_file" do
-    let(:file) {collector.extract_change_file(line)}
-
-    context "with a simple changed file" do
-      let(:line) {"37	30	lib/file.rb"}
-      it {file[:additions].should == 37}
-      it {file[:deletions].should == 30}
-      it {file[:file].should == "lib/file.rb"}
-    end
-
-    context "with a simple rename/copy changed file" do
-      let(:line) {"11	3	old_file.rb => lib/file.rb"}
-      it {file[:additions].should == 11}
-      it {file[:deletions].should == 3}
-      it {file[:file].should == "lib/file.rb"}
-      it {file[:old_file].should == "old_file.rb"}
-    end
-
-    context "with a complex rename/copy changed file" do
-      let(:line) {"-	-	lib/{old_dir => new_dir}/file.rb"}
-      it {file[:additions].should == 0}
-      it {file[:deletions].should == 0}
-      it {file[:file].should == "lib/new_dir/file.rb"}
-      it {file[:old_file].should == "lib/old_dir/file.rb"}
-    end
-  end
-
-  describe "#extract_create_delete_file" do
-    let(:file) {collector.extract_create_delete_file(line)}
-
-    context "with a create changed file" do
-      let(:line) {"create mode 100644 lib/dir/file.rb"}
-      it {file[:status].should == "create"}
-      it {file[:file].should == "lib/dir/file.rb"}
-    end
-
-    context "with a delete changed file" do
-      let(:line) {"delete mode 100644 lib/file.rb"}
-      it {file[:status].should == "delete"}
-      it {file[:file].should == "lib/file.rb"}
-    end
-  end
-
-  describe "#extract_rename_copy_file" do
-    let(:file) {collector.extract_rename_copy_file(line)}
-
-    context "with a rename changed file" do
-      let(:line) {"rename lib/{old_dir => new_dir}/file.rb (100%)"}
-      it {file[:status].should == "rename"}
-      it {file[:old_file].should == "lib/old_dir/file.rb"}
-      it {file[:new_file].should == "lib/new_dir/file.rb"}
-      it {file[:similar].should == 100}
-    end
-
-    context "with a copy changed file" do
-      let(:line) {"copy lib/dir/{old_file.rb => new_file.rb} (75%)"}
-      it {file[:status].should == "copy"}
-      it {file[:old_file].should == "lib/dir/old_file.rb"}
-      it {file[:new_file].should == "lib/dir/new_file.rb"}
-      it {file[:similar].should == 75}
-    end
-  end
-
   describe "#acquire_commit_data" do
     let(:input) {fixture(fixture_file).read}
     let(:data) {collector.acquire_commit_data(input)}
@@ -204,7 +139,7 @@ describe Collector do
     context "with no changes" do
       let(:buffer) {[]}
       it {files.size.should == 0}
-      it {files[0].should == nil}
+      it {files[0].should.nil?}
     end
 
     context "with all types (create,delete,rename,copy) of files" do
@@ -256,7 +191,7 @@ describe Collector do
       it {data[:files][0][:name].should == "Gemfile"}
       it {data[:files][0][:additions].should == 0}
       it {data[:files][0][:deletions].should == 1}
-      it {data[:files][0][:status].should == nil}
+      it {data[:files][0][:status].should.nil?}
       it {data[:files][0][:binary].should == false}
       it {data[:files][0][:image].should == false}
       it {data[:files][0][:vendored].should == false}
@@ -276,7 +211,7 @@ describe Collector do
       it {data[:files][2][:name].should == "lib/git_statistics/initialize.rb"}
       it {data[:files][2][:additions].should == 0}
       it {data[:files][2][:deletions].should == 1}
-      it {data[:files][2][:status].should == nil}
+      it {data[:files][2][:status].should.nil?}
       it {data[:files][2][:binary].should == false}
       it {data[:files][2][:image].should == false}
       it {data[:files][2][:vendored].should == false}
@@ -286,12 +221,12 @@ describe Collector do
 
     context "with buffer that has no file changes" do
       let(:fixture_file) {"commit_buffer_information.txt"}
-      it {data.should == nil}
+      it {data.should.nil?}
     end
 
     context "with invalid buffer" do
       let(:buffer) {"invalid input"}
-      it {data.should == nil}
+      it {data.should.nil?}
     end
   end
 
@@ -305,7 +240,7 @@ describe Collector do
 
     context "with invalid sha" do
       let(:sha) {"111111aa111a11111a11aa11aaaa11a111111a11"}
-      it {results.should == nil}
+      it {results.should.nil?}
     end
   end
 
@@ -321,7 +256,7 @@ describe Collector do
 
     context "with invalid blob" do
       let(:file) {{:file => "dir/nothing.rb"}}
-      it {blob.should == nil}
+      it {blob.should.nil?}
     end
 
     context "with deleted file" do
@@ -373,7 +308,7 @@ describe Collector do
       it {data_file[:name].should == file[:file]}
       it {data_file[:additions].should == file[:additions]}
       it {data_file[:deletions].should == file[:deletions]}
-      it {data_file[:status].should == nil}
+      it {data_file[:status].should.nil?}
       it {data_file[:binary].should == false}
       it {data_file[:image].should == false}
       it {data_file[:vendored].should == false}
@@ -393,7 +328,7 @@ describe Collector do
       it {data_file[:name].should == file[:file]}
       it {data_file[:additions].should == file[:additions]}
       it {data_file[:deletions].should == file[:deletions]}
-      it {data_file[:status].should == nil}
+      it {data_file[:status].should.nil?}
       it {data_file[:binary].should == false}
       it {data_file[:image].should == false}
       it {data_file[:vendored].should == false}

data/spec/commit_line_extractor_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+include GitStatistics
+
+describe CommitLineExtractor do
+
+  let(:extractor) { CommitLineExtractor.new(line) }
+
+  describe "#extract_change_file" do
+    let(:file) { extractor.changed }
+
+    context "with a simple changed file" do
+      let(:line) {"37 30  lib/file.rb"}
+      it {file[:additions].should == 37}
+      it {file[:deletions].should == 30}
+      it {file[:file].should == "lib/file.rb"}
+    end
+
+    context "with a simple rename/copy changed file" do
+      let(:line) {"11 3 old_file.rb => lib/file.rb"}
+      it {file[:additions].should == 11}
+      it {file[:deletions].should == 3}
+      it {file[:file].should == "lib/file.rb"}
+      it {file[:old_file].should == "old_file.rb"}
+    end
+
+    context "with a complex rename/copy changed file" do
+      let(:line) {"-  - lib/{old_dir => new_dir}/file.rb"}
+      it {file[:additions].should == 0}
+      it {file[:deletions].should == 0}
+      it {file[:file].should == "lib/new_dir/file.rb"}
+      it {file[:old_file].should == "lib/old_dir/file.rb"}
+    end
+  end
+
+  describe "#extract_create_delete_file" do
+    let(:file) { extractor.created_or_deleted }
+
+    context "with a create changed file" do
+      let(:line) {"create mode 100644 lib/dir/file.rb"}
+      it {file[:status].should == "create"}
+      it {file[:file].should == "lib/dir/file.rb"}
+    end
+
+    context "with a delete changed file" do
+      let(:line) {"delete mode 100644 lib/file.rb"}
+      it {file[:status].should == "delete"}
+      it {file[:file].should == "lib/file.rb"}
+    end
+  end
+
+  describe "#extract_rename_copy_file" do
+    let(:file) { extractor.renamed_or_copied }
+
+    context "with a rename changed file" do
+      let(:line) {"rename lib/{old_dir => new_dir}/file.rb (100%)"}
+      it {file[:status].should == "rename"}
+      it {file[:old_file].should == "lib/old_dir/file.rb"}
+      it {file[:new_file].should == "lib/new_dir/file.rb"}
+      it {file[:similar].should == 100}
+    end
+
+    context "with a copy changed file" do
+      let(:line) {"copy lib/dir/{old_file.rb => new_file.rb} (75%)"}
+      it {file[:status].should == "copy"}
+      it {file[:old_file].should == "lib/dir/old_file.rb"}
+      it {file[:new_file].should == "lib/dir/new_file.rb"}
+      it {file[:similar].should == 75}
+    end
+  end
+end

data/spec/commits_spec.rb

@@ -170,12 +170,12 @@ describe Commits do
 
     context "with invalid type" do
       let(:sort) {:wrong}
-      it {stats.should == nil}
+      it {stats.should.nil?}
     end
 
     context "with invalid data" do
       let(:fixture_file) {nil}
-      it {stats.should == nil}
+      it {stats.should.nil?}
     end
   end
 

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ def fixture(file)
 end
 
 def setup_commits(commits, file_load, file_save, pretty)
-  return if file_load == nil || file_save == nil
+  return if file_load.nil? || file_save.nil?
   commits.load(fixture(file_load))
   commits.save(file_save, pretty)
 end

data/spec/utilities_spec.rb

@@ -18,22 +18,22 @@ describe Utilities do
 
     context "when not in a repository directory" do
       let(:dir) {Dir.pwd + "../"} # git_statistics/../
-      it {repo.should == nil}
+      it {repo.should.nil?}
     end
   end
 
-  describe "#find_longest_length" do
+  describe "#max_length_in_list" do
     let(:max) {nil}
     let(:list) {[]}
-    let(:results) {Utilities.find_longest_length(list, max)}
+    let(:results) {Utilities.max_length_in_list(list, max)}
 
     context "with empty list" do
-      it {results.should == nil}
+      it {results.should.nil?}
     end
 
     context "with nil list" do
       let(:list) {nil}
-      it {results.should == nil}
+      it {results.should.nil?}
     end
 
     context "with preset minimum length" do
@@ -52,35 +52,6 @@ describe Utilities do
     end
   end
 
-  describe "#unique_data_in_hash" do
-    let(:type) {:word}
-    let(:list) {Utilities.unique_data_in_hash(data, type)}
-
-    context "with valid type" do
-      let(:data) {
-        {:entry_a => {type => "test"},
-         :entry_b => {type => "a"},
-         :entry_c => {type => "a"},
-         :entry_d => {type => "is"},
-         :entry_e => {type => "test"}}
-      }
-
-      it {list.size.should == 3}
-      it {list.include?("is").should be_true}
-      it {list.include?("a").should be_true}
-      it {list.include?("test").should be_true}
-    end
-
-    context "with invalid type" do
-      let(:data) {
-        {:entry_a => {:wrong => "test"},
-         :entry_b => {:wrong => "is"}}
-      }
-
-      it {list.should == [nil]}
-    end
-  end
-
   describe "#clean_string" do
     let(:unclean) {"  master   "}
     let(:clean) {Utilities.clean_string(unclean)}
@@ -90,6 +61,23 @@ describe Utilities do
     end
   end
 
+  describe "#get_modified_time" do
+    let(:file) { 'file' }
+    before do
+      OS.stub(:mac?) { false }
+      OS.stub(:linux?) { false }
+    end
+    after { Utilities.get_modified_time(file) }
+    context "on a Mac" do
+      before { OS.stub(:mac?) { true } }
+      it { Utilities.should_receive(:time_at).with(%[stat -f %m file]) { 10 } }
+    end
+    context "on a Linux" do
+      before { OS.stub(:linux?) { true } }
+      it { Utilities.should_receive(:time_at).with(%[stat -c %Y file]) { 10 } }
+    end
+  end
+
   describe "#split_old_new_file" do
     let(:files) {Utilities.split_old_new_file(old, new)}
     context "with a change in middle" do
@@ -147,12 +135,12 @@ describe Utilities do
 
     context "file is nil" do
       let(:blob) {Utilities.find_blob_in_tree(tree, nil)}
-      it {blob.should == nil}
+      it {blob.should.nil?}
     end
 
     context "file is empty" do
       let(:file) {""}
-      it {blob.should == nil}
+      it {blob.should.nil?}
     end
 
     context "file is submodule" do
@@ -163,8 +151,8 @@ describe Utilities do
     end
   end
 
-  describe "#get_number_of_files" do
-    let(:files) {Utilities.get_number_of_files(directory, pattern)}
+  describe "#number_of_matching_files" do
+    let(:files) {Utilities.number_of_matching_files(directory, pattern)}
     let(:pattern) {/\d+\.json/}
     let(:directory) {Dir.pwd + File::Separator + "tmp_dir_for_spec" + File::Separator}
 
@@ -172,6 +160,12 @@ describe Utilities do
       FileUtils.mkdir_p(directory)
     end
 
+    context "with missing directory" do
+      subject { files }
+      before { FileUtils.rmdir(directory) }
+      it { should == 0 }
+    end
+
     after(:each) do
       FileUtils.rmdir(directory)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_statistics
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -113,12 +113,14 @@ files:
 - lib/git_statistics.rb
 - lib/git_statistics/blob.rb
 - lib/git_statistics/collector.rb
+- lib/git_statistics/commit_line_extractor.rb
 - lib/git_statistics/commits.rb
 - lib/git_statistics/initialize.rb
 - lib/git_statistics/results.rb
 - lib/git_statistics/utilities.rb
 - lib/git_statistics/version.rb
 - spec/collector_spec.rb
+- spec/commit_line_extractor_spec.rb
 - spec/commits_spec.rb
 - spec/fixtures/commit_buffer_changes.txt
 - spec/fixtures/commit_buffer_information.txt
@@ -161,6 +163,7 @@ specification_version: 3
 summary: Gem that provides the ability to gather detailed git statistics
 test_files:
 - spec/collector_spec.rb
+- spec/commit_line_extractor_spec.rb
 - spec/commits_spec.rb
 - spec/fixtures/commit_buffer_changes.txt
 - spec/fixtures/commit_buffer_information.txt