git-commit-notifier 0.11.4 → 0.11.5

data/README.md

@@ -4,10 +4,10 @@
 
 __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. 
+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.
 
@@ -15,8 +15,8 @@ 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 
+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.
@@ -42,7 +42,7 @@ Install the gem:
 gem install git-commit-notifier
 ```
 
-After you installed the gem, you need to configure your git repository. Add a file called 
+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
@@ -69,6 +69,13 @@ Git-commit-notifier supports easy integration with Redmine, Bugzilla and MediaWi
 * "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.
 
+## Github-flavored Webhooks
+
+Git-commit-notifier can send a webhook just after sending a mail, This webook will be sent in a POST request to a server specified in the configuration (webhook / url), under JSON format following the same syntax as Github webhooks.
+
+* [Cogbot](https://github.com/mose/cogbot) is the irc bot for which that feature was originaly designed for. Only a subset of the Github json file was required for that one so maybe it won't work on all Github webhook recievers.
+* [Github webhooks](https://help.github.com/articles/post-receive-hooks) describes the json format expected and some hints on how to design a webhook reciever.
+
 ## 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.

data/VERSION

@@ -1 +1 @@
-0.11.4
+0.11.5

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

@@ -1,7 +1,7 @@
 # set to true if you want to ignore empty merge messages
-ignore_merge: false 
+ignore_merge: false
 
-# Optional parameter for the subject-line of the mail 
+# Optional parameter for the subject-line of the mail
 # emailprefix: GIT
 
 # Set limit on maximum number of lines per file diff
@@ -10,6 +10,9 @@ lines_per_diff: 300
 # Show file list only when too many files
 too_many_files: 50
 
+# Show summary before changes
+show_summary: true
+
 # Whether to expand css inline. May be compatible with more mail readers
 # but consumes much more space and more cpu. Defaults to true
 # expand_css: true
@@ -29,13 +32,14 @@ too_many_files: 50
 #     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)
+#     description           - The git description tag ("git describe --always")
 #     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 
+# The default subject template varies a little depending on whether
 # or not group_email_by_push is set.
 #
 #subject: "[${prefix}${slash_branch_name}] ${commit_count_phrase2}${message}"
@@ -52,10 +56,15 @@ too_many_files: 50
 # 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 address. 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
 
+# If reply_to_author is set to true, the Reply-To address is same as the author's
+# email address, if not it will be same as the from address.
+# Defaults to false
+# reply_to_author: false
+
 # stylesheet file (embedded template/styles.css by default)
 # stylesheet: /absolute/path/to/readable/stylesheet.css
 
@@ -63,7 +72,7 @@ mailinglist: developers@example.com,dev2@example.com,dev3@example.com,cto@exampl
 # custom_template: /absolute/path/to/readable/email.html.erb
 
 # select the delivery method: smtp, nntp, sendmail, or debug
-delivery_method: sendmail 
+delivery_method: sendmail
 
 # Optionally group email by push: don't send an email for each commit when true.
 # group_email_by_push: false
@@ -101,7 +110,7 @@ nntp_settings:
 
 # Decorate files and commit ids with link to a webview. Possible values: none, gitweb,
 # gitorious, cgit, trac, gitlabhq, or redmine
-link_files: none 
+link_files: none
 
 # If link_files is set to "gitweb", you need to configure the path to your gitweb
 # instance and the project name.
@@ -173,6 +182,10 @@ show_master_branch_name: false
 # ignore whitespace?
 ignore_whitespace: true
 
+# adding parameters to send webhooks
+# webooks:
+#  url: http://example.com:8081/commits
+
 # This is developer debugging options. Do not uncomment it if You aren't Jedi
 # debug:
 #   enabled: true

data/git-commit-notifier.gemspec

@@ -29,14 +29,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<nntp>, ["~> 1.0"])
   s.add_runtime_dependency(%q<premailer>, ["~> 1.7", ">= 1.7.1", "!= 1.7.2"])
   s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4"])
+  s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0"])
   s.add_development_dependency(%q<rake>, ["~> 0.8", "!= 0.9.0"])
   s.add_development_dependency(%q<bundler>, ["~> 1.0", ">=1.0.10"])
   s.add_development_dependency(%q<code-cleaner>, [">= 0"])
   s.add_development_dependency(%q<rspec-core>, [">= 0"])
   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.5"])
-  s.add_development_dependency(%q<redcarpet>, ["~> 1.17.2"])
+  s.add_development_dependency(%q<faker>, ["~> 1.0"])
+  s.add_development_dependency(%q<yard>, ["~> 0.8.1"])
+  s.add_development_dependency(%q<redcarpet>, ["~> 2.1"])
 end
 

data/lib/git_commit_notifier/commit_hook.rb

@@ -60,6 +60,21 @@ module GitCommitNotifier
         ! commit_info[:commit_info][:merge].nil?
       end
 
+      # Gets message subject.
+      # @param [Hash] commit_info Commit info.
+      # @param [String] template Subject template.
+      # @param [Hash] subject_map Map of subject substitutions.
+      # @return [String] Message subject.
+      def get_subject(commit_info, template, subject_map)
+        template.gsub(/\$\{(\w+)\}/) do |m|
+          res = subject_map[$1.intern]
+          if res.kind_of?(Proc)
+            res = res.call(commit_info)
+          end
+          res
+        end
+      end
+
       # Runs comit hook handler using specified arguments.
       # @param [String] config_name Path to the application configuration file in YAML format.
       # @param [String] rev1 First specified revision.
@@ -117,6 +132,7 @@ module GitCommitNotifier
         #     branch_name
         #     slash_branch_name
         #     commit_id (hash)
+        #     description ('git describe' tag)
         #     short_message
         #     commit_number
         #     commit_count
@@ -128,6 +144,7 @@ module GitCommitNotifier
           :branch_name => branch_name,
           :slash_branch_name => slash_branch_name,
           :commit_id => nil,
+          :description => lambda { |commit_info| Git.describe(commit_info[:commit]) },
           :message => nil,
           :commit_number => nil,
           :commit_count => nil,
@@ -162,13 +179,14 @@ module GitCommitNotifier
             :commit_count_phrase2 => diffresult.size == 1 ? "" : "#{diffresult.size} commits: "
           })
           subject_template = config['subject'] || "[${prefix}${slash_branch_name}] ${commit_count_phrase2}${message}"
-          subject = subject_template.gsub(/\$\{(\w+)\}/) { |m| revised_subject_words[$1.intern] }
+          subject = get_subject(result[:commit_info], subject_template, revised_subject_words)
 
           emailer = Emailer.new(config,
             :project_path => project_path,
             :recipient => recipient,
             :from_address => config["from"] || result[:commit_info][:email],
             :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],
             :text_message => text.join("------------------------------------------\n\n"),
@@ -179,6 +197,22 @@ module GitCommitNotifier
             :repo_name => repo_name
           )
           emailer.send
+
+          # WEBHOOK patch
+          unless config['webhook'].nil?
+            webhook = Webhook.new(config,
+              :committer => result[:commit_info][:author],
+              :email => result[:commit_info][:email],
+              :message => result[:commit_info][:message],
+              :subject => subject,
+              :changed => Git.split_status(rev1,rev2),
+              :old_rev => rev1,
+              :new_rev => rev2,
+              :ref_name => ref_name,
+              :repo_name => repo_name
+            )
+            webhook.send
+          end
         else
           commit_number = 1
           diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name) do |count, result|
@@ -192,13 +226,14 @@ module GitCommitNotifier
               :commit_count_phrase2 => count == 1 ? "" : "#{count} commits: "
             })
             subject_template = config['subject'] || "[${prefix}${slash_branch_name}][${commit_number}/${commit_count}] ${message}"
-            subject = subject_template.gsub(/\$\{(\w+)\}/) { |m| revised_subject_words[$1.intern] }
+            subject = get_subject(result[:commit_info], subject_template, revised_subject_words)
 
             emailer = Emailer.new(config,
               :project_path => project_path,
               :recipient => recipient,
               :from_address => config["from"] || result[:commit_info][:email],
               :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],
               :text_message => result[:text_content],
@@ -209,6 +244,23 @@ module GitCommitNotifier
               :repo_name => repo_name
             )
             emailer.send
+
+            # WEBHOOK patch
+            unless config['webhook'].nil?
+              webhook = Webhook.new(config,
+                :committer => result[:commit_info][:author],
+                :email => result[:commit_info][:email],
+                :message => result[:commit_info][:message],
+                :subject => subject,
+                :changed => Git.split_status(rev1,rev2),
+                :old_rev => rev1,
+                :new_rev => rev2,
+                :ref_name => ref_name,
+                :repo_name => repo_name
+              )
+              webhook.send
+            end
+
             commit_number += 1
           end
         end
@@ -217,4 +269,3 @@ module GitCommitNotifier
     end
   end
 end
-

data/lib/git_commit_notifier/diff_to_html.rb

@@ -47,6 +47,7 @@ module GitCommitNotifier
       @lines_added = 0
       @file_added = false
       @file_removed = false
+      @file_changes = []
       @binary = false
     end
 
@@ -83,6 +84,11 @@ module GitCommitNotifier
       config['ignore_merge']
     end
 
+    # Gets show_summary setting from {#config}.
+    def show_summary?
+      config['show_summary']
+    end
+
     # Gets ignore_whitespace setting from {#config}.
     # @return [Boolean] true if whitespaces should be ignored in diff; otherwise false.
     def ignore_whitespaces?
@@ -200,7 +206,12 @@ module GitCommitNotifier
       end
 
       header = "#{op} #{binary}file #{file_name}"
-      "<h2>#{header}</h2>\n"
+
+      if show_summary?
+        @file_changes << [ file_name, header ]
+      end
+
+      "<h2 id=\"#{file_name}\">#{header}</h2>\n"
     end
 
     # Determines are two lines are sequentially placed in diff (no skipped lines between).
@@ -356,24 +367,33 @@ module GitCommitNotifier
     end
 
     def extract_commit_info_from_git_show_output(content)
-      result = { :message => [], :commit => '', :author => '', :date => '', :email => '',
-      :committer => '', :commit_date => '', :committer_email => ''}
+      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
-          break
-        elsif line =~ /^commit /
+        break  if line =~ /^diff/ # end of commit info
+
+        case line
+        when /^commit /
           result[:commit] = line[7..-1]
-        elsif line =~ /^Author:/
+        when /^Author:/
           result[:author], result[:email] = author_name_and_email(line[12..-1])
-        elsif line =~ /^AuthorDate:/
+        when /^AuthorDate:/
           result[:date] = line[12..-1]
-        elsif line =~ /^Commit:/
+        when /^Commit:/
           result[:committer], result[:commit_email] = author_name_and_email(line[12..-1])
-        elsif line =~ /^CommitDate:/
+        when /^CommitDate:/
           result[:commit_date] = line[12..-1]
-        elsif line =~ /^Merge:/
+        when /^Merge:/
           result[:merge] = line[7..-1]
         else
           message << line.strip
@@ -398,7 +418,7 @@ module GitCommitNotifier
 
     def author_name_and_email(info)
       # input string format: "autor name <author@email.net>"
-      return [$1, $2] if info =~ /^([^\<]+)\s+\<\s*(.*)\s*\>\s*$/ # normal operation
+      return [$1, $2]  if info =~ /^([^\<]+)\s+\<\s*(.*)\s*\>\s*$/ # normal operation
       # incomplete author info - return it as author name
       [info, '']
     end
@@ -523,15 +543,32 @@ module GitCommitNotifier
 
       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}"
+      @file_changes = []
+      text = ""
+
+      html_diff = diff_for_revision(extract_diff_from_git_show_output(raw_diff))
+      message_array = message_array_as_html(changed_files.split("\n"))
+
+      if show_summary? and @file_changes.respond_to?("each")
+        title += "<ul>"
+
+        @file_changes.each do |file_name, header|
+          title += "<li><a href=\"\##{file_name}\">#{header}</a></li>"
+          text += "#{header}\n"
+        end
+
+        title += "</ul>"
+        text += "\n"
+      end
+
+      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 += html_diff
+      html += message_array
       html += "<br /><br />"
       commit_info[:message] = first_sentence(commit_info[:message])
 
@@ -750,4 +787,3 @@ module GitCommitNotifier
     end
   end
 end
-

data/lib/git_commit_notifier/emailer.rb

@@ -181,6 +181,7 @@ class GitCommitNotifier::Emailer
     to_tag = config['delivery_method'] == 'nntp' ? 'Newsgroups' : 'To'
     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}>"
+    reply_to = (@from_alias.nil? || !config['reply_to_author']) ? @reply_to_address : "#{@from_alias} <#{@reply_to_address}>"
 
     plaintext = if config['add_plaintext'].nil? || config['add_plaintext']
       @text_message
@@ -190,6 +191,7 @@ class GitCommitNotifier::Emailer
 
     content = []
     content << "From: #{from}"  unless from.nil?
+    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

data/lib/git_commit_notifier/git.rb

@@ -1,7 +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 'set'
-
 # Git methods
 class GitCommitNotifier::Git
   class << self
@@ -40,6 +38,14 @@ class GitCommitNotifier::Git
       from_shell("git show #{rev.strip}#{gitopt}")
     end
 
+    # Runs `git describe'
+    # @return [String] Its output
+    # @see from_shell
+    # @param [String] rev Revision
+    def describe(rev)
+      from_shell("git describe --always #{rev.strip}").strip
+    end
+
     # Runs `git log`
     # @note uses "--pretty=fuller" option.
     # @return [String] Its output
@@ -51,7 +57,7 @@ class GitCommitNotifier::Git
     end
 
     # Runs `git log` and extract filenames only
-    # @note uses "--pretty=fuller" and "--name-status" options.
+    # @note uses "--pretty=oneline" and "--name-status" options.
     # @return [Array(String)] File names
     # @see lines_from_shell
     # @param [String] rev1 First revision
@@ -62,6 +68,18 @@ class GitCommitNotifier::Git
       lines.uniq
     end
 
+    # splits the output of changed_files
+    # @return [Hash(Array)] file names sorted by status
+    # @see changed_files
+    # @param [Array(String)] lines
+    def split_status(rev1, rev2)
+      lines = changed_files(rev1, rev2)
+      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? }
+      return { :m => modified, :a => added, :d => deleted }
+    end
+
     def branch_commits(treeish)
       args = branch_heads - [ branch_head(treeish) ]
       args.map! { |tree| "^#{tree}" }
@@ -90,7 +108,7 @@ class GitCommitNotifier::Git
     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
+      a = Array.new
 
       # If we want to include only those commits that are
       # unique to this branch, then exclude commits that occur on
@@ -98,23 +116,23 @@ class GitCommitNotifier::Git
       if unique_to_current_branch
         # Make a set of all branches, not'd (^BCURRENT ^B1 ^B2...)
         not_branches = lines_from_shell("git rev-parse --not --branches")
-        s.merge(not_branches.to_a.map { |l| l.chomp }.to_set)
+        a = not_branches.map { |l| l.chomp }
 
         # Remove the current branch (^BCURRENT) from the set
         current_branch = rev_parse(refname)
-        s.delete("^#{current_branch}")
+        a.delete_at a.index("^#{current_branch}") unless a.index("^#{current_branch}").nil?
       end
 
       # Add not'd oldrev (^oldrev)
-      s.add("^#{oldrev}")  unless oldrev =~ /^0+$/
+      a.push("^#{oldrev}")  unless oldrev =~ /^0+$/
 
       # Add newrev
-      s.add(newrev)
+      a.push(newrev)
 
       # We should now have ^B1... ^oldrev newrev
 
       # Get all the commits that match that specification
-      lines = lines_from_shell("git rev-list --reverse #{s.to_a.join(' ')}")
+      lines = lines_from_shell("git rev-list --reverse #{a.join(' ')}")
       commits = lines.to_a.map { |l| l.chomp }
     end
 

data/lib/git_commit_notifier/webhook.rb

@@ -0,0 +1,49 @@
+# -*- 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 "yajl"
+require "uri"
+require "cgi"
+require "net/http"
+
+class GitCommitNotifier::Webhook
+
+  PARAMETERS = %w(committer email message subject changed old_rev new_rev ref_name repo_name)
+  attr_accessor :config
+
+  def initialize(config, options = {})
+    @config = config || {}
+    PARAMETERS.each do |name|
+      instance_variable_set("@#{name}".to_sym, options[name.to_sym])
+    end
+  end
+
+  def payload
+    pay = {
+      'repository' => {
+        'name' => @repo_name
+      },
+      'ref' => @ref_name,
+      'before' => @old_rev,
+      'after' => @new_rev,
+      'commits' => [
+        {
+          'added' => @changed[:a],
+          'modified' => @changed[:m],
+          'removed' => @changed[:d],
+          'committer' => {
+            'name' => @committer,
+            'email' => @email
+          },
+          'message' => CGI::escape(@message)
+        }
+      ]
+    }
+    Yajl::Encoder.encode(pay)
+  end
+
+  def send
+    Net::HTTP.post_form(URI.parse(@config['webhook']['url']), { 'payload' => payload })
+    nil
+  end
+
+end

