rudy 0.6.6 → 0.6.7

data/CHANGES.txt

@@ -7,11 +7,18 @@ RUDY, CHANGES
 * TODO: Support for product codes
 * TODO: HTTPS
 
+#### 0.6.7 (2009-04-22) ###############################
+
+* ADDED: rudy-ec2 status can now display EU status
+* FIXED: Fixed bug on instance create. Instance.groups was nil, now it returns 
+empty Array.
+
 #### 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

data/README.rdoc

@@ -75,12 +75,14 @@ The <tt>-u root</tt> tells Rudy to open a connection as the root user. If you cr
 == Dependencies:
 
 * OpenSSH[http://www.openssh.com/]
-* Net::SSH[http://net-ssh.rubyforge.org/]
-* Net::SCP[http://net-ssh.rubyforge.org/]
-* amazon-ec2[http://github.com/grempe/amazon-ec2]
-* Rye[http://github.com/delano/rye]
-* Drydock[http://github.com/delano/drydock]
-* Caesars[http://github.com/delano/caesars]
+* Ruby 1.8.x, 1.9.x, or JRuby 1.2
+  * Net::SSH[http://net-ssh.rubyforge.org/]
+  * Net::SCP[http://net-ssh.rubyforge.org/]
+  * amazon-ec2[http://github.com/grempe/amazon-ec2]
+  * aws-s3[http://github.com/marcel/aws-s3]
+  * Rye[http://github.com/delano/rye]
+  * Drydock[http://github.com/delano/drydock]
+  * Caesars[http://github.com/delano/caesars]
 
 
 == Common Errors
@@ -105,6 +107,7 @@ Although Rudy has been well tested and is currently being used in production in
 
 == More Info
 
+* Rudy-Introduction[http://blog.solutious.com/2009/04/21/rudy-deployment-introduction/]
 * GitHub[http://github.com/solutious/rudy]
 * Issues[http://github.com/solutious/rudy/issues]
 * RubyForge[http://rubyforge.org/projects/rudy]
@@ -120,13 +123,13 @@ Although Rudy has been well tested and is currently being used in production in
   * Colin Brumelle
 * Everyone at Utrecht.rb[http://groups.google.com/group/utrecht-rb]
 * Jamis Buck for writing Net::SSH and friends. 
+* Keshia Knight Pulliam
 
 
 == Credits
 
 * Rudy::AWS::SDB adapted from aws_sdb by Tim Dysinger (http://dysinger.net)
 * Escape, Copyright (C) 2006,2007 Tanaka Akira  <akr@fsij.org>
-* Keshia Knight Pulliam (rudy@solutious.com)
 * Delano Mandelbaum (delano@solutious.com)
 
 

data/bin/rudy

@@ -10,7 +10,7 @@
 
 $:.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') }
+%w{amazon-ec2 drydock 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 :off
+  debug :on
   default :machines
   
 
@@ -272,6 +272,9 @@ rescue Rudy::Error => ex
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
+rescue Interrupt
+  puts "#{$/}Exiting... "
+  exit 1
 rescue SystemExit
   # Don't balk
 end

data/bin/rudy-ec2

@@ -29,11 +29,11 @@ module RudyCLI_EC2
   
   desc "Amazon EC2 Elastic IP addresses"
   usage "rudy-ec2 addresses"
+  usage "rudy-ec2 addresses -C"
   usage "rudy-ec2 addresses -A -i instance-id address"
   usage "rudy-ec2 addresses -A -i instance-id -n"
   usage "rudy-ec2 addresses -N address"
   usage "rudy-ec2 addresses -D address"
-  usage "rudy-ec2 addresses -C"
   option :i, :instance, String, "Instance ID"
   option :n, :newaddress, "Create and assign a new elastic IP"
   action :A, :associate, "Associate an IP address to a running instance"
@@ -98,8 +98,7 @@ module RudyCLI_EC2
   command_alias :groups, :g
   
   desc "Amazon EC2 Machine Images (AMIs)"
-  usage "rudy-ec2 im"
-  usage "rudy-ec2 image"
+  usage "rudy-ec2 images"
   usage "rudy-ec2 images image-id"
   usage "rudy-ec2 images -o 123456789012"
   usage "rudy-ec2 images -o amazon"
@@ -119,11 +118,9 @@ module RudyCLI_EC2
   command_alias :images, :im
   
   desc "Amazon EC2 Instances"
-  usage "rudy-ec2 i"
-  usage "rudy-ec2 instance"
   usage "rudy-ec2 instances"
   usage "rudy-ec2 instances [-g group-name] [instance-ID]"
-  usage "rudy-ec2 instances -C -g group-name -s m1.small -k keypair-name"
+  usage "rudy-ec2 instances -C -m ami-235fba4a -s m1.small -k keypair-name"
   usage "rudy-ec2 instances -C -a 255.255.255.255 -k keypair-name"
   usage "rudy-ec2 instances -R instance-ID"
   usage "rudy-ec2 instances -D instance-ID"
@@ -204,6 +201,7 @@ module RudyCLI_EC2
   command_alias :volumes, :v
   
   desc "Availability Zones"
+  usage "rudy-ec2 zones"
   argv :name
   command :zones => Rudy::CLI::AWS::EC2::Zones
   command_alias :zones, :zone
@@ -234,6 +232,9 @@ rescue Rudy::Error => ex
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
+rescue Interrupt
+  puts "#{$/}Exiting... "
+  exit 1
 rescue SystemExit
   # Don't balk
 end

data/bin/rudy-s3

@@ -69,6 +69,9 @@ rescue Rudy::Error => ex
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
+rescue Interrupt
+  puts "#{$/}Exiting... "
+  exit 1
 rescue SystemExit
   # Don't balk
 end

data/bin/rudy-sdb

@@ -59,6 +59,9 @@ rescue Rudy::Error => ex
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
+rescue Interrupt
+  puts "#{$/}Exiting... "
+  exit 1
 rescue SystemExit
   # Don't balk
 end

data/lib/annoy.rb

@@ -122,9 +122,7 @@ class Annoy
         #writer.flush
         #end
         #response = Annoy.get_response(writer)
-        
-        trap("SIGINT") { raise Annoy::GiveUp  }
-        
+                
         highline = HighLine.new 
         response = highline.ask(msg) { |q| 
           q.echo = '*'             # Don't display response
@@ -132,11 +130,14 @@ class Annoy
           q.whitespace = :strip    # Remove whitespace from the response
           q.answer_type = Integer  if flavor == :numeric
         }
-
+        
         ret = (response == answer)
         writer.puts "Incorrect" unless ret
         ret
       end
+    rescue Interrupt
+      writer.puts $/, "Giving up!"
+      false
     rescue Annoy::GiveUp => ex
       writer.puts $/, "Giving up!"
       false

data/lib/rudy.rb

@@ -65,7 +65,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 6.freeze
-      TINY  = 6.freeze
+      TINY  = 7.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -131,7 +131,7 @@ module Rudy
   def sysinfo; @@sysinfo;  end
   
   class Error < RuntimeError
-    def initialize(obj); @obj = obj; end
+    def initialize(obj=nil); @obj = obj; end
     def message; "#{self.class}: #{@obj}"; end
   end
   class InsecureKeyPermissions < Rudy::Error
@@ -142,7 +142,16 @@ module Rudy
     end
   end
   class NoConfig < Rudy::Error
-    def message; "No AWS credentials. Check your configs!"; end
+    def message; "No configuration found!"; end
+  end
+  class NoGlobal < Rudy::Error
+    def message; "No globals defined!"; end
+  end
+  class NoMachinesConfig < Rudy::Error
+    def message; "No machines configuration. Check your configs!"; end
+  end
+  class NoRoutinesConfig < Rudy::Error
+    def message; "No routines configuration. Check your configs!"; end
   end
   class ServiceUnavailable < Rudy::Error
     def message; "#{@obj} is not available. Check your internets!"; end

data/lib/rudy/aws/ec2/instance.rb

@@ -19,10 +19,8 @@ module Rudy::AWS
     field :reason
     field :groups => Array
     
-    # Groups aren't returned when creating an instance so this
-    # method returns an empty Array if +@groups+ is not set.
-    def groups
-      @groups || []
+    def init
+      @groups ||= []
     end
     
     def liner_note

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

@@ -11,6 +11,11 @@ module AWS; module EC2;
     end
     def status
       url = 'http://status.aws.amazon.com/rss/EC2.rss'
+      
+      if (@@global.region || '').to_s.strip.match(/\Aeu/)
+        url = 'http://status.aws.amazon.com/rss/EC2EU.rss'
+      end
+      
       # TODO: Move to Rudy::AWS
       ec2 = Rudy::Utils::RSSReader.run(url) || {}
       
@@ -21,14 +26,21 @@ module AWS; module EC2;
         require 'json'
         puts ec2.to_json
       else
-        puts "Updated: #{ec2[:pubdate]} (updated every #{ec2[:ttl]} minutes)"
-        ec2[:items].each do |i|
+        puts "#{ec2[:title]}"
+        puts "Updated: #{ec2[:pubdate]}"
+        (ec2[:items] || []).each do |i|
           puts
           puts '%s' % i[:title]
           puts '  %s: %s' % [i[:pubdate], i[:description]]
-          
+        end
+        if ec2.empty? || ec2[:items].empty?
+          puts "No announcements" 
+          return
         end
       end
+      
+      
+      
     end
     
     def ssh_valid?

data/lib/rudy/huxtable.rb

@@ -122,9 +122,10 @@ module Rudy
     
     
     def user_keypairpath(name)
-      raise "No user provided" unless name
-      raise "No configuration" unless @@config
-      raise "No machines configuration" unless @@config.machines
+      raise Rudy::Error, "No user provided" unless name
+      raise NoConfig unless @@config
+      raise NoMachinesConfig unless @@config.machines
+      raise NoGlobal unless @@global
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       #Caesars.enable_debug
       path = @@config.machines.find_deferred(zon, env, rol, [:users, name, :keypair])
@@ -189,8 +190,8 @@ module Rudy
     end
     
     def current_machine_address(position='01')
-      raise "No configuration" unless @@config
-      raise "No machines configuration" unless @@config.machines
+      raise NoConfig unless @@config
+      raise NoMachinesConfig unless @@config.machines
       raise "Position cannot be nil" if position.nil?
       addresses = [fetch_machine_param(:addresses)].flatten.compact
       addresses[position.to_i-1]
@@ -232,6 +233,8 @@ module Rudy
     # at least one definition in the config for this to return true
     # That's how Rudy knows the current group is defined. 
     def known_machine_group?
+      raise NoConfig unless @@config
+      raise NoMachinesConfig unless @@config.machines
       return false if !@@config && !@@global
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       conf = @@config.machines.find_deferred(@@global.region, zon, [env, rol])
@@ -265,9 +268,9 @@ module Rudy
     #            :size: 1
     #      
     def fetch_routine_config(action)
-      raise "No configuration" unless @@config
-      raise "No routines configuration" unless @@config.routines
-      raise "No globals" unless @@global
+      raise NoConfig unless @@config
+      raise NoRoutinesConfig unless @@config.routines
+      raise NoGlobal unless @@global
       
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       
@@ -295,18 +298,18 @@ module Rudy
     
     
     def fetch_machine_param(parameter)
-      raise "No configuration" unless @@config
-      raise "No machines configuration" unless @@config.machines
-      raise "No globals" unless @@global
+      raise NoConfig unless @@config
+      raise NoMachinesConfig unless @@config.machines
+      raise NoGlobal unless @@global
       top_level = @@config.machines.find(parameter)
       mc = fetch_machine_config
       mc[parameter] || top_level || nil
     end
     
     def fetch_machine_config
-      raise "No configuration" unless @@config
-      raise "No machines configuration" unless @@config.machines
-      raise "No globals" unless @@global
+      raise NoConfig unless @@config
+      raise NoMachinesConfig unless @@config.machines
+      raise NoGlobal unless @@global
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       hashes = []
       hashes << @@config.machines.find(env, rol)

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.6.6"
+	s.version = "0.6.7"
 	s.summary = "Rudy: Not your grandparent's deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,9 +14,9 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.5.5'  
+  s.add_dependency 'drydock', '>= 0.5.6'  
   s.add_dependency 'caesars', '>= 0.5.4'  
-  s.add_dependency 'rye', '>= 0.5.3'
+  s.add_dependency 'rye', '>= 0.5.4'
   
   s.add_dependency 'echoe'
   s.add_dependency 'amazon-ec2', '>= 0.3.8'  # Region fix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.5
+        version: 0.5.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.3
+        version: 0.5.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe