git-commit-notifier 0.11.0 → 0.11.1

data/README.md

@@ -88,10 +88,7 @@ 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 
+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,
@@ -110,16 +107,6 @@ old commits in processes of forking, branching etc.
   (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. 
-
-### Empty html on ruby 1.8.7
-
-Check <code>gem list premailer</code>. Please remove premailer 1.7.2 if exists (<code>gem uninstall premailer -v 1.7.2; gem install premailer</code>), because 1.7.2 was broken.
-
 ## Credits
 
 Thanks for [putpat.tv](http://www.putpat.tv), [Primalgrasp](http://www.primalgrasp.com) and [Undev](http://undev.ru/) for sponsoring this work.

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

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

@@ -26,18 +26,20 @@ too_many_files: 50
 #
 #     prefix                - The emailprefix set, defaulting to repo_name
 #     repo_name             - Name of the git repo
-#     branch_name           - Name of the git branch (master is "" unless show_master_branch_name)
+#     branch_name           - Name of the git branch
+#     slash_branch_name     - /branch_name (master is "" unless show_master_branch_name)
 #     commit_id             - The git commit id (hash)
 #     message               - The commit message
 #     commit_number         - The commit number within the push; 1-based
 #     commit_count          - The number of commits within the push
 #     commit_count_phrase   - The number of commits, as "1 commit", "2 commits", etc.
+#     commit_count_phrase2  - "2 commits: ", "3 commits: ", etc, or "" if just one
 #
 # The default subject template varies a little depending on whether 
 # or not group_email_by_push is set.
 #
-#subject: "[${prefix}${branch_name}] ${commit_count_phrase}: ${message}"
-#subject: "[${prefix}${branch_name}][${commit_number}] ${message}"
+#subject: "[${prefix}${slash_branch_name}] ${commit_count_phrase2}${message}"
+#subject: "[${prefix}${slash_branch_name}][${commit_number}] ${message}"
 
 # defines what branches to email for (defaults to all)
 # include_branches: ['master', 'some_other_branch']
@@ -151,6 +153,16 @@ message_integration:
 #  fogbugz: http://yourondemand.fogbugz.com/? # will rework BugzId: 123 to FogBugz cases
 
 # Track unique commits per branch?
+# The name of this option is confusing.
+#
+# If set to false, notifications are issued only for commits that are unique to the current branch.
+# If set to true, notifications are issued for any commit on the current branch, whether or not
+# it also occurs on other branches.
+#
+# In other words, setting this to false will filter out commits that have already been displayed
+# at some time in the past, for another branch. The confusing "unique" in the option name can
+# be thought of as implying that commits for each branch are considered in isolation, without
+# considering other branches.
 unique_commits_per_branch: false
 
 # Skip commits older than N days

data/git-commit-notifier.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec-expectations>, [">= 0"])
   s.add_development_dependency(%q<rr>, ["~> 1.0"])
   s.add_development_dependency(%q<faker>, ["~> 0.9.5"])
-  s.add_development_dependency(%q<yard>, ["~> 0.7.3"])
+  s.add_development_dependency(%q<yard>, ["~> 0.7.4"])
   s.add_development_dependency(%q<redcarpet>, ["~> 1.17.2"])
 end
 

data/lib/git_commit_notifier.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require 'git_commit_notifier/commit_hook'
 require 'git_commit_notifier/diff_to_html'
 require 'git_commit_notifier/diff_callback'

data/lib/git_commit_notifier/commit_hook.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require 'yaml'
 require 'cgi'
 require 'net/smtp'
@@ -7,7 +9,7 @@ module GitCommitNotifier
   class CommitHook
 
     class << self
-      attr_reader :config
+      attr_reader :config    
 
       def show_error(message)
         $stderr.puts "************** GIT NOTIFIER PROBLEM *******************"
@@ -42,9 +44,23 @@ module GitCommitNotifier
       end
 
       def run(config_name, rev1, rev2, ref_name)
+      
+      	# Load the configuration
         @config = File.exists?(config_name) ? YAML::load_file(config_name) : {}
 
-        project_path = Dir.getwd
+        project_path = Git.git_dir
+        repo_name = Git.repo_name
+        prefix = config["emailprefix"] || repo_name
+        
+        branch_name = if ref_name =~ /^refs\/heads\/(.+)$/
+          $1
+        else
+          ref_name.split("/").last
+        end
+        slash_branch_name = "/#{branch_name}"
+        slash_branch_name = "" if !config["show_master_branch_name"] && slash_branch_name == '/master'
+
+		# Identify email recipients
         recipient = config["mailinglist"] || Git.mailing_list_address
 
         # If no recipients specified, bail out gracefully. This is not an error, and might be intentional
@@ -53,56 +69,51 @@ module GitCommitNotifier
           return
         end
 
+		# Debug information
         logger.debug('----')
-        logger.debug("pwd: #{Dir.pwd}")
+        logger.debug("cwd: #{Dir.pwd}")
+        logger.debug("Git Directory: #{project_path}")
+        logger.debug("prefix: #{prefix}")
+        logger.debug("repo_name: #{repo_name}")
+        logger.debug("branch: #{branch_name}")
+        logger.debug("slash_branch: #{slash_branch_name}")
         logger.debug("ref_name: #{ref_name}")
         logger.debug("rev1: #{rev1}")
         logger.debug("rev2: #{rev2}")
         logger.debug("included branches: #{include_branches.join(', ')}") unless include_branches.nil?
 
-        repo_name = Git.repo_name
-        prefix = config["emailprefix"] || repo_name
-        
-        branch_name = if ref_name =~ /^refs\/heads\/(.+)$/
-          $1
-        else
-          ref_name.split("/").last
-        end
-
-        logger.debug("prefix: #{prefix}")
-        logger.debug("branch: #{branch_name}")
-
         unless include_branches.nil? || include_branches.include?(branch_name)
           info("Supressing mail for branch #{branch_name}...")
           return
         end
         
-        branch_name = "/#{branch_name}"
-        branch_name = "" if !config["show_master_branch_name"] && branch_name == '/master'
-        
         # Replacements for subject template
         #     prefix
         #     repo_name
         #     branch_name
+        #     slash_branch_name
         #     commit_id (hash)
         #     short_message
         #     commit_number
         #     commit_count
         #     commit_count_phrase (1 commit, 2 commits, etc)
+        #     commit_count_phrase2 (2 commits:, 3 commits:, etc, or "" if just one)
         subject_words = {
           :prefix => prefix,
           :repo_name => repo_name,
           :branch_name => branch_name,
+          :slash_branch_name => slash_branch_name,
           :commit_id => nil,
           :message => nil,
           :commit_number => nil,
           :commit_count => nil,
-          :commit_count_phrase => nil
+          :commit_count_phrase => nil,
+          :commit_count_phrase2 => nil
         }
         
         info("Sending mail...")
 
-        diff2html = DiffToHtml.new(Dir.pwd, config)
+        diff2html = DiffToHtml.new(config)
         if config["group_email_by_push"]
           diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name)
           diffresult = diff2html.result
@@ -129,9 +140,10 @@ module GitCommitNotifier
             :message => result[:commit_info][:message],
             :commit_number => 1,
             :commit_count => diffresult.size,
-            :commit_count_phrase => diffresult.size == 1 ? "#{diffresult.size} commit" : "#{diffresult.size} commits"
+            :commit_count_phrase => diffresult.size == 1 ? "1 commit" : "#{diffresult.size} commits",
+            :commit_count_phrase2 => diffresult.size == 1 ? "" : "#{diffresult.size} commits: "
           })
-          subject_template = config['subject'] || "[${prefix}${branch_name}] ${commit_count_phrase}: ${message}"
+          subject_template = config['subject'] || "[${prefix}${slash_branch_name}] ${commit_count_phrase2}${message}"
           subject = subject_template.gsub(/\$\{(\w+)\}/) { |m| revised_subject_words[$1.intern] }
 
           emailer = Emailer.new(config,
@@ -159,9 +171,10 @@ module GitCommitNotifier
               :message => result[:commit_info][:message],
               :commit_number => commit_number,
               :commit_count => 1,
-              :commit_count_phrase => "1 commit"
+              :commit_count_phrase => "1 commit",
+              :commit_count_phrase2 => ""
             })
-            subject_template = config['subject'] || "[${prefix}${branch_name}][${commit_number}] ${message}"
+            subject_template = config['subject'] || "[${prefix}${slash_branch_name}][${commit_number}] ${message}"
             subject = subject_template.gsub(/\$\{(\w+)\}/) { |m| revised_subject_words[$1.intern] }
             
             emailer = Emailer.new(config,

data/lib/git_commit_notifier/diff_callback.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 module GitCommitNotifier
   class DiffCallback
     attr_reader :tags

data/lib/git_commit_notifier/diff_to_html.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require 'diff/lcs'
 require 'digest/sha1'
 require 'time'
@@ -35,14 +37,12 @@ module GitCommitNotifier
     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, :config
+    attr_reader :result, :oldrev, :newrev, :rev, :ref_name, :config
 
-    def initialize(previous_dir = nil, config = nil)
-      @previous_dir = previous_dir
+    def initialize(config = nil)
       @config = config || {}
       @lines_added = 0
       @file_added = false
@@ -336,9 +336,11 @@ module GitCommitNotifier
     def extract_commit_info_from_git_show_output(content)
       result = { :message => [], :commit => '', :author => '', :date => '', :email => '',
       :committer => '', :commit_date => '', :committer_email => ''}
+      
+      message = []
       content.split("\n").each do |line|
-        if line =~ /^diff/ # end of commit info, return results
-          return result
+        if line =~ /^diff/ # end of commit info
+          break
         elsif line =~ /^commit /
           result[:commit] = line[7..-1]
         elsif line =~ /^Author:/
@@ -352,10 +354,19 @@ module GitCommitNotifier
         elsif line =~ /^Merge:/
           result[:merge] = line[7..-1]
         else
-          clean_line = line.strip
-          result[:message] << clean_line unless clean_line.empty?
+          message << line.strip
         end
       end
+      
+      # Strip blank lines off top and bottom of message
+      while !message.empty? && message.first.empty?
+        message.shift
+      end
+      while !message.empty? && message.last.empty?
+        message.pop
+      end
+      result[:message] = message
+      
       result
     end
 
@@ -380,60 +391,8 @@ module GitCommitNotifier
       ! ! config['unique_commits_per_branch']
     end
 
-    def get_previous_commits(previous_file)
-      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
-      (!@previous_dir.nil? && File.exists?(@previous_dir)) ? @previous_dir : '/tmp'
-    end
-
-    def previous_prefix
-      unique_commits_per_branch? ? "#{Digest::SHA1.hexdigest(branch)}." : ''
-    end
-
-    def previous_file_path
-      previous_name = "#{previous_prefix}#{HANDLED_COMMITS_FILE}"
-      File.join(previous_dir, previous_name)
-    end
-
-    def new_file_path
-      new_name = "#{previous_prefix}#{NEW_HANDLED_COMMITS_FILE}"
-      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
-
-    def check_handled_commits(commits)
-      previous_list = get_previous_commits(previous_file_path)
-      commits.reject! {|c| (c.respond_to?(:lines) ? c.lines : c).find { |sha| previous_list.include?(sha) } }
-      save_handled_commits(previous_list, commits.flatten)
-
-      commits
-    end
-
     def branch_name
-      branch.split('/').last
+      ref_name.split('/').last
     end
 
     def old_commit?(commit_info)
@@ -485,7 +444,29 @@ module GitCommitNotifier
         output.string
       end
     end
-
+    
+    def markup_commit_for_html(commit)
+      commit = 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}'>#{commit}</a>"
+        elsif config["link_files"] == "gitorious" && config["gitorious"]
+          "<a href='#{config['gitorious']['path']}/#{config['gitorious']['project']}/#{config['gitorious']['repository']}/commit/#{commit}'>#{commit}</a>"
+        elsif config["link_files"] == "trac" && config["trac"]
+          "<a href='#{config['trac']['path']}/#{commit}'>#{commit}</a>"
+        elsif config["link_files"] == "cgit" && config["cgit"]
+          "<a href='#{config['cgit']['path']}/#{config['cgit']['project']}/commit/?id=#{commit}'>#{commit}</a>"
+        elsif config["link_files"] == "gitlabhq" && config["gitlabhq"]
+          "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"
+        elsif config["link_files"] == "redmine" && config["redmine"]
+          "<a href='#{config['redmine']['path']}/projects/#{config['redmine']['project'] || Git.repo_name}/repository/revisions/#{commit}'>#{commit}</a>"
+        else
+          "#{commit}"
+        end
+      else
+        "#{commit}"
+      end
+    end
+    
     def diff_for_commit(commit)
       @current_commit = commit
       raw_diff = truncate_long_lines(Git.show(commit, :ignore_whitespaces => ignore_whitespaces?))
