solutious-rudy 0.7.1 → 0.7.2

data/CHANGES.txt

@@ -8,6 +8,13 @@ RUDY, CHANGES
 * TODO: Tests for AWS HTTPS
 
 
+#### 0.7.2 (2009-04-04) ###############################
+
+* FIXED: cli/routine.rb release method wasn't sending command alias (which broke rerelease)
+* ADDED: global.offline for being cool when Internet is down
+* ADDED: Better handling in aws/sdb when call returns nil (Internet is down)
+
+
 #### 0.7.1 (2009-04-04) ###############################
 
 * FIXED: rudy wasn't honouring -C option for specifying a config file

data/lib/rudy.rb

@@ -45,7 +45,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 1.freeze
+      TINY  = 2.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/lib/rudy/aws.rb

@@ -23,6 +23,7 @@ module Rudy
     end
     
     module ObjectBase
+      include Rudy::Huxtable
       
     protected
 
@@ -52,9 +53,9 @@ module Rudy
         rescue Timeout::Error => ex
           STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
         rescue SocketError => ex
-          raise SocketError, "Check your Internets!"
           #STDERR.puts ex.message
           #STDERR.puts ex.backtrace
+          raise SocketError, "Check your Internets!" unless @@global.offline
         ensure
           response ||= default
         end

data/lib/rudy/aws/sdb.rb

@@ -98,18 +98,20 @@ module Rudy
           
         doc = call(:get, params)
         results = []
-        REXML::XPath.each(doc, "//Item") do |item|
-          name = REXML::XPath.first(item, './Name/text()').to_s
+        if doc
+          REXML::XPath.each(doc, "//Item") do |item|
+            name = REXML::XPath.first(item, './Name/text()').to_s
 
-          attributes = {'Name' => name}
-          REXML::XPath.each(item, "./Attribute") do |attr|
-            key = REXML::XPath.first(attr, './Name/text()').to_s
-            value = REXML::XPath.first(attr, './Value/text()').to_s
-            ( attributes[key] ||= [] ) << value
+            attributes = {'Name' => name}
+            REXML::XPath.each(item, "./Attribute") do |attr|
+              key = REXML::XPath.first(attr, './Name/text()').to_s
+              value = REXML::XPath.first(attr, './Value/text()').to_s
+              ( attributes[key] ||= [] ) << value
+            end
+            results << attributes
           end
-          results << attributes
+          #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
         end
-        #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
         
         hash_results = {}
         results.each do |item|
@@ -134,8 +136,10 @@ module Rudy
 
         doc = call(:get, params)
         results = []
-        REXML::XPath.each(doc, '//ItemName/text()') do |item|
-          results << item.to_s
+        if doc
+          REXML::XPath.each(doc, '//ItemName/text()') do |item|
+            results << item.to_s
+          end
         end
         
         #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
@@ -159,18 +163,20 @@ module Rudy
 
         doc = call(:get, params)
         results = []
-        REXML::XPath.each(doc, "//Item") do |item|
-          name = REXML::XPath.first(item, './Name/text()').to_s
+        if doc
+          REXML::XPath.each(doc, "//Item") do |item|
+            name = REXML::XPath.first(item, './Name/text()').to_s
 
-          attributes = {'Name' => name}
-          REXML::XPath.each(item, "./Attribute") do |attr|
-            key = REXML::XPath.first(attr, './Name/text()').to_s
-            value = REXML::XPath.first(attr, './Value/text()').to_s
-            ( attributes[key] ||= [] ) << value
+            attributes = {'Name' => name}
+            REXML::XPath.each(item, "./Attribute") do |attr|
+              key = REXML::XPath.first(attr, './Name/text()').to_s
+              value = REXML::XPath.first(attr, './Value/text()').to_s
+              ( attributes[key] ||= [] ) << value
+            end
+            results << attributes
           end
-          results << attributes
+          #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
         end
-        #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
         
         hash_results = {}
         results.each do |item|
