xforge 0.1.4 → 0.1.5

data/CHANGES

@@ -1,5 +1,13 @@
 = XForge Changelog
 
+== Version 0.1.5
+
+This release of XForge adds functionality to access scm browsers (ViewCvs) and RSCM objects.
+
+* Refactored classes into separate files
+* Added Project.scm_web to access a ViewCvs object 
+* Added ViewCvs.scms to access an array of RSCM::Cvs
+
 == Version 0.1.4
 
 This is the first functional release of XForge, a Ruby library and Rake task to automate release of

data/Rakefile

@@ -10,12 +10,13 @@ $:.unshift('lib')
 require 'xforge'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require 'rake/contrib/xforge'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
 PKG_NAME = "xforge"
-PKG_VERSION = "0.1.4"
+PKG_VERSION = "0.1.5"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/scm_web/view_cvs.rb

@@ -0,0 +1,24 @@
+module ScmWeb
+  class ViewCvs
+
+    attr_reader :uri, :project
+
+    def initialize(uri, project)
+      @uri, @project = uri, project
+    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
+      end
+      @scms
+    end
+  end
+end

data/lib/xforge.rb

@@ -1,232 +1,8 @@
-require 'net/http'
-require 'open-uri'
-require 'rake/contrib/xforge'
-
-# XForge provides an object-oriented view of the administrative interface for
-# hosting environments similar to SourceForge.net. This includes http://rubyforge.org/,
-# http://sourceforge.net/, custom installations of GForge (http://gforge.org/) and other
-# clones (provided their URL schemes are the similar).
-#
-# Currently it only supports uploading of new releases, but later versions may support
-# other functions if there is a demand for it. Patches are welcome.
-#
-# Example usage:
-#
-#   require 'xforge'
-#
-#   rubyforge = XForge::Host.new('rubyforge.org')
-#   xforge = rubyforge.project('xforge')
-#   session = xforge.login(my_user, my_password)
-#   session.release(['pkg/xforge-0.1.gem'], "XForge-0.1")
-#
-# Also see Rake::XForge::Release.
-#
-module XForge
-  # A Host represents a proxy to a server
-  class Host
-    attr_reader :name
-
-    # Create a new Host proxy located at +name+.
-    def initialize(name)
-      @name = name
-    end
-    
-    # Get access to 
-    def project(name)
-      Project.new(self, name)
-    end
-  end
-  
-  # A Project is an interface to a hosted project.
-  class Project
-    def initialize(host, name)
-      @host = host
-      @name = name
-    end
-    
-    # Logs in and returns a Session
-    def login(user_name, password)
-      login_response = Net::HTTP.start(@host.name, 80) do |http|
-        data = [
-          "login=1",
-          "form_loginname=#{user_name}",
-          "form_pw=#{password}"
-        ].join("&")
-        http.post("/account/login.php", data)
-      end
-
-      cookie = login_response["set-cookie"]
-      raise "Login failed" unless cookie
-      Session.new(@host, self, cookie)
-    end
-    
-    # The group_id of this project
-    def group_id
-      unless(@group_id)
-        project_uri = "http://#{@host.name}/projects/#{@name}/"
-        project_data = open(project_uri) { |data| data.read }
-        @group_id = project_data[/[?&]group_id=(\d+)/, 1]
-        raise "Couldn't get group_id" unless @group_id
-      end
-      @group_id
-    end
-  end
-  
-  # A Session object allows authenticated interaction with a Project, such as releasing files.
-  #
-  # A Session object can be obtained via Project.login
-  #
-  class Session
-    
-    BOUNDARY = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-
-    def initialize(host, project, cookie) # :nodoc:
-      @host = host
-      @project = project
-      @headers = { "Cookie" => cookie }
-    end
-    
-    # The package_id of our project
-    def package_id
-      unless(@package_id)
-        release_uri = "http://#{@host.name}/frs/admin/?group_id=#{@project.group_id}"
-        release_data = open(release_uri, @headers) { |data| data.read }
-        @package_id = release_data[/[?&]package_id=(\d+)/, 1]
-        raise "Couldn't get package_id" unless @package_id
-      end
-      @package_id
-    end
-
-    # Creates a new release containing the files specified by +filenames+ (Array) and named +release_name+.
-    # Optional parameters are +processor+ (which should be one of the Processor constants), +release_notes+,
-    # +release_changes+ and +preformatted+ which will appear on the releas page of the associated project.
-    #
-    def release(release_name, filenames, release_notes="", release_changes="", preformatted=true, processor=Processor::ANY)
-      release_date = Time.now.strftime("%Y-%m-%d %H:%M")
-      release_id = nil
-
-      puts "About to release '#{release_name}'"
-      puts "Files:"
-      puts "  " + filenames.join("\n  ")
-      puts "\nRelease Notes:\n"
-      puts release_notes
-      puts "\nRelease Changes:\n"
-      puts release_changes
-      puts "\nRelease Settings:\n"
-      puts "Preformatted: #{preformatted}"
-      puts "Processor: #{processor}"
-      puts "\nStarting release..."
-
-      xfiles = filenames.collect{|filename| XFile.new(filename)}      
-      xfiles.each_with_index do |xfile, i|
-        first_file = i==0
-        puts "Releasing #{xfile.basename}..."
-
-        release_response = Net::HTTP.start(@host.name, 80) do |http|
-          query_hash = if first_file then
-            {
-              "group_id" => @project.group_id,
-              "package_id" => package_id,
-              "type_id" => xfile.bin_type_id,
-              "processor_id" => processor,
-
-              "release_name" => release_name,
-              "release_date" => release_date,
-              "release_notes" => release_notes,
-              "release_changes" => release_changes,
-              "preformatted" => preformatted ? "1" : "0",
-              "submit" => "1"
-            }
-          else
-            {
-              "group_id" => @project.group_id,
-              "package_id" => package_id,
-              "type_id" => xfile.bin_type_id,
-              "processor_id" => processor,
-
-              "step2" => "1",
-              "release_id" => release_id,
-              "submit" => "Add This File"
-            }
-          end
-
-          query = "?" + query_hash.map do |(name, value)|
-            [name, URI.encode(value.to_s)].join("=")
-          end.join("&")
-
-          data = [
-            "--" + BOUNDARY,
-            "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{xfile.basename}\"",
-            "Content-Type: application/octet-stream",
-            "Content-Transfer-Encoding: binary",
-            "", xfile.data, ""
-            ].join("\x0D\x0A")
-
-          release_headers = @headers.merge(
-            "Content-Type" => "multipart/form-data; boundary=#{BOUNDARY}"
-          )
-
-          target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
-          http.post(target + query, data, release_headers)
-        end
-
-        if first_file then
-          release_id = release_response.body[/release_id=(\d+)/, 1]
-          raise("Couldn't get release id") unless release_id
-        end
-      end
-    end
-  end
-
-  # Simple enumeration of processors. Used from Session.release
-  class Processor
-    I386           = 1000
-    IA64           = 6000
-    ALPHA          = 7000
-    ANY            = 8000
-    PPC            = 2000
-    MIPS           = 3000
-    SPARC          = 4000
-    ULTRA_SPARC    = 5000
-    OTHER_PLATFORM = 9999
-  end
-
-  class XFile # :nodoc:
-
-    # extension => [mime_type, rubyforge_bin_type_id, rubyforge_src_type_id]
-    FILE_TYPES = {
-      ".deb"  => ["application/octet-stream", 1000],
-
-      # all of these can be source or binary
-      ".rpm"  => ["application/octet-stream", 2000, 5100],
-      ".zip"  => ["application/octet-stream", 3000, 5000],
-      ".bz2"  => ["application/octet-stream", 3100, 5010],
-      ".gz"   => ["application/octet-stream", 3110, 5020],
-      ".jpg"  => ["application/octet-stream", 8000],
-      ".jpeg" => ["application/octet-stream", 8000],
-      ".txt"  => ["text/plain", 8100, 8100],
-      ".html" => ["text/html", 8200, 8200],
-      ".pdf"  => ["application/octet-stream", 8300],
-      ".ebuild"  => ["application/octet-stream", 1300],
-      ".exe"  => ["application/octet-stream", 1100],
-      ".dmg"  => ["application/octet-stream", 1200],
-      ".gem"  => ["application/octet-stream", 1400],
-      ".sig"  => ["application/octet-stream", 8150]
-    }
-    FILE_TYPES.default = ["application/octet-stream", 9999, 5900] # default to "other", "other source"
-    
-    attr_reader :basename, :ext, :content_type, :bin_type_id, :src_type_id
-
-    def initialize(filename)
-      @filename = filename
-      @basename = File.basename(filename)
-      @ext = File.extname(filename)
-      @content_type = FILE_TYPES[@ext][0]
-      @bin_type_id = FILE_TYPES[@ext][1]
-    end
-
-    def data
-      File.open(@filename, "rb") { |file| file.read }
-    end
-  end
-end
+require 'xforge/version_parser'
+require 'xforge/host'
+require 'xforge/rubyforge'
+require 'xforge/sourceforge'
+require 'xforge/project'
+require 'xforge/session'
+require 'xforge/xfile'
+require 'scm_web/view_cvs'

data/lib/xforge/host.rb

@@ -0,0 +1,16 @@
+module XForge
+  # A Host represents a proxy to a server
+  class Host
+    attr_reader :name
+
+    # Create a new Host proxy located at +name+.
+    def initialize(name)
+      @name = name
+    end
+
+    # Get access to 
+    def project(name)
+      Project.new(self, name)
+    end
+  end
+end

data/lib/xforge/project.rb

@@ -0,0 +1,50 @@
+require 'net/http'
+require 'open-uri'
+
+module XForge
+
+  # A Project is an interface to a hosted project.
+  class Project
+
+    attr_reader :host, :name
+
+    def initialize(host, name)
+      @host = host
+      @name = name
+    end
+
+    # Logs in and returns a Session
+    def login(user_name, password)
+      login_response = Net::HTTP.start(@host.name, 80) do |http|
+        data = [
+          "login=1",
+          "form_loginname=#{user_name}",
+          "form_pw=#{password}"
+        ].join("&")
+        http.post("/account/login.php", data)
+      end
+
+      cookie = login_response["set-cookie"]
+      raise "Login failed" unless cookie
+      Session.new(@host, self, cookie)
+    end
+
+    # The group_id of this project
+    def group_id
+      unless(@group_id)
+        regexp = /stats\/[?&]group_id=(\d+)/
+        project_uri = "http://#{@host.name}/projects/#{@name}/"
+        project_data = open(project_uri) { |data| data.read }
+        @group_id = project_data[regexp, 1]
+        raise "Couldn't get group_id" unless @group_id
+      end
+      @group_id
+    end
+
+    # The scm browser of this project
+    def scm_web
+      @scm_web ||= host.scm_web(self)
+    end
+  end
+
+end

data/lib/xforge/rubyforge.rb

@@ -0,0 +1,20 @@
+module XForge
+  class RubyForge < Host
+    def initialize
+      super('rubyforge.org')
+    end
+
+    def cvs_path
+      "/var/cvs"
+    end
+
+    def cvs_host_name
+      name
+    end
+
+    def scm_web(project)
+      ::ScmWeb::ViewCvs.new("http://rubyforge.org/cgi-bin/viewcvs.cgi/?cvsroot=#{project.name}", project)
+    end
+
+  end
+end

data/lib/xforge/session.rb

@@ -0,0 +1,124 @@
+require 'net/http'
+require 'open-uri'
+
+module XForge
+
+  # A Session object allows authenticated interaction with a Project, such as releasing files.
+  #
+  # A Session object can be obtained via Project.login
+  #
+  class Session
+
+    # Simple enumeration of processors. Used from Session.release
+    class Processor
+      I386           = 1000
+      IA64           = 6000
+      ALPHA          = 7000
+      ANY            = 8000
+      PPC            = 2000
+      MIPS           = 3000
+      SPARC          = 4000
+      ULTRA_SPARC    = 5000
+      OTHER_PLATFORM = 9999
+    end
+
+    BOUNDARY = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+    def initialize(host, project, cookie) # :nodoc:
+      @host = host
+      @project = project
+      @headers = { "Cookie" => cookie }
+    end
+
+    # The package_id of our project
+    def package_id
+      unless(@package_id)
+        release_uri = "http://#{@host.name}/frs/admin/?group_id=#{@project.group_id}"
+        release_data = open(release_uri, @headers) { |data| data.read }
+        @package_id = release_data[/[?&]package_id=(\d+)/, 1]
+        raise "Couldn't get package_id" unless @package_id
+      end
+      @package_id
+    end
+
+    # Creates a new release containing the files specified by +filenames+ (Array) and named +release_name+.
+    # Optional parameters are +processor+ (which should be one of the Processor constants), +release_notes+,
+    # +release_changes+ and +preformatted+ which will appear on the releas page of the associated project.
+    #
+    def release(release_name, filenames, release_notes="", release_changes="", preformatted=true, processor=Processor::ANY)
+      release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+      release_id = nil
+
+      puts "About to release '#{release_name}'"
+      puts "Files:"
+      puts "  " + filenames.join("\n  ")
+      puts "\nRelease Notes:\n"
+      puts release_notes
+      puts "\nRelease Changes:\n"
+      puts release_changes
+      puts "\nRelease Settings:\n"
+      puts "Preformatted: #{preformatted}"
+      puts "Processor: #{processor}"
+      puts "\nStarting release..."
+
+      xfiles = filenames.collect{|filename| XFile.new(filename)}      
+      xfiles.each_with_index do |xfile, i|
+        first_file = i==0
+        puts "Releasing #{xfile.basename}..."
+
+        release_response = Net::HTTP.start(@host.name, 80) do |http|
+          query_hash = if first_file then
+            {
+              "group_id" => @project.group_id,
+              "package_id" => package_id,
+              "type_id" => xfile.bin_type_id,
+              "processor_id" => processor,
+
+              "release_name" => release_name,
+              "release_date" => release_date,
+              "release_notes" => release_notes,
+              "release_changes" => release_changes,
+              "preformatted" => preformatted ? "1" : "0",
+              "submit" => "1"
+            }
+          else
+            {
+              "group_id" => @project.group_id,
+              "package_id" => package_id,
+              "type_id" => xfile.bin_type_id,
+              "processor_id" => processor,
+
+              "step2" => "1",
+              "release_id" => release_id,
+              "submit" => "Add This File"
+            }
+          end
+
+          query = "?" + query_hash.map do |(name, value)|
+            [name, URI.encode(value.to_s)].join("=")
+          end.join("&")
+
+          data = [
+            "--" + BOUNDARY,
+            "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{xfile.basename}\"",
+            "Content-Type: application/octet-stream",
+            "Content-Transfer-Encoding: binary",
+            "", xfile.data, ""
+            ].join("\x0D\x0A")
+
+          release_headers = @headers.merge(
+            "Content-Type" => "multipart/form-data; boundary=#{BOUNDARY}"
+          )
+
+          target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+          http.post(target + query, data, release_headers)
+        end
+
+        if first_file then
+          release_id = release_response.body[/release_id=(\d+)/, 1]
+          raise("Couldn't get release id") unless release_id
+        end
+      end
+    end
+  end
+end

