git-commit-notifier 0.12.1 → 0.12.2

data/.yardopts

@@ -2,6 +2,7 @@
 --markup-provider redcarpet
 --charset utf-8
 --readme README.md
+--plugin redcarpet-ext
 -
 README.md
 LICENSE

data/CHANGES.md

@@ -2,6 +2,15 @@
 
 ## Not yet released
 
+## Version 0.12.2
+
+* Restrict `nokogiri` gem version to be lower than 1.6.0 to allow Ruby 1.8.7 installations.
+* Introduce a new option: `reply_to_mailinglist`. This option is mutually
+exclusive to `reply_to_author`. It gives us the ability to set the
+`Reply-To` adddress to the either the recipient/mailinglist.
+* More opaque diffs.
+* Minor updates.
+
 ## Version 0.12.1
 
 * The regular expression adjusted to include the underscore in repo name.

data/Gemfile

@@ -7,6 +7,3 @@ gem "erubis", "~> 2.7"
 gem "ripper", :group => :development, :platforms => :mri_18
 
 gem "coveralls", :require => false, :platforms => [:mri_19, :mri_20], :group => :development
-
-gem "nokogiri", "~> 1.5.0", :platforms => :mri_18
-

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.12.2

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

@@ -76,9 +76,16 @@ prefer_git_config_mailinglist: false
 
 # 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.
+# Note that you cannot set both, this and reply_to_mailinglist true!
 # Defaults to false
 # reply_to_author: false
 
+# If reply_to_mailinglist is set to true, the Reply-To address is same as the recipient
+# email address, or if that is missing, the same as hooks.mailinglist. If not it will be
+# same as the from address. Note that you cannot set both, this and reply_to_author true!
+# Defaults to false
+# reply_to_mailinglist: false
+
 # stylesheet file (embedded template/styles.css by default)
 # stylesheet: /absolute/path/to/readable/stylesheet.css
 

data/git-commit-notifier.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
   s.email = %q{bodo@bitboxer.de}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.md"
+    "README.md",
+    "CHANGES.md"
   ]
 
   s.files            = `git ls-files`.split("\n")
@@ -28,15 +29,16 @@ 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.1", "!= 1.7.2"])
-  s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4"])
+  s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4", "< 1.6.0"])
   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<bundler>, ["~> 1.3"])
   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>, ["~> 1.1.2"])
   s.add_development_dependency(%q<yard>, ["~> 0.8.1"])
-  s.add_development_dependency(%q<redcarpet>, ["~> 2.1"])
+  s.add_development_dependency(%q<redcarpet>, ["~> 3.0"])
+  s.add_development_dependency(%q<yard-redcarpet-ext>, ["~> 0.0.3"])
 end

data/lib/git_commit_notifier/commit_hook.rb

@@ -137,6 +137,15 @@ module GitCommitNotifier
           return
         end
 
+        reply_to_address = nil
+        if config["reply_to_author"]
+          reply_to_address ||= result[:commit_info][:email]
+        elsif config["reply_to_mailinglist"]
+          reply_to_address ||= recipient
+        else
+          reply_to_address ||= config["from"]
+        end
+
         # Debug information
         logger.debug('----')
         logger.debug("cwd: #{Dir.pwd}")
@@ -217,7 +226,7 @@ module GitCommitNotifier
             :recipient => config["send_mail_to_committer"] ? add_committer_to_recipient(recipient, result[:commit_info][:email]) : 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],
+            :reply_to_address => reply_to_address,
             :subject => subject,
             :commit_date => result[:commit_info][:date],
             :current_date => Time.new.rfc2822,
@@ -268,7 +277,7 @@ module GitCommitNotifier
               :recipient => config["send_mail_to_committer"] ? add_committer_to_recipient(recipient, result[:commit_info][:email]) : 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],
+              :reply_to_address => reply_to_address,
               :subject => subject,
               :commit_date => result[:commit_info][:date],
               :current_date => Time.new.rfc2822,

data/lib/git_commit_notifier/diff_to_html.rb

@@ -535,7 +535,13 @@ module GitCommitNotifier
       :gitorious => lambda { |config, commit| "<a href='#{config['gitorious']['path']}/#{config['gitorious']['project']}/#{config['gitorious']['repository']}/commit/#{commit}'>#{commit}</a>" },
       :trac      => lambda { |config, commit| "<a href='#{config['trac']['path']}/#{commit}'>#{commit}</a>" },
       :cgit      => lambda { |config, commit| "<a href='#{config['cgit']['path']}/#{config['cgit']['project'] || "#{Git.repo_name_real}"}/commit/?id=#{commit}'>#{commit}</a>" },
-      :gitlabhq  => lambda { |config, commit| "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>" },
+      :gitlabhq  => lambda { |config, commit|
+        if config['gitlabhq']['version'] >= 4.0
+          "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name_with_parent.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"
+        else
+          "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"
+        end
+      },
       :gitalist  => lambda { |config, commit| "<a href='#{config['gitalist']['path']}/projects/#{config['gitalist']['project'] || Git.repo_name}/#{commit}/log'>#{commit}</a>" },
       :redmine   => lambda { |config, commit| "<a href='#{config['redmine']['path']}/projects/#{config['redmine']['project'] || Git.repo_name}/repository/revisions/#{commit}'>#{commit}</a>" },
       :github    => lambda { |config, commit| "<a href='#{config['github']['path']}/#{config['github']['project']}/#{Git.repo_name}/commit/#{commit}'>#{commit}</a>" },

data/template/styles.css

@@ -22,6 +22,6 @@ td.sep {text-align:center; border-top:1px solid DimGray; border-bottom:1px solid
 .ln {background-color: white; width: 35px; padding-right: 5px; text-align:right; color: #666; border-right: 1px solid #ccc; }
 
 .r {background-color: #fdd;}
-.rr {background-color: #faa;}
+.rr {background-color: #faa; font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace;}
 .a {background-color: #dfd;}
-.aa {background-color: #afa;}
+.aa {background-color: #afa; font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -80,6 +80,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -88,6 +91,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -133,10 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,10 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: code-cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: yard-redcarpet-ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -259,7 +275,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.0.3
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -269,6 +285,7 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.md
+- CHANGES.md
 files:
 - .gitignore
 - .rspec
@@ -339,7 +356,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -137437954914361840
+      hash: -144969551668064151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: