git-commit-notifier 0.12.0 → 0.12.1

data/CHANGES.md

@@ -2,6 +2,17 @@
 
 ## Not yet released
 
+## Version 0.12.1
+
+* The regular expression adjusted to include the underscore in repo name.
+* More HTML commit messages appearance improvements.
+* Fix the issue of notifications for all commits being sent out when a
+  new branch is pushed with unique_commits_per_branch set to false.
+* gitlabhq also supports the character "-" within repository names.
+* Fixing broken links of renamed files in case of gitweb and other interfaces.
+* Do not list commit to closest annotated tag until configuration option set.
+* Show shortlog from previous tag on tag creation.
+
 ## Version 0.12.0
 
 * Detects renamed files.

data/README.md

@@ -174,6 +174,13 @@ bundle install
 rake # Run specs
 ```
 
+or
+
+```bash
+gem build git-commit-notifier.gemspec
+[sudo] gem install git-commit-notifier-0.11.10.gem
+```
+
 Now you can create test configuration file (example provided in `config` directory) and test your code over any test repository in this manner:
 
 ```bash

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

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

@@ -225,6 +225,13 @@ ignore_whitespace: all
 # more than 50% of it has not changed
 similarity_detection_threshold: "0.5"
 
+# Show a shortlog of commits since the last tag, when creating an annotated tag
+#
+# Note :: this feature uses git-describe to obtain the information
+# So, if git-describe is not one of your favourite ways to find the nearest tagged-commit, you will refrain from using this feature
+#
+show_a_shortlog_of_commits_since_the_last_annotated_tag: false
+
 # This is developer debugging options. Do not uncomment it if You aren't Jedi
 # debug:
 #   enabled: true

data/lib/git_commit_notifier/diff_to_html.rb

@@ -195,6 +195,12 @@ module GitCommitNotifier
 
       file_name = @current_file_name
 
+      # Adjust filenames and hashes in case of file renames
+      if @file_renamed
+        file_name = @file_renamed_new_name
+        @current_sha = Git.sha_of_filename(@current_commit, file_name)
+      end
+
       # TODO: these filenames, etc, should likely be properly html escaped
       file_link = file_name
       if config['link_files'] && !@file_removed
@@ -696,6 +702,23 @@ module GitCommitNotifier
         message_array = tag_info[:contents].split("\n")
         multi_line_message = message_array.count > 1
         html += "<dt>Message</dt><dd class='#{multi_line_message ? "multi-line" : ""}'>#{message_array_as_html(message_array)}</dd>\n"
+
+        if config['show_a_shortlog_of_commits_since_the_last_annotated_tag']
+          list_of_commits_in_between = Git.list_of_commits_between_current_commit_and_last_tag(ref_name, tag_info[:tagobject])
+          if list_of_commits_in_between.length > 0
+            html += "<dt><br/>Commits since the last annotated tag</dt><dd><br/><br/><ul>"                    
+            list_of_commits_in_between.each do |commit|
+              if config['link_files'].to_s != "none"
+                l = markup_commit_for_html(commit[0])
+                l = l.gsub(/>.*<\/a>/,">#{commit[1]}</a>") # Replace the link text with the commit message (the original link text is the commit hash)
+                html += "<li>#{l}</li>"
+              else
+                html += "<li>#{commit[1]}</li>"
+              end
+            end
+            html += "</ul></dd>"
+          end
+        end
         html += "</dl>"
 
         text = "Tag: #{tag} (#{change_type == :create ? "added" : "updated"})\n"
@@ -725,7 +748,17 @@ module GitCommitNotifier
         # on this branch without regard to whether they occur on other branches"
         # The flag unique_to_current_branch passed to new_commits means the
         # opposite: "consider only commits that are unique to this branch"
-        Git.new_commits(oldrev, newrev, ref_name, !unique_commits_per_branch?)
+
+       	# Note :: In case of creation of a new branch, the oldrev passed by git 
+       	# to the post-receive hook is 00000... which causes the git commit notifier 
+       	# to send out notifications for ALL commits in the repository. Hence we force 
+       	# the "unique_commits_per_branch" config to "true" in such cases, and in other 
+       	# cases, we consider the value from the config file
+        if oldrev =~ /^0+$/
+          Git.new_commits(oldrev, newrev, ref_name, true)
+        else
+          Git.new_commits(oldrev, newrev, ref_name, !unique_commits_per_branch?)
+        end
       end
 
       # Add each diff to @result

data/lib/git_commit_notifier/git.rb

@@ -70,6 +70,18 @@ class GitCommitNotifier::Git
       lines.uniq
     end
 
+    # Returns sha1 of the file after the most recent commit.
+    # Runs `git show  #{rev}:#{filename} | git hash-object --stdin` to return the sha of the file.
+    # @note It was required as when there is a file which is renamed, and it has a 100% similarity index, its sha is not included in the git-show output.
+    # @return [String] sha1 of the file name.
+    # @see from_shell
+    # @param [String] rev revision where we want to get the sha of the file name
+    # @param [String] filename File name whose sha1 we want
+    def sha_of_filename(rev, filename)
+      lines = from_shell("git show  #{rev}:#{filename} | git hash-object --stdin")
+      lines.strip
+    end
+
     # splits the output of changed_files
     # @return [Hash(Array)] file names sorted by status
     # @see changed_files
@@ -117,6 +129,31 @@ class GitCommitNotifier::Git
       from_shell("git rev-parse #{treeish}").strip
     end
 
+
+    # Lists commits between specified rev and closest annotated tag.
+    # Uses `git describe` to obtain information.
+    # @return [Array] Commit hashes and their messages
+    # @param [String] tag_name of the current tag
+    # @param [String] rev sha of the commit the tag is associated with
+    # @note There have been many complaints about using git describe to obtain this information
+    #       but, this looked like the best way to obtain the information here.
+    #       Here is a link http://www.xerxesb.com/2010/git-describe-and-the-tale-of-the-wrong-commits/
+    #       discussing, the way git-describe handles the problem of finding the nearest commit with a tag.
+    #       Looking forward to someone coming up with a better way.
+    def list_of_commits_between_current_commit_and_last_tag(tag_name, rev)
+      result = Array.new
+
+      lines = from_shell("git describe --abbrev=0 #{rev}^1 2> /dev/null | cat ").strip # the `cat` is used to suppress the error that might arise when handling the case of the first commit
+      if lines.length != 1
+        previous_tag = lines
+        list_of_commits = lines_from_shell("git log #{previous_tag}..#{tag_name} --format='%H::::::%s'")
+        list_of_commits.each do |row|
+          result << Array.new(row.split("::::::"))
+        end
+      end
+      result
+    end
+
     def new_commits(oldrev, newrev, refname, unique_to_current_branch)
       # We want to get the set of commits (^B1 ^B2 ... ^oldrev newrev)
       # Where B1, B2, ..., are any other branch
@@ -215,8 +252,8 @@ class GitCommitNotifier::Git
       if git_path.empty?
         git_path = git_dir
       end
-      name_with_parent = File.expand_path(git_path).scan(/[a-zA-z0-9]+\/[a-zA-Z0-9]+.git$/).first;
-      return name_with_parent.sub(/\.git$/, '') unless name_with_parent.empty?
+      name_with_parent = File.expand_path(git_path).scan(/[a-zA-z0-9\-_]+\/[a-zA-Z0-9\-_]+.git$/).first;
+      return name_with_parent.sub(/\.git$/, '')  unless name_with_parent.empty?
       File.expand_path(git_path).split("/").last.sub(/\.git$/, '')
     end
 

data/template/styles.css

@@ -1,14 +1,27 @@
-* {font-size:12px;}
-h2 {font-family:Verdana;font-size:12px;background-color: #bbb; font-weight: bold; line-height:25px; margin-bottom:2px; padding-left:5px}
-table {width:100%;border-collapse:collapse}
+* {font-size:12px; font-family: Verdana, sans-serif; }
+
+h2 {font-size:14px; background-color: #2e7bcc; color: white; font-weight: bold; padding: 10px;}
+
+h2 a {color: #FFCC33; text-decoration: none; font-size: 14px; font-weight: bold;}
+h2 a:visited {color: #CCCC66; text-decoration: none; font-size: 14px; font-weight: bold;}
+a, a:visited {color: #0B6CDA; text-decoration: none;}
+a:hover {text-decoration: underline;}
+
+.title {background-color: #FFFFCC; padding: 10px; border: 1px solid #FFAA00;}
+dt { float: left; font-weight: bold; min-width: 8em; }
+dt, dd { padding-bottom: 0.5em; }
+dt:after { content: ':'; }
+dd.multi-line { clear: both; margin-left: 0; padding-top: 1em; }
+
+ul li { padding-bottom: 0.5em; }
+
+table {width:100%; border-collapse:collapse;}
+td {color:#000; font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace;}
+td.sep {text-align:center; border-top:1px solid DimGray; border-bottom:1px solid DimGray;}
+
+.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;}
 .a {background-color: #dfd;}
 .aa {background-color: #afa;}
-.title {background-color: #ddd; padding: 10px;font-family:Verdana;font-size:12px;}
-dt { float: left; font-weight: bold; min-width: 6em; }
-dt:after { content: ':'; }
-dd.multi-line { clear: both; margin-left: 0; padding-top: 1em; }
-td {color:#000;font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace}
-.ln {background-color: #ccc; width:23px; text-align:right}
-td.sep {text-align:center;border-top:1px solid DimGray;border-bottom:1px solid DimGray;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -339,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -459626784997908862
+      hash: -137437954914361840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: