vclog 1.2 → 1.4.0

data/lib/vclog/vcs/svn.rb

@@ -4,35 +4,39 @@ module VCLog
 
     # = SVN
     #
-    # SVN's raw log format:
-    #
-    #   ------------------------------------------------------------------------
-    #   r34 | transami | 2006-08-02 22:10:11 -0400 (Wed, 02 Aug 2006) | 2 lines
-    #
-    #   change foo to work better
+    # 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 = []
 
-        txt = `svn log`.strip
+        xml = `svn log --xml`.strip
 
-        com = txt.split(/^[-]+$/)
+        commits = XmlSimple.xml_in(xml, {'KeyAttr' => 'rev'})
+        commits = commits['logentry']
 
-        com.each do |msg|
-          msg = msg.strip
+        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?
-
-          idx = msg.index("\n")
-          head = msg.slice!(0...idx)
-          rev, who, date, cnt = *head.split('|')
-
-          rev  = rev.strip
-          who  = who.strip
-          msg  = msg.strip
+          next if msg == "*** empty log message ***"
 
           date = Time.parse(date)
 
@@ -58,6 +62,7 @@ module VCLog
         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'])
@@ -66,8 +71,13 @@ module VCLog
           who  = info['Last Changed Author']
           rev  = info['Revision']
 
-          commit = `svn log -r BASE #{dir}`
-          msg  = commit.lines.to_a[2..-2].join("\n").strip
+          # 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

data/lib/vclog/vcs.rb

@@ -97,12 +97,21 @@ module VCLog
 
   private
 
-    # Looks for a "[type]" indicator at the end of the message.
+    # Looks for a "[type]" indicator at the end of the commit message.
+    # If that is not found, it looks at front of message for
+    # "[type]" or "[type]:". Failing that it tries just "type:".
+    #
     def split_type(note)
       note = note.strip
-      if md = /\A.*?\[(.*?)\]\s*$/.match(note)
+      if md = /\[(.*?)\]\Z/.match(note)
+        t = md[1].strip.downcase
+        n = note[0...(md.begin(0))]
+      elsif md = /\A\[(.*?)\]\:?/.match(note)
+        t = md[1].strip.downcase
+        n = note[md.end(0)..-1]
+      elsif md = /\A(\w+?)\:/.match(note)
         t = md[1].strip.downcase
-        n = note.sub(/\[#{md[1]}\]\s*$/, "")
+        n = note[md.end(0)..-1]
       else
         n, t = note, nil
       end

data/lib/vclog.rb

@@ -0,0 +1 @@
+require 'vclog/vcs'

data/meta/version

@@ -1 +1 @@
-1.2
+1.4.0

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vclog
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -9,66 +14,83 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -04:00
+date: 2010-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
+  type: :runtime
+  version_requirements: *id001
 description: VCLog is a cross-VCS/SCM ChangeLog generator.
-email: http://googlegroups.com/group/proutils
+email: 
 executables: 
 - vclog
 extensions: []
 
 extra_rdoc_files: 
-- README
-- MANIFEST
-- TODO
-- LICENSE
-- HISTORY.md
+- README.rdoc
 files: 
-- HISTORY.md
-- LICENSE
-- MANIFEST
-- README
-- TODO
 - bin/vclog
+- lib/plugins/syckle/vclog.rb
 - lib/vclog/change.rb
 - lib/vclog/changelog.rb
 - lib/vclog/cli.rb
 - lib/vclog/facets.rb
+- lib/vclog/heuristics.rb
 - lib/vclog/history.rb
 - lib/vclog/release.rb
 - lib/vclog/tag.rb
-- lib/vclog/vcs.rb
+- lib/vclog/templates/changelog.gnu
+- lib/vclog/templates/changelog.html
+- lib/vclog/templates/changelog.markdown
+- lib/vclog/templates/changelog.rdoc
+- lib/vclog/templates/changelog.xml
+- lib/vclog/templates/changelog.xsl
+- lib/vclog/templates/history.html
+- 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.rb
+- features/history.feature
+- features/step_definitions/history_steps.rb
+- features/support/ae.rb
+- features/support/loadpath.rb
 - meta/authors
 - meta/contact
 - meta/created
 - meta/description
 - meta/homepage
 - meta/license
-- meta/loadpath
-- meta/parent
-- meta/project
+- meta/name
 - meta/repository
 - meta/requires
 - meta/ruby
 - meta/sitemap
+- meta/suite
 - meta/summary
 - meta/title
 - meta/version
+- HISTORY.rdoc
+- PROFILE
+- LICENSE
+- README.rdoc
+- ROADMAP.rdoc
+- REQUIRE
+- VERSION
 has_rdoc: true
 homepage: http://proutils.rubyforge.org/vclog
 licenses: []
@@ -78,26 +100,27 @@ rdoc_options:
 - --title
 - VCLog API
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
-- plug
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: proutils
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cross-VCS/SCM ChangeLog Generator

data/HISTORY.md

@@ -1,55 +0,0 @@
-# RELEASE HISTORY
-
-## 1.2 / 2009-10-26
-
-Version 1.2 overhuals the internals so that History
-output is based on scm tags, not on a pre-existing history file.
-This is really the proper way to go about it and those
-who use it will, I think, be happily surprised at how it
-promotes good practices for the maintenance of History files.
-This overhaul led to substantial changes in the command-line
-interface.
-
-Changes:
-
-* 2 Major Enhancements
-
-  * Rewrote History class.
-  * Changed command-line interface.
-
-
-## 1.1 / 2009-10-23
-
-This release adds yaml and json formats an improves
-the command.
-
-Changes:
-
-* 2 Major Enhancements
-
-    * Added YAML format.
-    * Added JSON format.
-
-* 1 Minor Enhancements
-
-    * Use OptionParser instead of GetoptLong.
-
-
-## 1.0.0 / 2009-10-13
-
-This is the first "production" release of VCLog.
-
-* 2 Major Enhancements
-
-    * Improved command line interface.
-    * Added output option to save changelog.
-
-
-## 0.1.0 / 2009-08-17
-
-This is the initial version of vclog.
-
-* 1 Major Enhancement
-
-    * Happy Birthday
-

data/MANIFEST

@@ -1,36 +0,0 @@
-HISTORY.md
-LICENSE
-MANIFEST
-README
-TODO
-bin/vclog
-lib/vclog
-lib/vclog/change.rb
-lib/vclog/changelog.rb
-lib/vclog/cli.rb
-lib/vclog/facets.rb
-lib/vclog/history.rb
-lib/vclog/release.rb
-lib/vclog/tag.rb
-lib/vclog/vcs
-lib/vclog/vcs.rb
-lib/vclog/vcs/darcs.rb
-lib/vclog/vcs/git.rb
-lib/vclog/vcs/hg.rb
-lib/vclog/vcs/svn.rb
-meta/authors
-meta/contact
-meta/created
-meta/description
-meta/homepage
-meta/license
-meta/loadpath
-meta/parent
-meta/project
-meta/repository
-meta/requires
-meta/ruby
-meta/sitemap
-meta/summary
-meta/title
-meta/version

data/meta/loadpath

@@ -1,2 +0,0 @@
-lib
-plug