vclog 1.9.0 → 1.9.1

data/.ruby

@@ -40,7 +40,10 @@ requirements:
   development: true
 dependencies: []
 conflicts: []
-repositories: []
+repositories:
+- uri: git://github.com/rubyworks/vclog.git
+  scm: git
+  name: upstream
 resources:
   home: http://rubyworks.github.com/vclog
   code: http://github.com/rubyworks/vclog
@@ -51,8 +54,8 @@ revision: 0
 created: '2006-05-09'
 summary: Cross-VCS/SCM ChangeLog Generator
 title: VCLog
-version: 1.9.0
+version: 1.9.1
 name: vclog
 description: VCLog is a cross-VCS/SCM ChangeLog generator.
 organization: Rubyworks
-date: '2011-12-12'
+date: '2011-12-13'

data/HISTORY.rdoc

@@ -1,5 +1,15 @@
 = RELEASE HISTORY
 
+== 1.9.1 / 2011-12-13
+
+Fixes a couple of issues found with the last release.
+
+Changes:
+
+* Fix revision id in rss and atom formats.
+* Fix tag id in git tag parser.
+
+
 == 1.9.0 / 2011-12-12
 
 This is a BIG release and much has changed, so be sure to read the following

data/lib/vclog/adapters/git.rb

@@ -73,7 +73,7 @@ module VCLog
         tags = `git tag -l`
         tags.split(/\s+/).each do |tag|
           next unless version_tag?(tag) # only version tags
-          who, date, rev, msg = nil, nil, nil, nil
+          id, who, date, rev, msg = nil, nil, nil, nil, nil
           info = `git show #{tag}`
           info, *_ = info.split(/^(commit|diff|----)/)
           if /\Atag/ =~ info
@@ -81,9 +81,11 @@ module VCLog
             info.lines.to_a[1..-1].each do |line|
               case line
               when /^Tagger:/
-                who  = $'.strip
+                who = $'.strip
               when /^Date:/
                 date = $'.strip
+              when /^\s*[a-f0-9]+/
+                id = $0.strip
               else
                 msg << line
               end
@@ -93,11 +95,11 @@ module VCLog
             #info = `git show #{tag}^ --pretty=format:"%ci|~|%H|~|"`
             #cdate, id, *_ = *info.split('|~|')
 
-            info = git_show("#{tag}^")
+            info = git_show("#{tag}")
 
             change = Change.new(info)
 
-            list << Tag.new(:name=>tag, :date=>date, :who=>who, :msg=>msg, :commit=>change)
+            list << Tag.new(:id=>change.id, :name=>tag, :date=>date, :who=>who, :msg=>msg, :commit=>change)
           else
             #info = `git show #{tag} --pretty=format:"%cn|~|%ce|~|%ci|~|%H|~|%s|~|"`
             info   = git_show(tag)

data/lib/vclog/templates/history.atom.erb

@@ -30,7 +30,7 @@
 
     <title><%= h tag.name %></title>
 
-    <id><%= url %>#<%= tag.revision %></id>
+    <id><%= url %>#<%= tag.id %></id>
 
     <author><name><%= h tag.author %><name></author>
 

data/lib/vclog/templates/history.rss.erb

@@ -36,11 +36,11 @@
 
       <author><%= tag.author %></author>
 
-      <link><%= url %>#<%= tag.revision %></link>
+      <link><%= url %>#<%= tag.id %></link>
 
       <pubDate><%= tag.date.rfc822 %></pubDate>
 
-      <guid isPermaLink="false"><%= url %>#<%= tag.revision %></guid>
+      <guid isPermaLink="false"><%= url %>#<%= tag.id %></guid>
 
       <description><![CDATA[
 

data/lib/vclog/templates/history.xml.erb

@@ -16,7 +16,7 @@
     <commit-group type="<%= changes[0].type %>" label="<%= changes[0].label %>">
       <% changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
       <commit>
-        <id><%= h entry.revision %></id>
+        <id><%= h entry.id %></id>
         <date><%= entry.date %></date>
         <author><%= h entry.author %></author>
         <type><%= h entry.type %></type>

data/lib/vclog.yml

@@ -40,7 +40,10 @@ requirements:
   development: true
 dependencies: []
 conflicts: []
-repositories: []
+repositories:
+- uri: git://github.com/rubyworks/vclog.git
+  scm: git
+  name: upstream
 resources:
   home: http://rubyworks.github.com/vclog
   code: http://github.com/rubyworks/vclog
@@ -51,8 +54,8 @@ revision: 0
 created: '2006-05-09'
 summary: Cross-VCS/SCM ChangeLog Generator
 title: VCLog
-version: 1.9.0
+version: 1.9.1
 name: vclog
 description: VCLog is a cross-VCS/SCM ChangeLog generator.
 organization: Rubyworks
-date: '2011-12-12'
+date: '2011-12-13'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vclog
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
-  requirement: &24378380 !ruby/object:Gem::Requirement
+  requirement: &32227220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *24378380
+  version_requirements: *32227220
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &24377800 !ruby/object:Gem::Requirement
+  requirement: &32226640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *24377800
+  version_requirements: *32226640
 - !ruby/object:Gem::Dependency
   name: confection
-  requirement: &24377340 !ruby/object:Gem::Requirement
+  requirement: &32226180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24377340
+  version_requirements: *32226180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24376800 !ruby/object:Gem::Requirement
+  requirement: &32225640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24376800
+  version_requirements: *32225640
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &24376300 !ruby/object:Gem::Requirement
+  requirement: &32241520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24376300
+  version_requirements: *32241520
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &24375800 !ruby/object:Gem::Requirement
+  requirement: &32241020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24375800
+  version_requirements: *32241020
 - !ruby/object:Gem::Dependency
   name: citron
-  requirement: &24375300 !ruby/object:Gem::Requirement
+  requirement: &32240520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24375300
+  version_requirements: *32240520
 - !ruby/object:Gem::Dependency
   name: ae
-  requirement: &24374800 !ruby/object:Gem::Requirement
+  requirement: &32240020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24374800
+  version_requirements: *32240020
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &24374300 !ruby/object:Gem::Requirement
+  requirement: &32239520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24374300
+  version_requirements: *32239520
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &24373800 !ruby/object:Gem::Requirement
+  requirement: &32239020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24373800
+  version_requirements: *32239020
 description: VCLog is a cross-VCS/SCM ChangeLog generator.
 email:
 - transfire@gmail.com