git-commit-notifier 0.11.9 → 0.11.10

data/.travis.yml

@@ -1,8 +1,3 @@
-language: ruby
-before_install:
-  - gem install bundler
-install:
-  - bundle install
 notifications:
   recipients:
     - bodo@wannawork.de

data/CHANGES.md

@@ -0,0 +1,41 @@
+# Changes
+
+## Not yet released
+
+* Display info message if the config.yml specified is not found.
+* Strip whitespace after splitting emails for SMTP.
+* Added prefer_git_config_mailinglist config variable.
+* Allow to use one configuarion per all cgit projects.
+* Support for Gitalist.
+
+## Version 0.11.9
+
+* Notifier now do not falls on invalid utf-8 text in diffs.
+* Fixes erroneous 0.11.7 release (partially incomplete code was pushed to rubygems and breaks ruby 1.8 compatibility).
+
+## Version 0.11.7
+
+* Summary email section has been updated to be shown correctly.
+* More fine-grained values for ignore_whitespace option (all, change, none).
+* Add support for gitlabhq 4.0+ namespace repo arrangement.
+* Correct urls to cgit installations.
+* Correct Trac integration.
+* Support for GitHub WebHooks (as client).
+* Fix mailformed tag notifications.
+* A lot of other fixes.
+
+## Version 0.11.6
+
+* Project home has been moved to git-commit-notifier GitHub organization.
+
+## Version 0.11.5
+
+* Support for GitHub-flavoured WebHooks (as server).
+* Ability to reply_to_author.
+* Shows summary.
+* Do not send additional email on branch creation.
+
+## Versions 0.11.0 - 0.11.4
+
+* Fix segmentation faults with Unicode subjects on Ruby 1.9
+* A lot of refactorings.

data/README.md

@@ -61,6 +61,13 @@ If you want to send mails on each commit instead on each push, you should add a
 echo "HEAD^1 HEAD refs/heads/master" | git-commit-notifier path_to_config.yml
 ```
 
+## Decorate files and commit ids with link to a webview
+You need change next line in config file ```link_files: none```
+
+Possible values: none, gitweb, gitorious, cgit, trac, gitlabhq, or redmine
+
+* "cgit" you can omit "project". In this case repository name will be used by default
+
 ## Integration with Redmine, Bugzilla, MediaWiki
 
 Git-commit-notifier supports easy integration with Redmine, Bugzilla and MediaWiki. All you need is to uncomment the according line in the configuration and change the links to your software installations instead of example ones (no trailing slash please).

data/VERSION

@@ -1 +1 @@
-0.11.9
+0.11.10

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

@@ -56,6 +56,12 @@ show_summary: true
 # It can send to multiple destinations, just separate email addresses by ",".
 mailinglist: developers@example.com,dev2@example.com,dev3@example.com,cto@example.com
 
+# If set to true, the notifier will check first for a git config hooks.mailinglist
+# variable and use the recipients listed there before checking for the recipient(s)
+# listed above. If false, uses the receipient(s) above if defined, regardless 
+# of the git config variable. Defaults to false.
+prefer_git_config_mailinglist: false
+
 # The from address. If not defined it will use
 # the address that is configured in git
 # from: sender@example.com
@@ -109,7 +115,7 @@ nntp_settings:
   port: 119
 
 # Decorate files and commit ids with link to a webview. Possible values: none, gitweb,
-# gitorious, cgit, trac, gitlabhq, or redmine
+# gitorious, cgit, trac, gitlabhq, gitalist or redmine
 link_files: none
 
 # If link_files is set to "gitweb", you need to configure the path to your gitweb
@@ -128,7 +134,9 @@ gitorious:
 # if link_files is set to "cgit", you need to configure the path to your cgit
 cgit:
   path: http://example.com/path_to_cgit
-  project: backend
+  project: project-name
+# project defaults to git repository name
+
 
 # If link_files is set to "trac", you need to configure the path to your trac
 # instance
@@ -141,6 +149,12 @@ gitlabhq:
   path: http://gitlabhq.example.com
   version: 1.2
 
+# If link_files is set to "gitalist", you need to configure the path to your gitalist
+# instance
+gitalist:
+  path: http://gitalist.example.com
+  project: test.git
+
 # If link_files is set to "redmine", you need to configure the path to your redmine
 # instance
 redmine:

data/lib/git_commit_notifier/commit_hook.rb

@@ -85,7 +85,12 @@ module GitCommitNotifier
       def run(config_name, rev1, rev2, ref_name)
 
         # Load the configuration
-        @config = File.exists?(config_name) ? YAML::load_file(config_name) : {}
+        if File.exists?(config_name) 
+          @config = YAML::load_file(config_name) 
+        else
+          GitCommitNotifier::CommitHook.info("Unable to find configuration file: #{config_name}")
+          @config = {}
+        end
 
         project_path = Git.git_dir
         repo_name = Git.repo_name
@@ -100,7 +105,11 @@ module GitCommitNotifier
         slash_branch_name = "" if !config["show_master_branch_name"] && slash_branch_name == '/master'
 
         # Identify email recipients
-        recipient = config["mailinglist"] || Git.mailing_list_address
+        if config["prefer_git_config_mailinglist"]
+          recipient = Git.mailing_list_address || config["mailinglist"] 
+        else
+          recipient = config["mailinglist"] || Git.mailing_list_address
+        end
 
         # If no recipients specified, bail out gracefully. This is not an error, and might be intentional
         if recipient.nil? || recipient.length == 0

data/lib/git_commit_notifier/diff_to_html.rb

@@ -11,8 +11,6 @@ module GitCommitNotifier
   class DiffToHtml
     include EscapeHelper
 
-
-
     # Integration map for commit message keywords to third-party links.
     INTEGRATION_MAP = {
       :mediawiki => { :search_for => /\[\[([^\[\]]+)\]\]/, :replace_with => '#{url}/\1' },
@@ -192,11 +190,9 @@ module GitCommitNotifier
 
       file_name = @current_file_name
 
-      text = "#{op} #{binary}file #{file_name}"
-
       # TODO: these filenames, etc, should likely be properly html escaped
       file_link = file_name
-      if config['link_files']
+      if config['link_files'] && !@file_removed
         file_link = if config["link_files"] == "gitweb" && config["gitweb"]
           "<a href='#{config['gitweb']['path']}?p=#{config['gitweb']['project'] || "#{Git.repo_name}.git"};f=#{file_name};h=#{@current_sha};hb=#{@current_commit}'>#{file_name}</a>"
         elsif config["link_files"] == "gitorious" && config["gitorious"]
@@ -204,7 +200,7 @@ module GitCommitNotifier
         elsif config["link_files"] == "trac" && config["trac"]
           "<a href='#{config['trac']['path']}/#{@current_commit}/#{file_name}'>#{file_name}</a>"
         elsif config["link_files"] == "cgit" && config["cgit"]
-          "<a href='#{config['cgit']['path']}/#{config['cgit']['project']}/tree/#{file_name}?h=#{branch_name}'>#{file_name}</a>"
+          "<a href='#{config['cgit']['path']}/#{config['cgit']['project'] || "#{Git.repo_name_real}"}/tree/#{file_name}?h=#{branch_name}'>#{file_name}</a>"
         elsif config["link_files"] == "gitlabhq" && config["gitlabhq"]
           if config["gitlabhq"]["version"] && config["gitlabhq"]["version"] < 1.2
             "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/tree/#{@current_commit}/#{file_name}'>#{file_name}</a>"
@@ -213,6 +209,8 @@ module GitCommitNotifier
           else
             "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/#{@current_commit}/tree/#{file_name}'>#{file_name}</a>"
           end
+        elsif config["link_files"] == "gitalist" && config["gitalist"]
+          "<a href='#{config['gitalist']['path']}/#{config['gitalist']['project'] || Git.repo_name}/#{@current_commit}/blob/#{file_name}'>#{file_name}</a>"
         elsif config["link_files"] == "redmine" && config["redmine"]
           "<a href='#{config['redmine']['path']}/projects/#{config['redmine']['project'] || Git.repo_name}/repository/revisions/#{@current_commit}/entry/#{file_name}'>#{file_name}</a>"
         else
@@ -223,7 +221,7 @@ module GitCommitNotifier
       if show_summary?
         @file_changes << {
           :file_name => file_name, 
-          :text => text,
+          :text => "#{op} #{binary}file #{file_name}",
         }
       end
 
@@ -508,8 +506,9 @@ module GitCommitNotifier
       :gitweb    => lambda { |config, commit| "<a href='#{config['gitweb']['path']}?p=#{config['gitweb']['project'] || "#{Git.repo_name}.git"};a=commitdiff;h=#{commit}'>#{commit}</a>" },
       :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']}/commit/?id=#{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>" },
+      :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>" },
       :default   => lambda { |config, commit| commit.to_s }
     }.freeze

data/lib/git_commit_notifier/emailer.rb

@@ -136,7 +136,7 @@ class GitCommitNotifier::Emailer
 
       recipients = @recipient.dup
       recipients.force_encoding('ASCII-8BIT') if recipients.respond_to?(:force_encoding)
-      recipients = recipients.split(",")
+      recipients = recipients.split(",").map(&:strip)
       smtp.open_message_stream(@from_address, recipients) do |f|
         content.each do |line|
           line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)

data/lib/git_commit_notifier/git.rb

@@ -72,13 +72,14 @@ class GitCommitNotifier::Git
     # splits the output of changed_files
     # @return [Hash(Array)] file names sorted by status
     # @see changed_files
-    # @param [Array(String)] lines
+    # @param [String] rev1 First revision
+    # @param [String] rev2 Second revision
     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 }
+      { :m => modified, :a => added, :d => deleted }
     end
 
     def branch_commits(treeish)
@@ -138,7 +139,7 @@ class GitCommitNotifier::Git
 
       # Get all the commits that match that specification
       lines = lines_from_shell("git rev-list --reverse #{a.join(' ')}")
-      commits = lines.to_a.map { |l| l.chomp }
+      lines.to_a.map { |l| l.chomp }
     end
 
     def rev_type(rev)
@@ -180,6 +181,17 @@ class GitCommitNotifier::Git
       File.expand_path(git_path).split("/").last.sub(/\.git$/, '')
     end
 
+    # Gets repository name.
+    # @return [String] Repository name.
+    def repo_name_real
+      git_path = toplevel_dir
+      # In a bare repository, toplevel directory is empty.  Revert to git_dir instead.
+      if git_path.empty?
+        git_path = git_dir
+      end
+      File.expand_path(git_path).split("/").last
+    end
+
 	# Gets repository name.
     # @note Tries to gets human readable repository name through `git config hooks.emailprefix` call.
     #       If it's not specified then returns directory name with parent directory name (except '.git'

data/spec/lib/git_commit_notifier/commit_hook_spec.rb

@@ -111,6 +111,7 @@ describe GitCommitNotifier::CommitHook do
   describe :run do
     it "should report informational message when no recipients specified" do
       mock(File).exists?(:noconfig) { false }
+      mock(GitCommitNotifier::CommitHook).info(/Unable to find/)
       mock(GitCommitNotifier::Git).mailing_list_address { nil }
       mock(GitCommitNotifier::CommitHook).info(/recipient/)
       GitCommitNotifier::CommitHook.run(:noconfig, :rev1, :rev2, 'master')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.11.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -274,6 +274,7 @@ files:
 - .rspec
 - .travis.yml
 - .yardopts
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
@@ -338,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1338348343432938380
+      hash: -83889522611154396
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: