git-commit-notifier 0.9.2 → 0.10.0

data/.travis.yml

@@ -0,0 +1,9 @@
+notifications:
+  recipients:
+    - bodo@wannawork.de
+    - akzhan.abdulin@gmail.com
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+

data/README.md

@@ -0,0 +1,125 @@
+# Git Commit Notifier
+
+[![Build Status](https://travis-ci.org/bitboxer/git-commit-notifier.png)](http://travis-ci.org/bitboxer/git-commit-notifier)
+
+__by Bodo Tasche (bodo 'at' wannawork 'dot' de), Akzhan Abdulin (akzhan 'dot' abdulin 'at' gmail 'dot' com), Csoma Zoltan  (info 'at' railsprogrammer 'dot' net)__
+
+Sends email commit messages splitting commits that were pushed in one step. 
+Email is delivered as text or HTML with changes refined per word. Emails 
+have a scannable subject containing the first sentence of the commit as well 
+as the author, project and branch name. 
+
+It's also possible to send a mail to a newsgroup using NNTP.
+
+For example:
+
+    [rails][branch] Fix Brasilia timezone. [#1180 state:resolved]
+
+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:
+
+    [rails][branch][0] Added deprecated warning messages to Float#months and Float#years deprications.
+    [rails][branch][1] Enhance testing for fractional days and weeks. Update changelog.
+
+Example email:
+
+![Example](http://img171.imageshack.us/img171/954/gitcommitnotifieremailpq3.png "Example")
+
+## Requirements
+
+* Ruby 1.8.7 or higher
+* RubyGems
+
+We do not support ruby 1.8.6 because of nokogiri gem.
+
+## Installing and Configuring
+
+Install the gem:
+
+```bash
+sudo gem install git-commit-notifier
+```
+
+After you installed the gem, you need to configure your git repository. Add a file called 
+"post-receive" to the "hooks" directory of your git repository with this content:
+
+```bash
+#!/bin/sh
+git-commit-notifier path_to_config.yml
+```
+
+(Don't forget to make that file executable.)
+
+An example for the config file can be found in [config/git-notifier-config.yml.sample](http://github.com/bitboxer/git-commit-notifier/blob/master/config/git-notifier-config.yml.sample).
+
+If you want to send mails on each commit instead on each push, you should add a file called "post-commit" with this content:
+
+```bash
+    #!/bin/sh
+    echo "HEAD^1 HEAD refs/heads/master" | git-commit-notifier path_to_config.yml
+```
+
+## Integration with Redmine, Bugzilla, MediaWiki
+
+Git-commit-notifier supports easy integration with Redmine, Bugzilla and MediaWiki. All you need is to uncomment the according line in the configuration and change the links to your software installations instead of example ones (no trailing slash please).
+
+* "BUG 123" sentence in commit message will be replaced with link to bug in Bugzilla.
+* "refs #123" and "fixes #123" sentences in commit message will be replaced with link to issue in Redmine.
+* "[[SomePage]]" sentence in commit message will be replaced with link to page in MediaWiki.
+
+## Integration of links to other websites
+
+If you need integration with other websites not supported by git-commit-notifier you can use the message\_map property. For that you need to know the basics of regular expressions syntax.
+
+Each key of message\_map is a case sensitive Regexp pattern, and its value is the replacement string.
+Every matched group (that defined by round brackets in regular expression) will be automatically substituted instead of \1-\9 backreferences in replacement string where the number after the backslash informs which group should be substituted instead of the backreference. The first matched group is known as \1.
+
+For example, when we need to expand "follow 23" to http://example.com/answer/23, simply type this:
+
+```yaml
+  '\bfollow\s+(\d+)': 'http://example.com/answer/\1'
+```
+
+Key and value are each enclosed in single quotes. \b means that "follow" must not be preceded by other word chars, so "befollow" will not match but "be follow" will match. After "follow" we expect one or more spaces followed by group of one or more digits. The \1 in the result url will be replaced with the matched group.
+
+More examples can be found in the config file.
+
+## Logic of commits handling
+
+The commit notifier uses special files named *previously.txt* to track already
+handled commits to not send repeated messages about commits.
+
+By default all commits are tracked through the whole repository so after a merge 
+you should not receive messages about those commits already posted in other branches.
+
+This behaviour can be changed using unique\_commits\_per\_branch option. When it's true,
+you should receive new message about commit when it's merged in other branch.
+
+Yet another option, skip\_commits\_older\_than (in days), should be used to not inform about
+old commits in processes of forking, branching etc.
+
+## Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Troubleshooting
+
+### Permission denied - /var/git/repo/previously.txt (Errno::EACCES)
+
+The file _previously.txt_ is created at the first commit. If you moved the file to the server, you have to check the rights to that file and fix them if needed. The git repo owner needs the right to write into that file. 
+
+## Credits
+
+Thanks for [Primalgrasp](http://www.primalgrasp.com) and [Undev](http://undev.ru/) for sponsoring this work.
+
+## License
+
+MIT License, see the file LICENSE.
+

data/Rakefile

@@ -26,12 +26,6 @@ end
 
 task :default => :spec
 
-begin
-  require 'metric_fu'
-rescue LoadError
-  $stderr.puts "metric_fu not available. Install it with: gem install metric_fu"
-end
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exists?('VERSION') ? IO.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.10.0

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

@@ -7,6 +7,9 @@ ignore_merge: false
 # Limit lines per diff
 # lines_per_diff: 300
 
+# Show file list only when too many files
+# too_many_files: 1000
+
 # defines what branches to email for (defaults to all)
 # include_branches: ['master', 'some_other_branch']
 # include_branches: 'master, some_other_branch'
@@ -18,14 +21,14 @@ ignore_merge: false
 # It can send to multiple destinations, just separate email addresses by ",".
 mailinglist: developers@example.com,dev2@example.com,dev3@example.com,cto@example.com
 
-# The from addres. If not defined it will use 
+# The from address. If not defined it will use 
 # the address that is configured in git
 # from: sender@example.com
 
 # stylesheet file (embedded template/styles.css by default)
 # stylesheet: /absolute/path/to/readable/stylesheet.css
 
-# select the delivery method: smtp, nntp, or sendmail 
+# select the delivery method: smtp, nntp, sendmail, or debug
 delivery_method: sendmail 
 
 # Optionally group email by push: don't send an email for each commit when true.
@@ -107,6 +110,9 @@ unique_commits_per_branch: false
 
 show_master_branch_name: false
 
+# ignore whitespace?
+ignore_whitespace: true
+
 # This is developer debugging options. Do not uncomment it if You aren't Jedi
 # debug:
 #   enabled: true

data/git-commit-notifier.gemspec

@@ -5,15 +5,13 @@ Gem::Specification.new do |s|
   s.version = IO.read('VERSION').chomp
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bodo Tasche"]
+  s.authors = ["Bodo Tasche", "Akzhan Abdulin"]
   s.date = Time.now.strftime('%Y-%m-%d')
-  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@bitboxer.de}
-  s.executables = ["git-commit-notifier"]
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.textile"
+    "README.md"
   ]
 
   s.files            = `git ls-files`.split("\n")
@@ -31,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<nntp>, [">= 0"])
   s.add_runtime_dependency(%q<premailer>, [">= 1.7.1"])
   s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
+  s.add_development_dependency(%q<rake>, ["!= 0.9.0"])
   s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
   s.add_development_dependency(%q<code-cleaner>, [">= 0"])
   s.add_development_dependency(%q<rspec-core>, [">= 0"])
@@ -38,6 +37,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rr>, [">= 0"])
   s.add_development_dependency(%q<faker>, [">= 0"])
   s.add_development_dependency(%q<rcov>, [">= 0"])
-  s.add_development_dependency(%q<metric_fu>, [">= 0"])
 end
 

data/lib/git_commit_notifier/commit_hook.rb

@@ -37,6 +37,10 @@ module GitCommitNotifier
         include_branches
       end
 
+      def merge_commit?(result)
+        ! result[:commit_info][:merge].nil?
+      end
+
       def run(config_name, rev1, rev2, ref_name)
         @config = File.exists?(config_name) ? YAML::load_file(config_name) : {}
 
@@ -75,24 +79,25 @@ module GitCommitNotifier
         info("Sending mail...")
 
         diff2html = DiffToHtml.new(Dir.pwd, config)
-        diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name)
-
-        diffresult = diff2html.result
-
-        if config["ignore_merge"]
-          diffresult = diffresult.reject do |result|
-            !result[:commit_info][:merge].nil?
+        if config["group_email_by_push"]
+          diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name)
+          diffresult = diff2html.result
+          diff2html.clear_result
+
+          if config["ignore_merge"]
+            diffresult.reject! do |result|
+              merge_commit?(result)
+            end
           end
-        end
 
-        if config["group_email_by_push"]
           text, html = [], []
+          result = diffresult.first
+          return if result.nil? || !result[:commit_info]
+
           diffresult.each_with_index do |result, i|
             text << result[:text_content]
             html << result[:html_content]
           end
-          result = diffresult.first
-          return if result.nil? || !result[:commit_info]
 
           emailer = Emailer.new(config,
             :project_path => project_path,
@@ -108,10 +113,10 @@ module GitCommitNotifier
           )
           emailer.send
         else
-          diffresult.reverse.each_with_index do |result, i|
-            next unless result[:commit_info]
-            nr = number(diffresult.size, i)
-
+          i = 0
+          diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name) do |result|
+            next  if config["ignore_merge"] && merge_commit?(result)
+            nr = number(i)
             emailer = Emailer.new(config,
               :project_path => project_path,
               :recipient => recipient,
@@ -125,14 +130,13 @@ module GitCommitNotifier
               :ref_name => ref_name
             )
             emailer.send
+            i += 1
           end
         end
       end
 
-      def number(total_entries, i)
-        return '' if total_entries <= 1
-        digits = total_entries < 10 ? 1 : 3
-        '[' + sprintf("%0#{digits}d", i + 1) + ']'
+      def number(i)
+        "[#{i + 1}]"
       end
     end
   end

data/lib/git_commit_notifier/diff_to_html.rb

@@ -27,10 +27,12 @@ module GitCommitNotifier
     MAX_COMMITS_PER_ACTION = 10000
     HANDLED_COMMITS_FILE = 'previously.txt'.freeze
     NEW_HANDLED_COMMITS_FILE = 'previously_new.txt'.freeze
+    GIT_CONFIG_FILE = File.join('.git', 'config').freeze
+    DEFAULT_NEW_FILE_RIGHTS = 0664
     SECS_PER_DAY = 24 * 60 * 60
 
     attr_accessor :file_prefix, :current_file_name
-    attr_reader :result, :branch
+    attr_reader :result, :branch, :config
 
     def initialize(previous_dir = nil, config = nil)
       @previous_dir = previous_dir
@@ -43,16 +45,14 @@ module GitCommitNotifier
 
     def range_info(range)
       matches = range.match(/^@@ \-(\S+) \+(\S+)/)
-      return matches[1..2].map { |m| m.split(',')[0].to_i }
+      matches[1..2].map { |m| m.split(',')[0].to_i }
     end
 
     def line_class(line)
-      if line[:op] == :removal
-        return " class=\"r\""
-      elsif line[:op] == :addition
-        return " class=\"a\""
-      else
-        return ''
+      case line[:op]
+      when :removal  then ' class="r"'
+      when :addition then ' class="a"'
+      else                ''
       end
     end
 
@@ -64,26 +64,29 @@ module GitCommitNotifier
     end
 
     def lines_per_diff
-      @config['lines_per_diff']
+      config['lines_per_diff']
+    end
+
+    def ignore_whitespace?
+      @config['ignore_whitespace'].nil? || @config['ignore_whitespace']
+    end
+
+    def skip_lines?
+      lines_per_diff && (@lines_added >= lines_per_diff)
     end
 
     def add_separator
-      return if lines_per_diff && @lines_added >= lines_per_diff
       @diff_result << '<tr class="sep"><td class="sep" colspan="3" title="Unchanged content skipped between diff. blocks">&hellip;</td></tr>'
     end
 
+    def add_skip_notification
+      @diff_result << '<tr><td colspan="3">Diff too large and stripped&hellip;</td></tr>'
+    end
+
     def add_line_to_result(line, escape)
       @lines_added += 1
-      if lines_per_diff
-        if @lines_added == lines_per_diff
-          @diff_result << '<tr><td colspan="3">Diff too large and stripped&hellip;</td></tr>'
-        end
-        if @lines_added >= lines_per_diff
-          return
-        end
-      end
       klass = line_class(line)
