rudy 0.9.7.001 → 0.9.8.001

data/CHANGES.txt

@@ -10,6 +10,10 @@ Creating volume...
 (S)kip  (A)bort:
 
 
+#### 0.9.7.002 (2010-04-02) ###############################
+
+* ADDED: Support for specifying non-ec2 instances in machines config with hostname parameter
+
 #### 0.9.7 (2010-02-20) ###############################
 
 * FIXED: Replace the group_id parameter with security_group. [Diego Elio 'Flameeyes' Pettenò]

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

@@ -5,8 +5,8 @@ module Rudy::AWS
   module EC2
     
     class Address < Storable
-      field :ipaddress
-      field :instid
+      field :ipaddress => String
+      field :instid => String
       
       def liner_note
         info = self.associated? ? @instid : "available"
@@ -133,7 +133,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 || []).each do |a|
           return true if a.ipaddress == address
         end
         false
@@ -143,7 +143,7 @@ module Rudy::AWS
       # Returns true if the given address is associated to an instance
       def associated?(address)
         address = address.ipaddress if address.is_a?(Rudy::AWS::EC2::Address)
-        list.each do |a|
+        (list || []).each do |a|
           return true if a.ipaddress == address && a.instid
         end
         false

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

@@ -4,15 +4,15 @@ module Rudy::AWS
   class EC2::Image < Storable
     @@sformat = "   -> %8s; %12s; %12s; %12s; %8s"
     
-    field :awsid
-    field :owner
-    field :aki
-    field :ari
-    field :state
-    field :arch
-    field :visibility
-    field :location
-    field :kind
+    field :awsid => String
+    field :owner => String
+    field :aki => String
+    field :ari => String
+    field :state => String
+    field :arch => String
+    field :visibility => String
+    field :location => String
+    field :kind => String
         
     def to_s(with_title=false)
       [@awsid.bright, @arch, @visibility, @location].join '; '

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

@@ -4,20 +4,20 @@
 module Rudy::AWS
   class EC2::Instance < Storable
     @@sformat = "   -> %10s; %10s; %12s; %10s; groups: %s"
-    field :aki
-    field :ari
     field :launch_index => Time
-    field :created
-    field :keyname
-    field :size
-    field :ami
-    field :dns_private
-    field :dns_public
-    field :awsid
-    field :state
-    field :zone
-    field :reason
     field :groups => Array
+    field :aki => String
+    field :ari => String
+    field :created => String
+    field :keyname => String
+    field :size => String
+    field :ami => String
+    field :dns_private => String
+    field :dns_public => String
+    field :awsid => String
+    field :state => String
+    field :zone => String
+    field :reason => String
     
     def init
       @groups ||= []

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

@@ -4,9 +4,9 @@ module Rudy::AWS
     
     class Keypair < Storable
       
-      field :name
-      field :fingerprint
-      field :private_key  
+      field :name => String
+      field :fingerprint => String
+      field :private_key   => String
       
       def to_s(titles=false)
         [@name.bright, @fingerprint].join '; '

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

@@ -5,13 +5,13 @@ module Rudy::AWS
     class Volume < Storable
       @@sformat = "%s  %10s;%4sGB;  %s  " # cram the terabyte
       
-      field :awsid
-      field :status
       field :size  => Integer
-      field :snapid
       field :zone  => Symbol
       field :created => Time
       field :attached => Time
+      field :awsid
+      field :status
+      field :snapid
       field :instid
       field :device
     

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

@@ -41,7 +41,10 @@ module AWS; module EC2;
       
       li "Destroying #{@volume.awsid}"
       execute_check(:medium)
-      execute_action("Destroy Failed") { Rudy::AWS::EC2::Volumes.destroy(@volume.awsid) }
+      execute_action("Destroy Failed") { 
+        Rudy::AWS::EC2::Volumes.destroy(@volume.awsid) 
+        true
+      }
       
       vol = Rudy::AWS::EC2::Volumes.get(@volume.awsid)
 

data/lib/rudy/cli/base.rb

@@ -107,8 +107,8 @@ module Rudy::CLI
     def print_stobject(obj, noverbose=false)
       format = @@global.format
       format = :yaml if @@global.verbose > 0 && @@global.format == :string
-      format = :string if noverbose
-      li obj.dump(format)
+      format = :string if noverbose || format.to_s == "s"
+      li String === obj ? obj.dump : obj.dump(format)
     end
     
     def machine_separator(name, awsid)

data/lib/rudy/cli/machines.rb

@@ -243,16 +243,24 @@ module Rudy
 
         rset = Rye::Set.new(current_machine_group, :parallel => @global.parallel)
         lt.each do |machine|
-          machine.refresh!  # make sure we have the latest DNS info
-          rbox = Rye::Box.new(machine.dns_public, rye_opts)
-          rbox.nickname = machine.name
+          if Rudy::Machine === machine 
+            machine.refresh! # make sure we have the latest DNS info 
+            rbox = Rye::Box.new(machine.dns_public, rye_opts)
+            rbox.nickname = machine.name
+            instid = machine.instid
+          else
+            rbox = Rye::Box.new(machine, rye_opts)
+            rbox.nickname = machine
+            instid = ''
+          end
+          
           if command == :interactive_ssh
             # Print header
             if @@global.quiet
               print "You are #{rye_opts[:user].to_s.bright}. " if !checked # only the 1st
             else
-              li machine_separator(machine.name, machine.instid)
-              li "Connecting #{rye_opts[:user].to_s.bright}@#{machine.dns_public} "
+              li machine_separator(rbox.nickname, instid)
+              li "Connecting #{rye_opts[:user].to_s.bright}@#{rbox.host} "
               li
             end
           else

data/lib/rudy/global.rb

@@ -9,6 +9,7 @@ module Rudy
   # be added to this class (optional: a default value in initialize).
   class Global < Storable
     
+    field :config => String
     field :region
     field :zone
     field :environment
@@ -41,7 +42,6 @@ module Rudy
     field :offline
     field :bucket
     
-    field :config => String
     
     attr_accessor :print_header
     

data/lib/rudy/machines.rb

@@ -16,6 +16,13 @@ module Rudy
       tmp.from_hash record
     end
     
+    def self.list(*args, &blk)
+      machs = super(*args, &blk) || []
+      manual = [fetch_machine_param(:hostname)].flatten.compact
+      manual.reject! { |m| m.is_a?(Symbol) }
+      machs.push *manual
+      machs
+    end
     def find_next_position
       raise "reimplement by looking at position values"
       list = Rudy::Machines.list({}, [:position]) || []
@@ -68,18 +75,6 @@ module Rudy
     def from_hash(h)
       Rudy::Machine.from_hash h
     end
-    
-    
-    
-
-    class UnknownRecordType < Rudy::Error
-      def message; "Unknown record type: #{@obj}"; end
-    end
-    class UnknownObject < Rudy::Error
-      def message; "Unknown object: #{@obj}"; end
-    end
-    # Raised when trying to save a record with a key that already exists
-    class DuplicateRecord < Rudy::Error; end
 
   end
   

data/lib/rudy/metadata/backup.rb

@@ -6,23 +6,23 @@ module Rudy
     include Rudy::Metadata
     include Gibbler::Complex
     
-    field :rtype
-    field :snapid
-    field :volid
-    
-    field :path
-    
     field :created => Time
-    field :year
-    field :month
-    field :day
-    field :hour
-    field :minute
-    field :second
-    
-    field :user
-    field :size
-    field :fstype
+    field :rtype => String
+    field :snapid => String
+    field :volid => String
+    
+    field :path => String
+    
+    field :year => String
+    field :month => String
+    field :day => String
+    field :hour => String
+    field :minute => String
+    field :second => String
+    
+    field :user => String
+    field :size => String
+    field :fstype => String
     
     # If one argument is supplied:
     # * +path+ is a an absolute filesystem path

data/lib/rudy/metadata/disk.rb

@@ -5,26 +5,26 @@ module Rudy
     include Rudy::Metadata
     include Gibbler::Complex
     
-    field :rtype
-    field :volid
-    field :status
-    field :instid
+    field :created  => Time
+    field :rtype => String
+    field :volid => String
+    field :status => String
+    field :instid => String
 
-    field :path
+    field :path => String
 
-    field :device
-    field :size
-    field :fstype
+    field :device => String
+    field :size => String
+    field :fstype => String
     
-    field :name    # Windows, used for label
-    field :index   # Windows, used for diskpart
+    field :name     => String# Windows, used for label
+    field :index    => String# Windows, used for diskpart
     
     #field :backups => Array
     
     # Is the associated volume formatted? One of: true, false
-    field :raw
-    field :mounted
-    field :created  => Time
+    field :raw => String
+    field :mounted => String
     
     # If one argument is supplied:
     # * +path+ is a an absolute filesystem path

data/lib/rudy/metadata/machine.rb

@@ -9,30 +9,30 @@ module Rudy
     include Rudy::Metadata
     include Gibbler::Complex
     
-    field :rtype
-    field :instid
-
-    field :region
-    field :zone
-    field :environment
-    field :role
-    field :position
-    
-    field :size
-    field :ami
-    field :group
-    field :keypair
-    field :address
-    
     field :created => Time
     field :started => Time
     
-    field :dns_public
-    field :dns_private
-    field :state
-    
-    field :os
-    field :impl
+    field :rtype => String
+    field :instid => String
+
+    field :region => Symbol
+    field :zone => Symbol
+    field :environment => Symbol
+    field :role => Symbol
+    field :position => Integer
+    
+    field :size => String
+    field :ami => String
+    field :group => String
+    field :keypair => String
+    field :address => String
+    
+    field :dns_public => String
+    field :dns_private => String
+    field :state => String
+    
+    field :os => Symbol
+    field :impl => Symbol
     
     attr_reader :instance
     

data/lib/rudy/metadata.rb

@@ -118,7 +118,7 @@ module Rudy
         fields = Rudy::Metadata.build_criteria self::RTYPE, fields, less
         records_raw, records = Rudy::Metadata.select(fields), []
         return nil if records_raw.nil? || records_raw.empty?
-        records_raw.each_pair do |p, r|
+        records_raw.each_pair do |key, r|
           obj = self.from_hash r
           records << obj
         end
@@ -232,6 +232,19 @@ module Rudy
       !Rudy::Metadata.get(self.name).nil?
     end
     
+    
+    
+    
+
+    class UnknownRecordType < Rudy::Error
+      def message; "Unknown record type: #{@obj}"; end
+    end
+    class UnknownObject < Rudy::Error
+      def message; "Unknown object: #{@obj}"; end
+    end
+    # Raised when trying to save a record with a key that already exists
+    class DuplicateRecord < Rudy::Error; end
+    
   end
   autoload :Backup, 'rudy/metadata/backup'
   autoload :Disk, 'rudy/metadata/disk'

data/lib/rudy/routines/passthrough.rb

@@ -11,7 +11,7 @@ module Rudy; module Routines;
     
     def execute
       Rudy::Routines::Handlers::Depends.execute_all @before
-      li " Executing routine: #{@name} ".att(:reverse)
+      li " Executing routine: #{@name} ".att(:reverse), ""
       # Re-retreive the machine set to reflect dependency changes
       Rudy::Routines.rescue {
         @machines = Rudy::Machines.list || []

data/lib/rudy/routines/reboot.rb

@@ -30,7 +30,7 @@ module Rudy; module Routines;
       if run?
         Rudy::Routines::Handlers::Depends.execute_all @before
         
-        li " Executing routine: #{@name} ".att(:reverse)
+        li " Executing routine: #{@name} ".att(:reverse), ""
         ld "[this is a generic routine]" if @routine.empty?
         
         # Re-retreive the machine set to reflect dependency changes

data/lib/rudy/routines/shutdown.rb

@@ -34,7 +34,7 @@ module Rudy; module Routines;
         
         Rudy::Routines::Handlers::Depends.execute_all @before
         
-        li " Executing routine: #{@name} ".att(:reverse)
+        li " Executing routine: #{@name} ".att(:reverse), ""
         ld "[this is a generic routine]" if @routine.empty?
         
         # Re-retreive the machine set to reflect dependency changes

data/lib/rudy/routines/startup.rb

@@ -24,7 +24,7 @@ module Rudy; module Routines;
       if run?
         Rudy::Routines::Handlers::Depends.execute_all @before
         
-        li " Executing routine: #{@name} ".att(:reverse)
+        li " Executing routine: #{@name} ".att(:reverse), ""
         ld "[this is a generic routine]" if @routine.empty?
         
         if @routine.has_key? :before_local
@@ -113,7 +113,7 @@ module Rudy; module Routines;
       if run? && !@@global.force
         if @@global.position.nil?
           raise MachineGroupAlreadyRunning, current_machine_group if Rudy::Machines.running?
-          raise MachineGroupMetadataExists, current_machine_group if Rudy::Machines.exists?
+          #raise MachineGroupMetadataExists, current_machine_group if Rudy::Machines.exists?
         else
           if Rudy::Machines.running? @@global.position
             m = Rudy::Machine.new @@global.position

data/lib/rudy/routines.rb

@@ -87,7 +87,7 @@ module Rudy
     def self.runner(routine, rset, lbox, argv=nil)
       routine.each_pair do |name,definition| 
         handler = Rudy::Routines.get_handler name
-        Rudy::Huxtable.li "  #{name}:".bright
+        #Rudy::Huxtable.li "  #{name}:".bright
         self.rescue {
           handler.execute(name, definition, rset, lbox, argv)
         }

data/lib/rudy.rb

@@ -4,9 +4,9 @@ unless defined?(RUDY_HOME)
   RUDY_LIB = File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
-#local_libs = %w{net-ssh net-scp aws-s3 caesars drydock rye storable sysinfo annoy gibbler}
-#local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
-#require 'rubygems'
+local_libs = %w{net-ssh net-scp aws-s3 caesars drydock rye storable sysinfo annoy gibbler}
+local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
+require 'rubygems'
 
 begin; require 'json'; rescue LoadError; end # Silence!
 
@@ -43,8 +43,8 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 7.freeze
-      PATCH  = '001'.freeze
+      TINY  = 8.freeze
+      PATCH = '001'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY, PATCH].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.9.7.001"
+  s.version = "0.9.8.001"
   s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -16,18 +16,19 @@
   
   s.executables = %w[rudy rudy-ec2 rudy-sdb rudy-s3]
   
-  s.add_dependency 'rye',        '>= 0.8.11'
+  s.add_dependency 'rye',        '>= 0.8.15'
+  s.add_dependency 'storable',   '>= 0.7.1'
   s.add_dependency 'attic',      '>= 0.5.2'
   s.add_dependency 'annoy',      '>= 0.5.6'
   s.add_dependency 'drydock',    '>= 0.6.9'
   s.add_dependency 'caesars',    '>= 0.7.4'
   s.add_dependency 'sysinfo',    '>= 0.7.3'
-  s.add_dependency 'gibbler',    '>= 0.7.4'
-  s.add_dependency 'storable',   '>= 0.6.3'
+  s.add_dependency 'gibbler',    '>= 0.7.7'
+  s.add_dependency 'storable',   '>= 0.6.5'
   
   s.add_dependency 'aws-s3',     '>= 0.6.1'
   s.add_dependency 'highline',   '>= 1.5.1'
-  s.add_dependency 'amazon-ec2', '>= 0.9.4'
+  s.add_dependency 'amazon-ec2', '>= 0.9.10'
 
   s.add_development_dependency 'tryouts',    '>= 0.8.8'
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.7.001
+  version: 0.9.8.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -05:00
+date: 2010-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.11
+        version: 0.8.15
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: storable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: attic
@@ -80,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: storable
@@ -90,7 +100,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -120,7 +130,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: tryouts