rudy 0.6.5 → 0.6.6

data/CHANGES.txt

@@ -7,7 +7,12 @@ RUDY, CHANGES
 * TODO: Support for product codes
 * TODO: HTTPS
 
-#### 0.6.5 (2009-04-??) ###############################
+#### 0.6.6 (2009-04-22) ###############################
+
+* ADDED: Better error handling for Rudy::AWS::SDB
+* FIXED: Ruby 1.9.1 compatability (including requiring aws-s3 >=0.6.1)
+
+#### 0.6.5 (2009-04-20) ###############################
 
 * FIXED: Startup and Shutdown routines now check machine group status first
 * FIXED: Misc release process issues between 0.6.0 and 0.6.4

data/README.rdoc

@@ -33,8 +33,8 @@ Via Rubygems, one of:
     $ sudo gem install solutious-rudy --source http://gems.github.com/
 
 or via download:
-* rudy-0.6.4.tar.gz[http://github.com/solutious/rudy/tarball/rudy-0.6.4]
-* rudy-0.6.4.zip[http://github.com/solutious/rudy/zipball/rudy-0.6.4]
+* rudy-0.6.6.tar.gz[http://github.com/solutious/rudy/tarball/rudy-0.6.6]
+* rudy-0.6.6.zip[http://github.com/solutious/rudy/zipball/rudy-0.6.6]
 
 NOTE: <em>If you are not installing via RubyGems, you need to make sure the dependencies are in your LOAD_PATH (<tt>$:</tt>). Ryan Tomayko wrote a gist[http://gist.github.com/54177] about it.</em>
 
@@ -85,7 +85,9 @@ The <tt>-u root</tt> tells Rudy to open a connection as the root user. If you cr
 
 == Common Errors
 
-* <tt>"`require': no such file to load -- amazon-ec2 (LoadError)"</tt>
+* <tt>"fingerprint ... does not match for 'ec2-11-22-33-44.compute-1.amazonaws.com,11.22.33.44'"</tt>
+  * This means the host SSH key for that machine does not match your +~/.ssh/known_hosts+ file. Most EC2 images generate new host SSH keys on the first boot so is the most likely cause for this error message (it's safe to continue). If this is not a new instance, you should tell Rudy not to continue and investigate manually.
+* <tt>"`require': no such file to load -- logger (LoadError)"</tt>
   * You're probably running a mix of Rubygem and non-Rubygem libraries. Ryan Tomayko has you covered: http://gist.github.com/54177
 * <tt>"The request signature we calculated does not match the signature you provided."</tt>
   * Check that your Amazon Web Service access key and secret key are correct

data/Rudyfile

@@ -52,8 +52,8 @@ machines do
     
     
     role :app do
-      positions 2
-      addresses '174.129.208.127', '174.129.208.169'
+      positions 1
+      #addresses '11.22.33.44', '55.66.77.88'
       
       # We define two disks for the stage-app machines
       disks do

data/bin/rudy

@@ -10,8 +10,8 @@
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
 $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
-%w{amazon-ec2 rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
-require 'rubygems'
+#%w{amazon-ec2 rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+#require 'rubygems'
 
 #$SAFE = 1   # require is unsafe in Ruby 1.9??
 
@@ -251,7 +251,7 @@ class RudyCLI < Rudy::CLI::Base
   
   # -------------------------------------------  UGLY STUFFS  --------
   # ------------------------------------------------------------------
-  debug :on
+  debug :off
   default :machines
   
 

data/bin/rudy-s3

@@ -0,0 +1,76 @@
+#!/usr/bin/ruby
+
+# = Rudy S3
+# 
+# === A Rudy interface to Amazon Simple Storage Service
+#
+# 
+# 
+# See rudy-s3 -h for usage
+# 
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
+$:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
+#%w{amazon-ec2 caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+#require 'rubygems'
+
+require 'rudy'
+require 'rudy/cli'
+require 'drydock'
+
+# Command-line interface for bin/rudy-s3
+module RudyCLI_S3
+  extend Drydock
+  
+  # ------------------------------------  AMAZON S3 COMMANDS  --------
+  # ------------------------------------------------------------------
+  
+  desc "Amazon S3 Buckets"
+  usage "rudy-s3 buckets"
+  option :l, :list, "List bucket objects"
+  action :C, :create, "Create a bucket"
+  action :D, :destroy, "Destroy a bucket"
+  argv :name
+  command :buckets => Rudy::CLI::AWS::S3::Buckets
+  command_alias :buckets, :b
+
+  #desc "Amazon S3 Storage Interface"
+  #usage "rudy-s3 store file-path"
+  #option :b, :bucket, String, "Bucket name"
+  #argv :path
+  #command :store => Rudy::CLI::AWS::S3::Store
+  #command_alias :store, :s
+
+  
+  
+  # ---------------------------------  RUDY-S3 MISCELLANEOUS  --------
+  # ------------------------------------------------------------------
+  
+  default :buckets
+  debug :off
+  
+  
+end
+
+
+#puts Rudy::Utils.banner("THIS IS RUBY #{RUBY_VERSION}") if Drydock.debug?
+
+# We call Drydock specifically otherwise it will run at_exit. Rye also
+# uses at_exit for shutting down the ssh-agent. Ruby executes at_exit
+# blocks in reverse order so if Drydock is required first, it's block
+# will run after Rye shuts down the ssh-agent. 
+begin
+  Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
+rescue Drydock::ArgError, Drydock::OptError=> ex
+  STDERR.puts ex.message
+  STDERR.puts ex.usage
+rescue Rudy::Error => ex
+  STDERR.puts ex.message
+rescue => ex
+  STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
+  STDERR.puts ex.backtrace if Drydock.debug?
+rescue SystemExit
+  # Don't balk
+end
+
+

data/lib/rudy/aws/sdb.rb

@@ -13,7 +13,8 @@ module Rudy
     class SDB
       class NoAccessKey < RuntimeError; end
       class NoSecretKey < RuntimeError; end
-        
+      include Rudy::AWS::ObjectBase
+      
       require 'rudy/aws/sdb/error'
       
       def initialize(access_key=nil, secret_key=nil, region=nil, debug=nil)
@@ -94,7 +95,7 @@ module Rudy
         }
         params['NextToken'] =
           token unless token.nil? || token.empty?
-
+          
         doc = call(:get, params)
         results = []
         REXML::XPath.each(doc, "//Item") do |item|
@@ -268,24 +269,31 @@ module Rudy
         uri = URI.parse(url)
         @debug.puts("#{url}") if @debug
         
-        response =
+        response = execute_request(nil) {
           Net::HTTP.new(uri.host, uri.port).send_request(method, uri.request_uri)
-        @debug.puts("#{response.code}\n#{response.body}") if @debug
-        raise(ConnectionError.new(response)) unless (200..400).include?(
-          response.code.to_i
-        )
+        }
         
-        doc = REXML::Document.new(response.body)
-        error = doc.get_elements('*/Errors/Error')[0]
-        raise(
-          Module.class_eval(
-            "AwsSdb::#{error.get_elements('Code')[0].text}Error"
-          ).new(
-            error.get_elements('Message')[0].text,
-            doc.get_elements('*/RequestID')[0].text
-          )
-        ) unless error.nil?
+        if !response.nil?
         
+          @debug.puts("#{response.code}\n#{response.body}") if @debug
+          raise(ConnectionError.new(response)) unless (200..400).include?(
+            response.code.to_i
+          )
+
+
+          doc = REXML::Document.new(response.body)
+          error = doc.get_elements('*/Errors/Error')[0]
+          raise(
+            Module.class_eval(
+              "AwsSdb::#{error.get_elements('Code')[0].text}Error"
+            ).new(
+              error.get_elements('Message')[0].text,
+              doc.get_elements('*/RequestID')[0].text
+            )
+          ) unless error.nil?
+        else
+          doc = nil
+        end
         doc
       end
     end

data/lib/rudy/aws.rb

@@ -1,8 +1,7 @@
 
 
-require 'EC2'       # What a
-#require 'aws_sdb'   # motley
-# Disabled b/c it's not Ruby 1.9 compatible
+require 'EC2'       # A
+require 'aws_sdb'   # motley
 require 'aws/s3'    # crew
 
 module Rudy
@@ -53,9 +52,9 @@ module Rudy
         rescue Timeout::Error => ex
           STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
         rescue SocketError => ex
-          STDERR.puts "Socket Error. Check your Internets!"
-          STDERR.puts ex.message
-          STDERR.puts ex.backtrace
+          raise SocketError, "Check your Internets!"
+          #STDERR.puts ex.message
+          #STDERR.puts ex.backtrace
         ensure
           response ||= default
         end

data/lib/rudy.rb

@@ -9,6 +9,7 @@ require 'digest/md5'
 require 'stringio'
 require 'ostruct'
 require 'yaml'
+require 'logger'
 require 'socket'
 require 'timeout'
 require 'tempfile'
@@ -26,7 +27,6 @@ require 'net/ssh/multi'
 require 'net/ssh/gateway'
 
 
-require 'logger'
 
 # = Rudy
 #
@@ -65,7 +65,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 6.freeze
-      TINY  = 5.freeze
+      TINY  = 6.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.6.5"
+	s.version = "0.6.6"
 	s.summary = "Rudy: Not your grandparent's deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -19,9 +19,10 @@
   s.add_dependency 'rye', '>= 0.5.3'
   
   s.add_dependency 'echoe'
-  s.add_dependency 'amazon-ec2', '>= 0.3.8'  # region fix
-  s.add_dependency 'net-ssh', '>=2.0.9'
-  s.add_dependency 'net-scp', '>=1.0.2'
+  s.add_dependency 'amazon-ec2', '>= 0.3.8'  # Region fix
+  s.add_dependency 'aws-s3', '>= 0.6.1'      # Ruby 1.9.1 compatability
+  s.add_dependency 'net-ssh', '>= 2.0.9'
+  s.add_dependency 'net-scp', '>= 1.0.2'
   s.add_dependency 'net-ssh-gateway'
   s.add_dependency 'net-ssh-multi'
   
@@ -31,7 +32,7 @@
   #s.add_development_dependency('jgre-monkeyspecdoc', '>= 0.1.0')
   #s.add_development_dependency('thoughtbot-shoulda', '>= 0.1.0')
   
-  s.executables = %w[ird rudy rudy-ec2 rudy-sdb]
+  s.executables = %w[ird rudy rudy-ec2 rudy-sdb rudy-s3]
   
   # = MANIFEST =
   # git ls-files
@@ -44,6 +45,7 @@
   bin/ird
   bin/rudy
   bin/rudy-ec2
+  bin/rudy-s3
   bin/rudy-sdb
   lib/annoy.rb
   lib/console.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -04:00
+date: 2009-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.8
     version: 
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   type: :runtime
@@ -109,6 +119,7 @@ executables:
 - rudy
 - rudy-ec2
 - rudy-sdb
+- rudy-s3
 extensions: []
 
 extra_rdoc_files: 
@@ -125,6 +136,7 @@ files:
 - bin/ird
 - bin/rudy
 - bin/rudy-ec2
+- bin/rudy-s3
 - bin/rudy-sdb
 - lib/annoy.rb
 - lib/console.rb