git-commit-notifier 0.2.0 → 0.3.0

data/README.textile

@@ -9,14 +9,14 @@ as the author, project and branch name.
 
 For example:
 
-<pre>[rails][master] Fix Brasilia timezone. [#1180 state:resolved] </pre>
+<pre>[rails][branch] Fix Brasilia timezone. [#1180 state:resolved] </pre>
 
 A reply-to header is added containing the author of the commit. This makes 
 follow up really simple. If multiple commits are pushed at once, emails are 
 numbered in chronological order:
 
-<pre> [rails][master][000] Added deprecated warning messages to Float#months and Float#years deprications.
- [rails][master][001] Enhance testing for fractional days and weeks. Update changelog.</pre>
+<pre> [rails][branch][000] Added deprecated warning messages to Float#months and Float#years deprications.
+ [rails][branch][001] Enhance testing for fractional days and weeks. Update changelog.</pre>
 
 Example email:
 

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_dependency('diff-lcs')
     gem.add_dependency('mocha')
     gem.add_dependency('hpricot')
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency('tamtam')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

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

@@ -1,12 +1,14 @@
 delivery_method: sendmail # smtp or sendmail
+ignore_merge: false # set to true if you want to ignore empty merge messages
 
 smtp_server:
   address: localhost
   port: 25
   domain: localhost
-  user_name:
-  password:
-  authentication:
+  user_name: user@localhost
+  password: password
+  authentication: plain
+  enable_tls: false
 
 sendmail_options:
   location: /usr/sbin/sendmail

data/git-commit-notifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-commit-notifier}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2010-03-24}
+  s.date = %q{2010-03-25}
   s.default_executable = %q{git-commit-notifier}
   s.description = %q{This git commit notifier sends html mails with nice diffs for every changed file.}
   s.email = %q{bodo@wannawork.de}
@@ -35,7 +35,10 @@ Gem::Specification.new do |s|
      "lib/result_processor.rb",
      "template/email.html.erb",
      "template/styles.css",
+     "test/fixtures/git-notifier-ignore-merge.yml",
+     "test/fixtures/git-notifier-with-merge.yml",
      "test/fixtures/git_log",
+     "test/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c",
      "test/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0",
      "test/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9",
      "test/fixtures/git_show_dce6ade4cdc2833b53bd600ef10f9bce83c7102d",
@@ -65,15 +68,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
       s.add_runtime_dependency(%q<mocha>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<tamtam>, [">= 0"])
     else
       s.add_dependency(%q<diff-lcs>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<tamtam>, [">= 0"])
     end
   else
     s.add_dependency(%q<diff-lcs>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<tamtam>, [">= 0"])
   end
 end
 

data/lib/commit_hook.rb

@@ -28,6 +28,9 @@ class CommitHook
       return
     end
     
+    puts "Sending mail..."
+    STDOUT.flush
+    
     prefix = Git.repo_name
     branch_name = (ref_name =~ /master$/i) ? "" : "/#{ref_name.split("/").last}"
 
@@ -36,8 +39,17 @@ class CommitHook
 
     diff2html = DiffToHtml.new(Dir.pwd)
     diff2html.diff_between_revisions rev1, rev2, prefix, ref_name
-    diff2html.result.reverse.each_with_index do |result, i|
-      nr = number(diff2html.result.size, i)
+    
+    result = diff2html.result
+
+    if (@config["ignore_merge"])
+      result = result.reject {|result|
+        !result[:commit_info][:merge].nil?
+      }
+    end
+    
+    result.reverse.each_with_index do |result, i|
+      nr = number(result.size, i)
       emailer = Emailer.new @config, project_path, recipient, result[:commit_info][:email], result[:commit_info][:author],
                      "[#{prefix}#{branch_name}]#{nr} #{result[:commit_info][:message]}", result[:text_content], result[:html_content], rev1, rev2, ref_name
       emailer.send

data/lib/diff_to_html.rb

@@ -222,6 +222,8 @@ class DiffToHtml
         result[:author], result[:email] = author_name_and_email(line[8..-1])
       elsif line =~ /^Date/
         result[:date] = line[8..-1]
+      elsif line =~ /^Merge/
+        result[:merge] = line[8..-1]
       else
         clean_line = line.strip
         result[:message] << clean_line unless clean_line.empty?
@@ -275,6 +277,7 @@ class DiffToHtml
     File.open(previous_file, "w"){|f| f << current_list.join("\n") } unless current_list.empty? || defined?(Test::Unit)
 
     commits.each_with_index do |commit, i|
+      
       raw_diff = Git.show(commit)
       raise "git show output is empty" if raw_diff.empty?
       @last_raw = raw_diff

data/lib/emailer.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'erb'
+require 'tamtam'
 
 class Emailer
 
@@ -17,7 +18,7 @@ class Emailer
     @new_rev = new_rev
 
     template = File.join(File.dirname(__FILE__), '/../template/email.html.erb')
-    @html_message = ERB.new(File.read(template)).result(binding)
+    @html_message = TamTam.inline(:document => ERB.new(File.read(template)).result(binding))
   end
 
   def boundary

data/test/fixtures/git-notifier-ignore-merge.yml

