rubyforge 0.3.2 → 0.4.0

data/.cvsignore

@@ -0,0 +1,2 @@
+doc
+pkg

data/History.txt

@@ -1,19 +1,31 @@
-== Version History
+* 0.4.0 / 2007-01-09:
+  * config.yml split and moved to user-config.yml (up to the user to do).
+  * auto-config.yml now generated via config command.
+  * @config renamed to @userconfig.
+  * @config["rubyforge"] moved to @autoconfig.
+  * Added save_autoconfig.
+  * Pulled scrape_project from scrape_config.
+  * scrape_config no longer takes a user param. Use opts to specify.
+  * scrape_project, add_project, add/remove_release now save automatically.
 
 * 0.3.2 / 2006-11-29:
   * Fixed file uploads for windows.
   * Correctly scrape releases with funky characters.
+
 * 0.3.1 / 2006-10-24:
   * Added SSL login.
   * Added yet more debugging output if $DEBUG.
+
 * 0.3.0 / 2006-09-30:
   * Added more debugging output if $DEBUG
   * Added news posting.
   * Added multiple file release to add_release (uses add_file for extras).
   * add_release now returns release_id
   * Fixed config scraper to include '-' in names.
+
 * 0.2.1 / 2006-09-14:
   * Gemspec was too loose about packaging. Now using manifest.
+
 * 0.2.0 / 2006-09-13:
   * Split original script into script and library.
   * Added tests for library.

data/Manifest.txt

@@ -1,9 +1,9 @@
+.cvsignore
 History.txt
 Manifest.txt
-README
+README.txt
 Rakefile
 bin/rubyforge
-install.rb
 lib/http-access2.rb
 lib/http-access2/cookie.rb
 lib/http-access2/http.rb

data/{README → README.txt}

@@ -6,13 +6,12 @@
 
 A simplistic script which automates a limited set of rubyforge operations 
 
-== Modes
-
-  run 'rubyforge help' for complete usage
-
-== Notes
-
-* don't forget to login!  logging in will store a cookie in your
+* Run 'rubyforge help' for complete usage.
+* Setup: For first time users AND upgrades to 0.4.0:
+  * rubyforge setup
+  * edit ~/.rubyforge/user-config.yml
+  * rubyforge config
+* 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.

data/Rakefile

@@ -1,91 +1,28 @@
 # -*- ruby -*-
 
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
-require 'rbconfig'
-
-$: << 'lib'
-require './lib/rubyforge.rb'
-
-require 'rubygems'
-
-gem = Gem::Specification::new do |spec|
-  spec.name = 'rubyforge'
-  spec.version = RubyForge::VERSION
-  spec.platform = Gem::Platform::RUBY
-
-  spec.summary = File.read("README").split(/\n\n+/)[3]
-  spec.description = spec.summary # TODO: improve
-
-  spec.files = File.readlines("Manifest.txt").map { |l| l.chomp }
-  spec.executables = spec.files.grep(/^bin/).map { |f| File::basename f }
-
-  spec.has_rdoc = true
-  spec.test_suite_file = "test/test_rubyforge.rb"
-
-  spec.author = "Ara T. Howard"
-  spec.email = "ara.t.howard@noaa.gov"
-  spec.homepage = "http://codeforpeople.com/lib/ruby/rubyforge/"
-
-  if $DEBUG then
-    puts "#{spec.name} #{spec.version}"
-    puts
-    puts "bin = #{spec.executable.sort.inspect}"
-    puts
-    puts "** summary:"
-    puts spec.summary
-    puts
-    puts "** description:"
-    puts spec.description
-  end
+begin
+  require 'hoe'
+rescue LoadError
+  abort "ERROR: This Rakefile is only useful with hoe installed.
+       If you're trying to install the rubyforge library,
+       please install it via rubygems."
 end
 
-desc 'Build Gem'
-Rake::GemPackageTask.new gem do |pkg|
-  pkg.need_tar = true
-end
+Object.send :remove_const, :RubyForge if defined? RubyForge
+require './lib/rubyforge.rb'
 
-desc 'Run tests'
-task :default => :test
+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
 
-desc 'Run tests'
-Rake::TestTask.new :test do |t|
-  t.libs << 'test'
-  t.warning = true
-end
+  changes = p.paragraphs_of("History.txt", 1).first
+  summary, *description = p.paragraphs_of("README.txt", 3, 3..4)
 
-desc 'Generate RDoc'
-Rake::RDocTask.new :rdoc do |rd|
-  rd.rdoc_dir = 'doc'
-  rd.rdoc_files.add 'README', 'History.txt', "lib/rubyforge.rb"
-  rd.main = 'README'
-  rd.options << "-t codeforpeople's rubyforge-#{RubyForge::VERSION} Documentation"
-end
-  
-desc 'Upload RDoc to RubyForge'
-task :upload => :rdoc do
-  user = "#{ENV['USER']}@rubyforge.org"
-  project = '/var/www/gforge-projects/codeforpeople/rubyforge'
-  local_dir = 'doc'
-  pub = Rake::SshDirPublisher.new user, project, local_dir
-  pub.upload
-end
-
-task :deploy => [:clean, :package] do |t|
-  version = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
-  puts "Releasing #{version}"
-  rf = RubyForge.new
-  rf.login
-  rf.add_release 'codeforpeople', 'rubyforge', version, "pkg/rubyforge-#{version}.tgz", "pkg/rubyforge-#{version}.gem"
-end
-
-desc 'Clean up'
-task :clean => [ :clobber_rdoc, :clobber_package ] do
-  rm_f Dir["**/*~"]
+  p.changes = changes
+  p.summary = summary
+  p.description = description.join("\n\n")
 end
 
 # vim:syntax=ruby
-

data/bin/rubyforge

@@ -16,7 +16,7 @@ SYNOPSIS
 
 DESCRIPTION
 
-  simplistic script which automates a limited set of rubyforge operations 
+  simplistic script which automates a limited set of rubyforge operations
 
 MODES
 
@@ -27,12 +27,13 @@ MODES
     example :
       #{ PROGRAM } setup
 
-  config()
-    Helps you populate your config.yml file by scraping rubyforge and
+  config([project])
+    Helps you populate your auto-config.yml file by scraping rubyforge and
     getting your groups, projects, and releases.
 
     example :
       #{ PROGRAM } config
+      #{ PROGRAM } config myproject
 
   names()
     Prints out the names of your configured groups and projects.
@@ -63,8 +64,8 @@ MODES
     example :
       #{ PROGRAM } add_release codeforpeople.com traits 0.8.0 traits-0.8.0.gem
       #{ PROGRAM } add_release codeforpeople.com traits 0.8.0 traits-0.8.0.tgz
-      #{ PROGRAM } add_release 1024 1242 0.8.0 traits-0.8.0.gem 
-      #{ PROGRAM } login && #{ PROGRAM } add_release 1024 1242 0.8.0 traits-0.8.0.gem 
+      #{ PROGRAM } add_release 1024 1242 0.8.0 traits-0.8.0.gem
+      #{ PROGRAM } login && #{ PROGRAM } add_release 1024 1242 0.8.0 traits-0.8.0.gem
 
   add_file(group_id, package_id, release_id, userfile)
     add a file to an existing release under the specified group_id,
@@ -73,7 +74,7 @@ MODES
     example :
       #{ PROGRAM } add_file codeforpeople.com traits 0.8.0 traits-0.8.0.gem
       #{ PROGRAM } add_file codeforpeople.com traits 0.8.0 traits-0.8.0.tgz
-      #{ PROGRAM } add_file 1024 1242 0.8.0 traits-0.8.0.gem 
+      #{ PROGRAM } add_file 1024 1242 0.8.0 traits-0.8.0.gem
 
   delete_package(group_id, package_name)
     deletes a package and all its files.
@@ -135,17 +136,17 @@ EOL
 mode = ARGV.shift
 
 opts = GetoptLong::new(
-         [ "--help"            , "-h" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--config"          , "-c" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--username"        , "-u" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--password"        , "-p" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--cookie_jar"      , "-C" , GetoptLong::REQUIRED_ARGUMENT ] , 
+         [ "--help"            , "-h" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--config"          , "-c" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--username"        , "-u" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--password"        , "-p" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--cookie_jar"      , "-C" , GetoptLong::REQUIRED_ARGUMENT ] ,
          [ "--is_private"      , "-P" , GetoptLong::REQUIRED_ARGUMENT ],
-         [ "--release_date"    , "-r" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--type_id"         , "-t" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--processor_id"    , "-o" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--release_notes"   , "-n" , GetoptLong::REQUIRED_ARGUMENT ] , 
-         [ "--release_changes" , "-a" , GetoptLong::REQUIRED_ARGUMENT ] , 
+         [ "--release_date"    , "-r" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--type_id"         , "-t" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--processor_id"    , "-o" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--release_notes"   , "-n" , GetoptLong::REQUIRED_ARGUMENT ] ,
+         [ "--release_changes" , "-a" , GetoptLong::REQUIRED_ARGUMENT ] ,
          [ "--preformatted"    , "-f" , GetoptLong::NO_ARGUMENT ]
        ).enum_for.inject({}){|h,kv| h.update kv.first.delete('-') => kv.last}
 
@@ -159,18 +160,20 @@ when %r/help/
 when %r/setup/
   rubyforge.setup
 when %r/config/
-  puts "Add the following to #{RubyForge::CONFIG_F}"
-  puts
-  username = ARGV.shift || rubyforge.config['username']
-  y "rubyforge" => rubyforge.scrape_config(username)
+  project = ARGV.shift
+  if project then
+    rubyforge.scrape_project(project)
+  else
+    rubyforge.scrape_config
+  end
 when %r/names/
-  rf = rubyforge.config["rubyforge"]
+  rf = rubyforge.autoconfig
   puts "groups  : #{rf["group_ids"].keys.sort.join(", ")}"
   puts "packages: #{rf["package_ids"].keys.sort.join(", ")}"
 when %r/login/
   rubyforge.login
 when %r/create_package/
-  page, msg = "/frs/admin/index.php", "post_content" 
+  page, msg = "/frs/admin/index.php", "post_content"
 
   group_id, package_name = ARGV
 

data/lib/rubyforge.rb

@@ -4,6 +4,7 @@ require 'enumerator'
 require 'fileutils'
 require 'http-access2'
 require 'yaml'
+require 'open-uri'
 
 $TESTING = false unless defined? $TESTING
 
@@ -25,10 +26,10 @@ end
 class RubyForge
 
   # :stopdoc:
-  VERSION     = "0.3.2"
+  VERSION     = "0.4.0"
   HOME        = ENV["HOME"] || ENV["HOMEPATH"] || File::expand_path("~")
   RUBYFORGE_D = File::join HOME, ".rubyforge"
-  CONFIG_F    = File::join RUBYFORGE_D, "config.yml"
+  CONFIG_F    = File::join RUBYFORGE_D, "user-config.yml"
   COOKIE_F    = File::join RUBYFORGE_D, "cookie.dat"
 
   # We must use __FILE__ instead of DATA because this is now a library
@@ -38,85 +39,116 @@ class RubyForge
   attr_reader :client if $TESTING
   # :startdoc:
 
-  attr_reader :config
+  attr_reader :userconfig, :autoconfig
 
-  def initialize(config=CONFIG_F, opts={})
-    @config = test(?e, config) ? IO::read(config) : CONFIG
-    @config = YAML.load(@config).merge(opts)
+  def initialize(userconfig=CONFIG_F, opts={})
+    @userconfig = test(?e, userconfig) ? IO::read(userconfig) : CONFIG
+    @userconfig = YAML.load(@userconfig).merge(opts)
+    dir, file = File.split(userconfig)
+    @autoconfig_path = File.join(dir, file.sub(/^user/, 'auto'))
+    @autoconfig = test(?e, @autoconfig_path) ? YAML.load_file(@autoconfig_path) : YAML.load(CONFIG)["rubyforge"]
 
-    @uri = URI.parse @config['uri']
+    @uri = URI.parse @userconfig['uri']
 
-    raise "no <username>" unless @config["username"]
-    raise "no <password>" unless @config["password"]
-    raise "no <cookie_jar>" unless @config["cookie_jar"]
+    raise "no <username>" unless @userconfig["username"]
+    raise "no <password>" unless @userconfig["password"]
+    raise "no <cookie_jar>" unless @userconfig["cookie_jar"]
   end
 
   def setup
     FileUtils::mkdir_p RUBYFORGE_D unless test ?d, RUBYFORGE_D
-    test ?e, CONFIG_F and FileUtils::mv CONFIG_F, "#{ CONFIG_F }.bak"    
-    open(CONFIG_F, "w") { |f| f.write CONFIG }
+    test ?e, CONFIG_F and FileUtils::mv CONFIG_F, "#{ CONFIG_F }.bak"
+    config = CONFIG[/\A.*(?=^\# AUTOCONFIG)/m]
+    open(CONFIG_F, "w") { |f| f.write config }
     FileUtils::touch COOKIE_F
     edit = (ENV["EDITOR"] || ENV["EDIT"] || "vi") + " #{ CONFIG_F }"
     system edit or puts "edit #{ CONFIG_F }"
   end
 
-  def login
-    page = @uri + "/account/login.php"
-    page.scheme = 'https'
-    page = URI.parse page.to_s # set SSL port correctly
+  def save_autoconfig
+    File.open(@autoconfig_path, "w") do |file|
+      YAML.dump @autoconfig, file
+    end
+  end
 
-    username = @config["username"]
-    password = @config["password"]
+  def scrape_config
+    username = @userconfig['username']
 
-    form = {
-      "return_to"      => "",
-      "form_loginname" => username,
-      "form_pw"        => password,
-      "login"          => "Login"
-    }
+    %w(group package release).each do |type|
+      @autoconfig["#{type}_ids"].clear
+    end
 
-    run page, form
+    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"
+      scrape_project(project)
+    end
   end
 
-  def scrape_config(username)
-    require 'open-uri'
-
+  def scrape_project(project)
     data = {
       "group_ids" => {},
       "package_ids" => {},
       "release_ids" => Hash.new { |h,k| h[k] = {} },
     }
 
-    html = URI.parse("http://rubyforge.org/users/#{username}/index.html").read
-    html.scan(%r%/projects/([^/]+)/%).flatten.each do |project|
-      next if project == "support"
-      html = URI.parse("http://rubyforge.org/projects/#{project}/index.html").read
+    puts "Updating #{project}"
 
+    unless data["group_ids"].has_key? project then
+      html = URI.parse("http://rubyforge.org/projects/#{project}/index.html").read
       group_id = html[/(frs|tracker)\/\?group_id=\d+/][/\d+/].to_i
       data["group_ids"][project] = group_id
+    end
+
+    group_id = data["group_ids"][project]
 
-      html = URI.parse("http://rubyforge.org/frs/?group_id=#{group_id}").read
-
-      package = nil
-      html.scan(/<h3>[^<]+|release_id=\d+">[^>]+|filemodule_id=\d+/).each do |s|
-        case s
-        when /<h3>([^<]+)/ then
-          package = $1.strip
-        when /release_id=(\d+)">([^<]+)/ then
-          data["release_ids"][package][$2] = $1.to_i
-        when /filemodule_id=(\d+)/ then
-          data["package_ids"][package] = $1.to_i
-        end
+    html = URI.parse("http://rubyforge.org/frs/?group_id=#{group_id}").read
+
+    package = nil
+    html.scan(/<h3>[^<]+|release_id=\d+">[^>]+|filemodule_id=\d+/).each do |s|
+      case s
+      when /<h3>([^<]+)/ then
+        package = $1.strip
+      when /release_id=(\d+)">([^<]+)/ then
+        data["release_ids"][package][$2] = $1.to_i
+      when /filemodule_id=(\d+)/ then
+        data["package_ids"][package] = $1.to_i
       end
     end
-    data
+
+    data.each do |key, val|
+      @autoconfig[key].merge! val
+    end
+
+    save_autoconfig
+  end
+
+  def login
+    page = @uri + "/account/login.php"
+    page.scheme = 'https'
+    page = URI.parse page.to_s # set SSL port correctly
+
+    username = @userconfig["username"]
+    password = @userconfig["password"]
+
+    form = {
+      "return_to"      => "",
+      "form_loginname" => username,
+      "form_pw"        => password,
+      "login"          => "Login"
+    }
+
+    run page, form
   end
 
   def create_package(group_id, package_name)
     page = "/frs/admin/index.php"
 
     group_id = lookup "group", group_id
-    is_private = @config["is_private"]
+    is_private = @userconfig["is_private"]
     is_public = is_private ? 0 : 1
 
     form = {
@@ -128,6 +160,9 @@ class RubyForge
     }
 
     run page, form
+
+    group_name = @autoconfig["group_ids"].invert[group_id]
+    scrape_project(group_name)
   end
 
   ##
@@ -163,6 +198,11 @@ class RubyForge
       "submit"      => "Delete",
     }
 
+    package_name = @autoconfig["package_ids"].invert[package_id]
+    @autoconfig["package_ids"].delete package_name
+    @autoconfig["release_ids"].delete package_name
+    save_autoconfig
+
     run page, form
   end
 
@@ -170,15 +210,15 @@ class RubyForge
     userfile = files.shift
     page = "/frs/admin/qrs.php"
 
-    group_id = lookup "group", group_id
-    package_id = lookup "package", package_id
-    userfile = open userfile, 'rb'
-    release_date = @config["release_date"]
-    type_id = @config["type_id"]
-    processor_id = @config["processor_id"]
-    release_notes = @config["release_notes"]
-    release_changes = @config["release_changes"]
-    preformatted = @config["preformatted"]
+    group_id        = lookup "group", group_id
+    package_id      = lookup "package", package_id
+    userfile        = open userfile, 'rb'
+    release_date    = @userconfig["release_date"]
+    type_id         = @userconfig["type_id"]
+    processor_id    = @userconfig["processor_id"]
+    release_notes   = @userconfig["release_notes"]
+    release_changes = @userconfig["release_changes"]
+    preformatted    = @userconfig["preformatted"]
 
     release_date ||= Time::now.strftime("%Y-%m-%d %H:%M")
 
@@ -219,6 +259,11 @@ class RubyForge
       add_file(group_id, package_id, release_id, file)
     end
 
+    package_name = @autoconfig["package_ids"].invert[package_id]
+    raise "unknown package name for #{package_id}" if package_name.nil?
+    @autoconfig["release_ids"][package_name][release_name] = release_id
+    save_autoconfig
+
     release_id
   end
 
@@ -232,12 +277,12 @@ class RubyForge
   #   add_file(1024, 1242, "0.8.0", "traits-0.8.0.gem")
 
   def add_file(group_name, package_name, release_name, userfile)
-    page = '/frs/admin/editrelease.php'
-    type_id = @config["type_id"]
-    group_id = lookup "group", group_name
-    package_id = lookup "package", package_name
-    release_id = (Integer === release_name) ? release_name : lookup("release", package_name)[release_name]
-    processor_id = @config["processor_id"]
+    page         = '/frs/admin/editrelease.php'
+    type_id      = @userconfig["type_id"]
+    group_id     = lookup "group", group_name
+    package_id   = lookup "package", package_name
+    release_id   = (Integer === release_name) ? release_name : lookup("release", package_name)[release_name]
+    processor_id = @userconfig["processor_id"]
 
     page = "/frs/admin/editrelease.php?group_id=#{group_id}&release_id=#{release_id}&package_id=#{package_id}"
 
@@ -255,7 +300,7 @@ class RubyForge
       "processor_id" => processor_id,
       "userfile"     => userfile,
       "submit"       => "Add This File"
-    }
+      }
 
     boundary = Array::new(8){ "%2.2d" % rand(42) }.join('__')
     boundary = "multipart/form-data; boundary=___#{ boundary }___"
@@ -266,11 +311,11 @@ class RubyForge
   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 @config["cookie_jar"]
+    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
@@ -280,7 +325,7 @@ class RubyForge
       puts "client.post_content #{uri.inspect}, #{form.inspect}, #{extheader.inspect}"
     end
 
-    response = client.post_content uri, form, extheader 
+    response = client.post_content uri, form, extheader
 
     @client = client if $TESTING
 
@@ -299,8 +344,8 @@ class RubyForge
   def lookup(type, val) # :nodoc:
     unless Fixnum === val then
       key = val.to_s
-      val = @config["rubyforge"]["#{type}_ids"][key]
-      raise "no <#{type}_id> configured for <#{ key }>" unless val 
+      val = @autoconfig["#{type}_ids"][key]
+      raise "no <#{type}_id> configured for <#{ key }>" unless val
     end
     val
   end
@@ -314,19 +359,17 @@ __END__
 #
 # this must be your username
 #
-  username   : username 
+  username   : username
 #
 # this must be your password
 #
-  password   : password 
+  password   : password
 #
-# defaults for some values 
+# defaults for some values
 #
-  cookie_jar : #{ COOKIE_F } 
+  cookie_jar : #{ COOKIE_F }
   is_private : false
-#
-# server side rubyforge configuration
-#
+# AUTOCONFIG:
   rubyforge :
   #
   # map your group names to their rubyforge ids

data/test/test_rubyforge.rb

@@ -6,13 +6,18 @@ require 'rubyforge'
 class FakeRubyForge < RubyForge
   HTML = "blah blah <form action=\"/frs/admin/editrelease.php?group_id=440&release_id=6948&package_id=491\" method=\"post\"> blah blah"
 
-  attr_accessor :page, :form, :extheader, :requests
+  attr_accessor :page, :form, :extheader, :requests, :scrape
   def run(page, form, extheader={})
     @page, @form, @extheader = page, form, extheader
     @requests ||= []
     @requests << { :url => page, :form => form, :headers => extheader }
     HTML
   end
+
+  def scrape_project(proj)
+    @scrape ||= []
+    @scrape << proj
+  end
 end
 
 class HTTPAccess2::Client
@@ -31,6 +36,11 @@ class TestRubyForge < Test::Unit::TestCase
     util_new FakeRubyForge
   end
 
+  def teardown
+    @rubyforge.autoconfig.replace @old_autoconfig
+    @rubyforge.save_autoconfig
+  end
+
   def test_initialize_bad
     assert_raise RuntimeError do
       RubyForge.new(RubyForge::CONFIG_F, "username" => nil)
@@ -49,8 +59,8 @@ class TestRubyForge < Test::Unit::TestCase
 
   def test_login
     u, p = 'fooby', 's3kr3t'
-    @rubyforge.config['username'] = u
-    @rubyforge.config['password'] = p
+    @rubyforge.userconfig['username'] = u
+    @rubyforge.userconfig['password'] = p
     @rubyforge.login
 
     util_run('https://rubyforge.org/account/login.php',
@@ -77,7 +87,6 @@ class TestRubyForge < Test::Unit::TestCase
   end
 
   def test_delete_package_package_name
-    @rubyforge.config["rubyforge"]["package_ids"]["woot_pkg"] = 666
     @rubyforge.delete_package(42, "woot_pkg")
     util_delete_package
   end
@@ -89,7 +98,6 @@ class TestRubyForge < Test::Unit::TestCase
   end
 
   def test_delete_package_group_name
-    @rubyforge.config["rubyforge"]["group_ids"]["seattlerb"] = 42
     @rubyforge.delete_package("seattlerb", 666)
     util_delete_package
   end
@@ -101,14 +109,13 @@ class TestRubyForge < Test::Unit::TestCase
   end
 
   def test_add_file
-    @rubyforge.config["rubyforge"]["group_ids"]["seattlerb"] = 666
-    @rubyforge.config["rubyforge"]["package_ids"]["ringy_dingy"] = 42
-    @rubyforge.config["rubyforge"]["release_ids"]["ringy_dingy"] ||= {}
-    @rubyforge.config["rubyforge"]["release_ids"]["ringy_dingy"]["1.2.3"] = 43
+    @rubyforge.autoconfig["package_ids"]["ringy_dingy"] = 314
+    @rubyforge.autoconfig["release_ids"]["ringy_dingy"] ||= {}
+    @rubyforge.autoconfig["release_ids"]["ringy_dingy"]["1.2.3"] = 43
 
     @rubyforge.add_file('seattlerb', 'ringy_dingy', '1.2.3', __FILE__)
 
-    util_run('/frs/admin/editrelease.php?group_id=666&release_id=43&package_id=42',
+    util_run('/frs/admin/editrelease.php?group_id=42&release_id=43&package_id=314',
              { "step2" => 1,
                "type_id" => 9999,
                "processor_id" => 8000,
@@ -142,7 +149,7 @@ class TestRubyForge < Test::Unit::TestCase
                     "submit" => "Add This File"},
                   :headers => {"content-type"=> "multipart/form-data; boundary=___23__06__24__24__12__01__38__39___"}})
     expected = [add_release, add_file]
-    
+
     result = @rubyforge.requests
     result.each do |r|
       r[:form].delete "userfile"
@@ -155,7 +162,7 @@ class TestRubyForge < Test::Unit::TestCase
     @rubyforge.post_news("seattlerb", "my summary", "my news")
 
     util_run("/news/submit.php",
-             "group_id"     => 1513,
+             "group_id"     => 42,
              "post_changes" => "y",
              "details"      => "my news",
              "summary"      => "my summary",
@@ -163,7 +170,6 @@ class TestRubyForge < Test::Unit::TestCase
   end
 
   def test_add_release_package_name
-    @rubyforge.config["rubyforge"]["package_ids"]["woot_pkg"] = 666
     @rubyforge.add_release(42, "woot_pkg", '1.2.3', __FILE__)
     util_add_release
   end
@@ -175,7 +181,6 @@ class TestRubyForge < Test::Unit::TestCase
   end
 
   def test_add_release_group_name
-    @rubyforge.config["rubyforge"]["group_ids"]["seattlerb"] = 42
     @rubyforge.add_release("seattlerb", 666, '1.2.3', __FILE__)
     util_add_release
   end
@@ -197,8 +202,8 @@ class TestRubyForge < Test::Unit::TestCase
   end
 
   def test_lookup_name
-    @rubyforge.config["rubyforge"]["package_ids"]["ringy_dingy"] = 42
-    assert_equal 42, @rubyforge.lookup("package", "ringy_dingy")
+    @rubyforge.autoconfig["package_ids"]["ringy_dingy"] = 314
+    assert_equal 314, @rubyforge.lookup("package", "ringy_dingy")
   end
 
   def test_lookup_undefined
@@ -237,8 +242,22 @@ class TestRubyForge < Test::Unit::TestCase
 
   def util_new(klass)
     @rubyforge = klass.new
-    @rubyforge.config["release_date"] = "today"
-    @rubyforge.config["rubyforge"]["type_ids"][".rb"] = 9999
+    @old_autoconfig = @rubyforge.autoconfig.dup
+
+    data = { # REFACTOR
+      "group_ids" => {},
+      "package_ids" => {},
+      "release_ids" => Hash.new { |h,k| h[k] = {} },
+      "type_ids" => {},
+      "processor_ids" => {"Any"=>8000},
+    }
+
+    @rubyforge.autoconfig.replace data
+
+    @rubyforge.userconfig["release_date"] = "today"
+    @rubyforge.autoconfig["type_ids"][".rb"] = 9999
+    @rubyforge.autoconfig["group_ids"]["seattlerb"] = 42
+    @rubyforge.autoconfig["package_ids"]["woot_pkg"] = 666
   end
 
   def util_run(page, form={}, extheader={})

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.7
+rubygems_version: 0.9.0.9
 specification_version: 1
 name: rubyforge
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2006-11-29 00:00:00 -08:00
+  version: 0.4.0
+date: 2007-01-10 00:00:00 -05:00
 summary: A simplistic script which automates a limited set of rubyforge operations
 require_paths: 
 - lib
-email: ara.t.howard@noaa.gov
-homepage: http://codeforpeople.com/lib/ruby/rubyforge/
-rubyforge_project: 
-description: A simplistic script which automates a limited set of rubyforge operations
+email: ryand-ruby@zenspider.com
+homepage: http://rubyforge.org/projects/codeforpeople
+rubyforge_project: codeforpeople
+description: "A simplistic 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 * edit ~/.rubyforge/user-config.yml * rubyforge config * 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
@@ -27,14 +27,16 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Ara T. Howard
+- Ara T Howard
+- Ryan Davis
+- Eric Hodel
 files: 
+- .cvsignore
 - History.txt
 - Manifest.txt
-- README
+- README.txt
 - Rakefile
 - bin/rubyforge
-- install.rb
 - lib/http-access2.rb
 - lib/http-access2/cookie.rb
 - lib/http-access2/http.rb

data/install.rb

@@ -1,174 +0,0 @@
-#!/usr/bin/env ruby
-require 'rbconfig'
-require 'find'
-require 'ftools'
-require 'tempfile'
-include Config
-
-LIBDIR      = "lib"
-LIBDIR_MODE = 0644
-
-BINDIR      = "bin"
-BINDIR_MODE = 0755
-
-
-$srcdir            = CONFIG["srcdir"]
-$version           = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
-$libdir            = File.join(CONFIG["libdir"], "ruby", $version)
-$archdir           = File.join($libdir, CONFIG["arch"])
-$site_libdir       = $:.find {|x| x =~ /site_ruby$/}
-$bindir            = CONFIG["bindir"] || CONFIG['BINDIR']
-$ruby_install_name = CONFIG['ruby_install_name'] || CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
-$ruby_ext          = CONFIG['EXEEXT'] || ''
-$ruby              = File.join($bindir, ($ruby_install_name + $ruby_ext))
-
-if !$site_libdir
-  $site_libdir = File.join($libdir, "site_ruby")
-elsif $site_libdir !~ %r/#{Regexp.quote($version)}/
-  $site_libdir = File.join($site_libdir, $version)
-end
-
-def install_rb(srcdir=nil, destdir=nil, mode=nil, bin=nil)
-#{{{
-  path   = []
-  dir    = []
-  Find.find(srcdir) do |f|
-    next unless FileTest.file?(f)
-    next if (f = f[srcdir.length+1..-1]) == nil
-    next if (/CVS$/ =~ File.dirname(f))
-    path.push f
-    dir |= [File.dirname(f)]
-  end
-  for f in dir
-    next if f == "."
-    next if f == "CVS"
-    File::makedirs(File.join(destdir, f))
-  end
-  for f in path
-    next if (/\~$/ =~ f)
-    next if (/^\./ =~ File.basename(f))
-    unless bin
-      File::install(File.join(srcdir, f), File.join(destdir, f), mode, true)
-    else
-      from = File.join(srcdir, f)
-      to = File.join(destdir, f)
-      shebangify(from) do |sf|
-        $deferr.print from, " -> ", File::catname(from, to), "\n"
-        $deferr.printf "chmod %04o %s\n", mode, to 
-        File::install(sf, to, mode, false)
-      end
-    end
-  end
-#}}}
-end
-def shebangify f
-#{{{
-  open(f) do |fd|
-    buf = fd.read 42 
-    if buf =~ %r/^\s*#\s*!.*ruby/o
-      ftmp = Tempfile::new("#{ $$ }_#{ File::basename(f) }")
-      begin
-        fd.rewind
-        ftmp.puts "#!#{ $ruby  }"
-        while((buf = fd.read(8192)))
-          ftmp.write buf
-        end
-        ftmp.close
-        yield ftmp.path
-      ensure
-        ftmp.close!
-      end
-    else
-      yield f
-    end
-  end
-#}}}
-end
-def ARGV.switch
-#{{{
-  return nil if self.empty?
-  arg = self.shift
-  return nil if arg == '--'
-  if arg =~ /^-(.)(.*)/
-    return arg if $1 == '-'
-    raise 'unknown switch "-"' if $2.index('-')
-    self.unshift "-#{$2}" if $2.size > 0
-    "-#{$1}"
-  else
-    self.unshift arg
-    nil
-  end
-#}}}
-end
-def ARGV.req_arg
-#{{{
-  self.shift || raise('missing argument')
-#}}}
-end
-def linkify d
-#--{{{
-  if test ?d, d
-    versioned = Dir[ File::join(d, "*-[0-9].[0-9].[0-9].rb") ]
-    versioned.each{|v| File::copy v, v.gsub(%r/\-[\d\.]+\.rb$/,'.rb')}
-  end
-#--}}}
-end
-
-
-#
-# main program
-#
-
-libdir = $site_libdir
-bindir = $bindir
-no_linkify = false
-help = false
-
-usage = <<-usage
-  #{ File::basename $0 }
-    -d, --destdir    <destdir>
-    -l, --libdir     <libdir>
-    -b, --bindir     <bindir>
-    -r, --ruby       <ruby>
-    -n, --no_linkify
-    -h, --help
-usage
-
-begin
-  while switch = ARGV.switch
-    case switch
-    when '-d', '--destdir'
-      libdir = ARGV.req_arg
-    when '-l', '--libdir'
-      libdir = ARGV.req_arg
-    when '-b', '--bindir'
-      bindir = ARGV.req_arg
-    when '-r', '--ruby'
-      $ruby = ARGV.req_arg
-    when '-n', '--no_linkify'
-      no_linkify = true
-    when '-h', '--help'
-      help = true
-    else
-      raise "unknown switch #{switch.dump}"
-    end
-  end
-rescue
-  STDERR.puts $!.to_s
-  STDERR.puts usage
-  exit 1
-end    
-
-if help
-  STDOUT.puts usage
-  exit
-end
-
-unless no_linkify
-  linkify('lib')
-  linkify('bin')
-end
-
-install_rb(LIBDIR, libdir, LIBDIR_MODE)
-install_rb(BINDIR, bindir, BINDIR_MODE, bin=true)
-