git-commit-notifier 0.10.2 → 0.10.3

data/README.md

@@ -1,6 +1,6 @@
 # Git Commit Notifier
 
-[![Build Status](https://travis-ci.org/bitboxer/git-commit-notifier.png)](http://travis-ci.org/bitboxer/git-commit-notifier)
+[![Build Status](http://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)__
 
@@ -116,6 +116,10 @@ old commits in processes of forking, branching etc.
 
 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.10.2
+0.10.3

data/bin/git-commit-notifier

@@ -6,6 +6,12 @@ if RUBY_VERSION < '1.9'
   require 'jcode'
 end
 
+if RUBY_VERSION >= '1.9'
+  Encoding.default_external = "utf-8"
+  Encoding.default_internal = "utf-8"
+end
+
+
 require 'rubygems'
 
 # parameters: revision1, revision 2, branch

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

@@ -28,6 +28,9 @@ mailinglist: developers@example.com,dev2@example.com,dev3@example.com,cto@exampl
 # stylesheet file (embedded template/styles.css by default)
 # stylesheet: /absolute/path/to/readable/stylesheet.css
 
+# custom template file (embedded template/email.html.erb)
+# custom_template: /absolute/path/to/readable/email.html.erb
+
 # select the delivery method: smtp, nntp, sendmail, or debug
 delivery_method: sendmail 
 

data/git-commit-notifier.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency(%q<diff-lcs>, ["~> 1.1.2"])
   s.add_runtime_dependency(%q<nntp>, ["~> 1.0"])
-  s.add_runtime_dependency(%q<premailer>, ["~> 1.7", "!= 1.7.2"])
+  s.add_runtime_dependency(%q<premailer>, ["~> 1.7", ">= 1.7.1", "!= 1.7.2"])
   s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4"])
   s.add_development_dependency(%q<rake>, ["~> 0.8", "!= 0.9.0"])
   s.add_development_dependency(%q<bundler>, ["~> 1.0", ">=1.0.10"])

data/lib/git_commit_notifier/diff_to_html.rb

@@ -434,8 +434,13 @@ module GitCommitNotifier
       return nil  if old_commit?(commit_info)
       changed_files = ""
       if merge_commit?(commit_info)
+        changed_file_list = []
         merge_revisions = commit_info[:merge].split
-        changed_files += "Changed files:\n\n#{Git.changed_files(*merge_revisions)}\n"
+        merge_first_parent = merge_revisions.slice!(0)
+        merge_revisions.each do |merge_other_parent|
+          changed_file_list += Git.changed_files(merge_first_parent, merge_other_parent)
+        end
+        changed_files = "Changed files:\n\n#{changed_file_list.uniq.join()}\n"
       end
 
       title = "<div class=\"title\">"
@@ -460,7 +465,7 @@ module GitCommitNotifier
 
       title += "<br />\n"
 
-      title += "<strong>Branch:</strong> #{CGI.escapeHTML(branch_name)}\n<br />"
+      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>"

data/lib/git_commit_notifier/emailer.rb

@@ -5,10 +5,12 @@ class GitCommitNotifier::Emailer
   TEMPLATE = File.join(File.dirname(__FILE__), '/../../template/email.html.erb').freeze
   PARAMETERS = %w[project_path recipient from_address from_alias subject text_message html_message ref_name old_rev new_rev].freeze
 
-  attr_reader :config
+  def config
+    @@config
+  end
 
   def initialize(config, options = {})
-    @config = config || {}
+    @@config = config || {}
     PARAMETERS.each do |name|
       instance_variable_set("@#{name}".to_sym, options[name.to_sym])
     end
@@ -19,9 +21,14 @@ class GitCommitNotifier::Emailer
       @template = nil
     end
 
+    def template_source
+      template_file = @@config['custom_template'] || TEMPLATE
+      IO.read(template_file)
+    end
+
     def template
       unless @template
-        source = IO.read(TEMPLATE)
+        source = template_source
         begin
           require 'erubis'
            @template = Erubis::Eruby.new(source)
@@ -136,7 +143,7 @@ class GitCommitNotifier::Emailer
     when :nntp then perform_delivery_nntp(content, config['nntp_settings'])
     when :debug then perform_delivery_debug(content)
     else # sendmail
-      perform_delivery_sendmail(content, @config['sendmail_options'])
+      perform_delivery_sendmail(content, config['sendmail_options'])
     end
   end
 

data/lib/git_commit_notifier/executor.rb

@@ -10,7 +10,12 @@ 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
-        oldrev, newrev, ref = $stdin.gets.strip.split
+        stdin = $stdin.gets
+        if stdin.nil?
+          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
       when 2
         GitCommitNotifier::CommitHook.run args.first, args.last, args.last, ""

data/local-run.rb

@@ -6,6 +6,12 @@ if RUBY_VERSION < '1.9'
   require 'jcode'
 end
 
+if RUBY_VERSION >= '1.9'
+  Encoding.default_external = "utf-8"
+  Encoding.default_internal = "utf-8"
+end
+
+
 require 'rubygems'
 $LOAD_PATH.unshift(File.expand_path('./lib', File.dirname(__FILE__)))
 

data/spec/lib/git_commit_notifier/emailer_spec.rb

@@ -86,4 +86,19 @@ describe GitCommitNotifier::Emailer do
       GitCommitNotifier::Emailer.template.should be_kind_of(ERB)
     end
   end
+
+  describe :template_source do
+    it "should return custom template if custom is provided" do
+      emailer = GitCommitNotifier::Emailer.new({'custom_template' => '/path/to/custom/template'})
+      mock(IO).read('/path/to/custom/template') { 'custom templated text' }
+      dont_allow(IO).read(GitCommitNotifier::Emailer::TEMPLATE)
+      GitCommitNotifier::Emailer.template_source.should == 'custom templated text'
+    end
+
+    it "should return the default template if custom_template is not provided" do
+      emailer = GitCommitNotifier::Emailer.new({})
+      mock(IO).read(GitCommitNotifier::Emailer::TEMPLATE) { 'default templated text' }
+      GitCommitNotifier::Emailer.template_source.should == 'default templated text'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000 +02:00
+date: 2011-10-16 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70327232962420 !ruby/object:Gem::Requirement
+  requirement: &70201601412560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70327232962420
+  version_requirements: *70201601412560
 - !ruby/object:Gem::Dependency
   name: nntp
-  requirement: &70327232961940 !ruby/object:Gem::Requirement
+  requirement: &70201601412080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,24 +34,27 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70327232961940
+  version_requirements: *70201601412080
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &70327232961440 !ruby/object:Gem::Requirement
+  requirement: &70201601411560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.1
     - - ! '!='
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70327232961440
+  version_requirements: *70201601411560
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70327225451960 !ruby/object:Gem::Requirement
+  requirement: &70201601410600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +62,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70327225451960
+  version_requirements: *70201601410600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70327225692660 !ruby/object:Gem::Requirement
+  requirement: &70201601410100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -73,10 +76,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70327225692660
+  version_requirements: *70201601410100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70327226404100 !ruby/object:Gem::Requirement
+  requirement: &70201601372340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +90,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *70327226404100
+  version_requirements: *70201601372340
 - !ruby/object:Gem::Dependency
   name: code-cleaner
-  requirement: &70327226682620 !ruby/object:Gem::Requirement
+  requirement: &70201601371500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327226682620
+  version_requirements: *70201601371500
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70327226991100 !ruby/object:Gem::Requirement
+  requirement: &70201601370900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327226991100
+  version_requirements: *70201601370900
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70327227187340 !ruby/object:Gem::Requirement
+  requirement: &70201601370320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327227187340
+  version_requirements: *70201601370320
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70327227206520 !ruby/object:Gem::Requirement
+  requirement: &70201601369720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +134,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70327227206520
+  version_requirements: *70201601369720
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70327229452500 !ruby/object:Gem::Requirement
+  requirement: &70201601369140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +145,7 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70327229452500
+  version_requirements: *70201601369140
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -213,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2795611329410386434
+      hash: 3801418310889905206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: