@@ -7,4 +7,5 @@ pkg .loadpath *~ *.html -*.gem \ No newline at end of file +*.gem +*.yml .gitignore @@ -9,6 +9,7 @@ require 'reporter' require 'date' require 'html_report' require 'html_summary' +require 'yaml' # Command line arguments workdir = ARGV[0] @@ -17,12 +18,17 @@ max_commits = ARGV[2].to_i if (max_commits <= 0) max_commits = 50 end +if (ARGV[3]) + translations = YAML::load(File.open(ARGV[3])) +else + translations = {} +end # Action! if (workdir and days > 0) puts "Git stats for repositories under #{workdir}" - reporter = Reporter.new(workdir) + reporter = Reporter.new(workdir, translations) reporter.extract_all_stats(Date.new - days) do |name| puts "Checking #{name}..." end bin/git-report.rb @@ -6,12 +6,13 @@ class Reporter attr_reader :repositories attr_accessor :repository_stats, :commiter_stats, :repository_summaries - def initialize(work_dir) + def initialize(work_dir, translations) @work_dir = work_dir @repositories = Hash.new @repository_stats = Hash.new @commiter_stats = Hash.new @repository_summaries = Hash.new + @translations = translations discover_repositories initialize_repositories end @@ -51,7 +52,7 @@ class Reporter def initialize_repositories for repository_name in @repositories_names - repository = Repository.new(repository_name, @work_dir + "/#{repository_name}") + repository = Repository.new(repository_name, @work_dir + "/#{repository_name}", @translations) @repositories[repository_name] = repository end end lib/reporter.rb @@ -5,10 +5,11 @@ class Repository attr_accessor :name, :dir, :url attr_reader :commiters, :summary - def initialize(name, dir) + def initialize(name, dir, translations) @name = name @dir = dir @delimiter = "#{200.chr}@@@" + @translations = translations end def clone @@ -41,6 +42,9 @@ class Repository for info in commit.split("\n") temp.push info unless info == "" end + if (@translations[temp[0]]) + temp[0] = @translations[temp[0]] + end @summary[temp[1]] = {:commiter => temp[0], :time => Time.at(temp[1].to_i), :message => temp[2]} if temp[1] end end @@ -54,6 +58,9 @@ class Repository @commiters = Hash.new while !match.nil? email = match[1].gsub("\n", "") + if (@translations[email]) + email = @translations[email] + end if @commiters[email].nil? @commiters[email] = 0 lib/repository.rb @@ -1,5 +1,5 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -describe "CaelumGitReports" do +describe "Reporter" do end spec/reporter_spec.rb @@ -13,20 +13,24 @@ User1 User1 -1 1 File1 2 2 File3 +User 1 + +1 1 File1 + User2 7 0 File1 0 3 File2 " - repository = Repository.new("SampleRepository","ArbitraryDirectory") + repository = Repository.new("SampleRepository","ArbitraryDirectory", {"User 1"=> "User1"}) repository.stub(:extract_log).and_return(log) repository.calculate_stats repository.commiters['User1'].should be(18) repository.commiters['User2'].should be(10) + repository.commiters['User 1'].should be(nil) end it "should generate a summary" do @@ -34,17 +38,17 @@ User2 log = "User 1 12345 Message number 1#{delimiter} -User 2 +User2 12344 Message number 2#{delimiter} " - repository = Repository.new("SampleRepository","ArbitraryDirectory") + repository = Repository.new("SampleRepository","ArbitraryDirectory", {"User 1"=> "User1"}) repository.stub(:extract_log_with_messages).and_return(log) repository.generate_summary - repository.summary['12345'][:commiter].should eql("User 1") + repository.summary['12345'][:commiter].should eql("User1") repository.summary['12345'][:time].should eql(Time.at(12345)) repository.summary['12345'][:message].should eql("Message number 1") - repository.summary['12344'][:commiter].should eql("User 2") + repository.summary['12344'][:commiter].should eql("User2") repository.summary['12344'][:time].should eql(Time.at(12344)) repository.summary['12344'][:message].should eql("Message number 2") end spec/repository_spec.rb 1dfdda20d20438c8b68919d51db55c2227f2c6a6 Pedro Matiello pmatiello@gmail.com http://github.com/caelum/git-reports/commit/3de6b2fa2cb4ded9fef2d0fcc05af190b03e5f5e 3de6b2fa2cb4ded9fef2d0fcc05af190b03e5f5e 2009-07-01T09:43:13-07:00 2009-07-01T09:43:13-07:00 Adding commiter name translation support. 578b27b198040b206db36720ab20aabff9241074 Pedro Matiello pmatiello@gmail.com