@@ -0,0 +1,17 @@
+delivery_method: sendmail # smtp or sendmail
+ignore_merge: true # set to true if you want to ignore empty merge messages
+
+smtp_server:
+  address: localhost
+  port: 25
+  domain: localhost
+  user_name: user@localhost
+  password: password
+  authentication: plain
+  enable_tls: false
+
+sendmail_options:
+  location: /usr/sbin/sendmail
+  arguments:
+
+

data/test/fixtures/git-notifier-with-merge.yml

@@ -0,0 +1,17 @@
+delivery_method: sendmail # smtp or sendmail
+ignore_merge: false # set to true if you want to ignore empty merge messages
+
+smtp_server:
+  address: localhost
+  port: 25
+  domain: localhost
+  user_name: user@localhost
+  password: password
+  authentication: plain
+  enable_tls: false
+
+sendmail_options:
+  location: /usr/sbin/sendmail
+  arguments:
+
+

data/test/fixtures/git_log

@@ -32,3 +32,10 @@ Date:   Mon Oct 6 17:35:21 2008 +0300
     button input elements have no default behavior to cancel.
     
     Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
+
+commit 055850e7d925110322b8db4e17c3b840d76e144c
+Merge: 7e4f6b4 4f13525
+Author: Bodo Tasche <bodo@wannawork.de>
+Date:   Thu Mar 25 21:02:04 2010 +0100
+
+    Merge branch 'master' of a/bla2/../bla

data/test/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c

@@ -0,0 +1,6 @@
+commit 055850e7d925110322b8db4e17c3b840d76e144c
+Merge: 7e4f6b4 4f13525
+Author: Bodo Tasche <bodo@wannawork.de>
+Date:   Thu Mar 25 21:02:04 2010 +0100
+
+    Merge branch 'master' of a/bla2/../bla

data/test/test_helper.rb

@@ -4,7 +4,8 @@ unless defined? REVISIONS
   REVISIONS = ['e28ad77bba0574241e6eb64dfd0c1291b221effe', # 2 files updated
              'a4629e707d80a5769f7a71ca6ed9471015e14dc9', # 1 file updated
              'dce6ade4cdc2833b53bd600ef10f9bce83c7102d', # 6 files updated
-             '51b986619d88f7ba98be7d271188785cbbb541a0'] # 3 files updated
+             '51b986619d88f7ba98be7d271188785cbbb541a0', # 3 files updated
+             '055850e7d925110322b8db4e17c3b840d76e144c'] # Empty merge message
 
 end
 

data/test/unit/test_commit_hook.rb

@@ -7,7 +7,15 @@ require File.dirname(__FILE__) + '/../../lib/git'
 
 class CommitHookTest < Test::Unit::TestCase
 
-  def test_hook
+  def test_hook_ignore_merge
+    run_with_config('test/fixtures/git-notifier-ignore-merge.yml', 4) # 4 commit, one email for each of them, without merge
+  end
+
+  def test_hook_with_merge
+    run_with_config('test/fixtures/git-notifier-with-merge.yml', 5) # 5 commit, one email for each of them, with merge mail
+  end
+
+  def run_with_config(config, times)
     path = File.dirname(__FILE__) + '/../fixtures/'
     Git.expects(:log).with(REVISIONS.first, REVISIONS.last).returns(read_file(path + 'git_log'))
     Git.expects(:mailing_list_address).returns('recipient@test.com')
@@ -15,8 +23,10 @@ class CommitHookTest < Test::Unit::TestCase
       Git.expects(:show).with(rev).returns(read_file(path + "git_show_#{rev}"))
     end
     emailer = mock('Emailer')
-    Emailer.expects(:new).times(4).returns(emailer) # 4 commit, one email for each of them
-    emailer.expects(:send).times(4)
-    CommitHook.run 'config/email.yml.sample', REVISIONS.first, REVISIONS.last, 'refs/heads/master'
+    Emailer.expects(:new).times(times).returns(emailer) # 4 commit, one email for each of them
+    emailer.expects(:send).times(times)
+    CommitHook.run config, REVISIONS.first, REVISIONS.last, 'refs/heads/master'
   end
+
+
 end

data/test/unit/test_diff_to_html.rb

@@ -19,7 +19,7 @@ class DiffToHtmlTest < Test::Unit::TestCase
 
     diff = DiffToHtml.new
     diff.diff_between_revisions REVISIONS.first, REVISIONS.last, 'testproject', 'master'
-    assert_equal 4, diff.result.size # one result for each of the commits
+    assert_equal 5, diff.result.size # one result for each of the commits
 
     diff.result.each do |html|
       assert !html.include?('@@') # diff correctly processed

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bodo Tasche
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +01:00
+date: 2010-03-25 00:00:00 +01:00
 default_executable: git-commit-notifier
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: tamtam
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: This git commit notifier sends html mails with nice diffs for every changed file.
 email: bodo@wannawork.de
 executables: 
@@ -79,7 +91,10 @@ files:
 - lib/result_processor.rb
 - template/email.html.erb
 - template/styles.css
+- test/fixtures/git-notifier-ignore-merge.yml
+- test/fixtures/git-notifier-with-merge.yml
 - test/fixtures/git_log
+- test/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
 - test/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0
 - test/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9
 - test/fixtures/git_show_dce6ade4cdc2833b53bd600ef10f9bce83c7102d