data/lib/xforge/sourceforge.rb

@@ -0,0 +1,22 @@
+module XForge
+
+  class SourceForge < Host
+    def initialize
+      super("sourceforge.net")
+    end
+
+    def cvs_path
+      "/cvsroot"
+    end
+    
+    def cvs_host_name
+      "cvs.sourceforge.net"
+    end
+
+    def scm_web(project)
+      ::ScmWeb::ViewCvs.new("http://#{cvs_host_name}/viewcvs.py/#{project.name}/", project)
+    end
+
+  end
+
+end

data/lib/xforge/xfile.rb

@@ -0,0 +1,41 @@
+module XForge
+
+  class XFile # :nodoc:
+
+    # extension => [mime_type, rubyforge_bin_type_id, rubyforge_src_type_id]
+    FILE_TYPES = {
+      ".deb"  => ["application/octet-stream", 1000],
+
+      # all of these can be source or binary
+      ".rpm"  => ["application/octet-stream", 2000, 5100],
+      ".zip"  => ["application/octet-stream", 3000, 5000],
+      ".bz2"  => ["application/octet-stream", 3100, 5010],
+      ".gz"   => ["application/octet-stream", 3110, 5020],
+      ".jpg"  => ["application/octet-stream", 8000],
+      ".jpeg" => ["application/octet-stream", 8000],
+      ".txt"  => ["text/plain", 8100, 8100],
+      ".html" => ["text/html", 8200, 8200],
+      ".pdf"  => ["application/octet-stream", 8300],
+      ".ebuild"  => ["application/octet-stream", 1300],
+      ".exe"  => ["application/octet-stream", 1100],
+      ".dmg"  => ["application/octet-stream", 1200],
+      ".gem"  => ["application/octet-stream", 1400],
+      ".sig"  => ["application/octet-stream", 8150]
+    }
+    FILE_TYPES.default = ["application/octet-stream", 9999, 5900] # default to "other", "other source"
+
+    attr_reader :basename, :ext, :content_type, :bin_type_id, :src_type_id
+
+    def initialize(filename)
+      @filename = filename
+      @basename = File.basename(filename)
+      @ext = File.extname(filename)
+      @content_type = FILE_TYPES[@ext][0]
+      @bin_type_id = FILE_TYPES[@ext][1]
+    end
+
+    def data
+      File.open(@filename, "rb") { |file| file.read }
+    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.4
-date: 2005-08-11
+  version: 0.1.5
+date: 2005-08-12
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -37,8 +37,14 @@ files:
   - lib/rake/contrib/xforge.rb
   - lib/rake/contrib/xforge/base.rb
   - lib/rake/contrib/xforge/release.rb
+  - lib/scm_web/view_cvs.rb
+  - lib/xforge/host.rb
+  - lib/xforge/project.rb
+  - lib/xforge/rubyforge.rb
+  - lib/xforge/session.rb
+  - lib/xforge/sourceforge.rb
   - lib/xforge/version_parser.rb
-  - doc/base_attrs.rdoc
+  - lib/xforge/xfile.rb
 test_files: []
 rdoc_options: 
   - "--title"

data/doc/base_attrs.rdoc

@@ -1,2 +0,0 @@
-* user_name
-* password