rubyforge 1.0.3 → 1.0.4

data/History.txt

@@ -1,57 +1,63 @@
-== Version History:
+=== 1.0.4 / 2009-07-21
 
-=== 1.0.3 / 2009-02-26:
+* Uses the passed in proxy, if provided. (Thanks sdabet, RF #24071).
+* Update group_id pattern for scraping project configs you are only a member of.
+* Update regexp used to validate login page to be less restrictive.
+* Fixed --help to not require an argument.
+* add --force flag for login command to ignore previous cookie. (or use logout)
+
+=== 1.0.3 / 2009-02-26
 
 * Fixed nil error in our Net::HTTP patches.
 * Removed password from warning if the login possibly failed.
 
-=== 1.0.2 / 2009-01-05:
+=== 1.0.2 / 2009-01-05
 
 * All webby commands now login automatically.
 * Login now no-ops if it already has a session cookie.
 * Added logout command.
 * Much more of the config is self-repairing, but still not bulletproof yet.
 
-=== 1.0.1 / 2008-10-22:
+=== 1.0.1 / 2008-10-22
 
 * Fixed multipart form upload so it isn't url escaping the data. DOH.
   * Affects release_notes and release_changes, but never reported for 5 months.
 
-=== 1.0.0 / 2008-05-20:
+=== 1.0.0 / 2008-05-20
 
 * Removed HTTPAccess2, thanks to Aaron Patterson. Even tho he's whiny.
 * Changed initialize/configure to make testing scream. 100x faster.
 
-=== 0.4.5 / 2008-03-11:
+=== 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:
+=== 0.4.4 / 2007-08-13
 
 * New type_id values will merge with extant data. (self-repairing data is Good)
 * Scrape processor_ids, merging in with extant data.
 * Default to "Other" if a file's type is unrecognized.
 
-=== 0.4.3 / 2007-07-23:
+=== 0.4.3 / 2007-07-23
 
 * Set mode on .rubyforge directory to 700.
 * Fix fetching of user id when user has no releases.
 
-=== 0.4.2 / 2007-05-21:
+=== 0.4.2 / 2007-05-21
 
 * Fix for windoze users (spaces in path).
 * Added check for extant release.
 * Added default hash for first-time releases.
 
-=== 0.4.1 / 2007-03-08:
+=== 0.4.1 / 2007-03-08
 
 * Verify that login succeeded and warn against if not (prolly should raise).
 * Print a friendly error if you have the wrong package id.
 * Handle upload error in add_release a bit better.
 
-=== 0.4.0 / 2007-01-09:
+=== 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.
@@ -62,17 +68,17 @@
 * 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:
+=== 0.3.2 / 2006-11-29
 
 * Fixed file uploads for windows.
 * Correctly scrape releases with funky characters.
 
-=== 0.3.1 / 2006-10-24:
+=== 0.3.1 / 2006-10-24
 
 * Added SSL login.
 * Added yet more debugging output if $DEBUG.
 
-=== 0.3.0 / 2006-09-30:
+=== 0.3.0 / 2006-09-30
 
 * Added more debugging output if $DEBUG
 * Added news posting.
@@ -80,11 +86,11 @@
 * add_release now returns release_id
 * Fixed config scraper to include '-' in names.
 
-=== 0.2.1 / 2006-09-14:
+=== 0.2.1 / 2006-09-14
 
 * Gemspec was too loose about packaging. Now using manifest.
 
-=== 0.2.0 / 2006-09-13:
+=== 0.2.0 / 2006-09-13
 
 * Split original script into script and library.
 * Added tests for library.

data/README.txt

@@ -35,7 +35,7 @@ A script which automates a limited set of rubyforge operations.
 
 (The MIT License)
 
-Copyright (c) 2006-2009 Ryan Davis, Eric Hodel, Ara T Howard.
+Copyright (c) Ryan Davis, Eric Hodel, Ara T Howard.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,28 +1,20 @@
 # -*- ruby -*-
 
-$:.unshift 'lib'
-require 'rubyforge'
-
-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
+require 'rubygems'
+require 'hoe'
 
 abort "you _must_ install this gem to release it" if
   ENV['VERSION'] && ENV['VERSION'] != RubyForge::VERSION
 
-Hoe.new("rubyforge", RubyForge::VERSION) do |rubyforge|
-  rubyforge.rubyforge_name = "codeforpeople"
-  rubyforge.need_tar = false
+Hoe.spec "rubyforge" do
+  developer 'Ryan Davis',   'ryand-ruby@zenspider.com'
+  developer 'Eric Hodel',   'drbrain@segment7.net'
+  developer 'Ara T Howard', 'ara.t.howard@gmail.com'
 
-  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')
+  multiruby_skip << "rubinius"
 
-  rubyforge.multiruby_skip << "rubinius"
+  self.rubyforge_name = "codeforpeople"
+  self.need_tar       = false
 end
 
 task :backup do

data/bin/rubyforge

@@ -136,7 +136,8 @@ EOL
 mode = ARGV.shift
 
 opts = GetoptLong::new(
-         [ "--help"            , "-h" , GetoptLong::REQUIRED_ARGUMENT ],
+         [ "--help"            , "-h" , GetoptLong::NO_ARGUMENT ],
+         [ "--force"           , "-F" , GetoptLong::NO_ARGUMENT ],
          [ "--username"        , "-u" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--password"        , "-p" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--cookie_jar"      , "-C" , GetoptLong::REQUIRED_ARGUMENT ],

data/lib/rubyforge.rb

@@ -11,7 +11,7 @@ $TESTING = false unless defined? $TESTING
 class RubyForge
 
   # :stopdoc:
-  VERSION     = '1.0.3'
+  VERSION     = '1.0.4'
   HOME        = ENV["HOME"] || ENV["HOMEPATH"] || File::expand_path("~")
   RUBYFORGE_D = File::join HOME, ".rubyforge"
   CONFIG_F    = File::join RUBYFORGE_D, "user-config.yml"
@@ -61,6 +61,10 @@ class RubyForge
     self
   end
 
+  def force
+    @userconfig['force']
+  end
+
   def cookie_store
     client.cookie_store
   end
@@ -120,7 +124,8 @@ class RubyForge
 
     unless data["group_ids"].has_key? project then
       html = URI.parse("http://rubyforge.org/projects/#{project}/index.html").read
-      group_id = html[/(frs|tracker|mail)\/\?group_id=\d+/][/\d+/].to_i
+      group_id = html[%r/(memberlist.php|frs|tracker|mail)\/?\?group_id=\d+/][%r/\d+/].to_i
+
       data["group_ids"][project] = group_id
     end
 
@@ -169,7 +174,7 @@ class RubyForge
   end
 
   def login
-    return if cookie_store['rubyforge.org']['session_ser'] rescue false
+    return if(!force and cookie_store['rubyforge.org']['session_ser']) rescue false
 
     page = self.uri + "/account/login.php"
     page.scheme = 'https'
@@ -187,7 +192,7 @@ class RubyForge
 
     response = run page, form
 
-    re = %r/personal\s+page\s+for:\s+#{ Regexp.escape username }/iom
+    re = %r/personal\s+page/iom
     unless response =~ re
       warn("%s:%d: warning: potentially failed login using %s" %
            [__FILE__, __LINE__, username]) unless $TESTING
@@ -336,8 +341,8 @@ class RubyForge
   # package_id, and release_id
   #
   # example :
-  #   add_file("codeforpeople.com", "traits", "0.8.0", "traits-0.8.0.gem")
-  #   add_file("codeforpeople.com", "traits", "0.8.0", "traits-0.8.0.tgz")
+  #   add_file("codeforpeople", "traits", "0.8.0", "traits-0.8.0.gem")
+  #   add_file("codeforpeople", "traits", "0.8.0", "traits-0.8.0.tgz")
   #   add_file(1024, 1242, "0.8.0", "traits-0.8.0.gem")
 
   def add_file(group_name, package_name, release_name, userfile)
@@ -436,7 +441,7 @@ __END__
   # map your group names to their rubyforge ids
   #
     group_ids :
-      codeforpeople.com : 1024
+      codeforpeople : 1024
   #
   # map your package names to their rubyforge ids
   #

data/lib/rubyforge/client.rb

@@ -33,7 +33,14 @@ class RubyForge
       @debug_dev       = nil
       @ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
       @cookie_manager  = CookieManager.new
-      @agent_class     = Net::HTTP
+      if proxy
+        begin
+          proxy_uri = URI.parse(proxy)
+          @agent_class = Net::HTTP::Proxy(proxy_uri.host,proxy_uri.port)
+        rescue URI::InvalidURIError
+        end
+      end
+      @agent_class ||= Net::HTTP
     end
 
     def cookie_store

data/test/test_rubyforge.rb

@@ -68,6 +68,16 @@ class TestRubyForge < Test::Unit::TestCase
     #     end
   end
 
+  def test_new_with_proxy_uses_a_proxy_class
+    client = RubyForge::Client.new('http://localhost:8808/')
+    assert client.agent_class.proxy_class?, 'agent class should be a proxy'
+  end
+
+  def test_new_with_bad_proxy_uses_normal_http
+    client = RubyForge::Client.new('asdfkjhalksdfjh')
+    assert !client.agent_class.proxy_class?, 'agent class should not be a proxy'
+  end
+
   def test_initialize_bad
     @cookie_path = File.join(Dir.tmpdir, "cookie.#{$$}.dat")
     File.open(@cookie_path, 'w') {} # touch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyforge
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -11,11 +11,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
+date: 2009-07-21 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."
+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
@@ -42,6 +54,8 @@ files:
 - test/test_rubyforge_cookie_manager.rb
 has_rdoc: true
 homepage: http://codeforpeople.rubyforge.org/rubyforge/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -63,9 +77,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A script which automates a limited set of rubyforge operations
 test_files: 
 - test/test_rubyforge.rb