rudy 0.4.0 → 0.6.0

data/lib/storable.rb

@@ -13,9 +13,11 @@ require 'fileutils'
 # Storable.field method which tells Storable the order and 
 # name.
 class Storable
-  VERSION = 2
-  NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze unless defined? NICE_TIME_FORMAT
-  SUPPORTED_FORMATS = %w{tsv csv yaml json}.freeze unless defined? SUPPORTED_FORMATS
+  unless defined?(SUPPORTED_FORMATS) # We can assume all are defined
+    VERSION = 5
+    NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
+    SUPPORTED_FORMATS = %w{tsv csv yaml json s string}.freeze 
+  end
   
   # This value will be used as a default unless provided on-the-fly.
   # See SUPPORTED_FORMATS for available values.
@@ -27,14 +29,11 @@ class Storable
     @format = v
   end
   
-  # TODO: from_args([HASH or ordered params])
-  
-  def init
-    # NOTE: I think this can be removed
-    self.class.send(:class_variable_set, :@@field_names, []) unless class_variable_defined?(:@@field_names)
-    self.class.send(:class_variable_set, :@@field_types, []) unless class_variable_defined?(:@@field_types)
+  def postprocess
   end
   
+  # TODO: from_args([HASH or ordered params])
+  
   # Accepts field definitions in the one of the follow formats:
   #
   #     field :product
@@ -68,7 +67,7 @@ class Storable
   def self.field_names
     class_variable_get(:@@field_names)
   end
-  # Ditto.
+  # Returns an array of field names defined by self.field
   def field_names
     self.class.send(:class_variable_get, :@@field_names)
   end
@@ -77,18 +76,23 @@ class Storable
   def self.field_types
     class_variable_get(:@@field_types)
   end
-  # Ditto.
+  # Returns an array of field types defined by self.field. Fields that did 
+  # not receive a type are set to nil.
   def field_types
     self.class.send(:class_variable_get, :@@field_types)
   end
 
   # Dump the object data to the given format. 
-  def dump(format=nil, with_titles=true)
-    format ||= @format
+  def dump(format=nil, with_titles=false)
+    format ||= 's' # as in, to_s
     raise "Format not defined (#{format})" unless SUPPORTED_FORMATS.member?(format)
     send("to_#{format}", with_titles) 
   end
   
+  def to_string(*args)
+    to_s(*args)
+  end
+  
   # Create a new instance of the object using data from file. 
   def self.from_file(file_path, format='yaml')
     raise "Cannot read file (#{file_path})" unless File.exists?(file_path)
@@ -108,10 +112,9 @@ class Storable
 
   # Create a new instance of the object from a hash.
   def self.from_hash(from={})
+    return nil if !from || from.empty?
     me = self.new
-  
-    return me if !from || from.empty?
-    
+        
     fnames = field_names
     fnames.each_with_index do |key,index|
       
@@ -122,8 +125,10 @@ class Storable
       if field_types[index] == Array
         ((value ||= []) << stored_value).flatten 
       elsif field_types[index] == Hash
+        
         value = stored_value
       else
+        
         # SimpleDB stores attribute shit as lists of values
         value = stored_value.first if stored_value.is_a?(Array) && stored_value.size == 1
 
@@ -137,14 +142,18 @@ class Storable
           value = value.to_f
         elsif field_types[index] == Integer
           value = value.to_i
+        elsif field_types[index].kind_of?(Storable) && stored_value.is_a?(Hash)
+          value = field_types[index].from_hash(stored_value)
         else
-          value = value.first if value.is_a?(Array) && value.size == 1 # I
+          value = (stored_value.is_a?(Array) && stored_value.size == 1) ? stored_value.first : stored_value
         end
       end
       
       me.send("#{key}=", value) if self.method_defined?("#{key}=")  
     end
     
+    me.postprocess
+    
     me
   end
   # Return the object data as a hash

data/lib/sysinfo.rb

@@ -0,0 +1,274 @@
+require 'storable'
+require 'socket'
+
+# SystemInfo
+# 
+# A container for the system platform information. 
+# Portions of this code is from Amazon's EC2 AMI tools, lib/platform.rb. 
+class SystemInfo < Storable
+  unless defined?(IMPLEMENTATIONS)
+    VERSION = 2.freeze
+    IMPLEMENTATIONS = [
+    
+      # These are for JRuby, System.getproperty('os.name'). 
+      # For a list of all values, see: http://lopica.sourceforge.net/os.html
+      [/mac\s*os\s*x/i,     :unix,    :osx     ],  
+      [/sunos/i,            :unix,    :solaris ], 
+      [/windows\s*ce/i,     :win32,   :windows ],
+      [/windows/i,          :win32,   :windows ],  
+      [/osx/i,              :unix,    :osx     ],
+    
+      # TODO: implement other windows matches: # /djgpp|(cyg|ms|bcc)win|mingw/ (from mongrel)
+    
+      # These are for RUBY_PLATFORM and JRuby
+      [/java/i,    :java,    :java             ],
+      [/darwin/i,  :unix,    :osx              ],
+      [/linux/i,   :unix,    :linux            ],
+      [/freebsd/i, :unix,    :freebsd          ],
+      [/netbsd/i,  :unix,    :netbsd           ],
+      [/solaris/i, :unix,    :solaris          ],
+      [/irix/i,    :unix,    :irix             ],
+      [/cygwin/i,  :unix,    :cygwin           ],
+      [/mswin/i,   :win32,   :windows          ],
+      [/mingw/i,   :win32,   :mingw            ],
+      [/bccwin/i,  :win32,   :bccwin           ],
+      [/wince/i,   :win32,   :wince            ],
+      [/vms/i,     :vms,     :vms              ],
+      [/os2/i,     :os2,     :os2              ],
+      [nil,        :unknown, :unknown          ],
+    ].freeze
+
+    ARCHITECTURES = [
+      [/(i\d86)/i,  :i386             ],
+      [/x86_64/i,   :x86_64           ],
+      [/x86/i,      :i386             ],  # JRuby
+      [/ia64/i,     :ia64             ],
+      [/alpha/i,    :alpha            ],
+      [/sparc/i,    :sparc            ],
+      [/mips/i,     :mips             ],
+      [/powerpc/i,  :powerpc          ],
+      [/universal/i,:universal        ],
+      [nil,         :unknown          ],
+    ].freeze
+  end
+
+
+  field :os => String
+  field :implementation => String
+  field :architecture => String
+  field :hostname => String
+  field :ipaddress => String
+  field :uptime => Float
+  
+  
+  alias :impl :implementation
+  alias :arch :architecture
+
+  
+  def initialize
+    @os, @implementation, @architecture = guess
+    @hostname, @ipaddress, @uptime = get_info
+  end
+  
+  # guess
+  #
+  # This is called at require-time in stella.rb. It guesses
+  # the current operating system, implementation, architecture. 
+  # Returns [os, impl, arch]
+  def guess
+    os = :unknown
+    impl = :unknown
+    arch = :unknown
+    IMPLEMENTATIONS.each do |r, o, i|
+      if r and RUBY_PLATFORM =~ r
+        os, impl = [o, i]
+        break
+      end
+    end
+    ARCHITECTURES.each do |r, a|
+      if r and RUBY_PLATFORM =~ r
+        arch = a
+        break
+      end
+    end
+    
+    #
+    if os == :win32
+      #require 'Win32API'
+
+    # If we're running in java, we'll need to look elsewhere
+    # for the implementation and architecture. 
+    # We'll replace IMPL and ARCH with what we find. 
+    elsif os == :java
+      require 'java'
+      include_class java.lang.System
+      
+      osname = System.getProperty("os.name")
+      IMPLEMENTATIONS.each do |r, o, i|
+        if r and osname =~ r
+          impl = i
+          break
+        end
+      end
+      
+      osarch = System.getProperty("os.arch")
+      ARCHITECTURES.each do |r, a|
+        if r and osarch =~ r
+          arch = a
+          break
+        end
+      end
+      
+    end
+
+    [os, impl, arch]
+  end
+
+  # get_info
+  #
+  # Returns [hostname, ipaddr, uptime] for the local machine
+  def get_info
+    hostname = :unknown
+    ipaddr = :unknown
+    uptime = :unknown
+
+    begin
+      hostname = local_hostname
+      ipaddr = local_ip_address
+      uptime = local_uptime       
+    rescue => ex
+      # Be silent!
+    end
+
+    [hostname, ipaddr, uptime]
+  end
+
+  # local_hostname
+  #
+  # Return the hostname for the local machine
+  def local_hostname
+    Socket.gethostname
+  end
+  
+  # local_uptime
+  #
+  # Returns the local uptime in hours. Use Win32API in Windows, 
+  # 'sysctl -b kern.boottime' os osx, and 'who -b' on unix.
+  # Based on Ruby Quiz solutions by: Matthias Reitinger 
+  # On Windows, see also: net statistics server
+  def local_uptime
+
+    # Each method must return uptime in seconds
+    methods = {
+
+      :win32_windows => lambda {
+        # Win32API is required in self.guess
+        getTickCount = Win32API.new("kernel32", "GetTickCount", nil, 'L')
+        ((getTickCount.call()).to_f / 1000).to_f
+      },
+
+      # Ya, this is kinda wack. Ruby -> Java -> Kernel32. See:
+      # http://www.oreillynet.com/ruby/blog/2008/01/jruby_meets_the_windows_api_1.html
+      # http://msdn.microsoft.com/en-us/library/ms724408(VS.85).aspx
+      # Ruby 1.9.1: Win32API is now deprecated in favor of using the DL library.
+      :java_windows => lambda {
+        kernel32 = com.sun.jna.NativeLibrary.getInstance('kernel32')
+        buf = java.nio.ByteBuffer.allocate(256)
+        (kernel32.getFunction('GetTickCount').invokeInt([256, buf].to_java).to_f / 1000).to_f 
+      },
+      
+      :unix_osx => lambda {
+        # This is faster than who and could work on BSD also. 
+        (Time.now.to_f - Time.at(`sysctl -b kern.boottime 2>/dev/null`.unpack('L').first).to_f).to_f
+      },
+      # This should work for most unix flavours. 
+      :unix => lambda {
+        # who is sloooooow. Use File.read('/proc/uptime')
+        (Time.now.to_f - Time.parse(`who -b 2>/dev/null`).to_f)
+      }
+    }
+
+    hours = 0
+    
+    begin
+      key = platform
+      method = (methods.has_key? key) ? methods[key] : methods[:unix]
+      hours = (method.call) / 3600 # seconds to hours
+    rescue => ex
+    end
+    hours
+  end
+
+
+  #
+  # Return the local IP address which receives external traffic
+  # from: http://coderrr.wordpress.com/2008/05/28/get-your-local-ip-address/
+  # NOTE: This <em>does not</em> open a connection to the IP address. 
+  def local_ip_address
+    # turn off reverse DNS resolution temporarily 
+    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true   
+    UDPSocket.open {|s| s.connect('75.101.137.7', 1); s.addr.last } # Solutious IP
+  ensure  
+    Socket.do_not_reverse_lookup = orig
+  end
+
+  #
+  # Returns the local IP address based on the hostname. 
+  # According to coderrr (see comments on blog link above), this implementation
+  # doesn't guarantee that it will return the address for the interface external
+  # traffic goes through. It's also possible the hostname isn't resolvable to the
+  # local IP.  
+  def local_ip_address_alt
+    ipaddr = :unknown
+    begin
+      saddr = Socket.getaddrinfo(  Socket.gethostname, nil, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
+      ipaddr = saddr.select{|type| type[0] == 'AF_INET' }[0][3]
+    rescue => ex
+    end
+    ipaddr
+  end
+
+  # returns a symbol in the form: os_implementation. This is used throughout Stella
+  # for platform specific support. 
+  def platform
+    "#{@os}_#{@implementation}".to_sym
+  end
+  
+  # Returns Ruby version as an array
+  def ruby
+    RUBY_VERSION.split('.').map { |v| v.to_i }
+  end
+  
+  # Returns the environment PATH as an Array
+  def paths
+    if @os == :unix
+      (ENV['PATH'] || '').split(':')
+    elsif
+      (ENV['PATH'] || '').split(';') # Note tested!
+    else
+      raise "paths not implemented for: #{@os}"
+    end
+  end
+  
+  def user
+    ENV['USER']
+  end
+  
+  def home
+    if @os == :unix
+      File.expand_path(ENV['HOME'])
+    elsif @os == :win32
+      File.expand_path(ENV['USERPROFILE'])
+    else
+      raise "paths not implemented for: #{@os}"
+    end
+  end
+  
+  # Print friendly system information. 
+  def to_s
+    sprintf("Hostname: %s#{$/}IP Address: %s#{$/}System: %s#{$/}Uptime: %.2f (hours)#{$/}Ruby: #{ruby.join('.')}", 
+      @hostname, @ipaddress, "#{@os}-#{@implementation}-#{@architecture}", @uptime)
+  end
+  
+  
+end

data/lib/tryouts.rb

@@ -3,25 +3,20 @@ require 'ostruct'
 
 module Tryouts
   
-  def before(&b)
-    b.call
-  end
-  def after(&b)
-    at_exit &b
-  end
-  
-  
   #    tryout :name do
   #       ...
   #    end
   def tryout(name, &b)
+    puts '-'*50
     puts "Running#{@poop}: #{name}"
     begin
       b.call
-      puts $/*2
-      sleep 1
+      sleep 0.1
     rescue Interrupt
-    end
+    rescue => ex
+      STDERR.puts "Tryout error: #{ex.message}"
+    end  
+      puts $/*2
   end
   
   # Ignore everything
@@ -36,5 +31,3 @@ module Tryouts
   end
   
 end
-
-include Tryouts

data/rudy.gemspec

@@ -1,12 +1,38 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
-	s.version = "0.4.0"
-	s.summary = "Your friend in staging and deploying with EC2."
+  s.rubyforge_project = 'rudy'
+	s.version = "0.6.0"
+	s.summary = "Rudy: Not your grandparent's deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
 	s.email = "delano@solutious.com"
 	s.homepage = "http://github.com/solutious/rudy"
- 
+  
+  s.extra_rdoc_files = %w[README.rdoc Rudyfile LICENSE.txt CHANGES.txt ]
+  s.has_rdoc = true
+  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
+  s.require_paths = %w[lib]
+  s.rubygems_version = '1.1.1'
+  
+  s.add_dependency 'drydock', '>= 0.5.5'  
+  s.add_dependency 'caesars', '>= 0.5.4'  
+  s.add_dependency 'rye', '>= 0.5.1'
+  
+  s.add_dependency 'echoe'
+  s.add_dependency 'amazon-ec2', '>= 0.3.8'  # region fix
+  s.add_dependency 'net-ssh', '>=2.0.9'
+  s.add_dependency 'net-scp', '>=1.0.2'
+  s.add_dependency 'net-ssh-gateway'
+  s.add_dependency 'net-ssh-multi'
+  
+  # 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[ird rudy rudy-ec2 rudy-sdb rudy-s3]
+  
   # = MANIFEST =
   # git ls-files
   s.files = %w(
@@ -14,61 +40,121 @@
   LICENSE.txt
   README.rdoc
   Rakefile
+  Rudyfile
+  bin/ird
   bin/rudy
   bin/rudy-ec2
-  lib/aws_sdb.rb
-  lib/aws_sdb/error.rb
-  lib/aws_sdb/service.rb
+  bin/rudy-s3
+  bin/rudy-sdb
+  lib/annoy.rb
   lib/console.rb
+  lib/escape.rb
   lib/rudy.rb
   lib/rudy/aws.rb
   lib/rudy/aws/ec2.rb
+  lib/rudy/aws/ec2/address.rb
+  lib/rudy/aws/ec2/group.rb
+  lib/rudy/aws/ec2/image.rb
+  lib/rudy/aws/ec2/instance.rb
+  lib/rudy/aws/ec2/keypair.rb
+  lib/rudy/aws/ec2/snapshot.rb
+  lib/rudy/aws/ec2/volume.rb
+  lib/rudy/aws/ec2/zone.rb
   lib/rudy/aws/s3.rb
-  lib/rudy/aws/simpledb.rb
-  lib/rudy/command/addresses.rb
-  lib/rudy/command/backups.rb
-  lib/rudy/command/base.rb
-  lib/rudy/command/config.rb
-  lib/rudy/command/deploy.rb
-  lib/rudy/command/disks.rb
-  lib/rudy/command/environment.rb
-  lib/rudy/command/groups.rb
-  lib/rudy/command/images.rb
-  lib/rudy/command/instances.rb
-  lib/rudy/command/machines.rb
-  lib/rudy/command/metadata.rb
-  lib/rudy/command/release.rb
-  lib/rudy/command/volumes.rb
+  lib/rudy/aws/sdb.rb
+  lib/rudy/aws/sdb/error.rb
+  lib/rudy/backup.rb
+  lib/rudy/cli.rb
+  lib/rudy/cli/aws/ec2/addresses.rb
+  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/instances.rb
+  lib/rudy/cli/aws/ec2/keypairs.rb
+  lib/rudy/cli/aws/ec2/snapshots.rb
+  lib/rudy/cli/aws/ec2/volumes.rb
+  lib/rudy/cli/aws/ec2/zones.rb
+  lib/rudy/cli/aws/s3/buckets.rb
+  lib/rudy/cli/aws/s3/store.rb
+  lib/rudy/cli/aws/sdb/domains.rb
+  lib/rudy/cli/candy.rb
+  lib/rudy/cli/config.rb
+  lib/rudy/cli/disks.rb
+  lib/rudy/cli/machines.rb
+  lib/rudy/cli/routines.rb
   lib/rudy/config.rb
+  lib/rudy/config/objects.rb
+  lib/rudy/disks.rb
+  lib/rudy/global.rb
+  lib/rudy/huxtable.rb
+  lib/rudy/machines.rb
   lib/rudy/metadata.rb
-  lib/rudy/metadata/backup.rb
-  lib/rudy/metadata/disk.rb
+  lib/rudy/routines.rb
+  lib/rudy/routines/helpers/diskhelper.rb
+  lib/rudy/routines/helpers/scripthelper.rb
+  lib/rudy/routines/release.rb
+  lib/rudy/routines/shutdown.rb
+  lib/rudy/routines/startup.rb
   lib/rudy/scm/svn.rb
   lib/rudy/utils.rb
   lib/storable.rb
+  lib/sysinfo.rb
   lib/tryouts.rb
   rudy.gemspec
   support/mailtest
+  support/randomize-root-password
   support/rudy-ec2-startup
-  tryouts/console_tryout.rb
+  support/update-ec2-ami-tools
+  test/05_config/00_setup_test.rb
+  test/05_config/30_machines_test.rb
+  test/20_sdb/00_setup_test.rb
+  test/20_sdb/10_domains_test.rb
+  test/25_ec2/00_setup_test.rb
+  test/25_ec2/10_keypairs_test.rb
+  test/25_ec2/20_groups_test.rb
+  test/25_ec2/30_addresses_test.rb
+  test/25_ec2/40_volumes_test.rb
+  test/25_ec2/50_snapshots_test.rb
+  test/26_ec2_instances/00_setup_test.rb
+  test/26_ec2_instances/10_instances_test.rb
+  test/26_ec2_instances/50_images_test.rb
+  test/30_sdb_metadata/00_setup_test.rb
+  test/30_sdb_metadata/10_disks_test.rb
+  test/30_sdb_metadata/20_backups_test.rb
+  test/coverage.txt
+  test/helper.rb
+  vendor/highline-1.5.1/CHANGELOG
+  vendor/highline-1.5.1/INSTALL
+  vendor/highline-1.5.1/LICENSE
+  vendor/highline-1.5.1/README
+  vendor/highline-1.5.1/Rakefile
+  vendor/highline-1.5.1/TODO
+  vendor/highline-1.5.1/examples/ansi_colors.rb
+  vendor/highline-1.5.1/examples/asking_for_arrays.rb
+  vendor/highline-1.5.1/examples/basic_usage.rb
+  vendor/highline-1.5.1/examples/color_scheme.rb
+  vendor/highline-1.5.1/examples/limit.rb
+  vendor/highline-1.5.1/examples/menus.rb
+  vendor/highline-1.5.1/examples/overwrite.rb
+  vendor/highline-1.5.1/examples/page_and_wrap.rb
+  vendor/highline-1.5.1/examples/password.rb
+  vendor/highline-1.5.1/examples/trapping_eof.rb
+  vendor/highline-1.5.1/examples/using_readline.rb
+  vendor/highline-1.5.1/lib/highline.rb
+  vendor/highline-1.5.1/lib/highline/color_scheme.rb
+  vendor/highline-1.5.1/lib/highline/compatibility.rb
+  vendor/highline-1.5.1/lib/highline/import.rb
+  vendor/highline-1.5.1/lib/highline/menu.rb
+  vendor/highline-1.5.1/lib/highline/question.rb
+  vendor/highline-1.5.1/lib/highline/system_extensions.rb
+  vendor/highline-1.5.1/setup.rb
+  vendor/highline-1.5.1/test/tc_color_scheme.rb
+  vendor/highline-1.5.1/test/tc_highline.rb
+  vendor/highline-1.5.1/test/tc_import.rb
+  vendor/highline-1.5.1/test/tc_menu.rb
+  vendor/highline-1.5.1/test/ts_all.rb
   )
-  s.executables = %w[rudy]
-  
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rudy: #{s.summary}", "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubygems_version = '1.1.1'
 
   
-  s.add_dependency 'drydock'
-  s.add_dependency 'caesars'
-  s.add_dependency 'net-ssh'
-  s.add_dependency 'net-scp'
-  s.add_dependency 'net-ssh-gateway'
-  s.add_dependency 'net-ssh-multi'
-  s.add_dependency 'highline'
-  
-    
-  s.rubyforge_project = 'rudy'
-end
+end
+