meta_project 0.4.4 → 0.4.5

data/CHANGES

@@ -1,5 +1,17 @@
 = MetaProject Changelog
 
+== Version 0.4.5
+
+This version improves the MetaProject::ScmWeb::Pathname support, allowing online contents in scm web interfaces to be navigated and read in a similar fashion to the standard library's Pathname class.
+
+* Better support for Pathname. children, directory? and open now supported.
+* Fixed some bugs for JIRA support.
+* Improved Pathname settings for Codehaus, SourceForge, Trac and RubyForge.
+* Pathname now takes a revision argument in the constructor.
+* Moved ScmWeb to ScmWeb::Browser.
+* Added a subset of the Ruby stlib Pathname API to ScmWeb.
+* Added a String extension for dealing with trailing slashes in URLs.
+
 == Version 0.4.4
 
 This release introduces a new Domain Specific Language (DSL) for SCM commit messages similar to Trac's post-commit hook for updating tickets.

data/Rakefile

@@ -24,7 +24,7 @@ require 'rake/rdoctask'
 #
 # REMEMBER TO KEEP PKG_VERSION IN SYNC WITH THE CHANGES FILE!
 PKG_NAME = "meta_project"
-PKG_VERSION = "0.4.4"
+PKG_VERSION = "0.4.5"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/meta_project/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def strip_trailing_slash
+    self[-1..-1] == "/" ? self[0..-2] : self
+  end
+end

data/lib/meta_project/project/codehaus/codehaus_project_svn.rb

@@ -3,22 +3,25 @@ module MetaProject
     module Codehaus
       class CodehausProjectSvn < Base
 
-        def initialize(project_id, svn_path, jira_id)
-          @name = project_id
-          @scm = RSCM::Subversion.new("svn://svn.#{project_id}.codehaus.org/#{project_id}/scm/#{svn_path}", svn_path)
+        def initialize(unix_name, svn_path, jira_id)
+          @unix_name = unix_name
+          @scm = RSCM::Subversion.new("svn://svn.#{unix_name}.codehaus.org/#{unix_name}/scm/#{svn_path}", svn_path)
           @tracker = ::MetaProject::Tracker::Jira::JiraTracker.new("http://jira.codehaus.org", jira_id)
 
-          overview  = "http://svn.#{project_id}.codehaus.org/#{svn_path}/"
+          overview  = "http://svn.#{unix_name}.codehaus.org/#{svn_path}/"
           history   = "#{overview}\#{path}"
           raw       = "#{history}?rev=\#{revision}"
           html       = "#{raw}&view=markup"
           # http://svn.picocontainer.codehaus.org/java/picocontainer/trunk/container/project.xml?r1=2220&r2=2234&p1=java/picocontainer/trunk/container/project.xml&p2=java/picocontainer/trunk/container/project.xml
           diff      = "#{history}?r1=\#{previous_revision}&r2=\#{revision}&p1=#{svn_path}/\#{path}&p2=#{svn_path}/\#{path}"
-          @scm_web = ScmWeb.new(overview, history, raw, html, diff)
+          child_dirs_pattern = /<a name="([^"]+)" href="([^"]+)">[\r\n\s]+<img src="\/icons\/small\/dir.gif"/
+          child_files_pattern = /<a href="[^"]+\/([^\?]+)\?rev=([\d]+)&view=auto">/
+
+          @scm_web = ScmWeb::Browser.new(overview, history, raw, html, diff, child_dirs_pattern, child_files_pattern)
         end
 
         def home_page
-          "http://#{@project_id}.codehaus.org/"
+          "http://#{@unix_name}.codehaus.org/"
         end
 
       end

data/lib/meta_project/project/trac/trac_project.rb

@@ -5,15 +5,40 @@ module MetaProject
 
         def initialize(trac_base_url, svn_root_url, svn_path)
           @trac_base_url = trac_base_url
+          @svn_path = svn_path
           @scm = RSCM::Subversion.new("#{svn_root_url}#{svn_path}", svn_path)
-          @tracker = ::MetaProject::Tracker::Trac::TracTracker.new(trac_base_url)
+          @tracker = ::MetaProject::Tracker::Trac::TracTracker.new(@trac_base_url)
+        end
+        
+        def scm_web
+          unless @scm_web
+            overview  = "#{@trac_base_url}/browser/#{@svn_path}/"
+            diff      = "#{@trac_base_url}/changeset/\#{revision}"
+
+            front_page = open(@trac_base_url).read
+            if(front_page =~ /<strong>Trac ([\d\.]+)\w*<\/strong>/)
+              
+              version = $1
+              version = "#{version}.0" if version =~ /[\d]+\.[\d]+\.$/              
+              version = version.gsub(/\./, "").to_i
+
+              if(version >= 90)
+                history   = "#{@trac_base_url}/browser/#{@svn_path}/\#{path}"
+                html      = "#{@trac_base_url}/browser/#{@svn_path}/\#{path}?rev=\#{revision}"
+                raw       = "#{@trac_base_url}/browser/#{@svn_path}/\#{path}?rev=\#{revision}&format=txt"
+              else
+                history   = "#{@trac_base_url}/log/#{@svn_path}/\#{path}"
+                html      = "#{@trac_base_url}/file/#{@svn_path}/\#{path}?rev=\#{revision}"
+                raw       = "#{@trac_base_url}/file/#{@svn_path}/\#{path}?rev=\#{revision}&format=txt"
+              end
+              child_dirs_pattern = /title="Browse Directory" href="[^"]+">([^<]+)<\/a>/
+              child_files_pattern = /title="View File" href="[^"]+">([^<]+)<\/a>/
+
+              @scm_web = ScmWeb::Browser.new(overview, history, raw, html, diff, child_dirs_pattern, child_files_pattern)
+            end
+          end
 
-          overview  = "#{trac_base_url}/browser/#{svn_path}/"
-          history   = "#{trac_base_url}/log/#{svn_path}/\#{path}"
-          html      = "#{trac_base_url}/file/#{svn_path}/\#{path}?rev=\#{revision}"
-          raw       = "#{html}&format=txt"
-          diff      = "#{trac_base_url}/changeset/\#{revision}"
-          @scm_web = ScmWeb.new(overview, history, raw, html, diff)
+          @scm_web
         end
         
         def home_page

data/lib/meta_project/project/xforge/ruby_forge.rb

@@ -31,7 +31,10 @@ module MetaProject
           html     = "#{view_cvs}#{path_cvs_root_rev}&content-type=text/vnd.viewcvs-markup"
           diff     = "#{view_cvs}#{mod}/\#{path}.diff#{cvsroot}&r1=\#{previous_revision}&r2=\#{revision}"
 
-          ScmWeb.new(overview, history, raw, html, diff)
+          child_dirs_pattern = /href="([^\?]*\/)\?cvsroot=#{unix_name}">/
+          child_files_pattern = /href="([^\?^\/]*)\?cvsroot=#{unix_name}">/
+
+          ScmWeb::Browser.new(overview, history, raw, html, diff, child_dirs_pattern, child_files_pattern)
         end
         
         # Regexp used to find projects' home page

data/lib/meta_project/project/xforge/source_forge.rb

@@ -31,7 +31,11 @@ module MetaProject
           html     = "#{history}?#{rev}&view=markup"
           diff     = "#{history}?r1=\#{previous_revision}&r2=\#{revision}"
 
-          ScmWeb.new(overview, history, raw, html, diff)
+
+          child_dirs_pattern = /<img src="\/icons\/small\/dir.gif"\s+alt="\(dir\)"\s+border=0\s+width=16\s+height=16>[\r\n\s]*([^\/]+)\/<\/a>/
+          child_files_pattern = /href="[^\?]+\/([^\?]+)\?rev=([^&]+)&view=log">/
+
+          ScmWeb::Browser.new(overview, history, raw, html, diff, child_dirs_pattern, child_files_pattern)
         end
 
         # Regexp used to find projects' home page

data/lib/meta_project/scm_web/browser.rb

@@ -0,0 +1,77 @@
+module MetaProject
+  module ScmWeb
+
+    # A Browser instance is capable of generating URLs to various files and diffs
+    # in an online scm web interface.
+    #
+    class Browser
+
+      attr_accessor :overview_spec, :history_spec, :raw_spec, :html_spec, :diff_spec
+
+      # The variables to use in +uri_specs+ are:
+      #
+      # * path
+      # * revision
+      # * previous_revision
+      #
+      def initialize(overview_spec=nil, history_spec=nil, raw_spec=nil, html_spec=nil, diff_spec=nil, child_dirs_pattern=nil, child_files_pattern=nil)
+        @overview_spec, @history_spec, @raw_spec, @html_spec, @diff_spec, @child_dirs_pattern, @child_files_pattern = overview_spec, history_spec, raw_spec, html_spec, diff_spec, child_dirs_pattern, child_files_pattern
+      end
+
+      # TODO: deprecate this and use root.cleanpath instead
+      def overview
+        file_uri(nil, nil, @overview_spec)
+      end
+
+      def history(path)
+        file_uri(path, nil, @history_spec)
+      end
+
+      def raw(path, revision)
+        file_uri(path, revision, @raw_spec)
+      end
+
+      def html(path, revision)
+        file_uri(path, revision, @html_spec)
+      end
+
+      def diff(path, revision, previous_revision)
+        file_uri(path, revision, @diff_spec, previous_revision)
+      end
+      
+      # The regexp used to determine child directories of a directory
+      def child_dirs_pattern
+        @child_dirs_pattern
+      end
+
+      # The regexp used to determine child files of a directory
+      def child_files_pattern
+        @child_files_pattern
+      end
+
+      # Returns a Pathname representing the root directory of this browser.
+      # NOTE: The root of the browser may be at a lower level than
+      # the toplevel of the online scm web interface; It depends
+      # on the configuration of this instance (overview).
+      def root
+        Pathname.new(self, "", nil, true)
+      end
+
+    private
+
+      # Returns the file URI for +path+. Valid options are:
+      #
+      # * :type => ["overview"|"html"|"diff"|"raw"]
+      # * :revision
+      # * :previous_revision
+      def file_uri(path="", revision=nil, spec=@overview_spec, previous_revision=nil)
+        begin
+          eval("\"#{spec}\"", binding)
+        rescue NameError
+          raise "Couldn't evaluate '#{spec}'"
+        end
+      end
+
+    end
+  end
+end

data/lib/meta_project/scm_web/pathname.rb

@@ -0,0 +1,70 @@
+require 'open-uri'
+
+module MetaProject
+  module ScmWeb
+    # A subset of the 
+    # <a href="http://www.ruby-doc.org/stdlib/libdoc/pathname/rdoc/index.html">Pathname</a> 
+    # API which is suitable for slurping SCM contents off the web.
+    #
+    class Pathname
+            
+      def initialize(browser, path_from_root, revision_identifier, directory)
+        @browser, @path_from_root, @revision_identifier, @directory = browser, path_from_root, revision_identifier, directory
+      end
+      
+      # The relative path from the root of the browser instance
+      def path_from_root
+        @path_from_root
+      end
+
+      # The revision of this file or nil if this is a directory
+      def revision_identifier
+        @revision_identifier
+      end
+
+      # Returns a Pathname at the +relative_path+ from this directory.
+      # Note: This only works if this instance is a +directory?+
+      def pathname(relative_path, revision_identifier, directory)
+        child_path_from_root = (@path_from_root == "") ? relative_path : "#{@path_from_root}#{relative_path}"
+        Pathname.new(@browser, child_path_from_root, revision_identifier, directory)
+      end
+
+      # Stlib Pathname methods
+
+      # Returns the full path on the web (to the history page)
+      def cleanpath
+        @browser.history(@path_from_root)
+      end
+
+      def children
+        result = []
+        html = Kernel.open(cleanpath).read
+
+        html.scan(@browser.child_dirs_pattern) do |child_path_rev_array|
+          relative_child_path = child_path_rev_array[0]
+          child_revision_identifier = child_path_rev_array[1] # nil for most browsers
+#puts "DIR:#{relative_child_path}:#{child_revision_identifier}"
+          result << pathname(relative_child_path, child_revision_identifier, true)
+        end
+
+        html.scan(@browser.child_files_pattern) do |child_path_rev_array|
+          relative_child_path = child_path_rev_array[0]
+          child_revision_identifier = child_path_rev_array[1]
+#puts "FILE:#{relative_child_path}:#{child_revision_identifier}"
+          result << pathname(relative_child_path, child_revision_identifier, false)
+        end
+        result
+      end
+      
+      def open(&block)
+        url = @browser.raw(@path_from_root, revision_identifier)
+        # open-uri's open
+        Kernel.open(url, &block)
+      end
+      
+      def directory?
+        @directory
+      end
+    end
+  end
+end

data/lib/meta_project/scm_web.rb

@@ -1,55 +1,2 @@
-module MetaProject
-  
-  # An ScmWeb instance is capable of generating URLs to various files and diffs
-  # in an online scm web interface.
-  class ScmWeb
-
-    attr_accessor :overview_spec, :history_spec, :raw_spec, :html_spec, :diff_spec
-
-    # The variables to use in +uri_specs+ are:
-    #
-    # * path
-    # * revision
-    # * previous_revision
-    #
-    def initialize(overview_spec=nil, history_spec=nil, raw_spec=nil, html_spec=nil, diff_spec=nil)
-      @overview_spec, @history_spec, @raw_spec, @html_spec, @diff_spec = overview_spec, history_spec, raw_spec, html_spec, diff_spec
-    end
-
-    def overview
-      file_uri(nil, nil, @overview_spec)
-    end
-
-    def history(path)
-      file_uri(path, nil, @history_spec)
-    end
-
-    def raw(path, revision)
-      file_uri(path, revision, @raw_spec)
-    end
-
-    def html(path, revision)
-      file_uri(path, revision, @html_spec)
-    end
-
-    def diff(path, revision, previous_revision)
-      file_uri(path, revision, @diff_spec, previous_revision)
-    end
-
-  private
-
-    # Returns the file URI for +path+. Valid options are:
-    #
-    # * :type => ["overview"|"html"|"diff"|"raw"]
-    # * :revision
-    # * :previous_revision
-    def file_uri(path="", revision=nil, spec=@overview_spec, previous_revision=nil)
-      begin
-        eval("\"#{spec}\"", binding)
-      rescue NameError
-        raise "Couldn't evaluate '#{spec}'"
-      end
-    end
-
-  end
-end
+require 'meta_project/scm_web/browser'
+require 'meta_project/scm_web/pathname'

data/lib/meta_project/tracker/jira/jira_issues.rb

@@ -22,7 +22,7 @@ module MetaProject
 
         def markup(text)
           text.gsub(issue_pattern) do |match|
-            issue_identifier = $1
+            issue_identifier = $1.upcase
             issue = issue(issue_identifier)
             issue.url ? "<a href=\"#{issue.url}\">#{issue_identifier}: #{issue.summary}</a>" : issue_identifier
           end

data/lib/meta_project/tracker/jira/jira_tracker.rb

@@ -50,10 +50,11 @@ module MetaProject
         
         def materialize(issue)
           login do |session|
+            issue.attributes[:identifier] = issue.attributes[:identifier].upcase
             issue_struct = session.getIssue(issue.identifier)
             
-            issue.attributes[:summary] = issue_struct["summary"]
-            issue.attributes[:detail] = issue_struct["description"]
+            issue.attributes[:summary] = issue_struct["summary"].strip
+            issue.attributes[:detail] = issue_struct["description"].strip
             issue.attributes[:url] = "#{@jira_base_url}/browse/#{issue.identifier}"
           end
         end

data/lib/meta_project.rb

@@ -1,3 +1,4 @@
+require 'meta_project/core_ext/string'
 require 'meta_project/project_analyzer'
 require 'meta_project/patois'
 require 'meta_project/project'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: meta_project
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2005-08-30 00:00:00 -04:00
+  version: 0.4.5
+date: 2005-09-01 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -42,6 +42,7 @@ files:
   - lib/meta_project/scm_web.rb
   - lib/meta_project/tracker.rb
   - lib/meta_project/version_parser.rb
+  - lib/meta_project/core_ext/string.rb
   - lib/meta_project/patois/parser.rb
   - lib/meta_project/project/base.rb
   - lib/meta_project/project/codehaus.rb
@@ -56,6 +57,8 @@ files:
   - lib/meta_project/project/xforge/xforge_base.rb
   - lib/meta_project/release/freshmeat.rb
   - lib/meta_project/release/raa.rb
+  - lib/meta_project/scm_web/browser.rb
+  - lib/meta_project/scm_web/pathname.rb
   - lib/meta_project/tracker/base.rb
   - lib/meta_project/tracker/digit_issues.rb
   - lib/meta_project/tracker/issue.rb