vclog 1.8.2 → 1.9.0

data/lib/vclog/templates/changelog.html.erb

@@ -25,11 +25,20 @@
     <ul>
     <% changelog.changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
     <li class="commit">
+      <div class="id"><%= h entry.id %></div>
       <div class="date"><%= entry.date %></div>
       <div class="author"><%= h entry.author %></div>
       <div class="type"><%= h entry.type %></div>
-      <div class="message"><%= h entry.message %></div>
-      <div class="revision">#<%= h entry.revision %></div>
+      <div class="message">
+        <div class="summary"><%= h entry.summary %></div>
+<% if entry.details.empty? %>
+        <div class="details"></div>
+<% else %>
+        <div class="details">
+<%= r entry.details %>
+        </div>
+<% end %>
+      </div>
     </li>
     <% end %>
     </ul>

data/lib/vclog/templates/changelog.markdown.rb

@@ -9,17 +9,17 @@ changelog.by_date.each do |date, date_changes|
     out << "\n## #{date} #{author}\n"
 
     author_changes.each do |entry|
+      msg = entry.to_s(:summary=>!options.detail)
 
-      out << "* #{entry.message.strip}"
+      out << msg.tabto(2).sub('  ','* ')
 
       if entry.type
         out.last << " [#{entry.type}]"
       end
 
-      if options.revision
-        out.last << " (##{entry.revision})"
+      if options.reference
+        out.last << " (##{entry.id})"
       end
-
     end
 
   end

data/lib/vclog/templates/changelog.rdoc.rb

@@ -9,17 +9,17 @@ changelog.by_date.each do |date, date_changes|
     out << "\n== #{date} #{author}\n"
 
     author_changes.each do |entry|
+      msg = entry.to_s(:summary=>!options.detail)
 
-      out << "* #{entry.message.strip}"
+      out << msg.tabto(2).sub('  ','* ')
 
       if entry.type
         out.last << " [#{entry.type}]"
       end
 
-      if options.revision
-        out.last << " (##{entry.revision})"
+      if options.reference
+        out.last << " (##{entry.id})"
       end
-
     end
 
   end

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

@@ -29,8 +29,7 @@
 <% changelog.changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
 
     <item>
-
-      <title><%= h entry.message.lines.first.rstrip %></title>
+      <title><%= h entry.summary %></title>
 
       <author><%= entry.author %></author>
 
@@ -38,14 +37,11 @@
 
       <pubDate><%= entry.date.rfc822 %></pubDate>
 
-      <guid><%= url %>#<%= entry.revision %></guid>
+      <guid><%= url %>#<%= entry.id %></guid>
 
       <description><![CDATA[
-
         <%= entry.message %><br/>
-
         <%= entry.author %> <%= entry.date.strftime('%Y-%m-%d %H:%M:%S') %>
-
       ]]></description>
 
     </item>

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

@@ -5,11 +5,23 @@
 <changelog title="<%= title %>">
   <% changelog.changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
   <commit>
-    <revision>#<%= h entry.revision %></revision>
+    <id><%= h entry.id %></id>
     <date><%= entry.date %></date>
     <author><%= h entry.author %></author>
     <type><%= h entry.type %></type>
-    <message><%= h entry.message %></message>
+    <message>
+      <summary><%= h entry.summary %></summary>
+<% if entry.details.empty? %>
+      <details></details>
+<% else %>
+      <details>
+<![CDATA[
+<%= h entry.details %>
+
+]]>
+      </details>
+<% end %>
+    </message>
   </commit>
   <% end %>
 </changelog>

data/lib/vclog/templates/history.ansi.rb

@@ -4,8 +4,7 @@ out = []
 
 out << "#{title.ansi(:bold)}"
 
-history.releases.sort.each do |release|
-
+releases.sort.each do |release|
   tag = release.tag
 
   # TODO: support verbose option
@@ -17,7 +16,7 @@ history.releases.sort.each do |release|
 
   out << "\n#{tag.message.strip} (#{tag.author})"
 
-  if options.extra && !release.changes.empty?
+  if !(options.summary or release.changes.empty?)
 
     #out << "\nChanges:".ansi(:green)
 
@@ -26,30 +25,26 @@ history.releases.sort.each do |release|
       out << "\n* " + "#{changes.size} #{changes[0].label}\n"
 
       changes.sort{|a,b| b.date <=> a.date}.each do |entry|
-
-        line = "#{entry.message.strip}"
-
-        if options.revision
-          out.last <<  "(##{entry.revision})"
-        end
+        msg = entry.to_s(:summary=>!options.detail)
 
         case entry.level
         when 1
-          line = line.ansi(:yellow)
+          msg = msg.ansi(:yellow)
         when 0
-          line = line.ansi(:green)
+          msg = msg.ansi(:green)
         when -1
-          line = line.ansi(:cyan)
+          msg = msg.ansi(:cyan)
         else
           if entry.level > 1
-            line = line.ansi(:red) 
+            msg = msg.ansi(:red) 
           else
-            line = line.ansi(:blue)
+            msg = msg.ansi(:blue)
           end
         end
 
-        out << "    * " + line
+        msg << "\n(##{entry.id})" if options.reference
 
+        out << msg.tabto(6).sub('      ','    * ')
       end
 
     end
@@ -57,8 +52,6 @@ history.releases.sort.each do |release|
   end 
 
   out << ""
-
 end
 
 out.join("\n") + "\n"
-

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

@@ -10,7 +10,7 @@
  
   <% if homepage %><link href="<%= homepage %>" /><% end %>
 
-  <id><% if vcs.uuid %>urn:uuid:<%= vcs.uuid %><% else %><%= vcs.repository %><% end %></id>
+  <id><% if repo.uuid %>urn:uuid:<%= repo.uuid %><% else %><%= repo.repository %><% end %></id>
 
   <updated><%= Time.now.xmlschema %></updated>
 
@@ -22,7 +22,7 @@
 
   </author>
 
-<% history.releases.sort.each do |release| %>
+<% releases.sort.each do |release| %>
 
 <% tag = release.tag %>
 
@@ -44,7 +44,7 @@
 
         <p><%= tag.message %></p>
 
-<% if options.extra %>
+<% if !options.summary %>
 
 <% release.groups.each do |number, changes| %>
 
@@ -60,7 +60,7 @@
 
             <%= entry.author %> <%= entry.date.strftime('%Y-%m-%d %H:%M:%S') %>
 
-            <% if options.revision %>(#<%= entry.revision %>)<% end %>
+            <% if options.reference %>(#<%= entry.id %>)<% end %>
 
           </li>
 

data/lib/vclog/templates/history.gnu.rb

@@ -3,7 +3,7 @@ out = []
 
 out << "#{title}"
 
-history.releases.sort.each do |release|
+releases.sort.each do |release|
 
   tag = release.tag
 
@@ -11,7 +11,7 @@ history.releases.sort.each do |release|
 
   out << "\n#{tag.message.strip} (#{tag.author})"
 
-  if options.extra && !release.changes.empty?
+  if !(options.summary or release.changes.empty?)
 
     out << "\nChanges:"
 
@@ -20,13 +20,11 @@ history.releases.sort.each do |release|
       out << "\n* #{changes.size} #{changes[0].label }\n"
 
       changes.sort{|a,b| b.date <=> a.date}.each do |entry|
+        msg = entry.to_s(:summary=>!options.detail) 
 
-        out << "    * #{entry.message.strip}"
-
-        if options.revision
-          out.last <<  "(##{entry.revision})"
-        end
+        msg << "\n(##{entry.id})" if options.reference
 
+        out << msg.tabto(6).sub('      ','    * ')
       end
 
     end

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

@@ -21,12 +21,12 @@
 <div class="main">
   <div class="title"><%= title %></div>
   <div class="history">
-<% history.releases.sort.each do |release| %>
+<% releases.sort.each do |release| %>
 <%   tag = release.tag %>
 
     <h1><%= tag.name %> / <%= tag.date.strftime('%Y-%m-%d') %></h1>
     <p><%= tag.message %></p>
-<%   if options.extra %>
+<%   if !options.summary %>
 <%     release.groups.each do |number, changes| %>
 
     <h2><%= changes.size %> <%= changes[0].label %></h2>
@@ -34,10 +34,17 @@
 <%       changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
       <li class="entry">
         <div class="message">
-          <%= h entry.message.strip %>
+          <div class="summary"><%= h entry.summary %></summary>
+<% if entry.details.empty? %>
+          <div class="details"></div>
+<% else %>
+          <div class="details">
+<%= r entry.details %>
+          </div>
+<% end %>
         </div>
         <!-- <div class="type"><%= h entry.type %></div> -->
-        <div class="revision">#<%= h entry.revision %></div>
+        <div class="id">#<%= h entry.id %></div>
         <div class="date"><%= entry.date %></div>
         <div class="author"><%= h entry.author %></div>
       </li>

data/lib/vclog/templates/history.json.rb

@@ -1 +1 @@
-history.to_h.to_json
+releases.map{ |r| r.to_h }.to_json

data/lib/vclog/templates/history.markdown.rb

@@ -2,7 +2,7 @@ out = []
 
 out << "# #{title || 'RELEASE HISTORY'}"
 
-history.releases.sort.each do |release|
+releases.sort.each do |release|
 
   tag = release.tag
 
@@ -10,7 +10,7 @@ history.releases.sort.each do |release|
 
   out << "\n#{tag.message.strip} (#{tag.author})"
 
-  if options.extra && !release.changes.empty?
+  if !(options.summary or release.changes.empty?)
 
     out << "\nChanges:"
 
@@ -19,13 +19,11 @@ history.releases.sort.each do |release|
       out << "\n* #{changes.size} #{changes[0].label }\n"
 
       changes.sort{|a,b| b.date <=> a.date}.each do |entry|
+        msg = entry.to_s(:summary=>!options.detail)
 
-        out << "    * #{entry.message.strip}"
-
-        if options.revision
-          out.last <<  "(##{entry.revision})"
-        end
+        msg << "\n(##{entry.id})" if options.reference
 
+        out << msg.tabto(6).sub('      ','    * ')
       end
 
     end

data/lib/vclog/templates/history.rdoc.rb

@@ -2,15 +2,14 @@ out = []
 
 out << "= #{title || 'Release History'}"
 
-history.releases.sort.each do |release|
-
+releases.sort.each do |release|
   tag = release.tag
 
   out << "\n== #{tag.name} / #{tag.date.strftime('%Y-%m-%d')}"
 
   out << "\n#{tag.message.strip} (#{tag.author})"
 
-  if options.extra && !release.changes.empty?
+  if !(options.summary or release.changes.empty?)
 
     out << "\nChanges:"
 
@@ -19,13 +18,11 @@ history.releases.sort.each do |release|
       out << "\n* #{changes.size} #{changes[0].label }\n"
 
       changes.sort{|a,b| b.date <=> a.date}.each do |entry|
+        msg = entry.to_s(:summary=>!options.detail)
 
-        out << "    * #{entry.message.strip}"
-
-        if options.revision
-          out.last <<  "(##{entry.revision})"
-        end
+        msg << "\n(##{entry.id})" if options.reference
 
+        out << msg.tabto(6).sub('      ','    * ')
       end
 
     end
@@ -33,7 +30,6 @@ history.releases.sort.each do |release|
   end 
 
   out << ""
-
 end
 
 out.join("\n") + "\n"

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

@@ -26,7 +26,7 @@
 
     <webMaster><%= email %> (<%= user %>)</webMaster>
 
-<% history.releases.sort.each do |release| %>
+<% releases.sort.each do |release| %>
 
 <% tag = release.tag %>
 
@@ -46,7 +46,7 @@
 
         <p><%= tag.message %></p>
 
-<% if options.extra %>
+<% if !options.summary %>
 
 <% release.groups.each do |number, changes| %>
 
@@ -57,13 +57,11 @@
 <% changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
 
           <li class="entry">
-
             <%= entry.message.rstrip %><br/>
 
             <%= entry.author %> <%= entry.date.strftime('%Y-%m-%d %H:%M:%S') %>
 
-            <% if options.revision %>(#<%= h entry.revision %>)<% end %>           
-
+            <% if options.reference %>(#<%= h entry.id %>)<% end %>           
           </li>
 
 <% end %>

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

@@ -4,7 +4,7 @@
 <% end %>
 <history>
   <title><%= title %></title>
-  <% history.releases.sort.each do |release| %>
+  <% releases.sort.each do |release| %>
   <tag>
     <% tag = release.tag %>
     <name><%= h tag.name %></name>
@@ -16,11 +16,23 @@
     <commit-group type="<%= changes[0].type %>" label="<%= changes[0].label %>">
       <% changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
       <commit>
-        <revision>#<%= h entry.revision %></revision>
+        <id><%= h entry.revision %></id>
         <date><%= entry.date %></date>
         <author><%= h entry.author %></author>
         <type><%= h entry.type %></type>
-        <message><%= h entry.message %></message>
+        <message>
+          <summary><%= h entry.summary %></summary>
+<% if entry.details.empty? %>
+          <details></details>
+<% else %>
+          <details>
+<![CDATA[
+<%= h entry.details %>
+
+]]>
+          </details>
+<% end %>
+        </message>
       </commit>
       <% end %>
     </commit-group>

data/lib/vclog/templates/history.yaml.rb

@@ -1 +1 @@
-history.to_h.to_yaml
+releases.map{ |r| r.to_h }.to_yaml

data/man/man1/vclog-autotag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "VCLOG\-AUTOTAG" "1" "November 2010" "RubyWorks" "VCLog"
+.TH "VCLOG\-AUTOTAG" "1" "December 2011" "RubyWorks" "VCLog"
 .
 .SH "NAME"
 \fBvclog\-autotag\fR \- tag history entries