data/lib/git_commit_notifier.rb

@@ -4,6 +4,7 @@ require 'git_commit_notifier/commit_hook'
 require 'git_commit_notifier/diff_to_html'
 require 'git_commit_notifier/diff_callback'
 require 'git_commit_notifier/emailer'
+require 'git_commit_notifier/webhook'
 require 'git_commit_notifier/escape_helper'
 require 'git_commit_notifier/git'
 require 'git_commit_notifier/logger'

data/spec/fixtures/git_describe_055850e7d925110322b8db4e17c3b840d76e144c

@@ -0,0 +1 @@
+Tag-05

data/spec/fixtures/git_describe_51b986619d88f7ba98be7d271188785cbbb541a0

@@ -0,0 +1 @@
+Tag-51

data/spec/fixtures/git_describe_a4629e707d80a5769f7a71ca6ed9471015e14dc9

@@ -0,0 +1 @@
+Tag-a4

data/spec/fixtures/git_describe_dce6ade4cdc2833b53bd600ef10f9bce83c7102d

@@ -0,0 +1 @@
+Tag-dc

data/spec/fixtures/git_describe_e28ad77bba0574241e6eb64dfd0c1291b221effe

@@ -0,0 +1 @@
+Tag-e2

data/spec/fixtures/git_describe_ff037a73fc1094455e7bbf506171a3f3cf873ae6

@@ -0,0 +1 @@
+Tag-ff

data/spec/lib/git_commit_notifier/commit_hook_spec.rb

@@ -80,6 +80,7 @@ describe GitCommitNotifier::CommitHook do
     mock(GitCommitNotifier::Git).changed_files('7e4f6b4', '4f13525') { [] }
     REVISIONS.each do |rev|
       mock(GitCommitNotifier::Git).show(rev, :ignore_whitespaces => true) { IO.read(FIXTURES_PATH + "git_show_#{rev}") }
+      dont_allow(GitCommitNotifier::Git).describe(rev) { IO.read(FIXTURES_PATH + "git_describe_#{rev}") }
     end
   end
 
@@ -133,7 +134,17 @@ describe GitCommitNotifier::CommitHook do
       mock(GitCommitNotifier::CommitHook).config { { 'include_branches' => 'test, me, yourself'  } }
       GitCommitNotifier::CommitHook.include_branches.should == %w(test me yourself)
     end
+  end
 
+  describe :get_subject do
+    it "should run lambda if specified in mapping" do
+      mock(GitCommitNotifier::Git).describe("commit_id") { "yo" }
+      GitCommitNotifier::CommitHook.get_subject(
+        { :commit => "commit_id" },
+        "${description}",
+        { :description => lambda { |commit_info| GitCommitNotifier::Git.describe(commit_info[:commit]) } }
+      ).should == "yo"
+    end
   end
 
 end

data/spec/lib/git_commit_notifier/diff_to_html_spec.rb

@@ -101,13 +101,13 @@ describe GitCommitNotifier::DiffToHtml do
   end
 
   it "multiple commits" do
-
     mock(GitCommitNotifier::Git).changed_files('7e4f6b4', '4f13525') { [] }
     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) }
+      dont_allow(GitCommitNotifier::Git).describe(rev) { IO.read(FIXTURES_PATH + 'git_describe_' + rev) }
     end
 
     diff = GitCommitNotifier::DiffToHtml.new
@@ -162,6 +162,7 @@ describe GitCommitNotifier::DiffToHtml do
     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) }
+      dont_allow(GitCommitNotifier::Git).describe(rev) { IO.read(FIXTURES_PATH + 'git_describe_' + rev) }
     end
     diff = GitCommitNotifier::DiffToHtml.new
     diff.diff_between_revisions(first_rev, last_rev, 'tm-admin', 'refs/heads/rvm')

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -32,6 +32,14 @@ describe GitCommitNotifier::Git do
     end
   end
 
+  describe :describe do
+    it "should strip given description" do
+      expected = 'some descriptio'
+      mock(GitCommitNotifier::Git).from_shell("git describe --always #{SAMPLE_REV}") { "#{expected}\n" }
+      GitCommitNotifier::Git.describe(SAMPLE_REV).should == expected
+    end
+  end
+
   describe :branch_heads do
     before(:each) do
       mock(GitCommitNotifier::Git).from_shell("git rev-parse --branches") { "some\npopular\ntext\n" }
@@ -94,6 +102,17 @@ describe GitCommitNotifier::Git do
     end
   end
 
