git-commit-mailer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9a76ede1a8e869ceb08833b8d53d8ac98a4a18
-  data.tar.gz: cafcfc3b82ab6101a2b57b7d9eb176afac78f047
+  metadata.gz: 3c8f402644de43c9b76f2631aef1603d127d3f12
+  data.tar.gz: 8306e844d78ee136b1d499f9b9a73d033dcf83c5
 SHA512:
-  metadata.gz: 3b582c308654f80df51c2f3804b1d4ee97a068432e79ab13ddd4e23f1339efb961a2bbe39cbf60399adeb34570ef531f14592938368d2136e6c3de63a50df291
-  data.tar.gz: 87f2bc5f3cc64241d0a443a66a1e1d9f8027751928cac405f11a47943923f1bb413ecf713f968d32e5da5fe588d79a9284e2040d30998d3a9b9b37050e330255
+  metadata.gz: f1a33c639872bbc62c88c86cc4300bba9e6e4e9dcb8c6c32f1acfd619c43dbfc9d3258862a0619d9372f3369e890595f0a9378a56fe7e7dd2deb021673d9085a
+  data.tar.gz: 223867affd7a3ab35163af1d1528cb19d9c2ad480dd3d0f3d7c2a29ac1dcc76dfe881d1177cd203b842e167ad5671ffeb02391b620a89824e73707abf32674f9

data/LICENSE

@@ -0,0 +1 @@
+GPLv3 or later. See doc/text/GPL-3.txt for details.

data/README.md

@@ -2,7 +2,7 @@
 
 # GitCommitMailer
 
-A utility to send commit mails for commits pushed to git repositories.
+A utility to send commit mails for commits pushed to Git repositories.
 
 See also [Git](http://git-scm.com/).
 
@@ -15,12 +15,12 @@ See also [Git](http://git-scm.com/).
 ## License
 
 GitCommitMailer is licensed under GPLv3 or later. See
-license/GPL-3.txt for details.
+doc/text/GPL-3.txt for details.
 
 ## Dependencies
 
-* Ruby >= 2.0.0
-* git >= 1.7
+* Ruby >= 1.9.3
+* Git >= 1.7
 
 ## Install
 
@@ -28,20 +28,20 @@ license/GPL-3.txt for details.
 $ gem install git-commit-mailer
 ~~~
 
-git-commit-mailer utilizes git's hook functionality to send
+git-commit-mailer utilizes Git's hook functionality to send
 commit mails.
 
 Edit "post-receive" shell script file to execute it from there,
-which is located under "hooks" directory in a git repository.
+which is located under "hooks" directory in a Git repository.
 
 Example:
 
 ~~~
-    git-commit-mailer \
-      --from-domain=example.com \
-      --error-to=onodera@example.com \
-      commit@example.com
+git-commit-mailer \
+  --from-domain=example.com \
+  --error-to=onodera@example.com \
+  commit@example.com
 ~~~
 
-For more detailed usage and options, execute commit-email.rb
+For more detailed usage and options, execute git-commit-mailer
 with `--help` option.

data/doc/text/news.md

@@ -0,0 +1,18 @@
+# News
+
+## 1.0.1 - 2015-06-09 {#version-1-0-1}
+
+GitHub support improvement release!
+
+### Improvements
+
+  * Supported GitHub issue link by `#NNN` form in commit message.
+  * Followed line number link change in commit page on GitHub.
+
+### Fixes
+
+  * Fixed message ID duplication problem in merge commits.
+
+## 1.0.0 - 2015-05-23 {#version-1-0-0}
+
+The initial release!

data/lib/git-commit-mailer/commit-info.rb

@@ -46,7 +46,7 @@ class GitCommitMailer
     attr_reader :subject, :author_name, :author_email, :date, :summary
     attr_accessor :merge_status
     attr_writer :reference
-    attr_reader :merge_revisions
+    attr_reader :merge_commits
     def initialize(mailer, reference, revision)
       @mailer = mailer
       @reference = reference
@@ -65,7 +65,7 @@ class GitCommitMailer
       parse_diff
 
       @merge_status = []
-      @merge_revisions = []
+      @merge_commits = []
     end
 
     def first_parent
@@ -85,7 +85,11 @@ class GitCommitMailer
     end
 
     def message_id
-      "<#{@revision}@#{self.class.host_name}>"
+      if merge?
+        "<merge.#{@parent_revisions.first}.#{@revision}@#{self.class.host_name}>"
+      else
+        "<#{@revision}@#{self.class.host_name}>"
+      end
     end
 
     def headers
@@ -102,8 +106,8 @@ class GitCommitMailer
 
     def related_mail_headers
       headers = []
-      @merge_revisions.each do |merge_revision|
-        merge_message_id = "<#{merge_revision}@#{self.class.host_name}>"
+      @merge_commits.each do |merge_commit|
+        merge_message_id = merge_commit.message_id
         headers << "References: #{merge_message_id}"
         headers << "In-Reply-To: #{merge_message_id}"
       end

data/lib/git-commit-mailer/html-mail-body-formatter.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009  Ryo Onodera <onodera@clear-code.com>
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+require "digest/md5"
+
 class GitCommitMailer
   class HTMLMailBodyFormatter < MailBodyFormatter
     include ERB::Util
@@ -27,7 +29,7 @@ class GitCommitMailer
 
     private
     def template
-      <<-EOT
+      <<-TEMPLATE
 <!DOCTYPE html>
 <html>
   <head>
@@ -51,7 +53,7 @@ class GitCommitMailer
       </dd>
 <% end %>
       <%= dt("Message") %>
-      <%= dd(pre(h(@info.summary.strip))) %>
+      <%= dd(format_summary(@info.summary.strip)) %>
 <%= format_files("Added",        @info.added_files) %>
 <%= format_files("Copied",       @info.copied_files) %>
 <%= format_files("Removed",      @info.deleted_files) %>
@@ -63,7 +65,7 @@ class GitCommitMailer
 <%= format_diffs %>
   </body>
 </html>
-EOT
+      TEMPLATE
     end
 
     def format_revision
@@ -209,6 +211,22 @@ EOT
       [from_line_column, to_line_column, content_column]
     end
 
+    def format_summary(summary)
+      case @mailer.repository_browser
+      when "github"
+        linked_summary = h(summary).gsub(/\#(\d+)/) do
+          %Q(<a href="#{github_issue_url($1)}">\##{$1}</a>)
+        end
+        pre(linked_summary)
+      else
+        pre(h(summary))
+      end
+    end
+
+    def github_issue_url(id)
+      "#{@mailer.github_base_url}/#{@mailer.github_user}/#{@mailer.github_repository}/issues/#{id}"
+    end
+
     def tag_start(name, attributes)
       start_tag = "<#{name}"
       unless attributes.empty?
@@ -431,7 +449,12 @@ EOT
 
     def span_line_number_hunk_header(file_path, direction, offset)
       content = "..."
-      url = commit_file_line_number_url(file_path, direction, offset - 1)
+      if offset <= 1
+        offset_omitted = nil
+      else
+        offset_omitted = offset - 1
+      end
+      url = commit_file_line_number_url(file_path, direction, offset_omitted)
       if url
         content = tag("a", {"href" => url}, content)
       end
@@ -559,5 +582,37 @@ EOT
           },
           content)
     end
+
+    def commit_file_url(file)
+      case @mailer.repository_browser
+      when "github"
+        base_url = commit_url
+        return nil if base_url.nil?
+        file_md5 = Digest::MD5.hexdigest(file)
+        "#{base_url}#diff-#{file_md5}"
+      when "github-wiki"
+        commit_file_url_github_wiki(file)
+      else
+        nil
+      end
+    end
+
+    def commit_file_line_number_url(file, direction, line_number)
+      base_url = commit_url
+      return nil if base_url.nil?
+
+      case @mailer.repository_browser
+      when "github"
+        file_md5 = Digest::MD5.hexdigest(file)
+        url = "#{base_url}#diff-#{file_md5}"
+        if line_number
+          url << ((direction == :from) ? "L" : "R")
+          url << line_number.to_s
+        end
+        url
+      else
+        nil
+      end
+    end
   end
 end

data/lib/git-commit-mailer/mail-body-formatter.rb

@@ -49,21 +49,6 @@ class GitCommitMailer
       end
     end
 
-    def commit_file_url(file)
-      case @mailer.repository_browser
-      when "github"
-        base_url = commit_url
-        return nil if base_url.nil?
-        index = @info.file_index(file)
-        return nil if index.nil?
-        "#{base_url}#diff-#{index}"
-      when "github-wiki"
-        commit_file_url_github_wiki(file)
-      else
-        nil
-      end
-    end
-
     def commit_file_url_github_wiki(file)
       return nil if file.nil?
 
@@ -76,22 +61,5 @@ class GitCommitMailer
       revision = @info.revision
       "#{base_url}/#{user}/#{repository}/wiki/#{page_name_in_url}/#{revision}"
     end
-
-    def commit_file_line_number_url(file, direction, line_number)
-      base_url = commit_url
-      return nil if base_url.nil?
-
-      case @mailer.repository_browser
-      when "github"
-        index = @info.file_index(file)
-        return nil if index.nil?
-        url = "#{base_url}#L#{index}"
-        url << ((direction == :from) ? "L" : "R")
-        url << line_number.to_s
-        url
-      else
-        nil
-      end
-    end
   end
 end

data/lib/git-commit-mailer/push-info.rb

@@ -47,7 +47,7 @@ class GitCommitMailer
     end
 
     def message_id
-      "<#{old_revision}.#{new_revision}@#{self.class.host_name}>"
+      "<push.#{old_revision}.#{new_revision}@#{self.class.host_name}>"
     end
 
     def headers

data/lib/git-commit-mailer/version.rb

@@ -1,4 +1,4 @@
 class GitCommitMailer
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
   URL = "https://github.com/clear-code/git-commit-mailer"
 end

data/lib/git-commit-mailer.rb

@@ -1039,7 +1039,7 @@ EOF
         merge_message = "Merged #{merge_commit.short_revision}: #{merge_commit.subject}"
         if not is_traversing_first_parent and not commit_info.merge_status.index(merge_message)
           commit_info.merge_status << merge_message
-          commit_info.merge_revisions << merge_commit.revision
+          commit_info.merge_commits << merge_commit
         end
 
         if commit_info.merge?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryo Onodera
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,9 +81,12 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/git-commit-mailer
+- doc/text/GPL-3.txt
+- doc/text/news.md
 - git-commit-mailer.gemspec
 - lib/git-commit-mailer.rb
 - lib/git-commit-mailer/commit-info.rb
@@ -94,7 +97,6 @@ files:
 - lib/git-commit-mailer/push-info.rb
 - lib/git-commit-mailer/text-mail-body-formatter.rb
 - lib/git-commit-mailer/version.rb
-- license/GPL-3.txt
 homepage: https://github.com/clear-code/git-commit-mailer
 licenses:
 - GPL-3.0+
@@ -115,8 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A utility to send commit mails for commits pushed to git repositories.
 test_files: []
+has_rdoc: