rudy 0.6.4 → 0.6.5

data/CHANGES.txt

@@ -7,6 +7,13 @@ RUDY, CHANGES
 * TODO: Support for product codes
 * TODO: HTTPS
 
+#### 0.6.5 (2009-04-??) ###############################
+
+* FIXED: Startup and Shutdown routines now check machine group status first
+* FIXED: Misc release process issues between 0.6.0 and 0.6.4
+* ADDED: Better error handling during startup and shutdown. 
+* ADDED: Support for assigning addresses on startup
+
 
 #### 0.6.0 (2009-04-19) ###############################
 

data/README.rdoc

@@ -33,8 +33,8 @@ Via Rubygems, one of:
     $ sudo gem install solutious-rudy --source http://gems.github.com/
 
 or via download:
-* rudy-0.6.0.tar.gz[http://github.com/solutious/rudy/tarball/rudy-0.6.0]
-* rudy-0.6.0.zip[http://github.com/solutious/rudy/zipball/rudy-0.6.0]
+* rudy-0.6.4.tar.gz[http://github.com/solutious/rudy/tarball/rudy-0.6.4]
+* rudy-0.6.4.zip[http://github.com/solutious/rudy/zipball/rudy-0.6.4]
 
 NOTE: <em>If you are not installing via RubyGems, you need to make sure the dependencies are in your LOAD_PATH (<tt>$:</tt>). Ryan Tomayko wrote a gist[http://gist.github.com/54177] about it.</em>
 

data/Rudyfile

@@ -50,8 +50,10 @@ machines do
     ami "ami-5394733a"    # ec2onrails/ec2onrails-v0_9_9_1-i386.manifest.xml
     size 'm1.small'
     
+    
     role :app do
-      positions 1
+      positions 2
+      addresses '174.129.208.127', '174.129.208.169'
       
       # We define two disks for the stage-app machines
       disks do
@@ -66,10 +68,15 @@ machines do
       end
       
     end
-
     
-    role :SUCCESS do
-      
+    # Here are some examples of other roles. These can be anything.
+    role :db do
+    end
+    
+    role :analysis do
+    end
+    
+    role :balancer do
     end
     
   end  

data/bin/rudy

@@ -10,8 +10,8 @@
 
 $:.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') }
-#require 'rubygems'
+%w{amazon-ec2 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
   
 

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

@@ -71,6 +71,7 @@ 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)
+        p address
         raise AddressNotAssociated unless associated?(address)
         
         opts ={

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

@@ -79,8 +79,7 @@ module Rudy::AWS
       # * +:ami+          
       # * +:group+        
       # * +:size+          
-      # * +:keypair+      
-      # * +:address+
+      # * +:keypair+
       # * +:private+ true or false (default)
       # * +:machine_data+
       # * +:min+ count

data/lib/rudy/huxtable.rb

@@ -188,10 +188,12 @@ module Rudy
       fetch_machine_param(:size) || 'm1.small'
     end
     
-    def current_machine_address
+    def current_machine_address(position='01')
       raise "No configuration" unless @@config
       raise "No machines configuration" unless @@config.machines
-      @@config.machines.find_deferred(@@global.environment, @@global.role, :address)
+      raise "Position cannot be nil" if position.nil?
+      addresses = [fetch_machine_param(:addresses)].flatten.compact
+      addresses[position.to_i-1]
     end
     
     # TODO: fix machine_group to include zone
@@ -225,6 +227,18 @@ module Rudy
       #name.gsub(/key-/, '')   # We keep the key- now
     end
     
+    
+    # Looks for ENV-ROLE configuration in machines. There must be
+    # 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?
+      return false if !@@config && !@@global
+      zon, env, rol = @@global.zone, @@global.environment, @@global.role
+      conf = @@config.machines.find_deferred(@@global.region, zon, [env, rol])
+      conf ||= @@config.machines.find_deferred(zon, [env, rol])
+      !conf.nil?
+    end
+    
   private 
     
     
@@ -279,16 +293,6 @@ module Rudy
       routine
     end
     
-    # Looks for ENV-ROLE configuration in machines. There must be
-    # 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?
-      return false if !@@config && !@@global
-      zon, env, rol = @@global.zone, @@global.environment, @@global.role
-      conf = @@config.machines.find_deferred(@@global.region, zon, [env, rol])
-      conf ||= @@config.machines.find_deferred(zon, [env, rol])
-      !conf.nil?
-    end
     
     def fetch_machine_param(parameter)
       raise "No configuration" unless @@config

data/lib/rudy/machines.rb

@@ -113,7 +113,6 @@ module Rudy
         :group => current_group_name,
         :keypair => root_keypairname, 
         :zone => @@global.zone.to_s,
-        :address => current_machine_address,
         :machine_data => Machine.generate_machine_data.to_yaml
       }.merge(opts)
       
@@ -121,6 +120,17 @@ module Rudy
         @awsid = inst.awsid
         @created = @starts = Time.now
         @state = inst.state
+        # Assign IP address to only the first instance
+        if current_machine_address(@position)
+          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."
+            Rudy::Utils.bug()
+          end
+        end
       end
       
       self.save
@@ -201,8 +211,8 @@ module Rudy
     
     
     def destroy(&each_mach)
-      raise MachineGroupNotRunning, current_machine_group unless running?
       raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
+      raise MachineGroupNotRunning, current_machine_group unless running?
       list.each { |m| each_mach.call(m); } if each_mach
       list do |mach|
         puts "Destroying #{mach.name}"

data/lib/rudy/metadata.rb

@@ -10,6 +10,7 @@ module Rudy
         @sdb = Rudy::AWS::SDB.new(a, s, r)
         @ec2inst = Rudy::AWS::EC2::Instances.new(a, s, r)
         @rvol = Rudy::AWS::EC2::Volumes.new(a, s, r)
+        @radd = Rudy::AWS::EC2::Addresses.new(a, s, r)
         init(*args)
       end
       

data/lib/rudy/routines/helpers/diskhelper.rb

@@ -46,16 +46,26 @@ module Rudy; module Routines;
         # "No such file or directory while trying to determine filesystem size"
         sleep 2 
         
-        print "Creating ext3 filesystem for #{disk.device}... "
-        @rbox.mkfs(:t, "ext3", :F, disk.device)
-        @rbox.mkdir(:p, disk.path)
-        puts "done"
+        begin
+          print "Creating ext3 filesystem for #{disk.device}... "
+          @rbox.mkfs(:t, "ext3", :F, disk.device)
+          @rbox.mkdir(:p, disk.path)
+          puts "done"
         
-        print "Mounting at #{disk.path}... "
+          print "Mounting at #{disk.path}... "
         
-        @rbox.mount(:t, 'ext3', disk.device, disk.path)
-        disk.mounted = true
-        disk.save
+          @rbox.mount(:t, 'ext3', disk.device, disk.path)
+          disk.mounted = true
+          disk.save
+        rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch => ex  
+          STDERR.puts "Error creating disk".color(:red)
+          STDERR.puts ex.message.color(:red)
+         rescue Rye::CommandNotFound => ex
+          puts "  CommandNotFound: #{ex.message}".color(:red)
+        rescue
+          STDERR.puts "Error creating disk" .color(:red)
+          Rudy::Utils.bug
+        end
         puts "done"
         
       end

data/lib/rudy/routines/helpers/scripthelper.rb

@@ -47,22 +47,30 @@ module Rudy; module Routines;
       # add the method on for the instance of rbox we are using. 
       def rbox.rm(*args); cmd('rm', args); end
       
+      
       if routine.is_a?(Caesars::Hash) && routine.has_key?(timing)
         puts "Connecting to #{hostname}"
-        rbox.connect
+        begin
+          rbox.connect
+        rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch => ex  
+          STDERR.puts "Error connecting: #{ex.message}".color(:red)
+          STDERR.puts "Skipping scripts".color(:red)
+        end
+        
         original_user = rbox.user
         scripts = [routine[timing]].flatten
         scripts.each do |script|
-          user, command, *args = script.to_a.flatten.compact
-          rbox.switch_user user # does nothing if it's the same user
-          puts "Creating #{@@script_config_file}"
-          rbox.safe = false
-          puts rbox.echo("'#{sconf.to_hash.to_yaml}' > #{@@script_config_file}")
-          rbox.safe = true
-          rbox.chmod(600, @@script_config_file)
-          puts %Q{Running (as #{user}): #{rbox.preview_command(command, args)}}
           
           begin
+            user, command, *args = script.to_a.flatten.compact
+            rbox.switch_user user # does nothing if it's the same user
+            puts "Creating #{@@script_config_file}"
+            rbox.safe = false
+            puts rbox.echo("'#{sconf.to_hash.to_yaml}' > #{@@script_config_file}")
+            rbox.safe = true
+            rbox.chmod(600, @@script_config_file)
+            puts %Q{Running (as #{user}): #{rbox.preview_command(command, args)}}
+          
             ret = rbox.send(command, args)
             if ret.exit_code > 0
               puts "  Exit code: #{ret.exit_code}".color(:red)

data/lib/rudy/routines/shutdown.rb

@@ -5,8 +5,11 @@ module Rudy; module Routines;
   class Shutdown < Rudy::Routines::Base
     
     def execute
-      raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
       rmach = Rudy::Machines.new
+      raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
+      raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
+      raise MachineGroupNotRunning, current_machine_group unless rmach.running?
+      
       routine = fetch_routine_config(:shutdown)
       rbox_local = Rye::Box.new('localhost')
       sconf = fetch_script_config

data/lib/rudy/routines/startup.rb

@@ -5,9 +5,12 @@ module Rudy; module Routines;
   class Startup < Rudy::Routines::Base
 
     def execute
-      # There's no keypair check here because Rudy::Machines will attempt 
-      # to create one. 
       rmach = Rudy::Machines.new
+      # There's no keypair check here because Rudy::Machines will attempt 
+      # to create one.
+      raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
+      raise MachineGroupAlreadyRunning, current_machine_group if rmach.running?
+      
       routine = fetch_routine_config(:startup)
       rbox_local = Rye::Box.new('localhost')
       sconf = fetch_script_config

data/lib/rudy.rb

@@ -65,7 +65,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 6.freeze
-      TINY  = 4.freeze
+      TINY  = 5.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].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.6.4"
+	s.version = "0.6.5"
 	s.summary = "Rudy: Not your grandparent's deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -16,7 +16,7 @@
   
   s.add_dependency 'drydock', '>= 0.5.5'  
   s.add_dependency 'caesars', '>= 0.5.4'  
-  s.add_dependency 'rye', '>= 0.5.1'
+  s.add_dependency 'rye', '>= 0.5.3'
   
   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.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe