git-commit-notifier 0.11.3 → 0.11.4

data/VERSION

@@ -1 +1 @@
-0.11.3
+0.11.4

data/lib/git_commit_notifier/commit_hook.rb

@@ -143,12 +143,6 @@ module GitCommitNotifier
           diffresult = diff2html.result
           diff2html.clear_result
 
-          if config["ignore_merge"]
-            diffresult.reject! do |result|
-              merge_commit?(result)
-            end
-          end
-
           text, html = [], []
           result = diffresult.first
           return if result.nil? || !result[:commit_info]
@@ -187,19 +181,17 @@ module GitCommitNotifier
           emailer.send
         else
           commit_number = 1
-          diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name) do |result|
-            next  if config["ignore_merge"] && merge_commit?(result)
-
+          diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name) do |count, result|
             # Form the subject from template
             revised_subject_words = subject_words.merge({
               :commit_id => result[:commit_info][:commit],
               :message => result[:commit_info][:message],
               :commit_number => commit_number,
-              :commit_count => 1,
-              :commit_count_phrase => "1 commit",
-              :commit_count_phrase2 => ""
+              :commit_count => count,
+              :commit_count_phrase => count == 1 ? "1 commit" : "#{count} commits",
+              :commit_count_phrase2 => count == 1 ? "" : "#{count} commits: "
             })
-            subject_template = config['subject'] || "[${prefix}${slash_branch_name}][${commit_number}] ${message}"
+            subject_template = config['subject'] || "[${prefix}${slash_branch_name}][${commit_number}/${commit_count}] ${message}"
             subject = subject_template.gsub(/\$\{(\w+)\}/) { |m| revised_subject_words[$1.intern] }
 
             emailer = Emailer.new(config,
@@ -222,13 +214,6 @@ module GitCommitNotifier
         end
         nil
       end
-
-      # Gets human readable commit number.
-      # @param [Fixnum] i Commit index.
-      # @return [String] Human readable commit number.
-      def number(i)
-        "[#{i + 1}]"
-      end
     end
   end
 end

data/lib/git_commit_notifier/diff_to_html.rb

@@ -73,14 +73,20 @@ module GitCommitNotifier
     end
 
     # Gets lines_per_diff setting from {#config}.
+    # @return [Fixnum, NilClass] Lines per diff limit.
     def lines_per_diff
-      @config['lines_per_diff']
+      config['lines_per_diff']
+    end
+
+    # Gets ignore_merge setting from {#config}.
+    def ignore_merge?
+      config['ignore_merge']
     end
 
     # Gets ignore_whitespace setting from {#config}.
     # @return [Boolean] true if whitespaces should be ignored in diff; otherwise false.
     def ignore_whitespaces?
-      @config['ignore_whitespace'].nil? || @config['ignore_whitespace']
+      config['ignore_whitespace'].nil? || config['ignore_whitespace']
     end
 
     # Adds separator between diff blocks to @diff_result.
@@ -422,10 +428,10 @@ module GitCommitNotifier
     end
 
     def truncate_long_lines(text)
-      StringIO.open("", "w") do |output|
-        # Match encoding of output string to that of input string
-        output.string.force_encoding(text.encoding) if output.string.respond_to?(:force_encoding)
-
+      str = ""
+      # Match encoding of output string to that of input string
+      str.force_encoding(text.encoding)  if str.respond_to?(:force_encoding)
+      StringIO.open(str, "w") do |output|
         input = StringIO.new(text, "r")
         input.each_line "\n" do |line|
           if line.length > MAX_LINE_LENGTH && MAX_LINE_LENGTH >= 9
@@ -436,7 +442,7 @@ module GitCommitNotifier
             # characters, so deal specially with that case
             # so that we don't truncate in the middle of a UTF8 sequence,
             # which would be invalid.
-            if !line.respond_to?(:force_encoding)
+            unless line.respond_to?(:force_encoding)
               # If the last remaining character is part of a UTF8 multibyte character,
               # keep truncating until we go past the start of a UTF8 character.
               # This assumes that this is a UTF8 string, which may be a false assumption
@@ -697,8 +703,13 @@ module GitCommitNotifier
         puts "Unknown change type #{ref_name},#{@rev_type}"
       end
 
+      # Remove merge commits if required
+      if ignore_merge?
+        @result.reject! { |commit| merge_commit?(commit[:commit_info]) }
+      end
+
       # If a block was given, pass it the results, in turn
-      @result.each { |result| yield result }  if block_given?
+      @result.each { |commit| yield @result.size, commit }  if block_given?
     end
 
     def message_replace!(message, search_for, replace_with)

data/lib/git_commit_notifier/emailer.rb

@@ -242,10 +242,10 @@ class GitCommitNotifier::Emailer
   # can result in the MTA breaking lines at inconvenient points,
   # such as in the middle of UTF8 characters.
   def encode_quoted_printable_message(text)
-    StringIO.open("", "w") do |output|
-      # Character encoding of output string can be plain US-ASCII since quoted-printable is plain ASCII
-      output.string.force_encoding("US-ASCII") if output.string.respond_to?(:force_encoding)
-
+    str = ''
+    # Character encoding of output string can be plain US-ASCII since quoted-printable is plain ASCII
+    str.force_encoding("US-ASCII")  if str.respond_to?(:force_encoding)
+    StringIO.open(str, "w") do |output|
       line_max = 76
       line_len = 0
 
@@ -304,5 +304,3 @@ class GitCommitNotifier::Emailer
   end
 end
 
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70233138189380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70233138189380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: nntp
-  requirement: &70233138187640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233138187640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &70233138186300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +60,21 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70233138186300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70233138182860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +82,15 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70233138182860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233138197920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -75,10 +101,18 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70233138197920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70233138194380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +123,18 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *70233138194380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: code-cleaner
-  requirement: &70233138190680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +142,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233138190680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70233138210380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +158,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233138210380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70233138207180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +174,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233138207180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70233138400720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +190,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70233138400720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70233138395800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +206,15 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70233138395800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70233138429760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +222,15 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70233138429760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70233138423420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,7 +238,12 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70233138423420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.17.2
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -243,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sends git commit messages with diffs