rudy 0.7.4 → 0.7.6

data/CHANGES.txt

@@ -1,11 +1,19 @@
 RUDY, CHANGES
 
-* TODO: Remove string messages for non-string output formats
-* TODO: Support for reserved instances
-* TODO: Tests for zone and region support
-* TODO: Support for machine image attributes
-* TODO: Support for product codes
-* TODO: Tests for AWS HTTPS
+
+#### 0.7.6 (2009-05-18) ###############################
+
+* ADDED: Better windows instance support during routines
+* ADDED: "os" keyword to routines DSL
+* ADDED: Config defaults for "yes" global (thanks sabat)
+* FIXED: Handle exception when assigning inappropriate IP Address. 
+
+
+#### 0.7.5 (2009-05-12) ###############################
+
+* CHANGE: rudy-ec2 console now displays windows password automatically if keypair is supplied.
+* ADDED: register and destroy commands to rudy-ec2 images
+
 
 #### 0.7.4 (2009-05-10) ###############################
 

data/README.rdoc

@@ -105,6 +105,14 @@ I'm very open to contributions!
 * Rudy::AWS::SDB adapted from aws_sdb by Tim Dysinger (http://dysinger.net)
 
 
+== Related Projects
+
+* Pool Party -- http://www.poolpartyrb.com/
+* Rubber -- http://github.com/wr0ngway/rubber/wikis
+* Moonshine -- http://github.com/railsmachine/moonshine/tree
+* Boto -- http://code.google.com/p/boto/
+
+
 == License
 
 See: LICENSE.txt

data/Rudyfile

@@ -169,13 +169,13 @@ routines do
   
   anything do                        # $ rudy anything
     before :display_uptime           # Specify a dependency
-    script Rudy.sysinfo.user do      # This is Ruby, so any valid syntax
-      ls :l, Rudy.sysinfo.home       # can be used in the definitions. 
+    script :rudy do                  # This is Ruby, so any valid syntax
+      ls :l                          # can be used in the definitions. 
     end                              # See: SysInfo gem for more info.
   end
   
   display_uptime do                  # $ rudy display-uptime
-    script Rudy.sysinfo.user do      # NOTE: You can use 'dashes' on the
+    script :rudy do                  # NOTE: You can use 'dashes' on the
       uptime                         # command-line instead of underscores
     end
   end

data/bin/rudy

@@ -9,8 +9,7 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'drydock', 'lib') 
-#require 'rubygems'
+#$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'drydock', 'lib') 
 
 #$SAFE = 1   # require is unsafe in Ruby 1.9??
 
@@ -21,7 +20,7 @@ require 'rudy/cli'
 # Command-line interface for /bin/rudy
 class RudyCLI < Rudy::CLI::Base
   
-  debug :off
+  debug :on
   default :machines
   trawler :passthrough
   

data/bin/rudy-ec2

@@ -10,12 +10,11 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-#require 'rubygems'
 
+require 'drydock'
 require 'rudy'
 require 'rudy/cli'
 
-require 'drydock'
 
 # Command-line interface for bin/rudy-ec2
 module RudyCLI_EC2
@@ -102,6 +101,7 @@ module RudyCLI_EC2
   usage "rudy-ec2 images -o 123456789012"
   usage "rudy-ec2 images -o amazon"
   usage "rudy-ec2 images -o self"
+  usage "rudy-ec2 images -R bucket/ami-name.manifest.xml"
   option :o, :owner, String, "Amazon Account Number or one of: amazon, self"
   option :l, :all, "Display all registered machine images (warning: slow)"
   #option :p, :private, "Private images only"
@@ -110,6 +110,7 @@ module RudyCLI_EC2
   option :u, :user, String, "Username to connect as (used for creating an image)"
   action :C, :create, "Create an image"
   #action :P, :prepare, "Prepare a running instance to be used as an image"
+  action :R, :register, "Register an image"
   action :D, :destroy, "Deregister an image (does not remove image files from S3)"
   argv :ami
   command :images => Rudy::CLI::AWS::EC2::Images

data/bin/rudy-s3

@@ -10,11 +10,10 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-#require 'rubygems'
 
+require 'drydock'
 require 'rudy'
 require 'rudy/cli'
-require 'drydock'
 
 # Command-line interface for bin/rudy-s3
 module RudyCLI_S3

data/bin/rudy-sdb

@@ -10,11 +10,10 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-#require 'rubygems'
 
+require 'drydock'
 require 'rudy'
 require 'rudy/cli'
-require 'drydock'
 
 # Command-line interface for bin/rudy-sdb
 module RudyCLI_SDB

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

@@ -54,8 +54,8 @@ module Rudy::AWS
         
         address = address.ipaddress if address.is_a?(Rudy::AWS::EC2::Address)
         instance = instance.awsid if instance.is_a?(Rudy::AWS::EC2::Instance)
-        raise UnknownAddress unless exists?(address)
-        raise AddressAssociated if associated?(address)
+        raise UnknownAddress, address unless exists?(address)
+        raise AddressAssociated, address if associated?(address)
         
         opts ={
           :instance_id => instance,
@@ -134,7 +134,7 @@ module Rudy::AWS
       # Returns true if the given address is assigned to the current account
       def exists?(address)
         address = address.ipaddress if address.is_a?(Rudy::AWS::EC2::Address)
-        list.each do |a|
+        list do |a|
           return true if a.ipaddress == address
         end
         false

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

@@ -106,7 +106,7 @@ module Rudy::AWS
           :image_id => id
         }
         ret = @ec2.deregister_image(opts)
-        puts ret.to_yaml
+        return false unless ret && ret.is_a?(Hash)
         true
       end
       
@@ -117,8 +117,8 @@ module Rudy::AWS
           :image_location => path
         }
         ret = @ec2.register_image(opts)
-        puts ret.to_yaml
-        true
+        return nil unless ret && ret.is_a?(Hash)
+        ret['imageId']
       end
       
       #     imageOwnerId: "203338247012"

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

@@ -155,24 +155,24 @@ module AWS; module EC2;
       
     end
     
-    def deregister_valid?
+    def destroy_images_valid?
       unless @argv.ami && Rudy::Utils.is_id?(:image, @argv.ami)  
-        raise "You must supply an AMI ID (ami-XXXXXXX)" 
+        raise "Must supply an AMI ID (ami-XXXXXXX)" 
       end
+      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
     end
-    def deregister
-      puts "Deregistering #{@argv.ami}"
-      
-      execute_check(:medium)
-      
-      rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      
-      if rimages.deregister(ami)
-        puts "Done!"
-      else
-        puts "There was an unknown problem!"
+    def destroy_images
+     puts @rimages.deregister(@argv.ami) ? "Done" : "Unknown error"
+    end 
+    
+    def register_images_valid?
+      unless @argv.first
+        raise "Must supply a valid manifest path (bucket/ami-name.manifest.xml)"
       end
-      
+      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+    end
+    def register_images
+      puts @rimages.register(@argv.first)
     end
 
 

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

@@ -144,11 +144,8 @@ module AWS; module EC2;
             encrtypted_text = ($1 || '').strip
             k = Rye::Key.from_file(@@global.pkey)
             pword = k.decrypt(encrtypted_text)
-            ret = Annoy.pose_question("Display password?\a ", /yes|y|ya|sure|you bet!/i, STDERR)
-            if ret
-              answer = "%s: %s" % ['password', pword] 
-              Annoy.timed_display(answer, STDERR, 10)
-            end
+            answer = "%s: %s" % ['password', pword] 
+            Annoy.timed_display(answer, STDERR, 10)
             puts
           else
             puts "Please supply a private key path to decode the administrator password"

data/lib/rudy/config.rb

@@ -102,7 +102,8 @@ module Rudy
             environment :stage
             role :app
             user Rudy.sysinfo.user.to_sym
-            color false                        # set to true for terminal colors
+            color false                        # Terminal colors? true/false
+            yes false                          # Auto-confirm? true/false
           end
         }
         Rudy::Utils.write_to_file(Rudy::CONFIG_FILE, rudy_config, 'w', 0600)

data/lib/rudy/global.rb

@@ -56,7 +56,7 @@ module Rudy
       if config.defaults?
         # Apply the "color" default before "nocolor" so nocolor has presedence
         @nocolor = !config.defaults.color unless config.defaults.color.nil?
-        %w[region zone environment role position user nocolor quiet].each do |name|
+        %w[region zone environment role position user nocolor quiet yes].each do |name|
           val = config.defaults.send(name)
           self.send("#{name}=", val) unless val.nil?
         end
@@ -101,6 +101,7 @@ module Rudy
       @position &&= @position.to_s.rjust(2, '0')  
       @format &&= @format.to_sym rescue nil
       @quiet ? Rudy.enable_quiet : Rudy.disable_quiet
+      @yes ? Rudy.enable_yes : Rudy.disable_yes
     end
     
     def apply_environment_variables

data/lib/rudy/huxtable.rb

@@ -188,6 +188,10 @@ module Rudy
       fetch_machine_param(:ami)
     end
     
+    def current_machine_os
+      fetch_machine_param(:os) || 'linux'
+    end
+    
     def current_machine_size
       fetch_machine_param(:size) || 'm1.small'
     end

data/lib/rudy/machines.rb

@@ -21,6 +21,8 @@ module Rudy
     field :dns_private
     field :state
     
+    field :os
+    
     attr_reader :instance
     
     def init
@@ -32,6 +34,7 @@ module Rudy
       @role = @@global.role
       @position = find_next_position || '01'
       @state = 'no-instance'
+      @os = 'unknown'
     end
     
     def liner_note
@@ -117,20 +120,29 @@ module Rudy
         :machine_data => Machine.generate_machine_data.to_yaml
       }.merge(opts)
       
+      @os = current_machine_os
+      
       @ec2inst.create(opts) do |inst|
         @awsid = inst.awsid
         @created = @starts = Time.now
         @state = inst.state
-        # Assign IP address only if we have one for that position
-        if current_machine_address(@position)
+        # We need to be safe when creating machines because if an exception is
+        # raised, instances will have been creating but the calling class won't know. 
+        begin
           address = current_machine_address(@position)
-          puts "Associating #{address} to #{inst.awsid}"
-          begin
-            @radd.associate(address, inst.awsid)
-          rescue => ex 
-            STDERR.puts "Error while associating address (#{ex.class.to_s})"
-            Rudy::Utils.bug()
+          # Assign IP address only if we have one for that position
+          if address
+            # Make sure the address is associated to the current account
+            if @radd.exists?(address)
+              puts "Associating #{address} to #{inst.awsid}"
+              @radd.associate(address, inst.awsid)
+            else
+              STDERR.puts "Unknown address: #{address}"
+            end
           end
+        rescue => ex
+          STDERR.puts "Error: #{ex.message}"
+          STDERR.puts ex.backtrace if Rudy.debug?
         end
       end
       

data/lib/rudy/metadata.rb

@@ -6,6 +6,7 @@ module Rudy
     def initialize(*args)
       a, s, r = @@global.accesskey, @@global.secretkey, @@global.region
       @sdb = Rudy::AWS::SDB.new(a, s, r)
+      @radd = Rudy::AWS::EC2::Addresses.new(a, s, r)
       @rinst = Rudy::AWS::EC2::Instances.new(a, s, r)
       @rgrp = Rudy::AWS::EC2::Groups.new(a, s, r)
       @rkey = Rudy::AWS::EC2::KeyPairs.new(a, s, r)

data/lib/rudy/routines/release.rb

@@ -23,13 +23,11 @@ module Rudy; module Routines;
         end
       end
       
-      machines = []
-      generic_machine_runner(:list) do |machine,rbox|
+      machines = generic_machine_runner(:list) do |machine,rbox|
         vlist.each do |scm|
           puts task_separator("CREATING REMOTE #{scm.engine.to_s.upcase} CHECKOUT")
           scm.create_remote_checkout(rbox)
         end
-        machines << machine
       end
       
       machines

data/lib/rudy/routines/shutdown.rb

@@ -13,10 +13,9 @@ module Rudy; module Routines;
         STDERR.puts "[this is a generic shutdown routine]"
         @routine = {}
       end
-      machines = []
-      generic_machine_runner(:destroy) do |machine,rbox|
-        puts $/, "Shutting down...", $/
-        machines << machine
+
+      machines = generic_machine_runner(:list) do |machine|
+        machine.destroy
       end
       machines
     end
@@ -24,8 +23,10 @@ module Rudy; module Routines;
     # Called by generic_machine_runner
     def raise_early_exceptions
       rmach = Rudy::Machines.new
-      raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
       raise MachineGroupNotRunning, current_machine_group unless rmach.running?
+      # Check private key after machine group, otherwise we could get an error
+      # about there being no key which doesn't make sense if the group isn't running.
+      raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
     end
     
   end

data/lib/rudy/routines/startup.rb

@@ -10,16 +10,14 @@ module Rudy; module Routines;
     # * +each_mach+ is an optional block which is executed between 
     # disk creation and the after scripts. The will receives two 
     # arguments: instances of Rudy::Machine and Rye::Box.
+    # Returns an Array of Rudy::Machine objects
     def execute(&each_mach)
       routine_separator(:startup)
       unless @routine
         STDERR.puts "[this is a generic startup routine]"
         @routine = {}
       end
-      machines = []
-      generic_machine_runner(:create) do |machine,rbox|
-        machines << machine
-      end
+      machines = generic_machine_runner(:create) 
       machines
     end
 

data/lib/rudy/routines.rb

@@ -94,13 +94,11 @@ module Rudy
           end
         }
         
-        unless has_remote_task?(routine)
-          puts "[no remote tasks]"
-          return
-        end
         
-        # Execute the action (create, list, destroy, restart) & apply the block to each
-        rmach.send(machine_action) do |machine|
+        # Execute the action (create, list, destroy, restart)
+        machines = enjoy_every_sandwich([]) { rmach.send(machine_action) }
+        
+        machines.each do |machine|
           puts machine_separator(machine.name, machine.awsid) unless skip_header
           
           unless skip_check
@@ -109,15 +107,19 @@ module Rudy
               inst = machine.get_instance
               inst && inst.running?
             } 
+          end
           
-            # Add instance info to machine and save it. This is really important
-            # for the initial startup so the metadata is updated right away. But
-            # it's also important to call here because if a routine was executed
-            # and an unexpected exception occurs before this update is executed
-            # the machine metadata won't contain the DNS information. Calling it
-            # here ensure that the metadata is always up-to-date. 
-            machine.update 
+          # Add instance info to machine and save it. This is really important
+          # for the initial startup so the metadata is updated right away. But
+          # it's also important to call here because if a routine was executed
+          # and an unexpected exception occurs before this update is executed
+          # the machine metadata won't contain the DNS information. Calling it
+          # here ensure that the metadata is always up-to-date. 
+          machine.update 
           
+          next if (machine.os || '').to_s == 'win32'
+            
+          unless skip_check
             msg = preliminary_separator("Waiting for SSH daemon...")
             Rudy::Utils.waiter(2, 60, STDOUT, msg, 0) {
               Rudy::Utils.service_available?(machine.dns_public, 22)
@@ -152,7 +154,13 @@ module Rudy
             }
           end
           
-          
+          ## NOTE: This prevents shutdown from doing its thing and prob
+          ## isn't necessary. 
+          ##unless has_remote_task?(routine) 
+          ##  puts "[no remote tasks]"
+          ##  next
+          ##end
+
           enjoy_every_sandwich {
             if Rudy::Routines::UserHelper.adduser?(routine)       # adduser
               puts task_separator("ADD USER")
@@ -229,6 +237,7 @@ module Rudy
           execute_dependency(after_dependencies, skip_check, skip_header)
         }
         
+        machines
       end
       
       def execute_dependency(depends, skip_check, skip_header)
@@ -293,14 +302,15 @@ module Rudy
         #puts '%-40s' % [name.bright]
       end
       
-      def enjoy_every_sandwich(&bloc_party)
+      def enjoy_every_sandwich(ret=nil, &bloc_party)
         begin
-          bloc_party.call
+          ret = bloc_party.call
         rescue => ex
           STDERR.puts "  Error: #{ex.message}".color(:red)
           STDERR.puts ex.backtrace if Rudy.debug?
           exit 12 unless keep_going?
         end
+        ret
       end
       
        def keep_going?

data/lib/rudy.rb

@@ -4,8 +4,8 @@ unless defined?(RUDY_HOME)
   RUDY_LIB = File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
-#local_libs = %w{net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
-#local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
+local_libs = %w{net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
+local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
 
 require 'digest/md5'
 require 'stringio'
@@ -38,7 +38,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 4.freeze
+      TINY  = 6.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -88,6 +88,7 @@ module Rudy
     }.freeze
     
     @@quiet = false
+    @@yes = false
     @@debug = false
     @@sysinfo = SysInfo.new.freeze
     
@@ -95,10 +96,13 @@ module Rudy
   
   def Rudy.debug?; @@debug == true; end
   def Rudy.quiet?; @@quiet == true; end
+  def Rudy.yes?; @@yes == true; end
   def Rudy.enable_debug; @@debug = true; end
   def Rudy.enable_quiet; @@quiet = true; end
+  def Rudy.enable_yes; @@yes = true; end
   def Rudy.disable_debug; @@debug = false; end
   def Rudy.disable_quiet; @@quiet = false; end
+  def Rudy.disable_yes; @@yes = false; end
   
   def Rudy.sysinfo; @@sysinfo; end
   def sysinfo; @@sysinfo;  end

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.7.4"
+	s.version = "0.7.6"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,11 +14,11 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.6.2'
-  s.add_dependency 'caesars', '>= 0.6.4'
-  s.add_dependency 'rye', '>= 0.6.4'
+  s.add_dependency 'drydock', '>= 0.6.3'
+  s.add_dependency 'caesars', '>= 0.6.6'
+  s.add_dependency 'rye', '>= 0.6.5'
   s.add_dependency 'sysinfo', '>= 0.5.1'
-  s.add_dependency 'storable', '>= 0.5.1'
+  s.add_dependency 'storable', '>= 0.5.2'
   s.add_dependency 'annoy', '>= 0.5.0'
   
   s.add_dependency 'grit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 -04:00
+date: 2009-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.6.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.6.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: annoy