solutious-rudy 0.9.0 → 0.9.1

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

@@ -16,8 +16,8 @@ module Rudy; module Routines; module Handlers;
     end
     
     def execute(type, batch, rset, lbox, argv=nil)
-      if type.to_s =~ /\Ax/  
-        # do nothing
+      if type.to_s =~ /\Ax/     # (e.g. xremote, xlocal)
+        # do nothing 
         
       # It's important this stay a regex rather than a literal comparison
       elsif type.to_s =~ /local/   

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

@@ -21,6 +21,10 @@ module Rudy; module Routines; module Handlers;
       # On Solaris, the user's home directory needs to be specified
       # explicitly so we do it for linux too for fun. 
       homedir = robj.guess_user_home(user.to_s)
+      
+      # When more than one machine is running, this will be an Array
+      homedir = homedir.first if homedir.kind_of?(Array)
+      
       args = [:m, :d, homedir, :s, '/bin/bash', user.to_s]
       
       # NOTE: We'll may to use platform specific code here. 

data/lib/rudy/routines/reboot.rb

@@ -11,6 +11,8 @@ module Rudy; module Routines;
                          
     def init(*args)
       @routine ||= {}
+      @machines = Rudy::Machines.list
+      @@rset = create_rye_set @machines unless defined?(@@rset)
     end
     
     # Startup routines run in the following order:
@@ -24,15 +26,12 @@ module Rudy; module Routines;
     def execute
       ld "Executing routine: #{@name}"
       ld "[this is a generic routine]" if @routine.empty?
-
-      
-      # If this is a testrun we won't create new instances
-      # we'll just grab the list of machines in this group. 
-      # NOTE: Expect errors if there are no machines.
-      @machines = run? ? Rudy::Machines.restart : Rudy::Machines.list
-      @@rset = create_rye_set @machines unless defined?(@@rset)
       
       if run?
+        Rudy::Routines.rescue {
+          Rudy::Routines::Handlers::Group.authorize rescue nil
+        }
+        
         if @routine.has_key? :before_local
           handler = Rudy::Routines.get_handler :local
           Rudy::Routines.rescue {
@@ -48,9 +47,21 @@ module Rudy; module Routines;
         end
       end
       
+      Rudy::Routines.rescue {
+        if Rudy::Routines::Handlers::Disks.mount? @routine
+          fake = Hash[:umount => @routine.disks[:mount]]
+          Rudy::Routines::Handlers::Disks.execute :umount, fake, @@rset, @@lbox, @argv
+        end
+      }
+      
+      li "Rebooting #{current_group_name}..."
+      @machines.each { |m| m.restart } if run?
+      
+      15.times { print '.'; Kernel.sleep 2 }; puts $/  # Wait for 30 seconds
+      
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_running? @@rset
-          a = @@rset.boxes.select { |box| !box.stash.running? }
+          a = @@rset.boxes.select { |box| !box.stash.instance_running? }
           raise GroupNotRunning, a
         end
       }
@@ -61,7 +72,7 @@ module Rudy; module Routines;
       
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_available? @@rset
-          a = @@rset.boxes.select { |box| !box.stash.available? }
+          a = @@rset.boxes.select { |box| !box.stash.instance_available? }
           raise GroupNotAvailable, a
         end
       }
@@ -97,6 +108,12 @@ module Rudy; module Routines;
         bad = @routine.keys - @@allowed_actions
         raise UnsupportedActions.new(@name, bad) unless bad.empty?
       end
+      
+      if @machines
+        down = @@rset.boxes.select { |box| !box.stash.instance_running? }
+        raise GroupNotAvailable, down unless down.empty?
+      end
+      
     end
     
   end

data/lib/rudy/routines/shutdown.rb

@@ -28,6 +28,10 @@ module Rudy; module Routines;
       after_local = @routine.delete(:after_local)
       
       if run?
+        Rudy::Routines.rescue {
+          Rudy::Routines::Handlers::Group.authorize rescue nil
+        }
+        
         Rudy::Routines::Handlers::Depends.execute_all @before
       
         # This is the meat of the sandwich

data/lib/rudy/routines/startup.rb

@@ -64,7 +64,7 @@ module Rudy; module Routines;
       
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_running? @@rset
-          a = @@rset.boxes.select { |box| !box.stash.running? }
+          a = @@rset.boxes.select { |box| !box.stash.instance_running? }
           raise GroupNotRunning, a
         end
       }
@@ -72,9 +72,10 @@ module Rudy; module Routines;
       # This is important b/c the machines will not 
       # have DNS info until after they are running. 
       Rudy::Routines.rescue { Rudy::Routines::Handlers::Host.update_dns @@rset }
+      
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_available? @@rset
-          a = @@rset.boxes.select { |box| !box.stash.available? }
+          a = @@rset.boxes.select { |box| !box.stash.instance_available? }
           raise GroupNotAvailable, a
         end
       }

data/lib/rudy/utils.rb

@@ -86,6 +86,7 @@ module Rudy
       end
       
       if msg && logger
+        logger.puts
         logger.flush
       end
       
@@ -142,7 +143,7 @@ module Rudy
       Rudy::ID_MAP[key]
     end
 
-    # Return a string ID without the identifier. i.e. key-stage-app-root => stage-app-root
+    # Return a string ID without the identifier. e.g. key-stage-app-root => stage-app-root
     def noid(str)
       el = str.split('-')
       el.shift
@@ -199,15 +200,28 @@ module Rudy
     # Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error
     #
     def service_available?(host, port, wait=3)
-      begin
-        status = Timeout::timeout(wait) do
-          socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
-          sockaddr = Socket.pack_sockaddr_in( port, host )
-          socket.connect( sockaddr )
+      if Rudy.sysinfo.vm == :java
+        begin
+          iadd = Java::InetSocketAddress.new host, port      
+          socket = Java::Socket.new
+          socket.connect iadd, wait * 1000  # milliseconds
+          success = !socket.isClosed && socket.isConnected
+        rescue NativeException => ex
+          puts ex.message, ex.backtrace if Rudy.debug?
+          false
+        end
+      else 
+        begin
+          status = Timeout::timeout(wait) do
+            socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+            sockaddr = Socket.pack_sockaddr_in( port, host )
+            socket.connect( sockaddr )
+          end
+          true
+        rescue Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error => ex
+          puts ex.class, ex.message, ex.backtrace if Rudy.debug?
+          false
         end
-        true
-      rescue Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error => ex
-        false
       end
     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.0"
+	s.version = "0.9.1"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,12 +14,14 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.3.0'
   
-  s.add_dependency 'rye',        '>= 0.8.5'
+  s.executables = %w[rudy rudy-ec2 rudy-sdb rudy-s3]
+  
+  s.add_dependency 'rye',        '>= 0.8.6'
   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.2'
+  s.add_dependency 'sysinfo',    '>= 0.6.3'
   s.add_dependency 'gibbler',    '>= 0.6.0'
   s.add_dependency 'tryouts',    '>= 0.8.4'
   s.add_dependency 'storable',   '>= 0.5.6'
@@ -27,25 +29,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
-
-  # One of the other dependencies needs these gems 
-  # but doesn't seem to specify them. Why I outta!
-  s.add_dependency 'tenderlove-frex'
-  s.add_dependency 'archive-tar-minitar'
-  s.add_dependency 'nokogiri'
-  s.add_dependency 'echoe'
-  s.add_dependency 'racc'
-  s.add_dependency 'hoe'
-  
-  # libxml2 libxml2-dev libxslt-dev
-  
-  # http://bit.ly/2WaAgV
-  #s.add_runtime_dependency('xml-simple', '>= 1.0.11')
-  #s.add_dependency('xml-simple', '>= 1.0.11')
-  #s.add_development_dependency('jgre-monkeyspecdoc', '>= 0.1.0')
-  #s.add_development_dependency('thoughtbot-shoulda', '>= 0.1.0')
-  
-  s.executables = %w[rudy rudy-ec2 rudy-sdb rudy-s3]
   
   # = MANIFEST =
   # git ls-files
@@ -59,6 +42,7 @@
   bin/rudy-ec2
   bin/rudy-s3
   bin/rudy-sdb
+  examples/gem-test.rb
   lib/rudy.rb
   lib/rudy/aws.rb
   lib/rudy/aws/ec2.rb
@@ -97,7 +81,9 @@
   lib/rudy/cli/execbase.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
@@ -173,14 +159,9 @@
   tryouts/40_routines/11_group_handler_tryouts.rb
   tryouts/80_cli/10_rudyec2_tryouts.rb
   tryouts/80_cli/60_rudy_tryouts.rb
+  tryouts/exploration/console.rb
+  tryouts/exploration/machine.rb
   tryouts/failer
-  tryouts/misc/console_tryout.rb
-  tryouts/misc/disks_tryout.rb
-  tryouts/misc/drydock_tryout.rb
-  tryouts/misc/nested_methods.rb
-  tryouts/misc/session_tryout.rb
-  tryouts/misc/tryouts.rb
-  tryouts/misc/usage_tryout.rb
   )
 
   

data/tryouts/10_require_time/10_rudy_tryouts.rb

@@ -15,7 +15,7 @@ tryout "Rudy Initialization" do
   drill             "has sysinfo", Rudy.sysinfo, :class, SysInfo
   drill       "debug is disabled", Rudy.debug?, false
   drill       "quiet is disabled", Rudy.quiet?, false
-  drill    "auto-yes is disabled", Rudy.yes?, false
+  drill    "auto-yes is disabled", Rudy.auto?, false
   
   drill "debug can be enabled", true do
     Rudy.enable_debug

data/tryouts/failer

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # For some reason when this echo is commented out
-# and Net::SSH always reports the exit code as 0.
+#  Net::SSH always reports the exit code as 0.
 echo "Failing with $1"
 exit $1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.5
+        version: 0.8.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: attic
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: gibbler
@@ -132,66 +132,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.8
     version: 
-- !ruby/object:Gem::Dependency 
-  name: tenderlove-frex
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: racc
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: "Rudy: Not your grandparents' EC2 deployment tool."
 email: delano@solutious.com
 executables: 
@@ -216,6 +156,7 @@ files:
 - bin/rudy-ec2
 - bin/rudy-s3
 - bin/rudy-sdb
+- examples/gem-test.rb
 - lib/rudy.rb
 - lib/rudy/aws.rb
 - lib/rudy/aws/ec2.rb
@@ -254,7 +195,9 @@ files:
 - lib/rudy/cli/execbase.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
@@ -330,14 +273,9 @@ files:
 - tryouts/40_routines/11_group_handler_tryouts.rb
 - tryouts/80_cli/10_rudyec2_tryouts.rb
 - tryouts/80_cli/60_rudy_tryouts.rb
+- tryouts/exploration/console.rb
+- tryouts/exploration/machine.rb
 - tryouts/failer
-- tryouts/misc/console_tryout.rb
-- tryouts/misc/disks_tryout.rb
-- tryouts/misc/drydock_tryout.rb
-- tryouts/misc/nested_methods.rb
-- tryouts/misc/session_tryout.rb
-- tryouts/misc/tryouts.rb
-- tryouts/misc/usage_tryout.rb
 has_rdoc: true
 homepage: http://github.com/solutious/rudy
 licenses: 

data/tryouts/misc/disks_tryout.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/ruby
-
-# Tryout - New Rudy::Metadata::Disk API
-#
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-%w{drydock caesars rye}.each { |dir| $: << File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
-
-require 'rubygems'
-require 'rudy'
-require 'tryouts'
-include Tryouts
-
-#
-#mach7 = Rudy::Machine.load('m-us-east-1b-stage-app-01')
-mach7 = Rudy::Machine.new
-
-#puts mach7.running?
-#mach7.position = "07"
-##y mach1.start
-##mach1.save
-#p Rudy::Machines.get(mach7.name)
-#
-#
-
-
-
-#disk1 = Rudy::Metadata::Disk.new('/mnt/ride', 1, '/dev/sdh')
-#p disk1.valid?
-#p disk1.name
-#disk1.save
-#disk2 = Rudy::Disks.get("disk-poop-stage-app-01-")
-#
-#p disk1
-#p disk2
-#puts disk2 == disk1
-#puts disk2.destroy
-
-__END__
-
-
-#puts disk1.to_select
-#p disk1.to_query(nil, [:path])
-#p Rudy::Disks.query( "['rtype'='disk']")
-
-__END__
-group = Rudy::Groups.new
-inst = Rudy::Machines.new