rubyforge 0.4.4 → 0.4.5

data/History.txt

@@ -1,5 +1,11 @@
 == Version History:
 
+=== 0.4.5 / 2008-03-11:
+
+* Update for Ruby 1.9.0.
+* Updated History, Rakefile, and Readme for new hoe abilities.
+* Added config backup/restore rake tasks (for testing).
+
 === 0.4.4 / 2007-08-13:
 
 * New type_id values will merge with extant data. (self-repairing data is Good)

data/Rakefile

@@ -11,18 +11,27 @@ end
 Object.send :remove_const, :RubyForge if defined? RubyForge
 require './lib/rubyforge.rb'
 
-Hoe.new("rubyforge", RubyForge::VERSION) do |p|
-  p.rubyforge_name = "codeforpeople"
-  p.url = "http://rubyforge.org/projects/codeforpeople"
-  p.author = ['Ara T Howard', 'Ryan Davis', 'Eric Hodel']
-  p.need_tar = false
+Hoe.new("rubyforge", RubyForge::VERSION) do |rubyforge|
+  rubyforge.rubyforge_name = "codeforpeople"
+  rubyforge.need_tar = false
 
-  changes = p.paragraphs_of("History.txt", 1..2).join("\n\n")
-  summary, *description = p.paragraphs_of("README.txt", 3, 3..4)
+  rubyforge.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+  rubyforge.developer('Eric Hodel', 'drbrain@segment7.net')
+  rubyforge.developer('Ara T Howard', 'ara.t.howard@gmail.com')
+end
+
+task :backup do
+  Dir.chdir File.expand_path("~/.rubyforge") do
+    cp "user-config.yml",  "user-config.yml.bak"
+    cp "auto-config.yml",  "auto-config.yml.bak"
+  end
+end
 
-  p.changes = changes
-  p.summary = summary
-  p.description = description.join("\n\n")
+task :restore do
+  Dir.chdir File.expand_path("~/.rubyforge") do
+    cp "user-config.yml.bak",  "user-config.yml"
+    cp "auto-config.yml.bak",  "auto-config.yml"
+  end
 end
 
 # vim:syntax=ruby

data/lib/http-access2.rb

@@ -235,14 +235,14 @@ class Client
   #   Get a_sring of message-body of response.
   #
   def get_content(uri, query = nil, extheader = {}, &block)
-    retry_connect(uri, query) do |uri, query|
-      get(uri, query, extheader, &block)
+    retry_connect(uri, query) do |_uri, _query|
+      get(_uri, _query, extheader, &block)
     end
   end
 
   def post_content(uri, body = nil, extheader = {}, &block)
-    retry_connect(uri, nil) do |uri, query|
-      post(uri, body, extheader, &block)
+    retry_connect(uri, nil) do |_uri, query|
+      post(_uri, body, extheader, &block)
     end
   end
 
@@ -435,9 +435,9 @@ private
     @debug_dev << "\n\n= Response\n\n" if @debug_dev
     do_get_header(req, res, sess)
     conn.push(res)
-    sess.get_data() do |str|
-      block.call(str) if block
-      content << str
+    sess.get_data() do |s|
+      block.call(s) if block
+      content << s
     end
     @session_manager.keep(sess) unless sess.closed?
   end
@@ -455,8 +455,8 @@ private
     @debug_dev << "\n\n= Response\n\n" if @debug_dev
     do_get_header(req, res, sess)
     conn.push(res)
-    sess.get_data() do |str|
-      pipew.syswrite(str)
+    sess.get_data() do |s|
+      pipew.syswrite(s)
     end
     pipew.close
     @session_manager.keep(sess) unless sess.closed?

data/lib/http-access2/cookie.rb

@@ -51,8 +51,7 @@ class WebAgent
   class Cookie
     include CookieUtils
 
-    require 'parsedate'
-    include ParseDate
+    require 'time'
 
     attr_accessor :name, :value
     attr_accessor :domain, :path
@@ -182,7 +181,7 @@ class WebAgent
 	  @domain = value
 	when 'expires'
 	  begin
-	    @expires = Time.gm(*parsedate(value)[0,6])
+	    @expires = Time.parse(value).gmtime
 	  rescue ArgumentError
 	    @expires = nil
 	  end

data/lib/rubyforge.rb

@@ -26,7 +26,7 @@ end
 class RubyForge
 
   # :stopdoc:
-  VERSION     = '0.4.4'
+  VERSION     = '0.4.5'
   HOME        = ENV["HOME"] || ENV["HOMEPATH"] || File::expand_path("~")
   RUBYFORGE_D = File::join HOME, ".rubyforge"
   CONFIG_F    = File::join RUBYFORGE_D, "user-config.yml"
@@ -35,8 +35,6 @@ class RubyForge
   # We must use __FILE__ instead of DATA because this is now a library
   # and DATA is relative to $0, not __FILE__.
   CONFIG = File.read(__FILE__).split(/__END__/).last.gsub(/#\{(.*)\}/) { eval $1 }
-
-  attr_reader :client if $TESTING
   # :startdoc:
 
   attr_reader :userconfig, :autoconfig
@@ -48,6 +46,9 @@ class RubyForge
     @autoconfig_path = File.join(dir, file.sub(/^user/, 'auto'))
     @autoconfig = test(?e, @autoconfig_path) ? YAML.load_file(@autoconfig_path) : YAML.load(CONFIG)["rubyforge"]
 
+    @autoconfig["type_ids"] = YAML.load(CONFIG)['rubyforge']['type_ids']
+
+    @client = nil
     @uri = URI.parse @userconfig['uri']
 
     raise "no <username>" unless @userconfig["username"]
@@ -74,13 +75,15 @@ class RubyForge
   def scrape_config
     username = @userconfig['username']
 
-    %w(group package release).each do |type|
+    %w(group package processor release).each do |type|
       @autoconfig["#{type}_ids"].clear
     end
 
     puts "Getting #{username}"
     html = URI.parse("http://rubyforge.org/users/#{username}/index.html").read
+
     projects = html.scan(%r%/projects/([^/]+)/%).flatten
+
     puts "Fetching #{projects.size} projects"
     projects.each do |project|
       next if project == "support"
@@ -92,6 +95,7 @@ class RubyForge
     data = {
       "group_ids" => {},
       "package_ids" => {},
+      "processor_ids" => Hash.new { |h,k| h[k] = {} },
       "release_ids" => Hash.new { |h,k| h[k] = {} },
     }
 
@@ -119,6 +123,21 @@ class RubyForge
       end
     end
 
+    if not data['release_ids'][package].empty? and
+       @autoconfig['processor_ids'].empty? then
+      puts "Fetching processor ids"
+
+      login
+
+      html = client.get_content "http://rubyforge.org/frs/admin/qrs.php?package=&group_id=#{group_id}"
+
+      html =~ /<select name="processor_id">(.*?)<\/select>/m
+      processors = $1
+      processors.scan(/<option value="(\d{4})">([^<]+)/) do
+        data["processor_ids"][$2] = $1.to_i
+      end if processors
+    end
+
     data.each do |key, val|
       @autoconfig[key].merge! val
     end
@@ -326,18 +345,24 @@ class RubyForge
     run page, form, 'content-type' => boundary
   end
 
-  def run(page, form, extheader={}) # :nodoc:
-    client = HTTPAccess2::Client::new ENV["HTTP_PROXY"]
-    client.debug_dev = STDERR if ENV["RUBYFORGE_DEBUG"] || ENV["DEBUG"] || $DEBUG
-    client.set_cookie_store @userconfig["cookie_jar"]
-    client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  def client
+    return @client if @client
+
+    @client = HTTPAccess2::Client::new ENV["HTTP_PROXY"]
+    @client.debug_dev = STDERR if ENV["RUBYFORGE_DEBUG"] || ENV["DEBUG"] || $DEBUG
+    @client.set_cookie_store @userconfig["cookie_jar"]
+    @client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
     # HACK to fix http-access2 redirect bug/feature
-    client.redirect_uri_callback = lambda do |res|
+    @client.redirect_uri_callback = lambda do |res|
       page = res.header['location'].first
       page =~ %r/http/ ? page : @uri + page
     end
 
+    @client
+  end
+
+  def run(page, form, extheader={}) # :nodoc:
     uri = @uri + page
     if $DEBUG then
       puts "client.post_content #{uri.inspect}, #{form.inspect}, #{extheader.inspect}"
@@ -345,8 +370,6 @@ class RubyForge
 
     response = client.post_content uri, form, extheader
 
-    @client = client if $TESTING
-
     client.save_cookie_store
 
     if $DEBUG then
@@ -436,16 +459,10 @@ __END__
       .gem         : 1400
       .pgp         : 8150
       .sig         : 8150
+      .pem         : 1500
+
   #
   # map processor names to rubyforge ids
   #
     processor_ids :
-      i386       : 1000
-      IA64       : 6000
-      Alpha      : 7000
-      Any        : 8000
-      PPC        : 2000
-      MIPS       : 3000
-      Sparc      : 4000
-      UltraSparc : 5000
       Other      : 9999

data/test/test_rubyforge.rb

@@ -27,6 +27,29 @@ class HTTPAccess2::Client
     @url, @form, @headers = url, form, headers
     FakeRubyForge::HTML
   end
+
+  def self.data
+    @data ||= []
+  end
+
+  alias old_get_content get_content
+
+  def get_content(*args)
+    self.class.data.shift or raise "no more data"
+  end
+
+end
+
+class URI::HTTP
+
+  def self.data
+    @data ||= []
+  end
+
+  def read
+    self.class.data.shift or raise "no more data"
+  end
+
 end
 
 class TestRubyForge < Test::Unit::TestCase
@@ -240,6 +263,48 @@ class TestRubyForge < Test::Unit::TestCase
     assert_equal extheader, client.headers
   end
 
+  def test_scrape_project
+    orig_stdout = $stdout
+    orig_stderr = $stderr
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+    util_new RubyForge
+    @rubyforge.autoconfig.each { |k,v| v.clear }
+
+    URI::HTTP.data << "<a href='/tracker/?group_id=1513'>Tracker</a>"
+    URI::HTTP.data << <<-EOF
+<h3>ar_mailer
+<a href="/frs/monitor.php?filemodule_id=4566&group_id=1513&start=1">
+<a href="shownotes.php?release_id=13368">1.3.1</a>
+<a href="shownotes.php?release_id=12185">1.2.0</a></strong>
+    EOF
+
+    HTTPAccess2::Client.data << <<-EOF
+<select name="processor_id">
+<option value="100">Must Choose One</option>
+<option value="1000">i386</option>
+<option value="1001">i387</option>
+</select>
+    EOF
+
+    @rubyforge.scrape_project('my_project')
+
+    expected = {
+      "group_ids" => { "my_project" => 1513 },
+      "package_ids" => { "ar_mailer" => 4566 },
+      "processor_ids" => { "i386" => 1000, "i387" => 1001 },
+      "release_ids" => {
+        "ar_mailer" => { "1.2.0" => 12185, "1.3.1" => 13368 }
+      },
+      "type_ids" => {},
+    }
+
+    assert_equal expected, @rubyforge.autoconfig
+  ensure
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+  end
+
   def util_new(klass)
     @rubyforge = klass.new
     @old_autoconfig = @rubyforge.autoconfig.dup

metadata

@@ -1,35 +1,33 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rubyforge
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2007-08-13 00:00:00 -07:00
-summary: A script which automates a limited set of rubyforge operations.
-require_paths: 
-- lib
-email: ryand-ruby@zenspider.com
-homepage: http://rubyforge.org/projects/codeforpeople
-rubyforge_project: codeforpeople
-description: "A script which automates a limited set of rubyforge operations.  * Run 'rubyforge help' for complete usage. * Setup: For first time users AND upgrades to 0.4.0: * rubyforge setup (deletes your username and password, so run sparingly!) * edit ~/.rubyforge/user-config.yml * rubyforge config * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest. * Don't forget to login!  logging in will store a cookie in your .rubyforge directory which expires after a time.  always run the login command before any operation that requires authentication, such as uploading a package."
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.4.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Ara T Howard
 - Ryan Davis
 - Eric Hodel
+- Ara T Howard
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-03-11 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: "A script which automates a limited set of rubyforge operations.  * Run 'rubyforge help' for complete usage. * Setup: For first time users AND upgrades to 0.4.0: * rubyforge setup (deletes your username and password, so run sparingly!) * edit ~/.rubyforge/user-config.yml * rubyforge config * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest. * Don't forget to login!  logging in will store a cookie in your .rubyforge directory which expires after a time.  always run the login command before any operation that requires authentication, such as uploading a package."
+email: 
+- ryand-ruby@zenspider.com
+- drbrain@segment7.net
+- ara.t.howard@gmail.com
+executables: 
+- rubyforge
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -41,20 +39,32 @@ files:
 - lib/http-access2/http.rb
 - lib/rubyforge.rb
 - test/test_rubyforge.rb
-test_files: 
-- test/test_rubyforge.rb
+has_rdoc: true
+homepage: http://codeforpeople.rubyforge.org/rubyforge/
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- rubyforge
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: codeforpeople
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A script which automates a limited set of rubyforge operations
+test_files: 
+- test/test_rubyforge.rb