solutious-rudy 0.9.0 → 0.9.1

data/bin/rudy

@@ -30,33 +30,35 @@ class RudyCLI < Rudy::CLI::Base
   global :r, :role, String, "Connect to a machine with the specified role (e.g. #{Rudy::DEFAULT_ROLE})"
   global :p, :position, String, "Position in the machine in its group"
   global :b, :bucket, String, "An S3 bucket name (used when creating images)"
-  global :t, :testrun, "Test run. Don't execute action (EXPERIMENTAL)."
-  global :P, :parallel, "Execute remote commands in parallel (EXPERIMENTAL)."
+  global :t, :testrun, "Test run. Don't execute action (PARTIALLY SUPPORTED)."
+  global :P, :parallel, "Execute remote commands in parallel (PARTIALLY SUPPORTED)."
   global :F, :force, "Force an action despite warnings"
   
+  
   # ------------------------------------------  RUDY OBJECTS  --------
   # ------------------------------------------------------------------
   
-  about "View Routines"
-  usage "rudy routines"
-  usage "rudy routines -l"
-  option :l, :all, "Display routines for all environments and roles"
-  command :routines => Rudy::CLI::Routines
-  command_alias :routines, :r
-  
   about "View Machines"
   usage "rudy"
   usage "rudy machines"
   usage "rudy machines -l"
+  usage "rudy machines -U"
+  usage "rudy machines -A"
+  usage "rudy machines -S [static ip address]"
+  usage "rudy machines -D"
   option :l, :all, "Display machines for all environments and roles"
-  action :W, :wash, "Wash machine metadata."
+  action :W, :wash, "Wash machine metadata"
+  action :T, :available, "Test availablity"
+  action :U, :update, "Update machines based on configuration"
+  action :A, :associate, "Associate static IP addresses or display existing ones"
+  action :N, :disassociate, "Disassociate static IP addresses"
   command :machines => Rudy::CLI::Machines
   command_alias :machines, :m
   
   about "View Disks"
   usage "rudy disks"
   usage "rudy disks -l"
-  action :W, :wash, "Wash disk metadata."
+  action :W, :wash, "Wash disk metadata"
   option :b, :backups, "Display backups"
   option :l, :all, "Display all disks"
   command :disks => Rudy::CLI::Disks
@@ -65,7 +67,7 @@ class RudyCLI < Rudy::CLI::Base
   about "View Backups"
   usage "rudy backups"
   usage "rudy backups -l"
-  action :W, :wash, "Wash backups metadata."
+  action :W, :wash, "Wash backup metadata"
   option :l, :all, "Display all backups"
   command :backups => Rudy::CLI::Backups
   command_alias :backups, :b
@@ -80,18 +82,30 @@ class RudyCLI < Rudy::CLI::Base
   argv :oid
   command :metadata => Rudy::CLI::Metadata
   
-  about "Log in to a machine"
-  command :ssh => Rudy::CLI::Machines
-  
-  #about "Open the machine in your default browser (OSX only)"
-  #option :s, :https, "Use HTTPS"
-  #option :p, :port, Integer, "Port"
-  #command :open => Rudy::CLI::Candy
+  about "View Network configuration (local network only)"
+  usage "rudy networks"
+  usage "rudy networks -L"
+  usage "rudy networks -L -i"
+  usage "rudy networks -L -e"
+  usage "rudy networks -U"
+  option :e, :external, "Display only external IP address"
+  option :i, :internal, "Display only internal IP address"
+  action :U, :update, "Update networks based on configuration"
+  action :L, :local, "Show local network configuration"
+  command :networks => Rudy::CLI::Networks
+  command_alias :networks, :n
   
     
   # -----------------------------------------  RUDY ROUTINES  --------
   # ------------------------------------------------------------------
   
+  about "View Routines"
+  usage "rudy routines"
+  usage "rudy routines -l"
+  option :l, :all, "Display routines for all environments and roles"
+  command :routines => Rudy::CLI::Routines
+  command_alias :routines, :r
+  
   # A "do nothing" routine. Passthrough simply executes a routine
   # config block. Drydock's trawler uses this for unknown commands.
   about "A passthrough for custom routines"
@@ -117,7 +131,19 @@ class RudyCLI < Rudy::CLI::Base
 
   # ------------------------------------  RUDY MISCELLANEOUS  --------
   # ------------------------------------------------------------------