-      content = escape ? escape_content(line[:content]) : line[:content]
+      content = (escape == :escape) ? escape_content(line[:content]) : line[:content]
       padding = '&nbsp;' if klass != ''
       @diff_result << "<tr#{klass}>\n<td class=\"ln\">#{line[:removed]}</td>\n<td class=\"ln\">#{line[:added]}</td>\n<td>#{padding}#{content}</td></tr>"
     end
@@ -143,23 +146,27 @@ module GitCommitNotifier
 
     def operation_description
       binary = @binary ? 'binary ' : ''
-      if @file_removed
-        op = "Deleted"
+      op = if @file_removed
+        "Deleted"
       elsif @file_added
-        op = "Added"
+        "Added"
       else
-        op = "Changed"
+        "Changed"
       end
 
       file_name = @current_file_name
 
-      if (@config["link_files"] && @config["link_files"] == "gitweb" && @config["gitweb"])
-        file_name = "<a href='#{@config['gitweb']['path']}?p=#{@config['gitweb']['project']};f=#{file_name};hb=HEAD'>#{file_name}</a>"
-      elsif (@config["link_files"] && @config["link_files"] == "gitorious" && @config["gitorious"])
-        file_name = "<a href='#{@config['gitorious']['path']}/#{@config['gitorious']['project']}/#{@config['gitorious']['repository']}/blobs/#{branch_name}/#{file_name}'>#{file_name}</a>"
-      elsif (@config["link_files"] && @config["link_files"] == "cgit" && @config["cgit"])
-        file_name = "<a href='#{@config['cgit']['path']}/#{@config['cgit']['project']}/tree/#{file_name}'>#{file_name}</a>"
-      end
+      if config['link_files']
+        file_name = if config["link_files"] == "gitweb" && config["gitweb"]
+          "<a href='#{config['gitweb']['path']}?p=#{Git.repo_name}.git;f=#{file_name};h=#{@current_sha};hb=#{@current_commit}'>#{file_name}</a>"
+        elsif config["link_files"] == "gitorious" && config["gitorious"]
+          "<a href='#{config['gitorious']['path']}/#{config['gitorious']['project']}/#{config['gitorious']['repository']}/blobs/#{branch_name}/#{file_name}'>#{file_name}</a>"
+        elsif config["link_files"] == "cgit" && config["cgit"]
+          "<a href='#{config['cgit']['path']}/#{config['cgit']['project']}/tree/#{file_name}'>#{file_name}</a>"
+        else
+          file_name
+        end
+    end
 
       header = "#{op} #{binary}file #{file_name}"
       "<h2>#{header}</h2>\n"
@@ -178,18 +185,22 @@ module GitCommitNotifier
     def add_changes_to_result
       return if @current_file_name.nil?
       @diff_result << operation_description
-      @diff_result << '<table>'
-      unless @diff_lines.empty?
+      if !@diff_lines.empty? && !@too_many_files
+        @diff_result << '<table>'
         removals = []
         additions = []
         @diff_lines.each_with_index do |line, index|
+          if skip_lines?
+            add_skip_notification
+            break
+          end
           removals << line if line[:op] == :removal
           additions << line if line[:op] == :addition
           if line[:op] == :unchanged || index == @diff_lines.size - 1 # unchanged line or end of block, add prev lines to result
             if removals.size > 0 && additions.size > 0 # block of removed and added lines - perform intelligent diff
-              add_block_to_results(lcs_diff(removals, additions), escape = false)
+              add_block_to_results(lcs_diff(removals, additions), :dont_escape)
             else # some lines removed or added - no need to perform intelligent diff
-              add_block_to_results(removals + additions, escape = true)
+              add_block_to_results(removals + additions, :escape)
             end
             removals = []
             additions = []
@@ -197,11 +208,12 @@ module GitCommitNotifier
               prev_line = @diff_lines[index - 1]
               add_separator unless lines_are_sequential?(prev_line, line)
             end
-            add_line_to_result(line, escape = true) if line[:op] == :unchanged
+            add_line_to_result(line, :escape) if line[:op] == :unchanged
           end
+
         end
-        @diff_lines = []
         @diff_result << '</table>'
+        @diff_lines = []
       end
       # reset values
       @right_ln = nil
@@ -211,6 +223,9 @@ module GitCommitNotifier
       @binary = false
     end
 
+    RE_DIFF_FILE_NAME = /^diff\s\-\-git\sa\/(.*)\sb\//
+    RE_DIFF_SHA       = /^index [0-9a-fA-F]+\.\.([0-9a-fA-F]+)/
+
     def diff_for_revision(content)
       @left_ln = @right_ln = nil
 
@@ -218,16 +233,37 @@ module GitCommitNotifier
       @diff_lines = []
       @removed_files = []
       @current_file_name = nil
+      @current_sha = nil
+      @too_many_files = false
 
-      content.split("\n").each do |line|
-        if line =~ /^diff\s\-\-git\sa\/(.*)\sb\//
+      lines = content.split("\n")
+
+      if config['too_many_files'] && config['too_many_files'].to_i > 0
+        file_count = lines.inject(0) do |count, line|
+          (line =~ RE_DIFF_FILE_NAME) ? (count + 1) : count
+        end
+
+        if file_count >= config['too_many_files'].to_i
+          @too_many_files = true
+        end
+      end
+
+      lines.each do |line|
+        case line
+        when RE_DIFF_FILE_NAME then
           file_name = $1
           add_changes_to_result
           @current_file_name = file_name
+        when RE_DIFF_SHA then
+          @current_sha = $1
+        else
+          op = line[0, 1]
+          if @left_ln.nil? || op == '@'
+            process_info_line(line, op)
+          else
+            process_code_line(line, op)
+          end
         end
-
-        op = line[0,1]
-        @left_ln.nil? || op == '@' ? process_info_line(line, op) : process_code_line(line, op)
       end
       add_changes_to_result
       @diff_result.join("\n")
@@ -288,7 +324,7 @@ module GitCommitNotifier
         elsif line =~ /^Date/
           result[:date] = line[8..-1]
         elsif line =~ /^Merge/
-          result[:merge] = line[8..-1]
+          result[:merge] = line[7..-1]
         else
           clean_line = line.strip
           result[:message] << clean_line unless clean_line.empty?
@@ -315,18 +351,14 @@ module GitCommitNotifier
     end
 
     def unique_commits_per_branch?
-      !!@config['unique_commits_per_branch']
+      ! ! config['unique_commits_per_branch']
     end
 
     def get_previous_commits(previous_file)
-      previous_list = []
-      if File.exists?(previous_file)
-        lines = IO.read(previous_file)
-        lines = lines.lines if lines.respond_to?(:lines) # Ruby 1.9 tweak
-        previous_list = lines.to_a.map { |s| s.chomp }.compact.uniq
-        lines = nil
-      end
-      previous_list
+      return [] unless File.exists?(previous_file)
+      lines = IO.read(previous_file)
+      lines = lines.lines if lines.respond_to?(:lines) # Ruby 1.9 tweak
+      lines.to_a.map { |s| s.chomp }.compact.uniq
     end
 
     def previous_dir
@@ -347,12 +379,21 @@ module GitCommitNotifier
       File.join(previous_dir, new_name)
     end
 
+    def new_file_rights
+      git_config_path = File.expand_path(GIT_CONFIG_FILE, '.')
+      # we should copy rights from git config if possible
+      File.stat(git_config_path).mode
+    rescue
+      DEFAULT_NEW_FILE_RIGHTS
+    end
+
     def save_handled_commits(previous_list, flatten_commits)
       return if flatten_commits.empty?
       current_list = (previous_list + flatten_commits).last(MAX_COMMITS_PER_ACTION)
 
       # use new file, unlink and rename to make it more atomic
       File.open(new_file_path, 'w') { |f| f << current_list.join("\n") }
+      File.chmod(new_file_rights, new_file_path) rescue nil
       File.unlink(previous_file_path) if File.exists?(previous_file_path)
       File.rename(new_file_path, previous_file_path)
     end
@@ -370,65 +411,102 @@ module GitCommitNotifier
     end
 
     def old_commit?(commit_info)
-      return false if !@config.include?('skip_commits_older_than') || @config['skip_commits_older_than'].to_i <= 0
+      return false if ! config.include?('skip_commits_older_than') || (config['skip_commits_older_than'].to_i <= 0)
       commit_when = Time.parse(commit_info[:date])
-      (Time.now - commit_when) > (SECS_PER_DAY * @config['skip_commits_older_than'].to_i)
+      (Time.now - commit_when) > (SECS_PER_DAY * config['skip_commits_older_than'].to_i)
+    end
+
+    def merge_commit?(commit_info)
+      ! commit_info[:merge].nil?
+    end
+
+    def diff_for_commit(commit)
+      @current_commit = commit
+      raw_diff = Git.show(commit, ignore_whitespace?)
+      raise "git show output is empty" if raw_diff.empty?
+
+      commit_info = extract_commit_info_from_git_show_output(raw_diff)
+      return nil  if old_commit?(commit_info)
+      changed_files = ""
+      if merge_commit?(commit_info)
+        merge_revisions = commit_info[:merge].split
+        changed_files += "Changed files:\n\n#{Git.changed_files(*merge_revisions)}\n"
+      end
+
+      title = "<div class=\"title\">"
+      title += "<strong>Message:</strong> #{message_array_as_html(commit_info[:message])}<br />\n"
+      title += "<strong>Commit:</strong> "
+
+      title += if config["link_files"]
+        if config["link_files"] == "gitweb" && config["gitweb"]
+          "<a href='#{config['gitweb']['path']}?p=#{Git.repo_name}.git;a=commitdiff;h=#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
+        elsif config["link_files"] == "gitorious" && config["gitorious"]
+          "<a href='#{config['gitorious']['path']}/#{config['gitorious']['project']}/#{config['gitorious']['repository']}/commit/#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
+        elsif config["link_files"] == "trac" && config["trac"]
+          "<a href='#{config['trac']['path']}/#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
+        elsif config["link_files"] == "cgit" && config["cgit"]
+          "<a href='#{config['cgit']['path']}/#{config['cgit']['project']}/commit/?id=#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
+        else
+          " #{commit_info[:commit]}"
+        end
+      else
+        " #{commit_info[:commit]}"
+      end
+
+      title += "<br />\n"
+
+      title += "<strong>Branch:</strong> #{CGI.escapeHTML(branch_name)}\n<br />"
+      title += "<strong>Date:</strong> #{CGI.escapeHTML commit_info[:date]}\n<br />"
+      title += "<strong>Author:</strong> #{CGI.escapeHTML(commit_info[:author])} &lt;#{commit_info[:email]}&gt;\n</div>"
+      text = "#{raw_diff}"
+      text += "#{changed_files}\n\n\n"
+
+      html = title
+      html += diff_for_revision(extract_diff_from_git_show_output(raw_diff))
+      html += message_array_as_html(changed_files.split("\n"))
+      html += "<br /><br />"
+      commit_info[:message] = first_sentence(commit_info[:message])
+
+      {
+        :commit_info  => commit_info,
+        :html_content => html,
+        :text_content => text
+      }
+    end
+
+    def clear_result
+      @result = []
     end
 
     def diff_between_revisions(rev1, rev2, repo, branch)
       @branch = branch
       @result = []
-      if rev1 == rev2
-        commits = [rev1]
+      commits = if rev1 == rev2
+        [ rev1 ]
       elsif rev1 =~ /^0+$/
         # creating a new remote branch
-        commits = Git.branch_commits(branch)
+        Git.branch_commits(branch)
       elsif rev2 =~ /^0+$/
         # deleting an existing remote branch
-        commits = []
+        []
       else
         log = Git.log(rev1, rev2)
-        commits = log.scan(/^commit\s([a-f0-9]+)/).map { |a| a.first }
+        log.scan(/^commit\s([a-f0-9]+)/).map { |a| a.first }
       end
 
       commits = check_handled_commits(commits)
 
-      commits.each_with_index do |commit, i|
-        raw_diff = Git.show(commit)
-        raise "git show output is empty" if raw_diff.empty?
-
-        commit_info = extract_commit_info_from_git_show_output(raw_diff)
-        next if old_commit?(commit_info)
-
-        title = "<div class=\"title\">"
-        title += "<strong>Message:</strong> #{message_array_as_html commit_info[:message]}<br />\n"
-        title += "<strong>Commit:</strong> "
-
-        if (@config["link_files"] && @config["link_files"] == "gitweb" && @config["gitweb"])
-          title += "<a href='#{@config['gitweb']['path']}?p=#{@config['gitweb']['project']};a=commitdiff;h=#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
-        elsif (@config["link_files"] && @config["link_files"] == "gitorious" && @config["gitorious"])
-          title += "<a href='#{@config['gitorious']['path']}/#{@config['gitorious']['project']}/#{@config['gitorious']['repository']}/commit/#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
-        elsif (@config["link_files"] && @config["link_files"] == "trac" && @config["trac"])
-          title += "<a href='#{@config['trac']['path']}/#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
-        elsif (@config["link_files"] && @config["link_files"] == "cgit" && @config["cgit"])
-          title += "<a href='#{@config['cgit']['path']}/#{@config['cgit']['project']}/commit/?id=#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
-        else
-          title += " #{commit_info[:commit]}"
+      commits.each do |commit|
+        @lines_added = 0  unless config["group_email_by_push"]
+        begin
+          commit_result = diff_for_commit(commit)
+          next  if commit_result.nil?
+          if block_given?
+            yield commit_result
+          else
+            @result << commit_result
+          end
         end
-
-        title += "<br />\n"
-
-        title += "<strong>Branch:</strong> #{CGI.escapeHTML(branch_name)}\n<br />"
-        title += "<strong>Date:</strong> #{CGI.escapeHTML commit_info[:date]}\n<br />"
-        title += "<strong>Author:</strong> #{CGI.escapeHTML(commit_info[:author])} &lt;#{commit_info[:email]}&gt;\n</div>"
-
-        text = "#{raw_diff}\n\n\n"
-
-        html = title
-        html += diff_for_revision(extract_diff_from_git_show_output(raw_diff))
-        html += "<br /><br />"
-        commit_info[:message] = first_sentence(commit_info[:message])
-        @result << {:commit_info => commit_info, :html_content => html, :text_content => text }
       end
     end
 
@@ -445,8 +523,8 @@ module GitCommitNotifier
     end
 
     def do_message_integration(message)
-      return message unless @config['message_integration'].respond_to?(:each_pair)
-      @config['message_integration'].each_pair do |pm, url|
+      return message unless config['message_integration'].respond_to?(:each_pair)
+      config['message_integration'].each_pair do |pm, url|
         pm_def = DiffToHtml::INTEGRATION_MAP[pm.to_sym] or next
         replace_with = pm_def[:replace_with]
         replace_with = replace_with.kind_of?(Proc) ? lambda { |m| pm_def[:replace_with].call(m, url) } : replace_with.gsub('#{url}', url)
@@ -456,8 +534,8 @@ module GitCommitNotifier
     end
 
     def do_message_map(message)
-      return message unless @config['message_map'].respond_to?(:each_pair)
-      @config['message_map'].each_pair do |search_for, replace_with|
+      return message unless config['message_map'].respond_to?(:each_pair)
+      config['message_map'].each_pair do |search_for, replace_with|
         message_replace!(message, Regexp.new(search_for), replace_with)
       end
       message