rubyforge 1.0.1 → 1.0.2

data/History.txt

@@ -1,5 +1,12 @@
 == Version History:
 
+=== 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:
 
 * Fixed multipart form upload so it isn't url escaping the data. DOH.

data/README.txt

@@ -22,3 +22,37 @@ A script which automates a limited set of rubyforge operations.
 
   rubyforge [options]* mode [mode_args]*
 
+== REQUIREMENTS
+
+* hoe
+* rubygems
+
+== INSTALL
+
+* sudo gem install rubyforge
+
+== LICENSE
+
+(The MIT License)
+
+Copyright (c) 2006-2009 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
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Rakefile

@@ -8,6 +8,8 @@ rescue LoadError
        please install it via rubygems."
 end
 
+$:.unshift 'lib'
+
 abort "you _must_ install this gem to release it" if
   ENV['VERSION'] && ENV['VERSION'] != RubyForge::VERSION
 

data/bin/rubyforge

@@ -172,51 +172,61 @@ when %r/names/
   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"
 
   group_id, package_name = ARGV
 
-  abort "no <group_id>" unless group_id
+  abort "no <group_id>"     unless group_id
   abort "no <package_name>" unless package_name
 
   group_id = Integer(group_id) rescue group_id
 
+  rubyforge.login
+
   rubyforge.create_package group_id, package_name
 when %r/delete_package/
   group_id, package_id = ARGV
 
-  abort "no <group_id>" unless group_id
+  abort "no <group_id>"   unless group_id
   abort "no <package_id>" unless package_id
 
-  group_id = Integer(group_id) rescue group_id
+  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
 
-  abort "no <group_id>" unless group_id
-  abort "no <package_id>" unless package_id
+  abort "no <group_id>"     unless group_id
+  abort "no <package_id>"   unless package_id
   abort "no <release_name>" unless release_name
-  abort "no <userfile>" unless userfile
+  abort "no <userfile>"     unless userfile
 
-  group_id = Integer(group_id) rescue group_id
+  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
 
-  abort "no <group_id>" unless group_id
+  abort "no <group_id>"   unless group_id
   abort "no <package_id>" unless package_id
   abort "no <release_id>" unless release_id
-  abort "no <userfile>" unless userfile
+  abort "no <userfile>"   unless userfile
 
-  group_id = Integer(group_id) rescue group_id
+  group_id   = Integer(group_id)   rescue group_id
   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.rb

@@ -11,7 +11,7 @@ $TESTING = false unless defined? $TESTING
 class RubyForge
 
   # :stopdoc:
-  VERSION     = '1.0.1'
+  VERSION     = '1.0.2'
   HOME        = ENV["HOME"] || ENV["HOMEPATH"] || File::expand_path("~")
   RUBYFORGE_D = File::join HOME, ".rubyforge"
   CONFIG_F    = File::join RUBYFORGE_D, "user-config.yml"
@@ -23,6 +23,7 @@ class RubyForge
   CONFIG = YAML.load(config)
   # :startdoc:
 
+  # TODO: add an autoconfig method that is self-repairing, removing key checks 
   attr_reader :userconfig, :autoconfig
 
   def initialize(userconfig=nil, autoconfig=nil, opts=nil)
@@ -60,6 +61,10 @@ class RubyForge
     self
   end
 
+  def cookie_store
+    client.cookie_store
+  end
+
   def uri
     @uri ||= URI.parse @userconfig['uri']
   end
@@ -88,7 +93,7 @@ class RubyForge
     username = @userconfig['username']
 
     %w(group package processor release).each do |type|
-      @autoconfig["#{type}_ids"].clear
+      @autoconfig["#{type}_ids"].clear if @autoconfig["#{type}_ids"]
     end
 
     puts "Getting #{username}"
@@ -105,10 +110,10 @@ class RubyForge
 
   def scrape_project(project)
     data = {
-      "group_ids" => {},
-      "package_ids" => {},
+      "group_ids"     => {},
+      "package_ids"   => {},
       "processor_ids" => Hash.new { |h,k| h[k] = {} },
-      "release_ids" => Hash.new { |h,k| h[k] = {} },
+      "release_ids"   => Hash.new { |h,k| h[k] = {} },
     }
 
     puts "Updating #{project}"
@@ -136,7 +141,8 @@ class RubyForge
     end
 
     if not data['release_ids'][package].empty? and
-       @autoconfig['processor_ids'].empty? then
+        (@autoconfig['processor_ids'].nil? or
+         @autoconfig['processor_ids'].empty?) then
       puts "Fetching processor ids"
 
       login
@@ -151,13 +157,20 @@ class RubyForge
     end
 
     data.each do |key, val|
+      @autoconfig[key] ||= {}
       @autoconfig[key].merge! val
     end
 
     save_autoconfig
   end
 
+  def logout
+    cookie_store.clear "rubyforge.org"
+  end
+
   def login
+    return if cookie_store['rubyforge.org']['session_ser'] rescue false
+
     page = self.uri + "/account/login.php"
     page.scheme = 'https'
     page = URI.parse page.to_s # set SSL port correctly
@@ -177,7 +190,7 @@ class RubyForge
     re = %r/personal\s+page\s+for:\s+#{ Regexp.escape username }/iom
     unless response =~ re
       warn("%s:%d: warning: potentially failed login using %s:%s" %
-        [__FILE__,__LINE__,username,password]) unless $TESTING
+           [__FILE__,__LINE__,username,password]) unless $TESTING
     end
 
     response

data/lib/rubyforge/client.rb

@@ -36,6 +36,10 @@ class RubyForge
       @agent_class     = Net::HTTP
     end
 
+    def cookie_store
+      @cookie_manager
+    end
+
     def cookie_store=(path)
       @cookie_manager = CookieManager.load(path)
     end
@@ -59,7 +63,7 @@ class RubyForge
 
       @cookie_manager[uri].each { |k,v|
         request['Cookie'] = v.to_s
-      }
+      } if @cookie_manager[uri]
 
       http = agent_class.new( uri.host, uri.port )
 

data/lib/rubyforge/cookie_manager.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 class RubyForge
   class CookieManager
     class << self
@@ -19,7 +21,13 @@ class RubyForge
     def [](uri)
       # FIXME we need to do more matching on hostname....  This is not
       # bulletproof
-      @jar[uri.host.downcase]
+      uri = (URI === uri ? uri.host : uri).downcase 
+      @jar[uri] ||= {}
+    end
+
+    def clear uri
+      self[uri].clear
+      self.save!
     end
 
     def empty?
@@ -27,6 +35,7 @@ class RubyForge
     end
 
     def save!
+      clean_stale_cookies
       File.open(@cookies_file, 'wb') { |f|
         f.write(YAML.dump(self))
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyforge
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-22 00:00:00 -05:00
+date: 2009-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A script which automates a limited set of rubyforge operations