git-commit-notifier 0.10.1 → 0.10.2

data/Gemfile

@@ -2,3 +2,6 @@ source :rubygems
 
 gemspec
 
+gem "rcov", :group => :test, :platforms => :mri_18
+gem "erubis", "~> 2.7"
+

data/README.md

@@ -28,17 +28,18 @@ Example email:
 
 ## Requirements
 
-* Ruby 1.8.7 or higher
-* RubyGems
+* Ruby 1.8.7 or higher.
+* RubyGems.
+* libxml2 and libxslt with headers (see [nokogiri installation notes](http://nokogiri.org/tutorials/installing_nokogiri.html) for details).
 
-We do not support ruby 1.8.6 because of nokogiri gem.
+We do not support ruby 1.8.6 because of nokogiri gem requirements.
 
 ## Installing and Configuring
 
 Install the gem:
 
 ```bash
-sudo gem install git-commit-notifier
+gem install git-commit-notifier
 ```
 
 After you installed the gem, you need to configure your git repository. Add a file called 
@@ -51,13 +52,13 @@ git-commit-notifier path_to_config.yml
 
 (Don't forget to make that file executable.)
 
-An example for the config file can be found in [config/git-notifier-config.yml.sample](http://github.com/bitboxer/git-commit-notifier/blob/master/config/git-notifier-config.yml.sample).
+An example for the config file can be found in [config/git-notifier-config.example.yml](http://github.com/bitboxer/git-commit-notifier/blob/master/config/git-notifier-config.example.yml).
 
 If you want to send mails on each commit instead on each push, you should add a file called "post-commit" with this content:
 
 ```bash
-    #!/bin/sh
-    echo "HEAD^1 HEAD refs/heads/master" | git-commit-notifier path_to_config.yml
+#!/bin/sh
+echo "HEAD^1 HEAD refs/heads/master" | git-commit-notifier path_to_config.yml
 ```
 
 ## Integration with Redmine, Bugzilla, MediaWiki
@@ -117,7 +118,7 @@ The file _previously.txt_ is created at the first commit. If you moved the file
 
 ## Credits
 
-Thanks for [Primalgrasp](http://www.primalgrasp.com) and [Undev](http://undev.ru/) for sponsoring this work.
+Thanks for [putpat.tv](http://www.putpat.tv), [Primalgrasp](http://www.primalgrasp.com) and [Undev](http://undev.ru/) for sponsoring this work.
 
 ## License
 

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

data/git-commit-notifier.gemspec

@@ -25,17 +25,16 @@ Gem::Specification.new do |s|
 
   s.specification_version = 3
 
-  s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
-  s.add_runtime_dependency(%q<nntp>, [">= 0"])
-  s.add_runtime_dependency(%q<premailer>, [">= 1.7.1"])
-  s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
-  s.add_development_dependency(%q<rake>, ["!= 0.9.0"])
-  s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
+  s.add_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<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"])
   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>, [">= 0"])
-  s.add_development_dependency(%q<faker>, [">= 0"])
-  s.add_development_dependency(%q<rcov>, [">= 0"])
+  s.add_development_dependency(%q<rr>, ["~> 1.0"])
+  s.add_development_dependency(%q<faker>, ["~> 0.9.5"])
 end
 

data/lib/git_commit_notifier/diff_to_html.rb

@@ -313,17 +313,22 @@ module GitCommitNotifier
     end
 
     def extract_commit_info_from_git_show_output(content)
-      result = { :message => [], :commit => '', :author => '', :date => '', :email => '' }
+      result = { :message => [], :commit => '', :author => '', :date => '', :email => '',
+      :committer => '', :commit_date => '', :committer_email => ''}
       content.split("\n").each do |line|
         if line =~ /^diff/ # end of commit info, return results
           return result
-        elsif line =~ /^commit/
+        elsif line =~ /^commit /
           result[:commit] = line[7..-1]
-        elsif line =~ /^Author/
-          result[:author], result[:email] = author_name_and_email(line[8..-1])
-        elsif line =~ /^Date/
-          result[:date] = line[8..-1]
-        elsif line =~ /^Merge/
+        elsif line =~ /^Author:/
+          result[:author], result[:email] = author_name_and_email(line[12..-1])
+        elsif line =~ /^AuthorDate:/
+          result[:date] = line[12..-1]
+        elsif line =~ /^Commit:/
+          result[:committer], result[:commit_email] = author_name_and_email(line[12..-1])
+        elsif line =~ /^CommitDate:/
+          result[:commit_date] = line[12..-1]
+        elsif line =~ /^Merge:/
           result[:merge] = line[7..-1]
         else
           clean_line = line.strip
@@ -457,7 +462,9 @@ module GitCommitNotifier
 
       title += "<strong>Branch:</strong> #{CGI.escapeHTML(branch_name)}\n<br />"
       title += "<strong>Date:</strong> #{CGI.escapeHTML commit_info[:date]}\n<br />"
-      title += "<strong>Author:</strong> #{CGI.escapeHTML(commit_info[:author])} &lt;#{commit_info[:email]}&gt;\n</div>"
+      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>"
+
       text = "#{raw_diff}"
       text += "#{changed_files}\n\n\n"
 

data/lib/git_commit_notifier/git.rb

@@ -8,12 +8,13 @@ class GitCommitNotifier::Git
 
     def show(rev, ignore_whitespace)
       gitopt = ""
+      gitopt += " --pretty=fuller"
       gitopt += " -w" if ignore_whitespace
       from_shell("git show #{rev.strip}#{gitopt}")
     end
 
     def log(rev1, rev2)
-      from_shell("git log #{rev1}..#{rev2}").strip
+      from_shell("git log --pretty=fuller #{rev1}..#{rev2}").strip
     end
 
     def changed_files(rev1, rev2)

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -14,18 +14,18 @@ describe GitCommitNotifier::Git do
   describe :show do
     it "should get data from shell: git show without whitespaces" do
       expected = 'some data from git show'
-      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} -w") { expected }
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --pretty=fuller -w") { expected }
       GitCommitNotifier::Git.show(SAMPLE_REV, true).should == expected
     end
 
     it "should get data from shell: git show with whitespaces" do
       expected = 'some data from git show'
-      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV}") { expected }
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --pretty=fuller") { expected }
       GitCommitNotifier::Git.show(SAMPLE_REV, false).should == expected
     end
 
     it "should strip given revision" do
-      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} -w")
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} --pretty=fuller -w")
       GitCommitNotifier::Git.show("#{SAMPLE_REV}\n", true)
     end
   end
@@ -73,7 +73,7 @@ describe GitCommitNotifier::Git do
 
   describe :log do
     it "should run git log with given args" do
-      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2}") { " ok " }
+      mock(GitCommitNotifier::Git).from_shell("git log --pretty=fuller #{SAMPLE_REV}..#{SAMPLE_REV_2}") { " ok " }
       GitCommitNotifier::Git.log(SAMPLE_REV, SAMPLE_REV_2).should == "ok"
     end
   end

data/template/email.html.erb

@@ -1,9 +1,10 @@
-<html><meta http-equiv="Content-type" content="text/html; charset=utf-8" /><head>
+<html><head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 <style type="text/css">
-  <%= stylesheet_string %>
+<%= stylesheet_string %>
 </style>
 </head>
 <body>
-  <%= @html_message %>
+<%= @html_message %>
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,78 +10,87 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000 +02:00
+date: 2011-09-08 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70201197492480 !ruby/object:Gem::Requirement
+  requirement: &70327232962420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70201197492480
+  version_requirements: *70327232962420
 - !ruby/object:Gem::Dependency
   name: nntp
-  requirement: &70201197492000 !ruby/object:Gem::Requirement
+  requirement: &70327232961940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201197492000
+  version_requirements: *70327232961940
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &70201197491520 !ruby/object:Gem::Requirement
+  requirement: &70327232961440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1.7'
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70201197491520
+  version_requirements: *70327232961440
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70201193363020 !ruby/object:Gem::Requirement
+  requirement: &70327225451960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70201193363020
+  version_requirements: *70327225451960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70201193362540 !ruby/object:Gem::Requirement
+  requirement: &70327225692660 !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70201193362540
+  version_requirements: *70327225692660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70201193362060 !ruby/object:Gem::Requirement
+  requirement: &70327226404100 !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *70201193362060
+  version_requirements: *70327226404100
 - !ruby/object:Gem::Dependency
   name: code-cleaner
-  requirement: &70201193361580 !ruby/object:Gem::Requirement
+  requirement: &70327226682620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201193361580
+  version_requirements: *70327226682620
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70201193361100 !ruby/object:Gem::Requirement
+  requirement: &70327226991100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201193361100
+  version_requirements: *70327226991100
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70201193360620 !ruby/object:Gem::Requirement
+  requirement: &70327227187340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,40 +120,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201193360620
+  version_requirements: *70327227187340
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70201193360140 !ruby/object:Gem::Requirement
+  requirement: &70327227206520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70201193360140
+  version_requirements: *70327227206520
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70201193359660 !ruby/object:Gem::Requirement
+  requirement: &70327229452500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70201193359660
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70201193359180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70201193359180
+  version_requirements: *70327229452500
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -164,7 +162,7 @@ files:
 - Rakefile
 - VERSION
 - bin/git-commit-notifier
-- config/git-notifier-config.yml.sample
+- config/git-notifier-config.example.yml
 - git-commit-notifier.gemspec
 - lib/git_commit_notifier.rb
 - lib/git_commit_notifier/commit_hook.rb
@@ -215,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1623397156377293911
+      hash: 2795611329410386434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: