hoe-git 1.3.0 → 1.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+=== 1.4.0 / 2011-05-16
+
+* 2 minor enhancements:
+
+  * Exported all the other git functions so that other rake tasks can benefit.
+  * Updated git:changelog to support annotated commit messages.
+
+* 1 bug fix:
+
+  * Fix shell escaping on Windows. [Gordon Thiesfeld]
+
 === 1.3.0 / 2009-07-27
 
 * Add a git:manifest task. [Phil Hagelb0rg]

data/README.rdoc

@@ -24,12 +24,15 @@ This takes all the commit messages since your last release and formats
 'em into a nice RDoc fragment. If you specify <tt>VERSION</tt>, it'll
 be used in the changelog fragment. If you specify <tt>FROM</tt>, it'll
 be used as a starting point for the changelog instead of your last
-release.
+tagged release.
 
-Commits that weren't made by a project developer will be attributed,
-like this:
+The rdoc is automatically formatted into sections by using "annotated
+commit messages" by using a simple format for multi-line commit messages:
 
-    * Did a thing with the stuff. [I R Contributor]
+    ! major change description.
+    + minor change description.
+    - bug fix description.
+    un-logged description (for minor stuff like re-formatting).
 
 === Generating the Manifest
 

data/lib/hoe/git.rb

@@ -20,7 +20,7 @@ class Hoe #:nodoc:
   module Git
 
     # Duh.
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
 
     # What do you want at the front of your release tags?
     # [default: <tt>"v"</tt>]
@@ -42,31 +42,51 @@ class Hoe #:nodoc:
 
       desc "Print the current changelog."
       task "git:changelog" do
-        tags  = git_tags
-        tag   = ENV["FROM"] || tags.last
+        tag   = ENV["FROM"] || git_tags.last
         range = [tag, "HEAD"].compact.join ".."
-        cmd   = "git log #{range} '--format=tformat:%s|||%aN|||%aE'"
+        cmd   = "git log #{range} '--format=tformat:%B|||%aN|||%aE|||'"
         now   = Time.new.strftime "%Y-%m-%d"
 
-        changes = `#{cmd}`.split("\n").map do |line|
-          msg, author, email = line.split("|||").map { |e| e.empty? ? nil : e }
-
-          developer = self.author.include?(author) ||
-            self.email.include?(email)
-
-          msg << " [#{author || email}]" unless developer
-          msg
+        changes = `#{cmd}`.split(/\|\|\|/).each_slice(3).map do |msg, author, email|
+          msg.split(/\n/).reject { |s| s.empty? }
         end
 
+        changes = changes.flatten
+
         next if changes.empty?
 
+        $changes = Hash.new { |h,k| h[k] = [] }
+
+        codes = {
+          "!" => :major,
+          "+" => :minor,
+          "*" => :minor,
+          "-" => :bug,
+          "?" => :unknown,
+        }
+
+        codes_re = Regexp.escape codes.keys.join
+
+        changes.each do |change|
+          if change =~ /^\s*([#{codes_re}])\s*(.*)/ then
+            code, line = codes[$1], $2
+          else
+            code, line = codes["?"], change.chomp
+          end
+
+          $changes[code] << line
+        end
+
         puts "=== #{ENV['VERSION'] || 'NEXT'} / #{now}"
         puts
-
-        changes.each { |change| puts "* #{change}" }
+        changelog_section :major
+        changelog_section :minor
+        changelog_section :bug
+        changelog_section :unknown
         puts
       end
 
+
       desc "Update the manifest with Git's file list. Use Hoe's excludes."
       task "git:manifest" do
         with_config do |config, _|
@@ -103,10 +123,12 @@ class Hoe #:nodoc:
     end
 
     def git_tag_and_push tag
+      msg = "Tagging #{tag}."
+
       if git_svn?
-        sh "git svn tag #{tag} -m 'Tagging #{tag} release.'"
+        sh "git svn tag #{tag} -m '#{msg}'"
       else
-        sh "git tag -f #{tag}"
+        sh "git tag -f #{tag} -m '#{msg}'"
         git_remotes.each { |remote| sh "git push -f #{remote} tag #{tag}" }
       end
     end
@@ -125,8 +147,35 @@ class Hoe #:nodoc:
           collect { |t| t.strip }.
           select  { |t| t =~ %r{^#{prefix}/#{git_release_tag_prefix}} }
       else
-        `git tag -l '#{git_release_tag_prefix}*'`.split "\n"
+        flags  = "--date-order --simplify-by-decoration --pretty=format:%H"
+        hashes = `git log #{flags}`.split(/\n/).reverse
+        names  = `git name-rev #{hashes.join " "}`.split(/\n/)
+        names  = names.map { |s| s[/tags\/(v.+)/, 1] }.compact
+        names.select { |t| t =~ %r{^#{git_release_tag_prefix}} }
+      end
+    end
+
+    def changelog_section code
+      name = {
+        :major   => "major enhancement",
+        :minor   => "minor enhancement",
+        :bug     => "bug fix",
+        :unknown => "unknown",
+      }[code]
+
+      changes = $changes[code]
+      count = changes.size
+      name += "s" if count > 1
+      name.sub!(/fixs/, 'fixes')
+
+      return if count < 1
+
+      puts "* #{count} #{name}:"
+      puts
+      changes.sort.each do |line|
+        puts "  * #{line}"
       end
+      puts
     end
   end
 end

metadata

@@ -1,37 +1,75 @@
 --- !ruby/object:Gem::Specification 
 name: hoe-git
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  hash: 7
+  prerelease: 
+  segments: 
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - John Barnette
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-07-27 00:00:00 -07:00
-default_executable: 
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
+        hash: 35
+        segments: 
+        - 2
+        - 9
+        - 4
+        version: 2.9.4
+  type: :development
+  version_requirements: *id002
 description: |-
   A set of Hoe plugins for tighter Git integration. Provides tasks to
   automate release tagging and pushing and changelog generation. I
@@ -53,7 +91,6 @@ files:
 - README.rdoc
 - Rakefile
 - lib/hoe/git.rb
-has_rdoc: true
 homepage: http://github.com/jbarnette/hoe-git
 licenses: []
 
@@ -64,21 +101,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: hoe-git
-rubygems_version: 1.3.5
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A set of Hoe plugins for tighter Git integration

metadata.gz.sig

@@ -0,0 +1,3 @@
+����'*P�*�xm�8:P%�|� -��1�˥���Oc\ԯ����Q5�<o�"9({��;�zZ.�J*��	U�+�1Go�&����D���Ų=:
����	�w����ڪk���=󦧼�ܾL#���:#�D���Q�S&;��q�(�k
+3���@���(�s$���5�so�m!&�l�3�!��6�X�(L��@HFVG�{���~��C�ư��5������u+#�k�_ٍ\�A
+����%�u�q