@@ -505,36 +486,23 @@ module GitCommitNotifier
         changed_files = "Changed files:\n\n#{changed_file_list.uniq.join()}\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>"
-        elsif config["link_files"] == "gitlabhq" && config["gitlabhq"]
-          "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
-        elsif config["link_files"] == "redmine" && config["redmine"]
-          "<a href='#{config['redmine']['path']}/projects/#{config['redmine']['project'] || Git.repo_name}/repository/revisions/#{commit_info[:commit]}'>#{commit_info[:commit]}</a>"
-        else
-          " #{commit_info[:commit]}"
-        end
-      else
-        " #{commit_info[:commit]}"
+      title = "<dl class=\"title\">"
+      title += "<dt>Commit</dt><dd>#{markup_commit_for_html(commit_info[:commit])}</dd>\n"
+      title += "<dt>Branch</dt><dd>#{CGI.escapeHTML(branch_name)}</dd>\n" if branch_name
+      
+      title += "<dt>Author</dt><dd>#{CGI.escapeHTML(commit_info[:author])} &lt;#{commit_info[:email]}&gt;</dd>\n"
+      
+      # Show separate committer name/email only if it differs from author
+      if commit_info[:author] != commit_info[:committer] || commit_info[:email] != commit_info[:commit_email]
+        title += "<dt>Committer</dt><dd>#{CGI.escapeHTML(commit_info[:committer])} &lt;#{commit_info[:commit_email]}&gt;</dd>\n"
       end
 
-      title += "<br />\n"
-
-      title += "<strong>Branch:</strong> #{CGI.escapeHTML(branch_name)}\n<br />" if branch_name
-      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<br />"
-      title += "<strong>Committer:</strong> #{CGI.escapeHTML(commit_info[:committer])} &lt;#{commit_info[:commit_email]}&gt;\n</div>"
+      title += "<dt>Date</dt><dd>#{CGI.escapeHTML commit_info[:date]}</dd>\n"
+      
+      multi_line_message = commit_info[:message].count > 1
+      title += "<dt>Message</dt><dd class='#{multi_line_message ? "multi-line" : ""}'>#{message_array_as_html(commit_info[:message])}</dd>\n"
+      
+      title += "</dl>"
 
       text = "#{raw_diff}"
       text += "#{changed_files}\n\n\n"
@@ -552,39 +520,169 @@ module GitCommitNotifier
       }
     end
 