@@ -216,10 +222,12 @@ module Rudy
           }
         )
         attributes = {}
-        REXML::XPath.each(doc, "//Attribute") do |attr|
-          key = REXML::XPath.first(attr, './Name/text()').to_s
-          value = REXML::XPath.first(attr, './Value/text()').to_s
-          ( attributes[key] ||= [] ) << value
+        if doc
+          REXML::XPath.each(doc, "//Attribute") do |attr|
+            key = REXML::XPath.first(attr, './Name/text()').to_s
+            value = REXML::XPath.first(attr, './Value/text()').to_s
+            ( attributes[key] ||= [] ) << value
+          end
         end
         attributes = nil if attributes.empty?
         attributes

data/lib/rudy/cli.rb

@@ -154,6 +154,7 @@ module Rudy
       global :C, :config, String, "Specify another configuration file to read (ie: #{Rudy::CONFIG_FILE})"
       global :Y, :yes, "Assume a correct answer to confirmation questions"
       global :q, :quiet, "Run with less output"
+      global :O, :offline, "Be cool about the internet being down"
       global :v, :verbose, "Increase verbosity of output (i.e. -v or -vv or -vvv)" do
         @verbose ||= 0
         @verbose += 1

data/lib/rudy/cli/aws/ec2/candy.rb

@@ -6,7 +6,7 @@ module AWS; module EC2;
     
     def status_valid?
       avail = Rudy::Utils.service_available?('status.aws.amazon.com', 80, 5)
-      raise ServiceUnavailable, 'status.aws.amazon.com' unless avail
+      raise ServiceUnavailable, 'status.aws.amazon.com' unless @@global.offline || avail
       true
     end
     def status

data/lib/rudy/cli/routines.rb

@@ -31,7 +31,7 @@ module Rudy; module CLI;
     end
     
     def release_valid?
-      @rr = Rudy::Routines::Release.new
+      @rr = Rudy::Routines::Release.new(@alias) # Important: could be rerelease
       @rr.raise_early_exceptions
       true
     end

data/lib/rudy/global.rb

@@ -34,6 +34,8 @@ module Rudy
     field :local_user
     field :local_hostname
     
+    field :offline
+    
     field :config => String
     
     attr_accessor :print_header

data/lib/rudy/routines.rb

@@ -91,7 +91,6 @@ module Rudy
             }
           end
           
-          
           # TODO: trap rbox errors. We could get an authentication error. 
           opts = { :keys =>  root_keypairpath, :user => 'root', :info => @@global.verbose > 0 }
           begin
@@ -125,12 +124,12 @@ module Rudy
             puts task_separator("AUTHORIZE USER")
             Rudy::Routines::UserHelper.authorize(@routine, machine, rbox)
           end
-          
+          #puts 1
           if Rudy::Routines::ScriptHelper.before?(@routine)      # before
             puts task_separator("REMOTE SHELL")
             Rudy::Routines::ScriptHelper.before(@routine, sconf, machine, rbox)
           end
-          
+          #puts 2
           if Rudy::Routines::DiskHelper.disks?(@routine)         # disk
             puts task_separator("DISKS")
             if rbox.ostype == "sunos"
@@ -139,7 +138,7 @@ module Rudy
               Rudy::Routines::DiskHelper.execute(@routine, machine, rbox)
             end    
           end
-
+          
           # Startup, shutdown, release, deploy, etc...
           routine_action.call(machine, rbox) if routine_action
           

data/lib/rudy/utils.rb

@@ -21,7 +21,7 @@ module Rudy
           ip = /([0-9]{1,3}\.){3}[0-9]{1,3}/.match(ipstr).to_s
           break if ip && !ip.empty?
         end
-      rescue SocketError, Errno::ETIMEDOUT
+      rescue SocketError, Errno::ETIMEDOUT => ex
         STDERR.puts "Connection Error. Check your internets!"
       end
       ip += "/32" if ip

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.7.1"
+	s.version = "0.7.2"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Delano Mandelbaum