rubyforge 1.0.2 → 2.0.0

data/History.txt

@@ -1,52 +1,74 @@
-== Version History:
+=== 2.0.0 / 2009-09-21
 
-=== 1.0.2 / 2009-01-05:
+* Modified to use RubyForge REST API rather than scraping HTML.
+
+=== 1.0.5 / 2009-09-15
+
+* Added experimental script to sync RF trackers with release names.
+* Fixed that damned processor_id bug. (hinegardner)
+* The century usually doesn't change across runs. Refactor.
+* Fix use of Time.utc if args.size < 10, tho seems unnecessary.
+
+=== 1.0.4 / 2009-07-21
+
+* 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
 
 * 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.
@@ -57,17 +79,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.
@@ -75,11 +97,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/Manifest.txt

@@ -5,7 +5,5 @@ Rakefile
 bin/rubyforge
 lib/rubyforge.rb
 lib/rubyforge/client.rb
-lib/rubyforge/cookie_manager.rb
 test/test_rubyforge.rb
 test/test_rubyforge_client.rb
-test/test_rubyforge_cookie_manager.rb

data/README.txt

@@ -13,10 +13,6 @@ A script which automates a limited set of rubyforge operations.
   * 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.
 
 == Synopsis
 
@@ -25,6 +21,7 @@ A script which automates a limited set of rubyforge operations.
 == REQUIREMENTS
 
 * hoe
+* json
 * rubygems
 
 == INSTALL
@@ -35,7 +32,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,29 +1,28 @@
 # -*- ruby -*-
 
-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
-
-$:.unshift 'lib'
+require 'rubygems'
+require 'hoe'
+require 'json'
 
 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.plugin :email
 
-  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')
+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'
+  developer 'Tom Copeland', 'tom@infoether.com'
 
-  rubyforge.multiruby_skip << "rubinius"
+  multiruby_skip << "rubinius"
+
+  self.rubyforge_name = "codeforpeople"
+  self.need_tar       = false
 end
 
+task :postrelease => :announce
+
 task :backup do
   Dir.chdir File.expand_path("~/.rubyforge") do
     cp "user-config.yml",  "user-config.yml.bak"

data/bin/rubyforge

@@ -41,21 +41,12 @@ MODES
     example :
       #{ PROGRAM } names
 
-  login()
-    sends username and password from config.yml (or --username/--password
-    options) and stores login cookie in cookie.dat.  this is required for
-    subsquent operations work.
-
-    example :
-      #{ PROGRAM } login
-      #{ PROGRAM } login --username zaphod --password 42
-
   create_package(group_id, package_name)
     creates the named package under the specified group.
 
     example :
       #{ PROGRAM } create_package 1024 traits
-      #{ PROGRAM } login && #{ PROGRAM } create_package codeforpeople.com traits
+      #{ PROGRAM } create_package codeforpeople.com traits
 
   add_release(group_id, package_id, release_name, userfile)
     release a file as release_name under the specified group_id and
@@ -65,7 +56,7 @@ MODES
       #{ 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
 
   add_file(group_id, package_id, release_id, userfile)
     add a file to an existing release under the specified group_id,
@@ -83,6 +74,12 @@ MODES
       #{ PROGRAM } delete_package codeforpeople.com traits
       #{ PROGRAM } delete_package 1024 traits
 
+  post_news(group_id, summary, details)
+    posts a news item to the specified group
+
+    example :
+      #{ PROGRAM } post_news codeforpeople.com "new release" "this release is great!"
+      #{ PROGRAM } post_news 1024 traits "new release" "this release is great!"
 NOTES
 
   - In order to use group_id, package_id, or release_id by name,
@@ -90,16 +87,10 @@ NOTES
     rubyforge[package_ids] translation tables in your config.yml. See
     the config command for more information and help.
 
-  - 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.
-
 TODO
 
-  - add error checking.  this requires screen scraping to see of an operation
-    succeeded since 200 is returned from rubyforge even for failed operations
-    and only the html text reveals the status.
+  - add error checking.  this may require mods to the REST API as 
+    well to ensure that it returns useful error codes.
 
 OPTIONS
 
@@ -112,8 +103,6 @@ OPTIONS
       specify username, taken from config otherwise
     --password        , -p
       specify password, taken from config otherwise
-    --cookie_jar      , -C
-      specify cookie storage file (default #{ RubyForge::COOKIE_F })
 
   add_release :
     --is_private      , -P
@@ -136,10 +125,10 @@ 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 ],
          [ "--is_private"      , "-P" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--release_date"    , "-r" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--type_id"         , "-t" , GetoptLong::REQUIRED_ARGUMENT ],
@@ -170,10 +159,6 @@ when %r/names/
   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/logout/
-  rubyforge.logout
 when %r/create_package/
   page, msg = "/frs/admin/index.php", "post_content"
 
@@ -184,9 +169,15 @@ when %r/create_package/
 
   group_id = Integer(group_id) rescue group_id
 
-  rubyforge.login
-
   rubyforge.create_package group_id, package_name
+when %r/post_news/
+  group_id, summary, details = ARGV
+
+  abort "no <group_id>"     unless group_id
+
+  group_id = Integer(group_id) rescue group_id
+
+  rubyforge.post_news group_id, summary, details
 when %r/delete_package/
   group_id, package_id = ARGV
 
@@ -196,8 +187,6 @@ when %r/delete_package/
   group_id   = Integer(group_id)   rescue group_id
   package_id = Integer(package_id) rescue package_id
 
-  rubyforge.login
-
   rubyforge.delete_package group_id, package_id
 when %r/add_release/
   group_id, package_id, release_name, userfile = ARGV
@@ -210,8 +199,6 @@ when %r/add_release/
   group_id   = Integer(group_id)   rescue group_id
   package_id = Integer(package_id) rescue package_id
 
-  rubyforge.login
-
   rubyforge.add_release group_id, package_id, release_name, userfile
 when %r/add_file/
   group_id, package_id, release_id, userfile = ARGV
@@ -225,8 +212,6 @@ when %r/add_file/
   package_id = Integer(package_id) rescue package_id
   release_id = Integer(release_id) rescue release_id
 
-  rubyforge.login
-
   rubyforge.add_file group_id, package_id, release_id, userfile
 else
   abort USAGE

data/lib/rubyforge/client.rb

@@ -1,16 +1,16 @@
 require 'webrick/cookie'
 require 'net/http'
 require 'net/https'
-require 'rubyforge/cookie_manager'
 
 # clean up warnings caused by web servers that send down 2 digit years
 class Time
+  CENTURY = Time.now.year / 100 * 100
+  
   class << self
     alias :old_utc :utc
 
     def utc(*args)
-      century = Time.now.year / 100 * 100
-      args[0] += century if args[0] < 100
+      args[0] += CENTURY if args[0] < 100
       old_utc(*args)
     end
   end
@@ -21,7 +21,7 @@ class Net::HTTP
   alias :old_use_ssl= :use_ssl=
   def use_ssl= flag
     self.old_use_ssl = flag
-    @ssl_context.tmp_dh_callback = proc {}
+    @ssl_context.tmp_dh_callback = proc {} if @ssl_context
   end
 end unless Net::HTTP.public_instance_methods.include? "old_use_ssl="
 
@@ -32,45 +32,41 @@ class RubyForge
     def initialize(proxy = nil)
       @debug_dev       = nil
       @ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
-      @cookie_manager  = CookieManager.new
-      @agent_class     = Net::HTTP
-    end
-
-    def cookie_store
-      @cookie_manager
-    end
-
-    def cookie_store=(path)
-      @cookie_manager = CookieManager.load(path)
+      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 post_content(uri, form = {}, headers = {})
+    def post_content(uri, form = {}, headers = {}, userconfig = nil)
       uri = URI.parse(uri) unless uri.is_a?(URI)
       request = agent_class::Post.new(uri.request_uri)
-      execute(request, uri, form, headers)
+      execute(request, uri, form, headers, userconfig)
     end
 
-    def get_content(uri, query = {}, headers = {})
+    def get_content(uri, query = {}, headers = {}, userconfig = nil)
       uri = URI.parse(uri) unless uri.is_a?(URI)
       request = agent_class::Get.new(uri.request_uri)
-      execute(request, uri, query, headers)
+      execute(request, uri, query, headers, userconfig)
     end
 
-    def execute(request, uri, parameters = {}, headers = {})
+    def execute(request, uri, parameters = {}, headers = {}, userconfig = nil)
       {
         'content-type' => 'application/x-www-form-urlencoded'
       }.merge(headers).each { |k,v| request[k] = v }
 
-      @cookie_manager[uri].each { |k,v|
-        request['Cookie'] = v.to_s
-      } if @cookie_manager[uri]
-
       http = agent_class.new( uri.host, uri.port )
 
-      if uri.scheme == 'https'
-        http.use_ssl      = true
-        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+      if uri.scheme == 'https' && uri.host !~ /localhost/
+       http.use_ssl      = true
+       http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
       end
+      
+      request.basic_auth(userconfig["username"], userconfig["password"])
 
       request_data = case request['Content-Type']
                      when /boundary=(.*)$/
@@ -81,13 +77,6 @@ class RubyForge
       request['Content-Length'] = request_data.length.to_s
 
       response = http.request(request, request_data)
-      (response.get_fields('Set-Cookie') || []).each do |raw_cookie|
-        WEBrick::Cookie.parse_set_cookies(raw_cookie).each { |baked_cookie|
-          baked_cookie.domain ||= url.host
-          baked_cookie.path   ||= url.path
-          @cookie_manager.add(uri, baked_cookie)
-        }
-      end
 
       return response.body if response.class <= Net::HTTPSuccess
 
@@ -131,8 +120,5 @@ class RubyForge
       }.compact.join('&')
     end
 
-    def save_cookie_store
-      @cookie_manager.save!
-    end
   end
 end