-    def clear_result
-      @result = []
+    def diff_for_lightweight_tag(tag, rev, change_type)
+    
+      if change_type == :delete
+        message = "Remove Lightweight Tag #{tag}"
+        
+        html = "<dl class='title'>"
+        html += "<dt>Tag</dt><dd>#{CGI.escapeHTML(tag)} (removed)</dd>\n"
+        html += "<dt>Type</dt><dd>lightweight</dd>\n"
+        html += "<dt>Commit</dt><dd>#{markup_commit_for_html(rev)}</dd>\n"
+        html += "</dl>"
+        
+        text = "Remove Tag: #{tag}\n"
+        text += "Type: lightweight\n"
+        text += "Commit: #{rev}\n"
+      else
+        message = "#{change_type == :create ? "Add" : "Update"} Lightweight Tag #{tag}"
+        
+        html = "<dl class='title'>"
+        html += "<dt>Tag</dt><dd>#{CGI.escapeHTML(tag)} (#{change_type == :create ? "added" : "updated"})</dd>\n"
+        html += "<dt>Type</dt><dd>lightweight</dd>\n"
+        html += "<dt>Commit</dt><dd>#{markup_commit_for_html(rev)}</dd>\n"
+        html += "</dl>"
+        
+        text = "Tag: #{tag} (#{change_type == :create ? "added" : "updated"})\n"
+        text += "Type: lightweight\n"
+        text += "Commit: #{rev}\n"
+      end
+      
+      commit_info = {
+        :commit => rev,
+        :message => message
+      }
+      
+      @result << {
+        :commit_info => commit_info,
+        :html_content => html,
+        :text_content => text
+      }
     end
 
-    def diff_between_revisions(rev1, rev2, repo, branch)
-      @branch = branch
-      @result = []
-      commits = if rev1 == rev2
-        [ rev1 ]
-      elsif rev1 =~ /^0+$/
-        # creating a new remote branch
-        Git.branch_commits(branch)
-      elsif rev2 =~ /^0+$/
-        # deleting an existing remote branch
-        []
+    def diff_for_annotated_tag(tag, rev, change_type)
+    
+      commit_info = {
+        :commit => rev
+      }
+      
+      if change_type == :delete
+        message = "Remove Annotated Tag #{tag}"
+        
+        html = "<dl class='title'>"
+        html += "<dt>Tag</dt><dd>#{CGI.escapeHTML(tag)} (removed)</dd>\n"
+        html += "<dt>Type</dt><dd>annotated</dd>\n"
+        html += "</dl>"
+        
+        text = message
+        commit_info[:message] = message
       else
-        log = Git.log(rev1, rev2)
-        log.scan(/^commit\s([a-f0-9]+)/).map { |a| a.first }.reverse
-      end
+        tag_info = Git.tag_info(ref_name)
 
-      commits = check_handled_commits(commits)
+        message = tag_info[:subject] || "#{change_type == :create ? "Add" : "Update"} Annotated Tag #{tag}"
+        
+        html = "<dl class='title'>"
+        html += "<dt>Tag</dt><dd>#{CGI.escapeHTML(tag)} (#{change_type == :create ? "added" : "updated"})</dd>\n"
+        html += "<dt>Type</dt><dd>annotated</dd>\n"
+        html += "<dt>Commit</dt><dd>#{markup_commit_for_html(tag_info[:tagobject])}</dd>\n"
+        html += "<dt>Tagger</dt><dd>#{CGI.escapeHTML(tag_info[:taggername])} #{CGI.escapeHTML(tag_info[:taggeremail])}</dd>\n"
+
+        message_array = tag_info[:contents].split("\n")
+        multi_line_message = message_array.count > 1
+        html += "<dt>Message</dt><dd class='#{multi_line_message ? "multi-line" : ""}'>#{message_array_as_html(message_array)}</dd>\n"
+        html += "</dl>"
+        
+        text = "Tag:</strong> #{tag} (#{change_type == :create ? "added" : "updated"})\n"
+        text += "Type: annotated\n"
+        text += "Commit: #{tag_info[:tagobject]}\n"
+        text += "Tagger: tag_info[:taggername] tag_info[:taggeremail]\n"
+        text += "Message: #{tag_info[:contents]}\n"
+        
+        commit_info[:message] = message
+        commit_info[:author], commit_info[:email] = author_name_and_email("#{tag_info[:taggername]} #{tag_info[:taggeremail]}")
+      end
+      
+      @result << {
+        :commit_info => commit_info,
+        :html_content => html,
+        :text_content => text
+      }
+    end
 
+    def diff_for_branch(branch, rev, change_type)      
+      commits = case change_type
+      when :delete
+        puts "ignoring branch delete"
+        []
+      when :create, :update
+        # Note that "unique_commits_per_branch" really means "consider commits
+        # on this branch without regard to whether they occur on other branches"
+        # The flag unique_to_current_branch passed to new_commits means the 
+        # opposite: "consider only commits that are unique to this branch"
+        Git.new_commits(oldrev, newrev, ref_name, !unique_commits_per_branch?)
+      end
+      
+      # Add each diff to @result
       commits.each do |commit|
-        begin
           commit_result = diff_for_commit(commit)
           next  if commit_result.nil?
-          if block_given?
-            yield commit_result
-          else
-            @result << commit_result
-          end
-        end
+          @result << commit_result
+      end
+    end
+
+    def clear_result
+      @result = []
+    end
+
+    def diff_between_revisions(rev1, rev2, repo, ref_name)
+      clear_result
+      
+      # Cleanup revs
+      @oldrev = Git.rev_parse(rev1)
+      @newrev = Git.rev_parse(rev2)
+      @ref_name = ref_name
+
+      # Establish the type of change
+      change_type = if @oldrev =~ /^0+$/
+        :create
+      elsif @newrev =~ /^0+$/
+        :delete
+      else
+        :update
       end
+      
+      # Establish type of the revs
+      @oldrev_type = Git.rev_type(@oldrev)
+      @newrev_type = Git.rev_type(@newrev)
+      if newrev =~ /^0+$/
+        @rev_type = @oldrev_type
+        @rev = @oldrev
+      else
+        @rev_type = @newrev_type
+        @rev = @newrev
+      end
+      
+      # Determine what to do based on the ref_name and the rev_type
+      case "#{@ref_name},#{@rev_type}"
+      when %r!^refs/tags/(.+),commit$!
+        # Change to an unannotated tag
+        diff_for_lightweight_tag($1, @rev, change_type)
+      when %r!^refs/tags/(.+),tag$!
+        # Change to a annotated tag
+        diff_for_annotated_tag($1, @rev, change_type)
+      when %r!^refs/heads/(.+),commit$!
+        # Change on a branch
+        diff_for_branch($1, @rev, change_type)
+      when %r!^refs/remotes/(.+),commit$!
+        # Remote branch
+        puts "Ignoring #{change_type} on remote branch #{$1}"
+      else
+        # Something we don't understand
+        puts "Unknown change type #{ref_name},#{@rev_type}"
+      end
+      
+      # If a block was given, pass it the results, in turn
+      @result.each { |result| yield result }  if block_given?
     end
 
     def message_replace!(message, search_for, replace_with)

data/lib/git_commit_notifier/emailer.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require 'premailer'
 
 class GitCommitNotifier::Emailer
@@ -116,17 +118,19 @@ class GitCommitNotifier::Emailer
 
   def send
     to_tag = config['delivery_method'] == 'nntp' ? 'Newsgroups' : 'To'
-    quoted_from_alias = quote_if_necessary("#{@from_alias}",'utf-8')
-    from = @from_alias.empty? ? @from_address : "#{quoted_from_alias} <#{@from_address}>"
+    quoted_from_alias = !@from_alias.nil? ? quote_if_necessary("#{@from_alias}",'utf-8') : nil
+    from = (@from_alias.nil? || @from_alias.empty?) ? @from_address : "#{quoted_from_alias} <#{@from_address}>"
     
     plaintext = if config['add_plaintext'].nil? || config['add_plaintext']
       @text_message
     else
       "Plain text part omitted. Consider setting add_plaintext in configuration."
     end
+    
+    content = []
+    content << "From: #{from}" if !from.nil?
 
-    content = [
-        "From: #{from}",
+    content.concat [
         "#{to_tag}: #{quote_if_necessary(@recipient, 'utf-8')}",
         "Subject: #{quote_if_necessary(@subject, 'utf-8')}",
         "X-Mailer: git-commit-notifier",
@@ -222,7 +226,7 @@ class GitCommitNotifier::Emailer
 
   # A quick-and-dirty regexp for determining whether a string contains any
   # characters that need escaping.
-  CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
+  CHARS_NEEDING_QUOTING = /[^\x0a\x0d\x20-\x7e]/
 
   # Quote the given text if it contains any "illegal" characters
   def quote_if_necessary(text, charset)

data/lib/git_commit_notifier/escape_helper.rb

@@ -1,5 +1,17 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 module GitCommitNotifier::EscapeHelper
+		
+  def expand_tabs(s, tabWidth)
+    delta = 0
+    s.gsub(/\t/) do |m|
+      add = tabWidth - (delta + $~.offset(0)[0]) % tabWidth
+      delta += add - 1
+      " " * add
+    end
+  end
+
   def escape_content(s)
-    CGI.escapeHTML(s).gsub(" ", " ")
+    CGI.escapeHTML(expand_tabs(s, 4)).gsub(" ", " ")
   end
 end

data/lib/git_commit_notifier/executor.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 # parameters: revision1, revision 2, branch
 
 require 'git_commit_notifier'
@@ -15,13 +17,18 @@ module GitCommitNotifier
         GitCommitNotifier::CommitHook.show_error("You have to add a path to the config file for git-commit-notifier")
         puts "Usage:  git-commit-notifier config-script [oldrev newrev [ref]]"
       when 1
-        stdin = $stdin.gets
-        if stdin.nil?
+        if $stdin.eof?
           GitCommitNotifier::CommitHook.show_error("No data given on standard input")
           return
         end
-        oldrev, newrev, ref = stdin.strip.split
-        GitCommitNotifier::CommitHook.run args.first, oldrev, newrev, ref
+        
+        # Note that there may be multiple lines on stdin, such
+        # as in the case of multiple tags being pushed
+        $stdin.each_line do |line|
+          oldrev, newrev, ref = line.strip.split
+          GitCommitNotifier::CommitHook.run args.first, oldrev, newrev, ref
+        end
+
       when 2
         GitCommitNotifier::CommitHook.run args.first, args.last, args.last, ""
       when 3

data/lib/git_commit_notifier/git.rb

@@ -1,3 +1,7 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
+require 'set'
+
 # Git methods
 class GitCommitNotifier::Git
   class << self
@@ -66,9 +70,69 @@ class GitCommitNotifier::Git
       lines.to_a.map { |head| head.chomp }
     end
 
+    def git_dir()
+      from_shell("git rev-parse --git-dir").strip
+    end
+
+    def rev_parse(param)
+      from_shell("git rev-parse '#{param}'").strip
+    end
+
     def branch_head(treeish)
       from_shell("git rev-parse #{treeish}").strip
     end
+    
+    def new_commits(oldrev, newrev, refname, unique_to_current_branch)
+      # We want to get the set of commits (^B1 ^B2 ... ^oldrev newrev)
+      # Where B1, B2, ..., are any other branch
+
+      s = Set.new
+      
+      # If we want to include only those commits that are
+      # unique to this branch, then exclude commits that occur on
+      # other branches
+      if unique_to_current_branch
+        # Make a set of all branches, not'd (^BCURRENT ^B1 ^B2...)
+        not_branches = from_shell("git rev-parse --not --branches")
+        s.merge(not_branches.lines.map {|l| l.chomp}.to_set)
+      
+        # Remove the current branch (^BCURRENT) from the set
+        current_branch = rev_parse(refname)
+        s.delete("^#{current_branch}")
+      end
+      
+      # Add not'd oldrev (^oldrev)
+      s.add("^#{oldrev}") unless oldrev =~ /^0+$/
+
+      # Add newrev
+      s.add(newrev)
+      
+      # We should now have ^B1... ^oldrev newrev
+
+      # Get all the commits that match that specification
+      lines = from_shell("git rev-list #{s.to_a.join(' ')}")
+      commits = lines.lines.map {|l| l.chomp}
+    end
+
+    def rev_type(rev)
+      from_shell("git cat-file -t '#{rev}' 2> /dev/null").strip
+    rescue ArgumentError
+      nil
+    end
+    
+    def tag_info(refname)
+      fields = [
+        ':tagobject => %(*objectname)',
+        ':tagtype => %(*objecttype)',
+        ':taggername => %(taggername)',
+        ':taggeremail => %(taggeremail)',
+        ':subject => %(subject)',
+        ':contents => %(contents)'
+      ]
+      joined_fields = fields.join(",")
+      hash_script = from_shell("git for-each-ref --shell --format='{ #{joined_fields} }' #{refname}")
+      eval(hash_script)
+    end
 
     def repo_name
       git_prefix = begin
@@ -77,7 +141,7 @@ class GitCommitNotifier::Git
         ''
       end
       return git_prefix unless git_prefix.empty?
-      Dir.pwd.split("/").last.sub(/\.git$/, '')
+      File.expand_path(git_dir).split("/").last.sub(/\.git$/, '')
     end
 
     def mailing_list_address

data/lib/git_commit_notifier/logger.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require 'tmpdir'
 
 class GitCommitNotifier::Logger

data/lib/git_commit_notifier/result_processor.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require 'cgi'
 require 'git_commit_notifier/escape_helper'
 

data/local-run.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
 
 if RUBY_VERSION < '1.9'
   # This is for Unicode support in Ruby 1.8

data/spec/lib/git_commit_notifier/commit_hook_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 
@@ -70,7 +72,9 @@ describe GitCommitNotifier::CommitHook do
    end
 
   def expect_repository_access
-    mock(GitCommitNotifier::Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
+    mock(GitCommitNotifier::Git).rev_type(REVISIONS.first) { "commit" }
+    mock(GitCommitNotifier::Git).rev_type(REVISIONS.last) { "commit" }
+    mock(GitCommitNotifier::Git).new_commits(anything, anything, anything, anything) { REVISIONS }    
     mock(GitCommitNotifier::Git).mailing_list_address { 'recipient@test.com' }
     mock(GitCommitNotifier::Git).repo_name { 'testproject' }
     mock(GitCommitNotifier::Git).changed_files('7e4f6b4', '4f13525') { [] }

data/spec/lib/git_commit_notifier/diff_to_html_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 require 'nokogiri'
@@ -5,23 +7,6 @@ require 'git_commit_notifier'
 
 describe GitCommitNotifier::DiffToHtml do
 
-  describe :new_file_rights do
-    before(:all) do
-      @diff_to_html = GitCommitNotifier::DiffToHtml.new
-    end
-
-    it "should be DEFAULT_NEW_FILE_RIGHTS unless get stats of git config file" do
-      mock(File).stat(File.expand_path(GitCommitNotifier::DiffToHtml::GIT_CONFIG_FILE, '.')) { raise Errno::ENOENT.new('') }
-      @diff_to_html.new_file_rights.should == GitCommitNotifier::DiffToHtml::DEFAULT_NEW_FILE_RIGHTS
-    end
-
-    it "should be rights of git config file if exists" do
-      stats = mock!.mode { 0444 }.subject
-      mock(File).stat(File.expand_path(GitCommitNotifier::DiffToHtml::GIT_CONFIG_FILE, '.')) { stats }
-      @diff_to_html.new_file_rights.should == 0444
-    end
-  end
-
   describe :chmod do
     it "should not raise anything and set mode from stats mode" do
       file = Tempfile.new('stattest')
@@ -100,48 +85,40 @@ describe GitCommitNotifier::DiffToHtml do
 
   describe :unique_commits_per_branch? do
     it "should be false unless specified in config" do
-      diff = GitCommitNotifier::DiffToHtml.new(nil, {})
+      diff = GitCommitNotifier::DiffToHtml.new
       diff.should_not be_unique_commits_per_branch
     end
 
     it "should be false if specified as false in config" do
-      diff = GitCommitNotifier::DiffToHtml.new(nil, { 'unique_commits_per_branch' => false })
+      diff = GitCommitNotifier::DiffToHtml.new({ 'unique_commits_per_branch' => false })
       diff.should_not be_unique_commits_per_branch
     end
 
     it "should be true if specified as true in config" do
-      diff = GitCommitNotifier::DiffToHtml.new(nil, { 'unique_commits_per_branch' => true })
+      diff = GitCommitNotifier::DiffToHtml.new({ 'unique_commits_per_branch' => true })
       diff.should be_unique_commits_per_branch
     end
   end
 
-  describe :get_previous_commits do
-    it "should read and parse previous file if it exists" do
-      fn = GitCommitNotifier::DiffToHtml::HANDLED_COMMITS_FILE
-      diff = GitCommitNotifier::DiffToHtml.new
-      mock(File).exists?(fn) { true }
-      mock(IO).read(fn) { "a\nb" }
-      diff.get_previous_commits(fn).should == %w[a b]
-    end
-  end
-
   it "multiple commits" do
+  
     mock(GitCommitNotifier::Git).changed_files('7e4f6b4', '4f13525') { [] }
-    mock(GitCommitNotifier::Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
+    mock(GitCommitNotifier::Git).rev_type(REVISIONS.first) { "commit" }
+    mock(GitCommitNotifier::Git).rev_type(REVISIONS.last) { "commit" }
+    mock(GitCommitNotifier::Git).new_commits(anything, anything, anything, anything) { REVISIONS.reverse }    
     REVISIONS.each do |rev|
       mock(GitCommitNotifier::Git).show(rev, :ignore_whitespaces => true) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
     end
     
     diff = GitCommitNotifier::DiffToHtml.new
-    mock(diff).check_handled_commits(anything) { |commits| commits }
-    diff.diff_between_revisions REVISIONS.first, REVISIONS.last, 'testproject', 'master'
+    diff.diff_between_revisions REVISIONS.first, REVISIONS.last, 'testproject', 'refs/heads/master'
 
     diff.result.should have(5).commits # one result for each of the commits
 
     diff.result.each do |html|
       html.should_not be_include('@@') # diff correctly processed
     end
-
+    
     # second commit - 51b986619d88f7ba98be7d271188785cbbb541a0
     hp = Nokogiri::HTML diff.result[1][:html_content]
     (hp/"table").should have(3).tables # 3 files updated
@@ -179,14 +156,15 @@ describe GitCommitNotifier::DiffToHtml do
   end
 
   it "should get good diff when new branch created" do
-    first_rev, last_rev = %w[ 0000000000000000000000000000000000000000 9b15cebcc5434e27c00a4a2acea43509f9faea21 ]
-    mock(GitCommitNotifier::Git).branch_commits('rvm') { %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ] }
+    first_rev, last_rev = %w[ 0000000000000000000000000000000000000000 ff037a73fc1094455e7bbf506171a3f3cf873ae6 ]
+    mock(GitCommitNotifier::Git).rev_type(first_rev) { "commit" }
+    mock(GitCommitNotifier::Git).rev_type(last_rev) { "commit" }
+    mock(GitCommitNotifier::Git).new_commits(anything, anything, anything, anything) { [ 'ff037a73fc1094455e7bbf506171a3f3cf873ae6' ] }    
     %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ].each do |rev|
       mock(GitCommitNotifier::Git).show(rev, :ignore_whitespaces => true) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
     end
     diff = GitCommitNotifier::DiffToHtml.new
-    mock(diff).check_handled_commits(anything) { |commits| commits }
-    diff.diff_between_revisions(first_rev, last_rev, 'tm-admin', 'rvm')
+    diff.diff_between_revisions(first_rev, last_rev, 'tm-admin', 'refs/heads/rvm')
     diff.result.should have(1).commit
     hp = Nokogiri::HTML diff.result.first[:html_content]
     (hp/"table").should have(1).table
@@ -214,7 +192,7 @@ describe GitCommitNotifier::DiffToHtml do
   describe :do_message_integration do
     before(:each) do
       @config = Hash.new
-      @diff = GitCommitNotifier::DiffToHtml.new(nil, @config)
+      @diff = GitCommitNotifier::DiffToHtml.new(@config)
     end
 
     it "should do nothing unless message_integration config section exists" do
@@ -234,7 +212,7 @@ describe GitCommitNotifier::DiffToHtml do
   describe :old_commit? do
     before(:each) do
       @config = Hash.new
-      @diff_to_html = GitCommitNotifier::DiffToHtml.new(nil, @config)
+      @diff_to_html = GitCommitNotifier::DiffToHtml.new(@config)
     end
 
     it "should be false unless skip_commits_older_than set" do

data/spec/lib/git_commit_notifier/emailer_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require File.expand_path('../../../spec_helper', __FILE__)
 
 require 'git_commit_notifier'

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 
@@ -60,13 +62,13 @@ describe GitCommitNotifier::Git do
 
     it "should return folder name if no emailprefix and directory not ended with .git" do
       mock(GitCommitNotifier::Git).from_shell("git config hooks.emailprefix") { " " }
-      mock(Dir).pwd { "/home/someuser/repositories/myrepo" }
+      mock(GitCommitNotifier::Git).git_dir { "/home/someuser/repositories/myrepo" }
       GitCommitNotifier::Git.repo_name.should == "myrepo"
     end
 
     it "should return folder name without extension if no emailprefix and directory ended with .git" do
       mock(GitCommitNotifier::Git).from_shell("git config hooks.emailprefix") { " " }
-      mock(Dir).pwd { "/home/someuser/repositories/myrepo.git" }
+      mock(GitCommitNotifier::Git).git_dir { "/home/someuser/repositories/myrepo.git" }
       GitCommitNotifier::Git.repo_name.should == "myrepo"
     end
   end

data/spec/lib/git_commit_notifier/logger_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 

data/spec/lib/git_commit_notifier/result_processor_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
 
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: ruby; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- vim:fenc=utf-8:filetype=ruby:et:sw=2:ts=2:sts=2
+
 if RUBY_VERSION < '1.9'
   # This is for Unicode support in Ruby 1.8
   $KCODE = 'u';

data/template/styles.css

@@ -1,4 +1,4 @@
-* {font-size:11px;}
+* {font-size:12px;}
 h2 {font-family:Verdana;font-size:12px;background-color: #bbb; font-weight: bold; line-height:25px; margin-bottom:2px; padding-left:5px}
 table {width:100%;border-collapse:collapse}
 .r {background-color: #fdd;}
@@ -6,6 +6,9 @@ table {width:100%;border-collapse:collapse}
 .a {background-color: #dfd;}
 .aa {background-color: #afa;}
 .title {background-color: #ddd; padding: 10px;font-family:Verdana;font-size:12px;}
+dt { float: left; font-weight: bold; min-width: 6em; }
+dt:after { content: ':'; }
+dd.multi-line { clear: both; margin-left: 0; padding-top: 1em; }
 td {color:#000;font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace}
 .ln {background-color: #ccc; width:23px; text-align:right}
 td.sep {text-align:center;border-top:1px solid DimGray;border-bottom:1px solid DimGray;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70202081729720 !ruby/object:Gem::Requirement
+  requirement: &70278308411520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70202081729720
+  version_requirements: *70278308411520
 - !ruby/object:Gem::Dependency
   name: nntp
-  requirement: &70202081729240 !ruby/object:Gem::Requirement
+  requirement: &70278308410260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202081729240
+  version_requirements: *70278308410260
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &70202081728720 !ruby/object:Gem::Requirement
+  requirement: &70278308409140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70202081728720
+  version_requirements: *70278308409140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70202081727760 !ruby/object:Gem::Requirement
+  requirement: &70278308423600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70202081727760
+  version_requirements: *70278308423600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202081727220 !ruby/object:Gem::Requirement
+  requirement: &70278308422800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -75,10 +75,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70202081727220
+  version_requirements: *70278308422800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70202081726400 !ruby/object:Gem::Requirement
+  requirement: &70278308420960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *70202081726400
+  version_requirements: *70278308420960
 - !ruby/object:Gem::Dependency
   name: code-cleaner
-  requirement: &70202081725280 !ruby/object:Gem::Requirement
+  requirement: &70278308419040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202081725280
+  version_requirements: *70278308419040
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70202081724720 !ruby/object:Gem::Requirement
+  requirement: &70278308418280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202081724720
+  version_requirements: *70278308418280
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70202081724240 !ruby/object:Gem::Requirement
+  requirement: &70278308417680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202081724240
+  version_requirements: *70278308417680
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70202081723720 !ruby/object:Gem::Requirement
+  requirement: &70278308417200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70202081723720
+  version_requirements: *70278308417200
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70202081723240 !ruby/object:Gem::Requirement
+  requirement: &70278308416500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,21 +144,21 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70202081723240
+  version_requirements: *70278308416500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70202081722760 !ruby/object:Gem::Requirement
+  requirement: &70278308471460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *70202081722760
+  version_requirements: *70278308471460
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70202081858160 !ruby/object:Gem::Requirement
+  requirement: &70278308470480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,7 +166,7 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70202081858160
+  version_requirements: *70278308470480
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3538399353583787974
+      hash: -2647894486101160074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: