xforge 0.3.3 → 0.3.4

data/CHANGES

@@ -1,5 +1,13 @@
 = XForge Changelog
 
+== Version 0.3.4
+
+This release simplifies ViewCvs configuration
+
+* Removed project_unix_name from ViewCvs' uri_specs
+* Tuned how XForge::Project is YAMLed, to avoid backreferences
+* Renamed some Tracker classes to be prefixed with the module name. This was to ease DamageControl integration.
+
 == Version 0.3.3
 
 This is a minor refactoring release

data/Rakefile

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

data/lib/scm_web/base.rb

@@ -3,7 +3,7 @@ module ScmWeb
     def self.classes
       [
         ViewCvs,
-        ::Tracker::Trac::Project
+        ::Tracker::Trac::TracProject
       ]
     end
   end

data/lib/scm_web/view_cvs.rb

@@ -1,7 +1,7 @@
 module ScmWeb
   # The variables to use in uri_specs are:
   #
-  # * project_unix_name
+  # * path
   # * revision
   # * previous_revision
   #

data/lib/tracker/base.rb

@@ -7,9 +7,9 @@ module Tracker
   class Base
     def self.classes
       [
-        ::Tracker::Jira::Project,
-        ::Tracker::XForge::RubyForge,
-        ::Tracker::Trac::Project
+        ::Tracker::Jira::JiraProject,
+        ::Tracker::XForge::RubyForgeProject,
+        ::Tracker::Trac::TracProject
       ]
     end
   end

data/lib/tracker/jira/host.rb

@@ -12,7 +12,7 @@ module Tracker
       end
 
       def project(identifier)
-        Project.new(self, identifier)
+        JiraProject.new(self, identifier)
       end
       
       def login

data/lib/tracker/jira/project.rb

@@ -1,12 +1,12 @@
 module Tracker
   module Jira
-    class Project < Base
+    class JiraProject < Base
       attr_accessor :host, :identifier
       
       def initialize(host=nil, identifier=nil)
         @host, @identifier = host, identifier
       end
-
+      
       def identifier_regexp
         /([A-Z]+-[\d]+)/
       end

data/lib/tracker/trac/project.rb

@@ -1,13 +1,13 @@
 module Tracker
   module Trac
-    class Project < Base
+    class TracProject < Base
       include DigitIssues
 
       attr_accessor :uri, :svn_path
       def initialize(uri=nil, svn_path=nil)
         @uri, @svn_path = uri, svn_path
       end
-      
+
       def issue(issue_identifier)
         issue_uri = "#{@uri}/ticket/#{issue_identifier}"
         begin

data/lib/tracker/xforge/rubyforge.rb

@@ -1,6 +1,7 @@
 module Tracker
   module XForge
-    class RubyForge < Base
+    class RubyForgeProject < Base
+
     end
   end
 end

data/lib/xforge/project.rb

@@ -13,6 +13,10 @@ module XForge
       @host = host
       @unix_name = unix_name
     end
+    
+    def to_yaml_properties
+      ["@host", "@unix_name"]
+    end
 
     # Logs in and returns a Session
     def login(user_name, password)

data/lib/xforge/rubyforge.rb

@@ -1,15 +1,5 @@
 module XForge
   class RubyForge < Host
-    VIEW_CVS = "http://rubyforge.org/cgi-bin/viewcvs.cgi/"
-    CVSROOT = "?cvsroot=\#{project_unix_name}"
-    PATH_CVSROOT = "\#{path}#{CVSROOT}"
-    PATH_CVSROOT_REV = "#{PATH_CVSROOT}&rev=\#{revision}"
-    
-    OVERVIEW = "#{VIEW_CVS}#{PATH_CVSROOT}"
-    RAW      = "#{VIEW_CVS}*checkout*/#{PATH_CVSROOT_REV}"
-    HTML     = "#{VIEW_CVS}#{PATH_CVSROOT_REV}&content-type=text/vnd.viewcvs-markup"
-    DIFF     = "#{VIEW_CVS}\#{path}.diff#{CVSROOT}&r1=\#{previous_revision}&r2=\#{revision}"
-    
     def initialize
       super('rubyforge.org')
     end
@@ -27,9 +17,19 @@ module XForge
     end
 
     def scm_web(project)
+      view_cvs = "http://rubyforge.org/cgi-bin/viewcvs.cgi/"
+      cvsroot = "?cvsroot=#{project.unix_name}"
+      path_cvs_root = "\#{path}#{cvsroot}"
+      path_cvs_root_rev = "#{path_cvs_root}&rev=\#{revision}"
+
+      overview = "#{view_cvs}#{path_cvs_root}"
+      raw      = "#{view_cvs}*checkout*/#{path_cvs_root_rev}"
+      html     = "#{view_cvs}#{path_cvs_root_rev}&content-type=text/vnd.viewcvs-markup"
+      diff     = "#{view_cvs}\#{path}.diff#{cvsroot}&r1=\#{previous_revision}&r2=\#{revision}"
+
       module_regexp = /href=\"(\w+)\/\?cvsroot=#{project.unix_name}/
       ::ScmWeb::ViewCvs.new(
-        {"overview" => OVERVIEW, "raw" => RAW, "html" => HTML, "diff" => DIFF}, 
+        {"overview" => overview, "raw" => raw, "html" => html, "diff" => diff}, 
         cvs_host_name,
         cvs_server_path,
         project.unix_name,
@@ -44,7 +44,7 @@ module XForge
     end
 
     def tracker(project)
-      Tracker::XForge::RubyForge.new(project.group_id_uri("tracker"), project)
+      Tracker::XForge::RubyForgeProject.new(project.group_id_uri("tracker"), project)
     end
   end
 end

data/lib/xforge/sourceforge.rb

@@ -1,14 +1,5 @@
 module XForge
   class SourceForge < Host
-    VIEW_CVS = "http://cvs.sourceforge.net/viewcvs.py/"
-    PROJECT_PATH = "\#{project_unix_name}/\#{path}"
-    REV = "rev=\#{revision}"
-
-    OVERVIEW = "#{VIEW_CVS}#{PROJECT_PATH}"
-    RAW      = "#{VIEW_CVS}*checkout*/#{PROJECT_PATH}?#{REV}"
-    HTML     = "#{OVERVIEW}?#{REV}&view=markup"
-    DIFF     = "#{OVERVIEW}?r1=\#{previous_revision}&r2=\#{revision}"
-
     def initialize
       super("sourceforge.net")
     end
@@ -26,9 +17,18 @@ module XForge
     end
 
     def scm_web(project)
+      view_cvs = "http://cvs.sourceforge.net/viewcvs.py/"
+      project_path = "#{project.unix_name}/\#{path}"
+      rev = "rev=\#{revision}"
+
+      overview = "#{view_cvs}#{project_path}"
+      raw      = "#{view_cvs}*checkout*/#{project_path}?#{rev}"
+      html     = "#{overview}?#{rev}&view=markup"
+      diff     = "#{overview}?r1=\#{previous_revision}&r2=\#{revision}"
+
       module_regexp = /viewcvs\.py\/#{project.unix_name}\/(\w+)\//
       ::ScmWeb::ViewCvs.new(
-        {"overview" => OVERVIEW, "raw" => RAW, "html" => HTML, "diff" => DIFF}, 
+        {"overview" => overview, "raw" => raw, "html" => html, "diff" => diff}, 
         cvs_host_name,
         cvs_server_path,
         project.unix_name,

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: xforge
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2005-08-16 00:00:00 -04:00
+  version: 0.3.4
+date: 2005-08-17 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
   - lib