solutious-rudy 0.9.1 → 0.9.2

data/lib/rudy/routines/handlers/group.rb

@@ -4,13 +4,24 @@ module Rudy; module Routines; module Handlers;
     include Rudy::Routines::Handlers::Base
     extend self
     
-    ##Rudy::Routines.add_handler :machines, self
+    Rudy::Routines.add_handler :network, self
     
     
-    def raise_early_exceptions(name=nil)
+    def raise_early_exceptions(type, batch, rset, lbox, argv=nil)
       
     end
     
+    def execute(type, routine, rset, lbox, argv=nil)
+      routine.each_pair do |action, definition|
+        unless respond_to?(action.to_sym)  
+          Rudy::Huxtable.le %Q(GroupHandler: unknown action "#{action}")
+          next
+        end
+        Rudy::Huxtable.ld %Q(GroupHandler: "#{action}")
+        Rudy::Routines::Handlers::Group.send(action, definition)
+      end
+    end
+    
     def create(name=nil)
       name ||= current_group_name
       return if exists? name
@@ -18,14 +29,12 @@ module Rudy; module Routines; module Handlers;
       Rudy::AWS::EC2::Groups.create name
     end
     
-    def authorize(name=nil, addresses=nil, ports=nil)
-      name ||= current_group_name
-      addresses ||= [Rudy::Utils::external_ip_address]
-      if ports.nil?
-        ports = current_machine_os.to_s == 'win32' ? [[3389,3389]] : [[22,22]]
-      end
-      li "Authorizing ports #{ports.inspect} access for: #{addresses.join(', ')}"
-      Rudy::AWS::EC2::Groups.authorize(name, addresses, ports) 
+    def authorize(ports=nil, addresses=nil, name=nil)      
+      modify(:authorize, ports, addresses, name)
+    end
+    
+    def revoke(ports=nil, addresses=nil, name=nil)      
+      modify(:revoke, ports, addresses, name)
     end
     
     def exists?(name=nil)
@@ -40,5 +49,31 @@ module Rudy; module Routines; module Handlers;
       Rudy::AWS::EC2::Groups.destroy name
     end
     
+    def get(name=nil)
+      name ||= current_group_name
+      Rudy::AWS::EC2::Groups.get name
+    end
+    
+    def list
+      Rudy::AWS::EC2::Groups.list
+    end
+    
+  private 
+    def modify(action, ports=nil, addresses=nil, name=nil)
+      name ||= current_group_name
+      addresses ||= [Rudy::Utils::external_ip_address]
+      
+      if ports.nil?
+        ports = current_machine_os.to_s == 'windows' ? [3389,22] : [22]
+      else
+        ports = [ports].flatten.compact
+      end
+      
+      ports.each do |port|
+        #li "Authorizing port #{port} access for: #{addresses.join(', ')}"
+        Rudy::AWS::EC2::Groups.send(action, name, addresses, [[port, port]]) rescue nil
+      end
+    end
+    
   end
 end; end; end

data/lib/rudy/routines/handlers/host.rb

@@ -10,7 +10,9 @@ module Rudy; module Routines; module Handlers;
       raise NoMachines if rset.boxes.empty?
       rset.boxes.each do |rbox|
         msg = "Waiting for #{rbox.nickname} to boot..."
-        Rudy::Utils.waiter(3, 240, Rudy::Huxtable.logger, msg, 0) {
+        multi = rbox.stash.windows? ? 6 : 3
+        interval, max = 1*multi, 80*multi
+        Rudy::Utils.waiter(interval, max, Rudy::Huxtable.logger, msg, 0) {
           inst = rbox.stash.get_instance
           inst && inst.running?
         }
@@ -36,17 +38,19 @@ module Rudy; module Routines; module Handlers;
     def is_available?(rset, port=22)
       raise NoMachines if rset.boxes.empty?
       rset.boxes.each do |rbox|
-        unless (rbox.stash.os || '').to_s == 'win32' # No SSH daemon in windows
-          msg = "Waiting for SSH (#{port}) on #{rbox.nickname} ..."
-          Rudy::Utils.waiter(2, 60, STDOUT, msg, 0) {
-            Rudy::Utils.service_available?(rbox.stash.dns_public, port)
-          }
-        end
+        msg = "Waiting for port #{port} on #{rbox.nickname} ..."
+        port = 3389 if rbox.stash.windows?
+        multi = rbox.stash.windows? ? 3 : 2
+        interval, max = 1*multi, 30*multi
+        Rudy::Utils.waiter(interval, max, STDOUT, msg, 0) {
+          Rudy::Utils.service_available?(rbox.stash.dns_public, port)
+        }
       end
     end
     
     def set_hostname(rset)
       raise NoMachines if rset.boxes.empty?
+      
       original_user = rset.user
       rset.switch_user 'root' 
       rset.add_key user_keypairpath('root')
@@ -58,9 +62,11 @@ module Rudy; module Routines; module Handlers;
       # run so we may want to make this an explicit action.
       type = current_machine_hostname || :rudy
       rset.batch(type) do |hn|
-        if hn != :default
-          hn = self.stash.name if hn == :rudy
-          self.quietly { hostname(hn) }
+        unless self.stash.os == :windows
+          if hn != :default
+            hn = self.stash.name if hn == :rudy
+            self.quietly { hostname(hn) }
+          end
         end
       end
       rset.switch_user original_user

data/lib/rudy/routines/handlers/keypair.rb

@@ -23,17 +23,33 @@ module Rudy; module Routines; module Handlers;
     def create(name=:root)
       keyname = user_keypairname name
       kp_file = pkey name
-      kp = nil
-      if registered? keyname 
-        raise PrivateKeyNotFound, keyname if kp_file.nil?
+
+      if registered? name && !@@global.force 
         raise PrivateKeyNotFound, kp_file if !File.exists?(kp_file)
-      else
-        raise PrivateKeyFileExists, kp_file if File.exists?(kp_file)
-        li "Creating keypair: #{keyname}"
-        kp = Rudy::AWS::EC2::Keypairs.create(keyname)
-        li "Saving #{kp_file}"
-        Rudy::Utils.write_to_file(kp_file, kp.private_key, 'w', 0600)
       end
+
+      if Rudy::AWS::EC2::Keypairs.exists? keyname
+        if @@global.force
+          li "Destroying existing keypair: #{keyname}"
+          Rudy::AWS::EC2::Keypairs.destroy keyname
+        else
+          raise Rudy::AWS::EC2::KeypairAlreadyDefined, keyname
+        end
+      end
+      
+      if File.exists?(kp_file)
+        if @@global.force
+          delete_pkey name
+        else
+          raise PrivateKeyFileExists, kp_file 
+        end
+      end
+      
+      li "Creating keypair: #{keyname}"
+      kp = Rudy::AWS::EC2::Keypairs.create(keyname)
+      li "Saving #{kp_file}"
+      Rudy::Utils.write_to_file(kp_file, kp.private_key, 'w', 0600)
+      
       kp
     end
     
@@ -55,7 +71,7 @@ module Rudy; module Routines; module Handlers;
     
     def registered?(name=:root)
       keyname = user_keypairname name
-      Rudy::AWS::EC2::Keypairs.exists?( keyname) rescue false
+      Rudy::AWS::EC2::Keypairs.exists?(keyname)
     end
     
     def pkey(name=:root)

data/lib/rudy/routines/handlers/rye.rb

@@ -0,0 +1,173 @@
+module Rudy::Routines::Handlers;
+  module RyeTools
+    include Rudy::Routines::Handlers::Base
+    extend self
+
+
+     # Create an instance of Rye::Box for +hostname+. +opts+ is
+     # an optional Hash of options. See Rye::Box.initialize
+     #
+     # This method should be used throughout the Rudy::Routines 
+     # namespace rather than creating instances manually b/c it 
+     # applies some fancy pants defaults like command hooks.
+     def create_box(hostname, opts={})
+       ld [:hostname, hostname, opts, caller[0]]
+       opts = {
+         :info => (@@global.verbose >= 3),  # rudy -vvv
+         :debug => false,
+         :user => current_machine_user, 
+         :ostype => current_machine_os || :unix,
+         :impltype => :linux
+       }.merge opts
+       
+       nickname = hostname
+       if hostname.kind_of? Rudy::Machine
+         hostname, nickname = hostname.dns_public, hostname.name
+       end
+       
+       box = ::Rye::Box.new hostname, opts
+       box.nickname = nickname
+      
+       local_keys = Rye.keys
+       box.add_keys local_keys if local_keys.is_a?(Array)
+       box.add_key user_keypairpath(opts[:user])
+       
+       # We define hooks so we can still print each command and its output
+       # when running the command blocks. NOTE: We only print this in
+       # verbosity mode. 
+       if @@global.verbose > 0 && !@@global.parallel
+         # This block gets called for every command method call.
+         box.pre_command_hook do |cmd, user, host, nickname|
+           print_command user, nickname, cmd
+         end
+       end
+
+       if @@global.verbose > 1
+         # And this one gets called after each command method call.
+         box.post_command_hook do |ret|
+           print_response ret
+         end
+       end
+
+       box.exception_hook(::Rye::CommandError, &rbox_exception_handler)
+       box.exception_hook(Exception, &rbox_exception_handler)
+
+       ## It'd better for unknown commands to be handled elsewhere
+       ## because it doesn't make sense to retry a method that doesn't exist
+       ##box.exception_hook(Rye::CommandNotFound, &rbox_exception_handler)
+
+       box
+     end
+
+
+
+     # Create an instance of Rye::Set from a list of +hostnames+.
+     # +hostnames+ can contain hostnames or Rudy::Machine objects.
+     # +opts+ is an optional Hash of options. See Rye::Box.initialize
+     #
+     # NOTE: Windows machines are skipped and not added to the set. 
+     def create_set(hostnames, opts={})
+       hostnames ||= []
+
+       opts = {
+         :user => (current_machine_user).to_s,
+         :parallel => @@global.parallel
+       }.merge(opts)
+       set = ::Rye::Set.new current_machine_group, opts 
+
+       opts.delete(:parallel)   # Not used by Rye::Box.new
+
+       hostnames.each do |m| 
+
+         if m.is_a?(Rudy::Machine)
+           m.refresh! if m.dns_public.nil? || m.dns_public.empty?
+           if m.dns_public.nil? || m.dns_public.empty?
+             ld "Cannot find public DNS for #{m.name} (continuing...)"
+             rbox = self.create_box('nohost', opts) 
+           else
+             ld [:dns_public, m.dns_public, m.instid]
+             rbox = self.create_box(m.dns_public, opts) 
+           end
+           rbox.stash = m   # Store the machine instance in the stash
+           rbox.nickname = m.name
+         else
+           # Otherwise we assume it's a hostname
+           rbox = self.create_box(m)
+         end
+         rbox.add_key user_keypairpath(opts[:user])
+         set.add_box rbox
+       end
+
+       ld "Machines Set: %s" % [set.empty? ? '[empty]' : set.inspect]
+
+       set
+     end
+
+
+    private 
+
+    # Returns a formatted string for printing command info
+    def print_command(user, host, cmd)
+      #return if @@global.parallel
+      cmd ||= ""
+      cmd, user = cmd.to_s, user.to_s
+      prompt = user == "root" ? "#" : "$"
+      li ("%s@%s%s %s" % [user, host, prompt, cmd.bright])
+    end
+
+    def print_response(rap)
+      # Non zero exit codes raise exceptions so  
+      # the erorrs have already been handled. 
+      return if rap.exit_code != 0
+
+      if @@global.parallel
+        cmd, user = cmd.to_s, user.to_s
+        prompt = user == "root" ? "#" : "$"
+        li "%s@%s%s %s%s%s" % [rap.box.user, rap.box.nickname, prompt, rap.cmd.bright, $/, rap.stdout.inspect]
+        unless rap.stderr.empty?
+          le "#{rap.box.nickname}: " << rap.stderr.join("#{rap.box.nickname}: ")
+        end
+      else
+        li '  ' << rap.stdout.join("#{$/}  ") if !rap.stdout.empty?
+        colour = rap.exit_code != 0 ? :red : :normal
+        unless rap.stderr.empty?
+          le ("  STDERR  " << '-'*38).color(colour).bright
+          le "  " << rap.stderr.join("#{$/}    ").color(colour)
+        end
+      end
+    end
+
+
+   def rbox_exception_handler
+     Proc.new do |ex, cmd, user, host, nickname|
+       print_exception(user, host, cmd, nickname, ex)
+       unless @@global.parallel
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (F)orce  (A)bort: ', nil, 3600) || ''
+         if choice.match(/\AS/i)
+           :skip
+         elsif choice.match(/\AR/i)
+           :retry   # Tells Rye::Box#run_command to retry
+         elsif choice.match(/\AF/i)
+           @@global.force = true
+           :retry
+         else
+           exit 12
+         end
+       end
+     end
+   end
+
+   def print_exception(user, host, cmd, nickname, ex)
+     prefix = @@global.parallel ? "#{nickname}: #{cmd}: " : ""
+     if ex.is_a?(::Rye::CommandError)
+       le prefix << ex.message.color(:red)
+     else
+       le prefix << "#{ex.class}: #{ex.message}".color(:red)
+     end
+     le *ex.backtrace if @@global.verbose > 2
+   end
+
+
+ end
+end
+

data/lib/rudy/routines/handlers/script.rb

@@ -46,7 +46,8 @@ module Rudy; module Routines; module Handlers;
         
         # The error doesn't apply to the local Rye::Box instance
         if robj.is_a?(Rye::Set) && !File.exists?(user_keypairpath(user) || '')
-          le "Cannot find key for #{user}: #{user_keypairpath(user)}"
+          # TODO: This prints always even if an account is authorized with different keys. 
+          #le "Cannot find key for #{user}: #{user_keypairpath(user)}"          
         end
         
         if user.to_s != robj.user

data/lib/rudy/routines/passthrough.rb

@@ -4,11 +4,11 @@ module Rudy; module Routines;
     
     def init(*args)
       @machines = Rudy::Machines.list || []
-      @@rset = create_rye_set @machines unless defined?(@@rset)
+      @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
     end
     
     def execute
-      ld "Executing routine: #{@name}"
+      li "Executing routine: #{@name}"
       return @machines unless run?
       Rudy::Routines::Handlers::Depends.execute_all @before
       Rudy::Routines.runner(@routine, @@rset, @@lbox, @argv)

data/lib/rudy/routines/reboot.rb

@@ -12,7 +12,7 @@ module Rudy; module Routines;
     def init(*args)
       @routine ||= {}
       @machines = Rudy::Machines.list
-      @@rset = create_rye_set @machines unless defined?(@@rset)
+      @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
     end
     
     # Startup routines run in the following order:
@@ -24,7 +24,7 @@ module Rudy; module Routines;
     # * all other actions
     # * after dependencies
     def execute
-      ld "Executing routine: #{@name}"
+      li "Executing routine: #{@name}"
       ld "[this is a generic routine]" if @routine.empty?
       
       if run?

data/lib/rudy/routines/shutdown.rb

@@ -10,7 +10,7 @@ module Rudy; module Routines;
                          
     def init(*args)
       @machines = Rudy::Machines.list || []
-      @@rset = create_rye_set @machines unless defined?(@@rset)
+      @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
       @routine ||= {}
     end
     
@@ -21,7 +21,7 @@ module Rudy; module Routines;
     # * after_local (if present)
     # * after dependencies
     def execute
-      ld "Executing routine: #{@name}"
+      li "Executing routine: #{@name}"
       ld "[this is a generic routine]" if @routine.empty?
       
       # We need to remove after_local so the runner doesn't see it

data/lib/rudy/routines/startup.rb

@@ -20,7 +20,7 @@ module Rudy; module Routines;
     # * all other actions
     # * after dependencies
     def execute
-      ld "Executing routine: #{@name}"
+      li "Executing routine: #{@name}"
       ld "[this is a generic routine]" if @routine.empty?
       
       
@@ -59,9 +59,11 @@ module Rudy; module Routines;
       # NOTE: Expect errors if there are no machines.
       Rudy::Routines.rescue {
         @machines = run? ? Rudy::Machines.create : Rudy::Machines.list
-        @@rset = create_rye_set @machines unless defined?(@@rset)
+        @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
       }
       
+      sleep 1  # SimpleDB eventual consistency 
+      
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_running? @@rset
           a = @@rset.boxes.select { |box| !box.stash.instance_running? }

data/rudy.gemspec

@@ -1,12 +1,12 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.9.1"
+	s.version = "0.9.2"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
 	s.email = "delano@solutious.com"
-	s.homepage = "http://github.com/solutious/rudy"
+	s.homepage = "http://solutious.com/projects/rudy/"
   
   s.extra_rdoc_files = %w[README.rdoc Rudyfile LICENSE.txt CHANGES.txt]
   s.has_rdoc = true
@@ -16,19 +16,19 @@
   
   s.executables = %w[rudy rudy-ec2 rudy-sdb rudy-s3]
   
-  s.add_dependency 'rye',        '>= 0.8.6'
+  s.add_dependency 'rye',        '>= 0.8.9'
   s.add_dependency 'attic',      '>= 0.4.0'
   s.add_dependency 'annoy',      '>= 0.5.5'
   s.add_dependency 'drydock',    '>= 0.6.6'
   s.add_dependency 'caesars',    '>= 0.7.3'
-  s.add_dependency 'sysinfo',    '>= 0.6.3'
+  s.add_dependency 'sysinfo',    '>= 0.7.0'
   s.add_dependency 'gibbler',    '>= 0.6.0'
   s.add_dependency 'tryouts',    '>= 0.8.4'
   s.add_dependency 'storable',   '>= 0.5.6'
   
-  s.add_dependency 'aws-s3',     '>= 0.6.1'  # Ruby 1.9.1 compatability
-  s.add_dependency 'highline',   '>= 1.5.1'  # Ruby 1.9.1 compatability
-  s.add_dependency 'amazon-ec2', '>= 0.3.8'  # Region fix
+  s.add_dependency 'aws-s3',     '>= 0.6.1'
+  s.add_dependency 'highline',   '>= 1.5.1'
+  s.add_dependency 'amazon-ec2', '>= 0.5.0'
   
   # = MANIFEST =
   # git ls-files
@@ -42,7 +42,10 @@
   bin/rudy-ec2
   bin/rudy-s3
   bin/rudy-sdb
+  examples/authorize.rb
   examples/gem-test.rb
+  examples/solaris.rb
+  examples/windows.rb
   lib/rudy.rb
   lib/rudy/aws.rb
   lib/rudy/aws/ec2.rb
@@ -63,6 +66,7 @@
   lib/rudy/cli/aws/ec2/candy.rb
   lib/rudy/cli/aws/ec2/groups.rb
   lib/rudy/cli/aws/ec2/images.rb
+  lib/rudy/cli/aws/ec2/info.rb
   lib/rudy/cli/aws/ec2/instances.rb
   lib/rudy/cli/aws/ec2/keypairs.rb
   lib/rudy/cli/aws/ec2/snapshots.rb
@@ -79,11 +83,13 @@
   lib/rudy/cli/config.rb
   lib/rudy/cli/disks.rb
   lib/rudy/cli/execbase.rb
+  lib/rudy/cli/images.rb
+  lib/rudy/cli/info.rb
+  lib/rudy/cli/keypairs.rb
   lib/rudy/cli/machines.rb
   lib/rudy/cli/metadata.rb
   lib/rudy/cli/networks.rb
   lib/rudy/cli/routines.rb
-  lib/rudy/cli/status.rb
   lib/rudy/config.rb
   lib/rudy/config/objects.rb
   lib/rudy/disks.rb
@@ -108,6 +114,7 @@
   lib/rudy/routines/handlers/host.rb
   lib/rudy/routines/handlers/keypair.rb
   lib/rudy/routines/handlers/machines.rb
+  lib/rudy/routines/handlers/rye.rb
   lib/rudy/routines/handlers/script.rb
   lib/rudy/routines/handlers/user.rb
   lib/rudy/routines/passthrough.rb