git-commit-notifier 0.11.11 → 0.12.0

data/CHANGES.md

@@ -2,6 +2,11 @@
 
 ## Not yet released
 
+## Version 0.12.0
+
+* Detects renamed files.
+* Fudge email send date to ensure ordering of commit messages.
+
 ## Version 0.11.11
 
 * Allow per branch mailing lists.

data/Gemfile

@@ -8,3 +8,5 @@ gem "ripper", :group => :development, :platforms => :mri_18
 
 gem "coveralls", :require => false, :platforms => [:mri_19, :mri_20], :group => :development
 
+gem "nokogiri", "~> 1.5.0", :platforms => :mri_18
+

data/VERSION

@@ -1 +1 @@
-0.11.11
+0.12.0

data/config/git-notifier-config.example.yml

@@ -217,6 +217,14 @@ ignore_whitespace: all
 # webooks:
 #  url: http://example.com:8081/commits
 
+# Adding the similarity detection threshold parameter used by the -M flag when detecting renames
+#
+# The value is a number between 0 and 1
+# with 0 signifying 0% and 1 signifying 100%.
+# The Default value is 0.5, meaning, git will consider a delete/add pair as a rename if 
+# more than 50% of it has not changed
+similarity_detection_threshold: "0.5"
+
 # This is developer debugging options. Do not uncomment it if You aren't Jedi
 # debug:
 #   enabled: true

data/lib/git_commit_notifier/commit_hook.rb

@@ -95,6 +95,11 @@ module GitCommitNotifier
       # @return [NilClass] nil
       # @see config
       def run(config_name, rev1, rev2, ref_name)
+      
+        if @start_time.nil?
+          @start_time = Time.new
+          @start_time_offset = 0
+        end
 
         # Load the configuration
         if File.exists?(config_name) 
@@ -214,7 +219,9 @@ module GitCommitNotifier
             :from_alias => result[:commit_info][:author],
             :reply_to_address => config["reply_to_author"] ? result[:commit_info][:email] : config["from"] || result[:commit_info][:email],
             :subject => subject,
-            :date => result[:commit_info][:date],
+            :commit_date => result[:commit_info][:date],
+            :current_date => Time.new.rfc2822,
+            :offset_date => (@start_time + @start_time_offset).rfc2822,
             :text_message => text.join("------------------------------------------\n\n"),
             :html_message => html.join("<hr /><br />"),
             :old_rev => rev1,
@@ -238,6 +245,8 @@ module GitCommitNotifier
               :repo_name => repo_name
             )
             webhook.send
+            
+            @start_time_offset += 1
           end
         else
           commit_number = 1
@@ -261,7 +270,9 @@ module GitCommitNotifier
               :from_alias => result[:commit_info][:author],
               :reply_to_address => config["reply_to_author"] ? result[:commit_info][:email] : config["from"] || result[:commit_info][:email],
               :subject => subject,
-              :date => result[:commit_info][:date],
+              :commit_date => result[:commit_info][:date],
+              :current_date => Time.new.rfc2822,
+              :offset_date => (@start_time + @start_time_offset).rfc2822,
               :text_message => result[:text_content],
               :html_message => result[:html_content],
               :old_rev => rev1,
@@ -288,6 +299,8 @@ module GitCommitNotifier
             end
 
             commit_number += 1
+            
+            @start_time_offset += 1
           end
         end
         nil

data/lib/git_commit_notifier/diff_to_html.rb

@@ -28,7 +28,7 @@ module GitCommitNotifier
           return m unless match
           r = { :phrase => match[1] }
           captures = match[2].split(/[\s\&\,]+/).map { |m| (m =~ /(\d+)/) ? $1 : m }.reject { |c| c.empty? }
-          r[:links] = captures.map { |mn| { :title => "##{mn}", :url => "#{url}/issues/show/#{mn}" } }
+          r[:links] = captures.map { |mn| { :title => "##{mn}", :url => "#{url}/issues/#{mn}" } }
           r
         end },
       :bugzilla => { :search_for => /\bBUG\s*(\d+)/i, :replace_with => '#{url}/show_bug.cgi?id=\1' },
@@ -47,6 +47,9 @@ module GitCommitNotifier
       @lines_added = 0
       @file_added = false
       @file_removed = false
+      @file_renamed = false
+      @file_renamed_old_name = false
+      @file_renamed_new_name = false
       @file_changes = []
       @binary = false
       unless String.method_defined?(:encode!)
@@ -184,6 +187,8 @@ module GitCommitNotifier
         "Deleted"
       elsif @file_added
         "Added"
+      elsif @file_renamed
+      	"Renamed"
       else
         "Changed"
       end
@@ -247,8 +252,15 @@ module GitCommitNotifier
 
       @lines_added = 0
       @diff_result << operation_description
-      if !@diff_lines.empty? && !@too_many_files
+
+      if (@file_renamed || !@diff_lines.empty?) && (!@too_many_files)
         @diff_result << '<table>'
+
+        ##Adds a ROW in the table for the File Rename Details (if at all present)
+        if @file_renamed
+          @diff_result << "<tr class='renamed'>\n<td class='ln'>&nbsp;</td><td class='ln'></td><td>&nbsp;<u>#{@file_renamed_old_name}</u> was renamed to <u>#{@file_renamed_new_name}</u></td></tr>"
+        end
+       
         removals = []
         additions = []
 
@@ -290,6 +302,9 @@ module GitCommitNotifier
       @left_ln = nil
       @file_added = false
       @file_removed = false
+      @file_renamed = false
+      @file_renamed_old_name = false
+      @file_renamed_new_name = false
       @binary = false
     end
 
@@ -366,6 +381,11 @@ module GitCommitNotifier
       elsif line =~ /\/dev\/null differ/ # Binary files ... and /dev/null differ (removal)
         @binary = true
         @file_removed = true
+      elsif line =~ /^rename from (.*)/
+        @file_renamed = true
+        @file_renamed_old_name = line.scan(/^rename from (.*)/)[0][0].to_s
+      elsif line =~ /^rename to (.*)/
+        @file_renamed_new_name = line.scan(/^rename to (.*)/)[0][0].to_s
       elsif op == '@'
         @left_ln, @right_ln = range_info(line)
       end

data/lib/git_commit_notifier/emailer.rb

@@ -9,7 +9,7 @@ class GitCommitNotifier::Emailer
   # Default ERB template file path
   TEMPLATE = File.join(File.dirname(__FILE__), *'../../template/email.html.erb'.split('/')).freeze
   # Instance variable names
-  PARAMETERS = %w[project_path recipient from_address from_alias reply_to_address date subject text_message html_message repo_name ref_name old_rev new_rev].freeze
+  PARAMETERS = %w[project_path recipient from_address from_alias reply_to_address commit_date current_date offset_date subject text_message html_message repo_name ref_name old_rev new_rev].freeze
 
   # Gets config.
   # @return [Hash] Configuration
@@ -194,11 +194,19 @@ class GitCommitNotifier::Emailer
     content << "Reply-To: #{reply_to}"  unless reply_to.nil?
 
     # Setting the email date from the commit date is undesired by those
-    # who sort their email by send date instead of receive date
-    #content << "Date: #{@date}" if !@date.nil?
+    # who sort their email by send date instead of receive date.
+    # We currently use @offset_date, which starts with the time the notifier was started,
+    # and adds a second of time per commit. This should result in the commits arriving
+    # in order by their processing sequence, even when they are all processed within the
+    # same second
+    #date = @commit_date    # Date of the commit
+    #date = @current_date   # Date we processed this commit
+    date = @offset_date     # Date notifier started, plus 1 second per commit processed
+    date = Time.new.rfc2822 if date.nil?    # Fallback to current date if date is nil
 
     content.concat [
         "#{to_tag}: #{quote_if_necessary(@recipient, 'utf-8')}",
+        "Date: #{date}",
         "Subject: #{quote_if_necessary(@subject, 'utf-8')}",
         "X-Mailer: git-commit-notifier",
         "X-Git-Repository: #{@repo_name}",

data/lib/git_commit_notifier/git.rb

@@ -25,7 +25,7 @@ class GitCommitNotifier::Git
     end
 
     # Runs `git show`
-    # @note uses "--pretty=fuller" option.
+    # @note uses "--pretty=fuller" and "-M" option.
     # @return [String] Its output
     # @see from_shell
     # @param [String] rev Revision
@@ -34,6 +34,7 @@ class GitCommitNotifier::Git
     def show(rev, opts = {})
       gitopt = " --date=rfc2822"
       gitopt += " --pretty=fuller"
+      gitopt += " -M#{GitCommitNotifier::CommitHook.config['similarity_detection_threshold'] || "0.5"}"
       gitopt += " -w" if opts[:ignore_whitespace] == 'all'
       gitopt += " -b" if opts[:ignore_whitespace] == 'change'
       from_shell("git show #{rev.strip}#{gitopt}")
@@ -58,13 +59,13 @@ class GitCommitNotifier::Git
     end
 
     # Runs `git log` and extract filenames only
-    # @note uses "--pretty=oneline" and "--name-status" options.
+    # @note uses "--pretty=oneline" and "--name-status" and "-M" options.
     # @return [Array(String)] File names
     # @see lines_from_shell
     # @param [String] rev1 First revision
     # @param [String] rev2 Second revision
     def changed_files(rev1, rev2)
-      lines = lines_from_shell("git log #{rev1}..#{rev2} --name-status --pretty=oneline")
+      lines = lines_from_shell("git log #{rev1}..#{rev2} --name-status --pretty=oneline -M#{GitCommitNotifier::CommitHook.config['similarity_detection_threshold'] || "0.5"}")
       lines = lines.select {|line| line =~ /^\w{1}\s+\w+/} # grep out only filenames
       lines.uniq
     end
@@ -79,7 +80,8 @@ class GitCommitNotifier::Git
       modified = lines.map { |l| l.gsub(/M\s/,'').strip if l[0,1] == 'M' }.select { |l| !l.nil? }
       added = lines.map { |l| l.gsub(/A\s/,'').strip if l[0,1] == 'A' }.select { |l| !l.nil? }
       deleted = lines.map { |l| l.gsub(/D\s/,'').strip if l[0,1] == 'D' }.select { |l| !l.nil? }
-      { :m => modified, :a => added, :d => deleted }
+      renamed = lines.map { |l| l.gsub(/R\d+\s/,'').strip if l[0,1] == 'R' }.select { |l| !l.nil? }
+      { :m => modified, :a => added, :d => deleted , :r => renamed}
     end
 
     def branch_commits(treeish)

data/lib/git_commit_notifier/webhook.rb

@@ -30,6 +30,7 @@ class GitCommitNotifier::Webhook
           'added' => @changed[:a],
           'modified' => @changed[:m],
           'removed' => @changed[:d],
+          'renamed' => @changed[:r],
           'committer' => {
             'name' => @committer,
             'email' => @email

data/spec/lib/git_commit_notifier/diff_to_html_spec.rb

@@ -206,7 +206,7 @@ describe GitCommitNotifier::DiffToHtml do
         'mediawiki' => 'http://example.com/wiki', # will rework [[text]] to MediaWiki pages
         'redmine' => 'http://redmine.example.com' # will rework refs #123, #125 to Redmine issues
       }
-      @diff.do_message_integration("[[text]] refs #123, #125").should == "<a href=\"http://example.com/wiki/text\">[[text]]</a> refs <a href=\"http://redmine.example.com/issues/show/123\">#123</a>, <a href=\"http://redmine.example.com/issues/show/125\">#125</a>"
+      @diff.do_message_integration("[[text]] refs #123, #125").should == "<a href=\"http://example.com/wiki/text\">[[text]]</a> refs <a href=\"http://redmine.example.com/issues/123\">#123</a>, <a href=\"http://redmine.example.com/issues/125\">#125</a>"
     end
   end
 

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -16,18 +16,18 @@ describe GitCommitNotifier::Git do
   describe :show do
     it "should get data from shell: git show without whitespaces" do
       expected = 'some data from git show'
-      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --date=rfc2822 --pretty=fuller -w") { expected }
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --date=rfc2822 --pretty=fuller -M0.5 -w") { expected }
       GitCommitNotifier::Git.show(SAMPLE_REV, :ignore_whitespace => 'all').should == expected
     end
 
     it "should get data from shell: git show with whitespaces" do
       expected = 'some data from git show'
-      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --date=rfc2822 --pretty=fuller") { expected }
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --date=rfc2822 --pretty=fuller -M0.5") { expected }
       GitCommitNotifier::Git.show(SAMPLE_REV, :ignore_whitespace => 'none').should == expected
     end
 
     it "should strip given revision" do
-      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --date=rfc2822 --pretty=fuller -w")
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --date=rfc2822 --pretty=fuller -M0.5 -w")
       GitCommitNotifier::Git.show("#{SAMPLE_REV}\n", :ignore_whitespace => 'all')
     end
   end
@@ -126,7 +126,7 @@ describe GitCommitNotifier::Git do
       files = ["M       README.rdoc\n",
                "D       git_commit_notifier/Rakefile\n",
                "M       post-receive\n"]
-      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --pretty=oneline" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
+      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --pretty=oneline -M0.5" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
       GitCommitNotifier::Git.changed_files(SAMPLE_REV, SAMPLE_REV_2).should == files
     end
   end
@@ -136,7 +136,7 @@ describe GitCommitNotifier::Git do
       files = ["M       README.rdoc\n",
                "D       git_commit_notifier/Rakefile\n",
                "M       post-receive\n"]
-      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --pretty=oneline" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
+      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --pretty=oneline -M0.5" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
       output = GitCommitNotifier::Git.split_status(SAMPLE_REV, SAMPLE_REV_2)
       output[:m].should == [ 'README.rdoc', 'post-receive' ]
       output[:d].should == [ 'git_commit_notifier/Rakefile' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -339,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 778864539407809625
+      hash: -459626784997908862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: