vclog 1.4.0 → 1.5.0

data/lib/vclog/templates/history.rdoc

@@ -1,12 +1,12 @@
 = <%= title %>
-<% releases.each do |release| %><% tag = release.tag %>
+<% history.releases.sort.each do |release| %><% tag = release.tag %>
 == <%= tag.name %> / <%= tag.date.strftime('%Y-%m-%d') %>
 
 <%= h tag.message.strip %> (<%= tag.author %>)
 
-<% if extra %>Changes:
-<% groups(release.changes).each do |number, changes| %>
+<% if options.extra %>Changes:
+<% release.groups.each do |number, changes| %>
 * <%= changes.size %> <%= changes[0].type_phrase %>
 <% changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
-    * <%= entry.message %> <% if rev %>(#<%= entry.revision %>)<% end %><% end %>
+    * <%= entry.message %> <% if options.revision %>(#<%= entry.revision %>)<% end %><% end %>
 <% end %><% end %><% end %>

data/lib/vclog/templates/history.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0"?>
-<% if xsl %>
-<?xml-stylesheet href="#{xsl}" type="text/xsl" ?>
+<% if options.stylesheet %>
+<?xml-stylesheet href="#{options.stylesheet}" type="text/xsl" ?>
 <% end %>
 <history>
   <title><%= title %></title>
-  <% releases.each do |release| %>
+  <% history.releases.sort.each do |release| %>
   <tag>
     <% tag = release.tag %>
     <name><%= h tag.name %></name>
     <date><%= tag.date.strftime('%Y-%m-%d') %></date>
     <author><%= h tag.author %></author>
     <message><%= h tag.message %></message>
-    <% groups(release.changes).each do |number, changes| %>
+
+    <% release.groups.each do |number, changes| %>
     <commit-group type="<%= changes[0].type %>" label="<%= changes[0].type_phrase %>">
       <% changes.sort{|a,b| b.date <=> a.date}.each do |entry| %>
       <commit>

data/lib/vclog/templates/history.yaml

@@ -0,0 +1 @@
+<%= history.to_h.to_yaml %>

data/lib/vclog.rb

@@ -1 +1 @@
-require 'vclog/vcs'
+require 'vclog/adapters'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-05-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: VCLog is a cross-VCS/SCM ChangeLog generator.
-email: 
+email: transfire@gmail.com
 executables: 
 - vclog
 extensions: []
@@ -41,49 +41,49 @@ extra_rdoc_files:
 files: 
 - bin/vclog
 - lib/plugins/syckle/vclog.rb
+- lib/vclog/adapters/abstract.rb
+- lib/vclog/adapters/darcs.rb
+- lib/vclog/adapters/git.rb
+- lib/vclog/adapters/hg.rb
+- lib/vclog/adapters/svn.rb
+- lib/vclog/adapters.rb
 - lib/vclog/change.rb
 - lib/vclog/changelog.rb
 - lib/vclog/cli.rb
 - lib/vclog/facets.rb
+- lib/vclog/formatter.rb
 - lib/vclog/heuristics.rb
 - lib/vclog/history.rb
+- lib/vclog/metadata.rb
 - lib/vclog/release.rb
 - lib/vclog/tag.rb
+- lib/vclog/templates/changelog.atom
 - lib/vclog/templates/changelog.gnu
 - lib/vclog/templates/changelog.html
+- lib/vclog/templates/changelog.json
 - lib/vclog/templates/changelog.markdown
 - lib/vclog/templates/changelog.rdoc
 - lib/vclog/templates/changelog.xml
 - lib/vclog/templates/changelog.xsl
+- lib/vclog/templates/changelog.yaml
+- lib/vclog/templates/history.atom
+- lib/vclog/templates/history.gnu
 - lib/vclog/templates/history.html
+- lib/vclog/templates/history.json
 - lib/vclog/templates/history.markdown
 - lib/vclog/templates/history.rdoc
 - lib/vclog/templates/history.xml
-- lib/vclog/vcs/darcs.rb
-- lib/vclog/vcs/git.rb
-- lib/vclog/vcs/hg.rb
-- lib/vclog/vcs/svn.rb
-- lib/vclog/vcs.rb
+- lib/vclog/templates/history.yaml
 - lib/vclog.rb
-- features/history.feature
+- features/git.feature
+- features/hg.feature
 - features/step_definitions/history_steps.rb
+- features/step_definitions/repo_steps.rb
 - features/support/ae.rb
+- features/support/aruba.rb
 - features/support/loadpath.rb
-- meta/authors
-- meta/contact
-- meta/created
-- meta/description
-- meta/homepage
-- meta/license
-- meta/name
-- meta/repository
-- meta/requires
-- meta/ruby
-- meta/sitemap
-- meta/suite
-- meta/summary
-- meta/title
-- meta/version
+- features/support/repo.rb
+- features/svn.feature
 - HISTORY.rdoc
 - PROFILE
 - LICENSE
@@ -92,7 +92,7 @@ files:
 - REQUIRE
 - VERSION
 has_rdoc: true
-homepage: http://proutils.rubyforge.org/vclog
+homepage: http://proutils.github.com/vclog
 licenses: []
 
 post_install_message: 
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: proutils
+rubyforge_project: vclog
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3

data/features/history.feature

@@ -1,16 +0,0 @@
-Feature: Release History
-  As a SCM user
-  I want to generate a nicely formatted Release History
-
-  Scenario: SVN History
-    Given a SVN repository
-    When I generate a History
-    Then it should include all tags
-    And the list of releases should be in order from newest to oldest
-
-  Scenario: Git History
-    Given a Git repository
-    When I generate a History
-    Then it should include all tags
-    And the list of releases should be in order from newest to oldest
-

data/lib/vclog/vcs/darcs.rb

@@ -1,83 +0,0 @@
-module VCLog
-
-  class VCS
-
-    # = DARCS
-    #
-    # Provide Darcs SCM revision tools.
-    #
-    # TODO: This needs to be fixed.
-    #
-    class DARCS
-
-      ### Is a darcs repository?
-      def repository?
-        File.directory?('_darcs')
-      end
-
-      ### This is also a module function.
-      module_function :repository?
-
-      ### Cached Changelog.
-      def changelog
-        @changelog ||= generate_changelog
-      end
-
-      ### Generate Changelog object.
-      def generate_changelog
-        raise "not a darcs repository" unless repository?
-
-        log = Changelog.new
-
-        txt = `darcs changes` #--repo=#{@repository}`
-
-        txt.each_line do |line|
-          case line
-          when /^\s*$/
-          when /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun)/
-          when /^\s*tagged/
-            log << $'
-            log << "\n"
-          else
-            log << line
-            log << "\n"
-          end
-        end
-
-        return log
-      end
-
-      ### Retrieve the "revision number" from the darcs tree.
-      def calculate_version
-        raise "not a darcs repository" unless repository?
-
-        status = info.status
-
-        changes = `darcs changes`
-        count   = 0
-        tag     = "0.0"
-
-        changes.each("\n\n") do |change|
-          head, title, desc = change.split("\n", 3)
-          if title =~ /^  \*/
-            # Normal change.
-            count += 1
-          elsif title =~ /tagged (.*)/
-            # Tag.  We look for these.
-            tag = $1
-            break
-          else
-            warn "Unparsable change: #{change}"
-          end
-        end
-        ver = "#{tag}.#{count.to_s}"
-
-        return ver
-        #format_version_stamp(ver, status) # ,released)
-      end
-
-    end
-
-  end
-end
-

data/lib/vclog/vcs/git.rb

@@ -1,83 +0,0 @@
-module VCLog
-
-  require 'vclog/vcs'
-
-  class VCS
-
-    # = GIT Adapter
-    #
-    class GIT < VCS
-
-      #def initialize
-      #end
-
-      #
-      #def changelog
-      #  @changelog ||= ChangeLog.new(changes)
-      #end
-
-      #
-      #def history(opts={})
-      #  @history ||= History.new(self, opts)
-      #end
-
-      # Collect changes.
-      #
-      def extract_changes
-        list = []
-        changelog = `git log --pretty=format:"---%ci|~|%aN|~|%H|~|%s"`.strip
-        changes = changelog.split("---")
-        #changes = changelog.split(/^commit/m)
-        changes.shift # throw the first (empty) entry away
-        changes.each do |entry|
-          date, who, rev, msg = entry.split('|~|')
-          date = Time.parse(date)
-          msg, type = *split_type(msg)
-          list << [rev, date, who, msg, type]
-        end
-        list
-      end
-
-      # Collect tags.
-      #
-      # `git show 1.0` produces:
-      #
-      #   tag 1.0
-      #   Tagger: 7rans <transfire@gmail.com>
-      #   Date:   Sun Oct 25 09:27:58 2009 -0400
-      #
-      #   version 1.0
-      #   commit
-      #   ...
-      #
-      def extract_tags
-        list = []
-        tags = `git tag -l`
-        tags.split(/\s+/).each do |tag|
-          info = `git show #{tag}`
-          md = /\Atag(.*?)\n(.*?)^commit/m.match(info)
-          who, date, *msg = *md[2].split(/\n/)
-          who  = who.split(':')[1].strip
-          date = date[date.index(':')+1..-1].strip
-          msg  = msg.join("\n")
-
-          info = `git show #{tag}^ --pretty=format:"%ci|-|"`
-          date, *_ = *info.split('|-|')
-
-          #md = /\Atag(.*?)\n(.*?)^commit/m.match(info)
-          #_who, _date, *_msg = *md[2].split(/\n/)
-          #_who  = _who.split(':')[1].strip
-          #_date = _date[_date.index(':')+1..-1].strip
-          #_msg  = _msg.join("\n")
-
-          list << [tag, date, who, msg]
-        end
-        list
-      end
-
-    end#class GIT
-
-  end#class VCS
-
-end#module VCLog
-

data/lib/vclog/vcs/svn.rb

@@ -1,116 +0,0 @@
-module VCLog
-
-  class VCS
-
-    # = SVN
-    #
-    # NOTE: Unfortunately the SVN adapater is very slow. If hits the server
-    # every time the 'svn log' command is issued. When generating a History
-    # that's one hit for every tag. If anyone knows a better way please have
-    # at it --maybe future versions of SVN will improve the situation.
-    #
-    class SVN < VCS
-
-      def initialize(root)
-        begin
-          require 'xmlsimple'
-        rescue LoadError
-          "VCLog requires xmlsimple for SVN support"
-        end
-        super(root)
-      end
-
-      #
-      def extract_changes
-        log = []
-
-        xml = `svn log --xml`.strip
-
-        commits = XmlSimple.xml_in(xml, {'KeyAttr' => 'rev'})
-        commits = commits['logentry']
-
-        commits.each do |com|
-          rev  = com["revision"]
-          msg  = [com["msg"]].flatten.compact.join('').strip
-          who  = [com["author"]].flatten.compact.join('').strip
-          date = [com["date"]].flatten.compact.join('').strip
-
-          next if msg.empty?
-          next if msg == "*** empty log message ***"
-
-          date = Time.parse(date)
-
-          msg, type = *split_type(msg)
-
-          log << [rev, date, who, msg, type]
-        end
-
-        log
-      end
-
-      #
-      def extract_tags
-        list = []
-        tagdir = tag_directory
-
-        if tagdir
-          tags = Dir.entries(tagdir).select{ |e| e.index('.') != 0 && e =~ /\d(.*)$/ }
-        else
-          tags = []
-        end
-
-        tags.each do |path|
-          dir = File.join(tagdir, path)
-
-          # using yaml, but maybe use xml instead?
-          info = `svn info #{dir}`
-          info = YAML.load(info)
-          md = /(\d.*)$/.match(info['Path'])
-          name = md ? md[1] : path
-          date = info['Last Changed Date']
-          who  = info['Last Changed Author']
-          rev  = info['Revision']
-
-          # get last commit
-          xml = `svn log -l1 --xml #{dir}`
-          commits = XmlSimple.xml_in(xml, {'KeyAttr' => 'rev'})
-          commit = commits['logentry'].first
-
-          msg  = [commit["msg"]].flatten.compact.join('').strip
-          date = [commit["date"]].flatten.compact.join('').strip
-
-          list << [name, date, who, msg]
-        end
-        list
-      end
-
-      # This isn't perfect, but is there really anyway for it to be?
-      # It ascends up the current directory tree looking for the 
-      # best candidate for a tags directory.
-      def tag_directory
-        fnd = nil
-        dir = root
-        while dir != '/' do
-          entries = Dir.entries(dir)
-          if entries.include?('.svn')
-            if entries.include?('tags')
-              break(fnd = File.join(dir, 'tags'))
-            else
-              entries = entries.reject{ |e| e.index('.') == 0 }
-              entries = entries.reject{ |e| e !~ /\d$/ }
-              break(fnd = dir) unless entries.empty?
-            end
-          else
-            break(fnd=nil)
-          end
-          dir = File.dirname(dir)
-        end
-        fnd
-      end
-
-    end#class SVN
-
-  end#class VCS
-
-end#module VCLog
-

data/meta/authors

@@ -1 +0,0 @@
-Thomas Sawyer

data/meta/contact

@@ -1 +0,0 @@
-http://googlegroups.com/group/proutils

data/meta/created

@@ -1 +0,0 @@
-2006-05-09

data/meta/description

@@ -1 +0,0 @@
-VCLog is a cross-VCS/SCM ChangeLog generator.

data/meta/homepage

@@ -1 +0,0 @@
-http://proutils.rubyforge.org/vclog

data/meta/license

@@ -1 +0,0 @@
-GPL3

data/meta/name

@@ -1 +0,0 @@
-vclog

data/meta/repository

@@ -1 +0,0 @@
-git://github.com/proutils/vclog.git

data/meta/requires

@@ -1 +0,0 @@
-facets > 2.4

data/meta/ruby

@@ -1,2 +0,0 @@
-- 1.8.6
-- 1.8.7

data/meta/sitemap

@@ -1 +0,0 @@
-doc/rdoc: vclog

data/meta/suite

@@ -1 +0,0 @@
-proutils

data/meta/summary

@@ -1 +0,0 @@
-Cross-VCS/SCM ChangeLog Generator

data/meta/title

@@ -1 +0,0 @@
-VCLog

data/meta/version

@@ -1 +0,0 @@
-1.4.0