xforge 0.1.5 → 0.1.6

data/CHANGES

@@ -1,5 +1,14 @@
 = XForge Changelog
 
+== Version 0.1.6
+
+This release of XForge improves scm browser capabilities.
+
+* Added ViewCvs.uri(path, options) method to get an URI to a file on the web
+* Added an rspec suite
+* Added logic for parsing top-level CVS modules
+* Made Rake Release task use RubyForge by default
+
 == Version 0.1.5
 
 This release of XForge adds functionality to access scm browsers (ViewCvs) and RSCM objects.

data/Rakefile

@@ -15,8 +15,16 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+# Versioning scheme: MAJOR.MINOR.PATCH
+# MAJOR bumps when API is broken backwards
+# MINOR bumps when the API is broken backwards in a very slight/subtle (but not fatal) way
+# -OR when a new release is made and propaganda is sent out.
+# 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
 PKG_NAME = "xforge"
-PKG_VERSION = "0.1.5"
+PKG_VERSION = "0.1.6"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/rake/contrib/xforge/base.rb

@@ -5,9 +5,9 @@ module Rake
     class Base
       attr_writer :user_name, :password
 
-      def initialize(project_name, xforge_host="rubyforge.org")
+      def initialize(project_name, host=::XForge::RubyForge.new)
         @project_name = project_name
-        @host = ::XForge::Host.new(xforge_host)
+        @host = host
 
         set_defaults
   

data/lib/scm_web/view_cvs.rb

@@ -1,24 +1,48 @@
 module ScmWeb
+  # TODO: implement RSCM API via HTTP ala CVSGrab
   class ViewCvs
 
-    attr_reader :uri, :project
+    attr_reader :project
 
-    def initialize(uri, project)
-      @uri, @project = uri, project
+    def initialize(uri_specs, project, module_regexp)
+      @uri_specs, @project, @module_regexp = uri_specs, project, module_regexp
     end
 
     def scms
       unless(@scms)
         require 'rscm'
-        cvs_root = open(uri) { |data| data.read }
 
         @scms = []
-        scm = RSCM::Cvs.new
-        scm.root = ":pserver:anonymous@#{project.host.cvs_host_name}:#{project.host.cvs_path}/#{project.name}"
-        scm.mod = project.name
-        @scms << scm
+        cvs_root = open(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@#{project.host.cvs_host_name}:#{project.host.cvs_path}/#{mod}"
+                scm.mod = project.name
+                @scms << scm
+              end
+            end
+          end
+        end
       end
       @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_name = project.name
+      revision = options[:revision]
+      eval("\"#{uri_spec}\"", binding)
+    end
   end
 end

data/lib/xforge/project.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'open-uri'
 
 module XForge
@@ -15,7 +16,17 @@ module XForge
 
     # Logs in and returns a Session
     def login(user_name, password)
-      login_response = Net::HTTP.start(@host.name, 80) do |http|
+      http = Net::HTTP.new(@host.name, host.login_port)
+      
+      # http://www.ruby-lang.org/ja/man/index.cgi?cmd=view;name=net%2Fhttps.rb
+      if(host.login_port == 443)
+        http.use_ssl = true
+        http.ca_file = '/usr/share/ssl/cert.pem'
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.verify_depth = 5
+      end
+
+      login_response = http.start do |http|
         data = [
           "login=1",
           "form_loginname=#{user_name}",

data/lib/xforge/rubyforge.rb

@@ -1,8 +1,20 @@
 module XForge
   class RubyForge < Host
+    VIEW_CVS = "http://rubyforge.org/cgi-bin/viewcvs.cgi/"
+    PATH_CVSROOT = "\#{path}?cvsroot=\#{project_name}"
+    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"
+    
     def initialize
       super('rubyforge.org')
     end
+    
+    def login_port
+      80
+    end
 
     def cvs_path
       "/var/cvs"
@@ -13,8 +25,9 @@ module XForge
     end
 
     def scm_web(project)
-      ::ScmWeb::ViewCvs.new("http://rubyforge.org/cgi-bin/viewcvs.cgi/?cvsroot=#{project.name}", project)
+      module_regexp = /href=\"(\w+)\/\?cvsroot=#{project.name}/
+      ::ScmWeb::ViewCvs.new({:overview => OVERVIEW, :raw => RAW, :html => HTML}, project, module_regexp)
     end
 
   end
-end
+end

data/lib/xforge/sourceforge.rb

@@ -1,10 +1,21 @@
 module XForge
-
   class SourceForge < Host
+    VIEW_CVS = "http://cvs.sourceforge.net/viewcvs.py/"
+    PROJECT_PATH = "\#{project_name}/\#{path}"
+    REV = "rev=\#{revision}"
+
+    OVERVIEW = "#{VIEW_CVS}#{PROJECT_PATH}"
+    RAW = "#{VIEW_CVS}*checkout*/#{PROJECT_PATH}?#{REV}"
+    HTML = "#{OVERVIEW}?#{REV}&view=markup"
+
     def initialize
       super("sourceforge.net")
     end
 
+    def login_port
+      443
+    end
+
     def cvs_path
       "/cvsroot"
     end
@@ -14,9 +25,9 @@ module XForge
     end
 
     def scm_web(project)
-      ::ScmWeb::ViewCvs.new("http://#{cvs_host_name}/viewcvs.py/#{project.name}/", project)
+      module_regexp = /viewcvs\.py\/#{project.name}\/(\w+)\//
+      ::ScmWeb::ViewCvs.new({:overview => OVERVIEW, :raw => RAW, :html => HTML}, project, module_regexp)
     end
 
   end
-
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: xforge
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2005-08-12
+  version: 0.1.6
+date: 2005-08-13
 summary: Ruby based make-like utility.
 require_paths: 
   - lib