-    
+  
+  about "Display existing environment objects"  
+  option :l, :all, "Include all regions"
+  command :status => Rudy::CLI::Status
+  
+  about "Log in to a machine"
+  command :ssh => Rudy::CLI::Machines
+  
+  #about "Open the machine in your default browser (OSX only)"
+  #option :s, :https, "Use HTTPS"
+  #option :p, :port, Integer, "Port"
+  #command :open => Rudy::CLI::Candy
+  
   usage "rudy [-f config-file] config [param-name]"
   about "Check Rudy configuration."
   option :l, :all, "Display all configs for all machines"
@@ -132,10 +158,12 @@ class RudyCLI < Rudy::CLI::Base
   #option :g, :group, String, "Display configuration for a specific group"
   argv :name
   command :config => Rudy::CLI::Config
+  command_alias :config, :configs
   
   command :print_global => Rudy::CLI::Config
+  command_alias :print_global, :globals
   command_alias :print_global, :global
-  
+   
   about "Initialize Rudy configuration"
   command :init do |obj|
     
@@ -165,7 +193,7 @@ class RudyCLI < Rudy::CLI::Base
            Rudy::NoConfig => ex
       puts "AWS credentials must be configured to continue."
       puts "You can modify these in #{Rudy::CONFIG_FILE}"
-      exit 1
+      exit 0
     end
   
     obj.global.quiet = true  # don't print elapsed time
@@ -177,24 +205,7 @@ class RudyCLI < Rudy::CLI::Base
     t = obj.option.local ? Time.now : Time.now.utc
     puts '%s' % t.strftime("%Y-%m-%d %T %Z (%z)")
   end
-
-  usage "rudy myaddress [-i] [-e]"
-  about "Displays you current internal and external IP addresses"
-  option :e, :external, "Display only external IP address"
-  option :i, :internal, "Display only internal IP address"
-  command :myaddress do |obj|
-    ea = Rudy::Utils::external_ip_address || '' 
-    ia = Rudy::Utils::internal_ip_address || ''
-    if obj.global.quiet
-      puts ia unless obj.option.external && !obj.option.internal
-      puts ea unless obj.option.internal && !obj.option.external
-    else
-      puts "%10s: %s" % ['Internal', ia] unless obj.option.external && !obj.option.internal
-      puts "%10s: %s" % ['External', ea] unless obj.option.internal && !obj.option.external
-    end
-    obj.global.quiet = true  # don't print elapsed time
-  end
-
+  
   usage "rudy [global options] annoy [-h -m -l] [-e]"
   about "Play around with Rudy's annoying challenges"
   option :s, :string, "A numeric challenge"
@@ -229,7 +240,7 @@ class RudyCLI < Rudy::CLI::Base
     end
   end
   
-  
+  about "Display basic system information"
   command :sysinfo do
     puts Rudy.sysinfo.to_yaml
   end

data/examples/gem-test.rb

@@ -0,0 +1,92 @@
+# Rudy Gem Test
+#
+# This configuration is used to 
+# test installing the Rudy gem. 
+
+defaults do
+  color true
+  environment :test
+  role :rudy
+end
+
+machines do
+  env :test do
+    role :rudy do
+      ami 'ami-e348af8a'               # Alestic Debian 5.0, 32-bit (US)
+      user :root
+    end
+  end
+end
+
+commands do
+  allow :apt_get, "apt-get", :y, :q
+  allow :gem_install, "/usr/bin/gem", "install", :n, '/usr/bin', :y, :V, "--no-rdoc", "--no-ri"
+  allow :gem_sources, "/usr/bin/gem", "sources"
+  allow :gem_uninstall, "/usr/bin/gem", "uninstall", :V, :y
+  allow :update_rubygems
+  allow :rake
+  allow :rm
+end
+
+routines do
+
+    
+  install_rubyforge do
+    remote :root do
+      gem_install 'rudy', :V
+    end
+  end
+
+  install_github do
+    remote :root do
+      gem_sources :a, "http://gems.github.com"
+      gem_install 'solutious-rudy'
+    end
+  end
+  
+  package_gem do
+    local do
+      rm :r, :f, 'pkg'
+      rake 'package'
+    end
+  end
+  
+  install_gem do
+    before :package_gem
+    remote :root do
+      file_upload "pkg/rudy-#{Rudy::VERSION}.gem", "/tmp/"
+      gem_install "/tmp/rudy-#{Rudy::VERSION}.gem"
+    end
+  end
+  
+  remove_rudy do
+    remote :root do
+      gem_uninstall 'rudy'
+      rm :r, :f, '.rudy'
+    end
+  end
+  
+  init_rudy do
+    remote do
+      disable_safe_mode
+      rudy :v, :v, 'init'  # create home directory
+      file_upload File.expand_path('~/.rudy/config'), '.rudy/'
+      ls :l, '.rudy/config'
+      rudy :v, :v, 'init'
+      rudy 'status', :l
+    end
+  end
+  
+  sysupdate do
+    remote :root do                  
+      apt_get "update"               
+      apt_get "install", "build-essential", "git-core"
+      apt_get "install", "ruby1.8-dev", "rdoc", "libzlib-ruby", "rubygems"
+      mkdir :p, "/var/lib/gems/1.8/bin" # Doesn't get created, but causes Rubygems to fail
+      gem_install "builder", "session"
+      gem_install 'rubygems-update', "-v=1.3.4"  # circular issue with 1.3.5 and hoe
+      update_rubygems
+    end
+  end
+end
+

data/lib/rudy.rb

@@ -4,7 +4,7 @@ unless defined?(RUDY_HOME)
   RUDY_LIB = File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
-local_libs = %w{net-ssh net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy gibbler}
+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'
 
@@ -16,6 +16,7 @@ require 'ostruct'
 require 'yaml'
 require 'logger'
 require 'socket'
+require 'resolv'
 require 'timeout'
 require 'gibbler'
 require 'tempfile'
@@ -27,7 +28,6 @@ require 'attic'
 require 'annoy'
 require 'rye'
 
-
 # = Rudy
 #
 #
@@ -42,7 +42,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 0.freeze
+      TINY  = 1.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -51,7 +51,7 @@ module Rudy
   unless defined? Rudy::DOMAIN # We can assume all constants are defined
     
     @@quiet = false
-    @@yes = false
+    @@auto = false
     @@debug = false
     @@sysinfo = SysInfo.new.freeze
     
@@ -100,9 +100,9 @@ module Rudy
   def Rudy.enable_quiet; @@quiet = true; end
   def Rudy.disable_quiet; @@quiet = false; end
   
-  def Rudy.yes?; @@yes == true; end
-  def Rudy.enable_yes; @@yes = true; end
-  def Rudy.disable_yes; @@yes = false; end
+  def Rudy.auto?; @@auto == true; end
+  def Rudy.enable_auto; @@auto = true; end
+  def Rudy.disable_auto; @@auto = false; end
   
   def Rudy.debug?; @@debug == true; end
   def Rudy.enable_debug; @@debug = true; end
@@ -114,6 +114,14 @@ module Rudy
   
 end
 
+if Rudy.sysinfo.vm == :java
+  require 'java'
+  module Java
+    include_class java.net.Socket unless defined?(Java::Socket)
+    include_class java.net.InetSocketAddress unless defined?(Java::InetSocketAddress)
+  end
+end
+
 require 'rudy/exceptions'
 require 'rudy/utils'               # The
 require 'rudy/global'              # order    

data/lib/rudy/aws.rb

@@ -8,10 +8,10 @@ module Rudy
     extend self
     
     unless defined?(Rudy::AWS::VALID_REGIONS)
-      VALID_REGIONS = ['eu-west-1', 'us-east-1'].freeze
+      VALID_REGIONS = [:'eu-west-1', :'us-east-1'].freeze
     end
     
-    def valid_region?(r); VALID_REGIONS.member?(r.to_s || ''); end
+    def valid_region?(r); VALID_REGIONS.member?(r.to_sym || ''); end
     
     # Modifies +str+ by removing <tt>[\0\n\r\032\\\\]</tt> and escaping <tt>[\'\"]</tt>
     def escape(str)

data/lib/rudy/aws/ec2.rb

@@ -4,7 +4,7 @@ module Rudy; module AWS
 #    include Rudy::Huxtable
     
     def self.connect(access_key=nil, secret_key=nil, region=nil, logger=nil)
-      
+
       if region
         raise InvalidRegion, region unless Rudy::AWS.valid_region?(region)
         host = "#{region}.ec2.amazonaws.com"
@@ -15,7 +15,7 @@ module Rudy; module AWS
       host ||= DEFAULT_EC2_HOST
       port ||= DEFAULT_EC2_PORT
       
-      @@ec2 ||= ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
+      @@ec2 = ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
       @@logger = logger
     end
     

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

@@ -7,7 +7,7 @@ module Rudy::AWS
     field :aki
     field :ari
     field :launch_index => Time
-    field :launch_time
+    field :created
     field :keyname
     field :size
     field :ami
@@ -263,7 +263,7 @@ module Rudy::AWS
         instances = nil if instances.empty? # Don't return an empty hash
         instances
       end
-    
+
       # System console output. 
       #
       # * +inst_id+ instance ID (String) or Instance object.
@@ -374,7 +374,7 @@ module Rudy::AWS
         inst = Rudy::AWS::EC2::Instance.new
         inst.aki = h['kernelId']
         inst.ami = h['imageId']
-        inst.launch_time = h['launchTime']
+        inst.created = h['launchTime']
         inst.keyname = h['keyName']
         inst.launch_index = h['amiLaunchIndex']
         inst.size = h['instanceType']

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

@@ -10,8 +10,8 @@ module Rudy::AWS
       field :size  => Integer
       field :snapid
       field :zone  => Symbol
-      field :create_time => Time
-      field :attach_time => Time
+      field :created => Time
+      field :attached => Time
       field :instid
       field :device
     
@@ -212,12 +212,12 @@ module Rudy::AWS
         vol.snapid = h['snapshotId']
         vol.zone = h['availabilityZone']
         vol.awsid = h['volumeId']
-        vol.create_time = h['createTime']
+        vol.created = h['createTime']
         if h['attachmentSet'].is_a?(Hash)
           item = h['attachmentSet']['item'].first
           vol.status = item['status']   # Overwrite "available status". Possibly a bad idea. 
           vol.device = item['device']
-          vol.attach_time = item['attachTime']
+          vol.attached = item['attachTime']
           vol.instid = item['instanceId']
         end
         vol.postprocess

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

@@ -64,11 +64,11 @@ module AWS; module EC2;
       opts[:id] = @option.instid if @option.instid
       
       # Options to be sent to Rye::Box
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
+        rye_opts[:keys] = @@global.pkey 
       end
       
       
@@ -88,20 +88,20 @@ module AWS; module EC2;
         
         # Print header
         if @@global.quiet
-          print "You are #{ssh_opts[:user].bright}. " if !checked # only the 1st
+          print "You are #{rye_opts[:user].bright}. " if !checked # only the 1st
         else
-          print "Connecting #{ssh_opts[:user].bright}@#{inst.dns_public} "
+          print "Connecting #{rye_opts[:user].bright}@#{inst.dns_public} "
           puts "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
         end
         
         # Make sure we want to run this command on all instances
         if !checked && command != :interactive_ssh 
-          execute_check(:medium) if ssh_opts[:user] == "root"
+          execute_check(:medium) if rye_opts[:user] == "root"
           checked = true
         end
         
         # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
+        rbox = Rye::Box.new(inst.dns_public, rye_opts)
         ret = rbox.send(command, command_args)
         puts ret unless command == :interactive_ssh
       end
@@ -123,11 +123,11 @@ module AWS; module EC2;
       opts[:id] &&= [opts[:id]].flatten
       
       # Options to be sent to Net::SSH
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
+        rye_opts[:keys] = @@global.pkey 
       end
       
       opts[:paths] = @argv
@@ -141,11 +141,11 @@ module AWS; module EC2;
     
       # Options to be sent to Rye::Box
       info = @@global.quiet ? nil : STDERR
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :info => info }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :info => info }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
+        rye_opts[:keys] = @@global.pkey 
       end
       
 
@@ -159,9 +159,9 @@ module AWS; module EC2;
         
         # Print header
         if @@global.quiet
-          print "You are #{ssh_opts[:user].bright}. " if !checked # only the 1st
+          print "You are #{rye_opts[:user].bright}. " if !checked # only the 1st
         else
-          print "Connecting #{ssh_opts[:user].bright}@#{inst.dns_public} "
+          print "Connecting #{rye_opts[:user].bright}@#{inst.dns_public} "
           puts "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
         end
         
@@ -172,7 +172,7 @@ module AWS; module EC2;
         end
         
         # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
+        rbox = Rye::Box.new(inst.dns_public, rye_opts)
         rbox.send(opts[:task], opts[:paths], opts[:dest])
       end