+  describe :new_empty_branch do
+    it "should commit an empty branch and output nothing" do
+      mock(GitCommitNotifier::Git).from_shell("git rev-parse --not --branches") {
+        "^#{SAMPLE_REV}\n^#{SAMPLE_REV}\n^#{SAMPLE_REV_2}" }
+      mock(GitCommitNotifier::Git).rev_parse("refs/heads/branch2") { SAMPLE_REV }
+      stub(GitCommitNotifier::Git).from_shell("git rev-list --reverse #{SAMPLE_REV} ^#{SAMPLE_REV_2}") { SAMPLE_REV }
+      mock(GitCommitNotifier::Git).from_shell("git rev-list --reverse ^#{SAMPLE_REV} ^#{SAMPLE_REV_2} #{SAMPLE_REV}") { "" }
+      GitCommitNotifier::Git.new_commits("0000000000000000000000000000000000000000", SAMPLE_REV, "refs/heads/branch2", true).should == []
+    end
+  end
+
   describe :changed_files do
     it "should run git log --name-status --oneline with given args and strip out the result" do
       files = ["M       README.rdoc\n",
@@ -103,4 +122,18 @@ describe GitCommitNotifier::Git do
       GitCommitNotifier::Git.changed_files(SAMPLE_REV, SAMPLE_REV_2).should == files
     end
   end
+
+  describe :split_status do
+    it "should split list of changed files in a hash indexed with statuses" 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') }
+      output = GitCommitNotifier::Git.split_status(SAMPLE_REV, SAMPLE_REV_2)
+      output[:m].should == [ 'README.rdoc', 'post-receive' ]
+      output[:d].should == [ 'git_commit_notifier/Rakefile' ]
+    end
+  end
+
+
 end

data/spec/lib/git_commit_notifier/webhook_spec.rb

@@ -0,0 +1,45 @@
+# -*- 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'
+
+describe GitCommitNotifier::Emailer do
+  describe :new do
+    it "should assign config if given" do
+      GitCommitNotifier::Webhook.new({:a => :b}).config[:a].should == :b
+    end
+
+    it "should use empty hash unless config given" do
+      cfg = GitCommitNotifier::Webhook.new(false).config
+      cfg.should be_kind_of(Hash)
+      cfg.should be_empty
+    end
+
+    it "should assign parameters from options" do
+      options = {}
+      GitCommitNotifier::Webhook::PARAMETERS.each do |name|
+        options[name.to_sym] = Faker::Lorem.sentence
+      end
+      webhook = GitCommitNotifier::Webhook.new({}, options)
+      options.each_pair do |key, value|
+        webhook.instance_variable_get("@#{key}").should == value
+      end
+    end
+  end
+
+  describe :payload do
+    it "should produce a valid json payload" do
+      options = {}
+      GitCommitNotifier::Webhook::PARAMETERS.each do |name|
+        options[name.to_sym] = Faker::Lorem.sentence
+      end
+      options[:changed] = { :a => [], :m => [], :d => [] }
+      options[:committer] = "tester"
+      webhook = GitCommitNotifier::Webhook.new({}, options)
+      payload = Yajl::Parser.parse(webhook.payload)
+      payload['commits'][0]['committer']['name'].should == "tester"
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -88,6 +88,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +219,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -211,7 +227,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +235,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -227,7 +243,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +251,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -243,7 +259,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.1'
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -276,12 +292,19 @@ files:
 - lib/git_commit_notifier/git.rb
 - lib/git_commit_notifier/logger.rb
 - lib/git_commit_notifier/result_processor.rb
+- lib/git_commit_notifier/webhook.rb
 - local-run.rb
 - spec/fixtures/existing_file_one_line.txt
 - spec/fixtures/git-notifier-group-email-by-push.yml
 - spec/fixtures/git-notifier-ignore-merge.yml
 - spec/fixtures/git-notifier-with-branch-restrictions.yml
 - spec/fixtures/git-notifier-with-merge.yml
+- spec/fixtures/git_describe_055850e7d925110322b8db4e17c3b840d76e144c
+- spec/fixtures/git_describe_51b986619d88f7ba98be7d271188785cbbb541a0
+- spec/fixtures/git_describe_a4629e707d80a5769f7a71ca6ed9471015e14dc9
+- spec/fixtures/git_describe_dce6ade4cdc2833b53bd600ef10f9bce83c7102d
+- spec/fixtures/git_describe_e28ad77bba0574241e6eb64dfd0c1291b221effe
+- spec/fixtures/git_describe_ff037a73fc1094455e7bbf506171a3f3cf873ae6
 - spec/fixtures/git_log
 - spec/fixtures/git_log_name_status
 - spec/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
@@ -297,6 +320,7 @@ files:
 - spec/lib/git_commit_notifier/git_spec.rb
 - spec/lib/git_commit_notifier/logger_spec.rb
 - spec/lib/git_commit_notifier/result_processor_spec.rb
+- spec/lib/git_commit_notifier/webhook_spec.rb
 - spec/spec_helper.rb
 - template/email.html.erb
 - template/styles.css
@@ -320,30 +344,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sends git commit messages with diffs
-test_files:
-- spec/fixtures/existing_file_one_line.txt
-- spec/fixtures/git-notifier-group-email-by-push.yml
-- spec/fixtures/git-notifier-ignore-merge.yml
-- spec/fixtures/git-notifier-with-branch-restrictions.yml
-- spec/fixtures/git-notifier-with-merge.yml
-- spec/fixtures/git_log
-- spec/fixtures/git_log_name_status
-- spec/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
-- spec/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0
-- spec/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9
-- spec/fixtures/git_show_dce6ade4cdc2833b53bd600ef10f9bce83c7102d
-- spec/fixtures/git_show_e28ad77bba0574241e6eb64dfd0c1291b221effe
-- spec/fixtures/git_show_ff037a73fc1094455e7bbf506171a3f3cf873ae6
-- spec/fixtures/new_file_one_line.txt
-- spec/lib/git_commit_notifier/commit_hook_spec.rb
-- spec/lib/git_commit_notifier/diff_to_html_spec.rb
-- spec/lib/git_commit_notifier/emailer_spec.rb
-- spec/lib/git_commit_notifier/git_spec.rb
-- spec/lib/git_commit_notifier/logger_spec.rb
-- spec/lib/git_commit_notifier/result_processor_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: