xforge 0.3.1 → 0.3.2

data/CHANGES

@@ -1,5 +1,13 @@
 = XForge Changelog
 
+== Version 0.3.2
+
+This release adds more support for other issue trackers ans scm browsers.
+
+* Fixed #2242
+* Added a lot of tracker and scm_web classes (factored out from DamageControl)
+* Decoupled view_cvs from rubyforge/sourceforge
+
 == Version 0.3.1
 
 This XForge release adds initial support for Trac and JIRA.

data/Rakefile

@@ -22,9 +22,9 @@ require 'rake/rdoctask'
 # PATCH is bumped for every API addition and/or bugfix (ideally for every commit)
 # Later DamageControl can bump PATCH automatically.
 #
-# REMEMBER TO KEEP PKG_VERSION IN SYNC WITH CHANGELOG
+# REMEMBER TO KEEP PKG_VERSION IN SYNC WITH THE CHANGES FILE!
 PKG_NAME = "xforge"
-PKG_VERSION = "0.3.1"
+PKG_VERSION = "0.3.2"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/scm_web/base.rb

@@ -0,0 +1,10 @@
+module ScmWeb
+  class Base
+    def self.classes
+      [
+        ViewCvs,
+        ::Tracker::Trac::Project
+      ]
+    end
+  end
+end

data/lib/scm_web/view_cvs.rb

@@ -1,11 +1,17 @@
 module ScmWeb
-  # TODO: implement RSCM API via HTTP ala CVSGrab
-  class ViewCvs
+  # The variables to use in uri_specs are:
+  #
+  # * project_unix_name
+  # * revision
+  # * previous_revision
+  #
+  class ViewCvs < Base
 
-    attr_reader :project
+    attr_accessor :uri_specs, :cvs_host_name, :cvs_server_path, :project_unix_name, :module_regexp
 
-    def initialize(uri_specs, project, module_regexp)
-      @uri_specs, @project, @module_regexp = uri_specs, project, module_regexp
+    def initialize(uri_specs=nil, cvs_host_name=nil, cvs_server_path=nil, project_unix_name=nil, module_regexp=nil)
+      @uri_specs, @cvs_host_name, @cvs_server_path, @project_unix_name, @module_regexp = 
+        uri_specs, cvs_host_name, cvs_server_path, project_unix_name, module_regexp
     end
 
     def scms
@@ -19,8 +25,8 @@ module ScmWeb
               mod = $1
               unless(mod == "CVSROOT")
                 scm = RSCM::Cvs.new
-                scm.root = ":pserver:anonymous@#{project.host.cvs_host_name}:#{project.host.cvs_path}/#{mod}"
-                scm.mod = project.unix_name
+                scm.root = ":pserver:anonymous@#{cvs_host_name}:#{cvs_server_path}/#{mod}" #TODO: is this right?
+                scm.mod = mod
                 @scms << scm
               end
             end
@@ -40,7 +46,7 @@ module ScmWeb
       uri_spec = @uri_specs[type]
       raise "No uri_spec for #{type}" unless uri_spec
 
-      project_unix_name = project.unix_name
+      project_unix_name = @project_unix_name
       revision = options[:revision]
       previous_revision = options[:previous_revision]
       eval("\"#{uri_spec}\"", binding)

data/lib/tracker/base.rb

@@ -0,0 +1,16 @@
+module Tracker
+
+  # Tracker objects are responsible for interacting with issue trackers (bug trackers).
+  # They know how to recognise issue identifiers in strings (typically from SCM commit
+  # messages) and turn these into HTML links that point to the associated issue on an
+  # issue tracker installation running somewhere else.
+  class Base
+    def self.classes
+      [
+        ::Tracker::Jira::Project,
+        ::Tracker::XForge::RubyForge,
+        ::Tracker::Trac::Project
+      ]
+    end
+  end
+end

data/lib/tracker/bugzilla/project.rb

@@ -0,0 +1,8 @@
+module Tracker
+  module Bugzilla
+    class Project < Base
+      include DigitIssues
+
+    end
+  end
+end

data/lib/tracker/digit_issues.rb

@@ -0,0 +1,12 @@
+module Tracker
+  # This module should be included by trackers that follow a digit-based issue scheme
+  module DigitIssues
+    def identifier_regexp
+      /#(\d+)/
+    end
+
+    def identifier_examples
+      ["#1926", "#1446"]
+    end
+  end
+end

data/lib/tracker/fog_bugz/project.rb

@@ -0,0 +1,8 @@
+module Tracker
+  module FogBugz
+    class Project < Base
+      include DigitIssues
+
+    end
+  end
+end

data/lib/tracker/jira/project.rb

@@ -1,7 +1,9 @@
 module Tracker
   module Jira
-    class Project
-      def initialize(host, identifier)
+    class Project < Base
+      attr_accessor :host, :identifier
+      
+      def initialize(host=nil, identifier=nil)
         @host, @identifier = host, identifier
       end
 

data/lib/tracker/mantis/project.rb

@@ -0,0 +1,8 @@
+module Tracker
+  module Mantis
+    class Project < Base
+      include DigitIssues
+
+    end
+  end
+end

data/lib/tracker/scarab/project.rb

@@ -0,0 +1,8 @@
+module Tracker
+  module Scarab
+    class Project < Base
+      include DigitIssues
+
+    end
+  end
+end

data/lib/tracker/trac/project.rb

@@ -1,16 +1,11 @@
 module Tracker
   module Trac
-    class Project
-      def initialize(uri)
-        @uri = uri
-      end
-      
-      def identifier_regexp
-        /#(\d+)/
-      end
+    class Project < Base
+      include DigitIssues
 
-      def identifier_examples
-        ["#1926", "#1446"]
+      attr_reader :uri, :svn
+      def initialize(uri=nil, svn=nil)
+        @uri, @svn = uri, svn
       end
       
       def issue(issue_identifier)
@@ -31,6 +26,26 @@ module Tracker
           issue ? "<a href=\"#{issue.uri}\">#{issue.summary}</a>" : "\##{issue_identifier}"
         end
       end
+      
+      OVERVIEW  = "\#{@uri}/log/\#{@svn.path}/\#{path}"
+      HTML      = "\#{@uri}/file/\#{@svn.path}/\#{path}?rev=\#{revision}"
+      RAW       = "#{HTML}&format=txt"
+      DIFF      = "\#{@uri}/changeset/\#{revision}"
+      URI_SPECS = {:overview => OVERVIEW, :raw => RAW, :html => HTML, :diff => DIFF}
+      
+      # This method can mean two things, since this class both implements the ScmWeb and Tracker API
+      # If called with no arguments, returns the uri of the project page, otherwise the uri of a file
+      # in the scm
+      def uri(path=nil, options={:type => :overview})
+        return @uri unless path
+        
+        type = options[:type]
+        uri_spec = URI_SPECS[type]
+
+        revision = options[:revision]
+        previous_revision = options[:previous_revision]
+        eval("\"#{uri_spec}\"", binding)
+      end
 
     end
   end

data/lib/tracker/xforge/base.rb

@@ -1,19 +1,12 @@
 module Tracker
   module XForge
     # TODO: rename to Project
-    class Base
-      attr_reader :uri, :project
+    class Base < ::Tracker::Base
+      include DigitIssues
 
-      def identifier_regexp
-        /#(\d+)/
-      end
-      
-      # Examples of what will be recognised as issue identifiers in #markup
-      def identifier_examples
-        ["#1462", "#872"]
-      end
+      attr_accessor :uri, :project
 
-      def initialize(uri, project)
+      def initialize(uri=nil, project=nil)
         @uri, @project = uri, project
       end
 

data/lib/xforge.rb

@@ -1,3 +1,6 @@
+require 'scm_web/base'
+require 'scm_web/view_cvs'
+
 require 'xforge/version_parser'
 require 'xforge/host'
 require 'xforge/rubyforge'
@@ -5,8 +8,10 @@ require 'xforge/sourceforge'
 require 'xforge/project'
 require 'xforge/session'
 require 'xforge/xfile'
-require 'scm_web/view_cvs'
+
+require 'tracker/digit_issues'
 require 'tracker/issue'
+require 'tracker/base'
 require 'tracker/xforge'
 require 'tracker/jira'
 require 'tracker/trac'

data/lib/xforge/rubyforge.rb

@@ -18,7 +18,7 @@ module XForge
       80
     end
 
-    def cvs_path
+    def cvs_server_path
       "/var/cvs"
     end
 
@@ -28,7 +28,13 @@ module XForge
 
     def scm_web(project)
       module_regexp = /href=\"(\w+)\/\?cvsroot=#{project.unix_name}/
-      ::ScmWeb::ViewCvs.new({:overview => OVERVIEW, :raw => RAW, :html => HTML, :diff => DIFF}, project, module_regexp)
+      ::ScmWeb::ViewCvs.new(
+        {:overview => OVERVIEW, :raw => RAW, :html => HTML, :diff => DIFF}, 
+        cvs_host_name,
+        cvs_server_path,
+        project.unix_name,
+        module_regexp
+      )
     end
 
     # Regexp used to find projects' home page

data/lib/xforge/sourceforge.rb

@@ -17,7 +17,7 @@ module XForge
       443
     end
 
-    def cvs_path
+    def cvs_server_path
       "/cvsroot"
     end
     
@@ -27,7 +27,13 @@ module XForge
 
     def scm_web(project)
       module_regexp = /viewcvs\.py\/#{project.unix_name}\/(\w+)\//
-      ::ScmWeb::ViewCvs.new({:overview => OVERVIEW, :raw => RAW, :html => HTML, :diff => DIFF}, project, module_regexp)
+      ::ScmWeb::ViewCvs.new(
+        {:overview => OVERVIEW, :raw => RAW, :html => HTML, :diff => DIFF}, 
+        cvs_host_name,
+        cvs_server_path,
+        project.unix_name,
+        module_regexp
+      )
     end
 
     # Regexp used to find projects' home page

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: xforge
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2005-08-15 00:00:00 -04:00
+  version: 0.3.2
+date: 2005-08-16 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -40,13 +40,20 @@ files:
   - lib/rake/contrib/xforge/base.rb
   - lib/rake/contrib/xforge/news_publisher.rb
   - lib/rake/contrib/xforge/release.rb
+  - lib/scm_web/base.rb
   - lib/scm_web/view_cvs.rb
+  - lib/tracker/base.rb
+  - lib/tracker/digit_issues.rb
   - lib/tracker/issue.rb
   - lib/tracker/jira.rb
   - lib/tracker/trac.rb
   - lib/tracker/xforge.rb
+  - lib/tracker/bugzilla/project.rb
+  - lib/tracker/fog_bugz/project.rb
   - lib/tracker/jira/host.rb
   - lib/tracker/jira/project.rb
+  - lib/tracker/mantis/project.rb
+  - lib/tracker/scarab/project.rb
   - lib/tracker/trac/project.rb
   - lib/tracker/xforge/base.rb
   - lib/tracker/xforge/rubyforge.rb