xforge 0.3.4 → 0.3.5

data/CHANGES

@@ -1,5 +1,13 @@
 = XForge Changelog
 
+== Version 0.3.5
+
+This is a bugfix release that fixes some bugs in ViewCvs.
+
+* Changed the way the server path of RSCM::Cvs objects are initialised from ViewCvs to fix a subtle bug.
+* Factored out generic file_uri to ScmWeb::FileUri.
+* Fixed bug in RubyForge's recognition of modules in ViewCvs.
+
 == Version 0.3.4
 
 This release simplifies ViewCvs configuration

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.4"
+PKG_VERSION = "0.3.5"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/scm_web/base.rb

@@ -1,5 +1,7 @@
 module ScmWeb
   class Base
+    include FileUri
+        
     def self.classes
       [
         ViewCvs,

data/lib/scm_web/file_uri.rb

@@ -0,0 +1,21 @@
+module ScmWeb
+  module FileUri
+    # TODO: rename to file_uri to avoid the clash that is currently in Trac
+    # Returns the URI for the file at +path+.
+    # Options are:
+    #   :type (can be one of :overview, :raw or :html)
+    #   :revision (the revision of the file. must be specified when :type is :raw or :html)
+    def file_uri(path="", options={:type=>"overview"})
+      type = options[:type]
+      raise "No :type specified" unless type
+      uri_spec = uri_specs[type]
+      raise "No uri_spec for #{type}" unless uri_spec
+
+      project_unix_name = @project_unix_name
+      path_prefix = options[:path_prefix]
+      revision = options[:revision]
+      previous_revision = options[:previous_revision]
+      eval("\"#{uri_spec}\"", binding)
+    end
+  end
+end

data/lib/scm_web/view_cvs.rb

@@ -1,31 +1,35 @@
 module ScmWeb
-  # The variables to use in uri_specs are:
-  #
-  # * path
-  # * revision
-  # * previous_revision
-  #
   class ViewCvs < Base
 
     attr_accessor :uri_specs, :cvs_host_name, :cvs_server_path, :project_unix_name, :module_regexp
 
-    def initialize(uri_specs=nil, cvs_host_name=nil, cvs_server_path=nil, project_unix_name=nil, module_regexp=nil)
+    def initialize(uri_specs={}, 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
+    
+    # The variables to use in uri_specs are:
+    #
+    # * path
+    # * revision
+    # * previous_revision
+    #
+    def uri_specs
+      @uri_specs ||= {}
+    end
 
     def scms
       unless(@scms)
         require 'rscm'
 
         @scms = []
-        cvs_root = open(uri) do |data|
+        cvs_root = open(file_uri) do |data|
           data.each_line do |line|
             if line =~ @module_regexp
               mod = $1
               unless(mod == "CVSROOT")
                 scm = RSCM::Cvs.new
-                scm.root = ":pserver:anonymous@#{cvs_host_name}:#{cvs_server_path}/#{mod}" #TODO: is this right?
+                scm.root = ":pserver:anonymous@#{cvs_host_name}:#{cvs_server_path}"
                 scm.mod = mod
                 @scms << scm
               end
@@ -36,20 +40,5 @@ module ScmWeb
       @scms
     end
     
-    # Returns the URI for the file at +path+.
-    # Options are:
-    #   :type (can be one of :overview, :raw or :html)
-    #   :revision (the revision of the file. must be specified when :type is :raw or :html)
-    def uri(path="", options={:type=>"overview"})
-      type = options[:type]
-      raise "No :type specified" unless type
-      uri_spec = @uri_specs[type]
-      raise "No uri_spec for #{type}" unless uri_spec
-
-      project_unix_name = @project_unix_name
-      revision = options[:revision]
-      previous_revision = options[:previous_revision]
-      eval("\"#{uri_spec}\"", binding)
-    end
   end
 end

data/lib/tracker/digit_issues.rb

@@ -8,5 +8,15 @@ module Tracker
     def identifier_examples
       ["#1926", "#1446"]
     end
+
+    # TODO: find a way to extract just the issue summaries so they can be stored in dc as an array
+    # embedded in the revision object. that way we don't alter the original commit message
+    def markup(text)
+      text.gsub(identifier_regexp) do |match|
+        issue_identifier = $1
+        issue = issue(issue_identifier)
+        issue ? "<a href=\"#{issue.uri}\">#{issue.summary}</a>" : "\##{issue_identifier}"
+      end
+    end
   end
 end

data/lib/tracker/trac/project.rb

@@ -2,6 +2,7 @@ module Tracker
   module Trac
     class TracProject < Base
       include DigitIssues
+      include ::ScmWeb::FileUri
 
       attr_accessor :uri, :svn_path
       def initialize(uri=nil, svn_path=nil)
@@ -19,34 +20,16 @@ module Tracker
         end
       end
 
-      def markup(text)
-        text.gsub(identifier_regexp) do |match|
-          issue_identifier = $1
-          issue = issue(issue_identifier)
-          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)
+      def uri_specs
+        URI_SPECS
       end
-
+      
     end
   end
 end

data/lib/xforge.rb

@@ -1,3 +1,4 @@
+require 'scm_web/file_uri'
 require 'scm_web/base'
 require 'scm_web/view_cvs'
 

data/lib/xforge/rubyforge.rb

@@ -8,8 +8,8 @@ module XForge
       80
     end
 
-    def cvs_server_path
-      "/var/cvs"
+    def cvs_server_path(project_unix_name)
+      "/var/cvs/#{project_unix_name}"
     end
 
     def cvs_host_name
@@ -27,11 +27,11 @@ module XForge
       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}/
+      module_regexp = /href=\"(.+)\/\?cvsroot=#{project.unix_name}/
       ::ScmWeb::ViewCvs.new(
         {"overview" => overview, "raw" => raw, "html" => html, "diff" => diff}, 
         cvs_host_name,
-        cvs_server_path,
+        cvs_server_path(project.unix_name),
         project.unix_name,
         module_regexp
       )

data/lib/xforge/sourceforge.rb

@@ -8,8 +8,8 @@ module XForge
       443
     end
 
-    def cvs_server_path
-      "/cvsroot"
+    def cvs_server_path(project_unix_name)
+      "/cvsroot/#{project_unix_name}"
     end
     
     def cvs_host_name
@@ -30,7 +30,7 @@ module XForge
       ::ScmWeb::ViewCvs.new(
         {"overview" => overview, "raw" => raw, "html" => html, "diff" => diff}, 
         cvs_host_name,
-        cvs_server_path,
+        cvs_server_path(project.unix_name),
         project.unix_name,
         module_regexp
       )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: xforge
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
-date: 2005-08-17 00:00:00 -04:00
+  version: 0.3.5
+date: 2005-08-20 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -41,6 +41,7 @@ files:
   - lib/rake/contrib/xforge/news_publisher.rb
   - lib/rake/contrib/xforge/release.rb
   - lib/scm_web/base.rb
+  - lib/scm_web/file_uri.rb
   - lib/scm_web/view_cvs.rb
   - lib/tracker/base.rb
   - lib/tracker/digit_issues.rb