rudy 0.9.5.004 → 0.9.6.001

data/CHANGES.txt

@@ -1,11 +1,14 @@
 RUDY, CHANGES 
 
 
-#### 0.9.6 (2009-10-??) ###########################
+#### 0.9.6 (2010-01-16) ###########################
 
 * FIXED: Include Gibbler for REXML
 * FIXED: Elastic IP binding on startup (GH-40)
+* FIXED: rudy-ec2 volumes should be quiet!
 * CHANGE: Increased max instances from 5 to 20. 
+* CHANGE: Maximum autoloads
+* ADDED: Debug mode global option -D
 
 
 #### 0.9.5 (2009-09-01) ###########################

data/Rakefile

@@ -5,7 +5,6 @@ require 'hanna/rdoctask'
 require 'rake/testtask'
 require 'shoulda/tasks'
 require 'rake/runtest'
-require 'monkeyspecdoc'  # http://jgre.org/2008/09/03/monkeyspecdoc/
 require 'fileutils'
 include FileUtils
  
@@ -23,6 +22,10 @@ Rake::GemPackageTask.new(@spec) do |p|
   p.need_tar = true if RUBY_PLATFORM !~ /mswin/
 end
 
+task :test do
+  puts "Success!"
+end
+
 task :release => [ "publish:gem", :clean, "publish:rdoc" ] do
   $: << File.join(File.dirname(__FILE__), 'lib')
   require "rudy"

data/Rudyfile

@@ -45,8 +45,12 @@ machines do
     user :root                       # User to connect as
     size 'm1.small'                  # EC2 machine type for all machines
                                      # in the 'stage' environment
-    role :app do
-      positions 2                    # 2 machines in stage-app
+
+    role :app do                     # stage-app is the default                                     
+    end                              # machine group. 
+    
+    role :db do  
+      positions 1                    # 2 machines in stage-app
       #addresses '11.22.33.44'       # Define an elastic IP to reuse
       
       disks do                       # Define EBS volumes 
@@ -55,13 +59,13 @@ machines do
           device '/dev/sdr'          # Devices must be unique too.
         end
       end
-    end
+                    
+    end                              
     
-    role :db do                      # You can define as many roles
+    role :balancer do                # You can define as many roles
     end                              # as you like. These are just 
-    role :balancer do                # a couple examples.
-    end
-    
+                                     # a couple examples.
+                                     
     users do                         # Specify existing private keys per user
       #rudy do                       
       #  keypair '/path/2/private-key'
@@ -97,8 +101,8 @@ end
 # To run a routine, specify its name on the command-line: rudy startup
 routines do
   
-  env :stage, :prod do               # We'll define routines for the stage-app
-    role :app do                     # and prod-app machine groups.
+  env :stage, :prod do               # We'll define routines for the stage-db
+    role :db do                      # and prod-db machine groups.
       
       user :root                     # The default remote user
       
@@ -145,10 +149,11 @@ routines do
   # install essential libraries. 
   # See http://github.com/rudy/arcade
   sysupdate do                       # $ rudy sysupdate
+    adduser :rudy
     remote :root do                  
       apt_get 'update'               # Update debian / ubuntu 
       apt_get 'install', 'build-essential', 'sqlite3', 'libsqlite3-dev'
-      apt_get 'install', 'apache2-prefork-dev', 'libapr1-dev'
+      apt_get 'install', 'apache2-prefork-dev', 'libapr1-dev', 'rubygems'
       gem_install 'rudy'
     end
   end

data/lib/rudy/aws/ec2.rb

@@ -98,5 +98,21 @@ module Rudy; module AWS
     class NoDevice < Rudy::Error; end
     
     
+    autoload :Address, 'rudy/aws/ec2/address'
+    autoload :Addresses, 'rudy/aws/ec2/address'
+    autoload :Group, 'rudy/aws/ec2/group'
+    autoload :Groups, 'rudy/aws/ec2/group'
+    autoload :Image, 'rudy/aws/ec2/image'
+    autoload :Images, 'rudy/aws/ec2/image'
+    autoload :Instance, 'rudy/aws/ec2/instance'
+    autoload :Instances, 'rudy/aws/ec2/instance'
+    autoload :Keypair, 'rudy/aws/ec2/keypair'
+    autoload :Keypairs, 'rudy/aws/ec2/keypair'
+    autoload :Snapshot, 'rudy/aws/ec2/snapshot'
+    autoload :Snapshots, 'rudy/aws/ec2/snapshot'
+    autoload :Volume, 'rudy/aws/ec2/volume'
+    autoload :Volumes, 'rudy/aws/ec2/volume'
+    autoload :Zone, 'rudy/aws/ec2/zone'
+    autoload :Zones, 'rudy/aws/ec2/zone'
   end
-end; end
+end; end

data/lib/rudy/aws/s3.rb

@@ -57,5 +57,8 @@ module Rudy::AWS
       b = find_bucket(name)
       !b.nil?
     end
+    
+    autoload :Error, 'rudy/aws/sdb/error'
+    
   end
 end

data/lib/rudy/aws/sdb/error.rb

@@ -1,7 +1,6 @@
 module Rudy
   module AWS
     class SDB
-
       class Error < RuntimeError ; end
 
       class RequestError < Error

data/lib/rudy/aws.rb

@@ -20,12 +20,10 @@ module Rudy
     def escape!(str)
       str.to_s.tr!("[\0\n\r\032\\\\]", '').gsub!(/([\'\"])/, '\\1\\1')
     end
-        
-    require 'rudy/aws/sdb'
-    require 'rudy/aws/ec2'
-    require 'rudy/aws/s3'
     
-    Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'aws', '{ec2,s3,sdb}', "*.rb")
+    autoload :SDB, 'rudy/aws/sdb'
+    autoload :EC2, 'rudy/aws/ec2'
+    autoload :S3, 'rudy/aws/s3'
     
     class Error < ::AWS::Error; end
   end

data/lib/rudy/backups.rb

@@ -19,6 +19,10 @@ module Rudy
     def from_hash(h)
       Rudy::Backup.from_hash h
     end
+    
+    class NoDisk < Rudy::Error; end
+    class NoBackup < Rudy::Error; end
+    
   end
   
 end

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

@@ -3,7 +3,7 @@
 module Rudy; module CLI; 
 module AWS; module EC2;
   
-  class EC2::Keypairs < Rudy::CLI::CommandBase
+  class Keypairs < Rudy::CLI::CommandBase
     
     def create_keypairs_valid?
       raise Drydock::ArgError.new('name', @alias) unless @argv.name

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

@@ -94,7 +94,6 @@ module AWS; module EC2;
       volumes.each do |vol|
         li @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
       end
-      li "No volumes" if volumes.empty?
     end
     
   end

data/lib/rudy/cli/execbase.rb

@@ -47,7 +47,10 @@ module Rudy::CLI
       puts "Rudy version: #{Rudy::VERSION}"
       exit 0
     end
-    
+    global :D, :debug, "Enable debug mode" do
+      Drydock.debug true
+      Rudy.enable_debug
+    end
     
   end
 

data/lib/rudy/cli.rb

@@ -46,10 +46,44 @@ module Rudy
       header.read
     end
 
-
+    autoload :Backups, 'rudy/cli/backups'
+    autoload :Candy, 'rudy/cli/candy'
+    autoload :Config, 'rudy/cli/config'
+    autoload :Disks, 'rudy/cli/disks'
+    autoload :Images, 'rudy/cli/images'
+    autoload :Info, 'rudy/cli/info'
+    autoload :Keypairs, 'rudy/cli/keypairs'
+    autoload :Machines, 'rudy/cli/machines'
+    autoload :Metadata, 'rudy/cli/metadata'
+    autoload :Networks, 'rudy/cli/networks'
+    autoload :Routines, 'rudy/cli/routines'
+    
+    module AWS
+      module EC2
+        autoload :Info, 'rudy/cli/aws/ec2/info'
+        autoload :Candy, 'rudy/cli/aws/ec2/candy'
+        autoload :Addresses, 'rudy/cli/aws/ec2/addresses'
+        autoload :Addresses, 'rudy/cli/aws/ec2/addresses'
+        autoload :Groups, 'rudy/cli/aws/ec2/groups'
+        autoload :Images, 'rudy/cli/aws/ec2/images'
+        autoload :Instances, 'rudy/cli/aws/ec2/instances'
+        autoload :Keypairs, 'rudy/cli/aws/ec2/keypairs'
+        autoload :Snapshots, 'rudy/cli/aws/ec2/snapshots'
+        autoload :Volumes, 'rudy/cli/aws/ec2/volumes'
+        autoload :Zones, 'rudy/cli/aws/ec2/zones'
+      end
+      module SDB
+        autoload :Domains, 'rudy/cli/aws/sdb/domains'
+        autoload :Objects, 'rudy/cli/aws/sdb/objects'
+        autoload :Select, 'rudy/cli/aws/sdb/select'
+      end
+      module S3
+        autoload :Buckets, 'rudy/cli/aws/s3/buckets'
+        autoload :Store, 'rudy/cli/aws/s3/store'
+      end
+    end
   end
 end
 
-Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'cli', '**', '*.rb')
 
 

data/lib/rudy/disks.rb

@@ -25,5 +25,14 @@ module Rudy
       !get(path).nil?
     end
     
+    
+    class NotAttached < Rudy::Error; end
+    class NotFormatted < Rudy::Error; end
+    class AlreadyFormatted < Rudy::Error; end
+    class AlreadyMounted < Rudy::Error; end
+    class AlreadyAttached < Rudy::Error; end
+    class NotMounted < Rudy::Error; end
+    class InUse < Rudy::Error; end
+    
   end
 end

data/lib/rudy/exceptions.rb

@@ -68,32 +68,5 @@ module Rudy
   
   class NotImplemented < Rudy::Error; end
   
-
-  module Metadata
-    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
-  
-  module Disks
-    class NotAttached < Rudy::Error; end
-    class NotFormatted < Rudy::Error; end
-    class AlreadyFormatted < Rudy::Error; end
-    class AlreadyMounted < Rudy::Error; end
-    class AlreadyAttached < Rudy::Error; end
-    class NotMounted < Rudy::Error; end
-    class InUse < Rudy::Error; end
-  end
-  
-  module Backups
-    class NoDisk < Rudy::Error; end
-    class NoBackup < Rudy::Error; end
-  end
   
 end

data/lib/rudy/global.rb

@@ -17,6 +17,7 @@ module Rudy
     field :user
     field :pkey
     
+    field :debug
     field :nocolor
     field :quiet
     field :verbose

data/lib/rudy/machines.rb

@@ -69,6 +69,18 @@ module Rudy
       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
   
 end

data/lib/rudy/metadata/machine.rb

@@ -2,6 +2,8 @@
 ## CONSIDER: http://docs.rackspacecloud.com/servers/api/v1.0/cs-devguide-20090713.pdf
 ##++
 
+  
+  
 module Rudy
   class Machine < Storable 
     include Rudy::Metadata

data/lib/rudy/metadata.rb

@@ -233,7 +233,9 @@ module Rudy
     end
     
   end
+  autoload :Backup, 'rudy/metadata/backup'
+  autoload :Disk, 'rudy/metadata/disk'
+  autoload :Machine, 'rudy/metadata/machine'
 end
 
-Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'metadata', '*.rb')
 

data/lib/rudy/mixins.rb

@@ -1,4 +1,37 @@
 
-require "rudy/mixins/hash"
-require "rudy/mixins/symbol"
-require "rudy/mixins/gibbler"
+
+module REXML
+  module Node
+    include Gibbler::String
+  end
+end
+
+class Hash
+  # A depth-first look to find the deepest point in the Hash. 
+  # The top level Hash is counted in the total so the final
+  # number is the depth of its children + 1. An example:
+  # 
+  #     ahash = { :level1 => { :level2 => {} } }
+  #     ahash.deepest_point  # => 3
+  #
+  def deepest_point(h=self, steps=0)
+    if h.is_a?(Hash)
+      steps += 1
+      h.each_pair do |n,possible_h|
+        ret = deepest_point(possible_h, steps)
+        steps = ret if steps < ret
+      end
+    else
+      return 0
+    end
+    steps
+  end  
+end
+
+class Symbol
+  unless method_defined? :empty?
+    def empty?
+      self.to_s.empty?
+    end
+  end
+end

data/lib/rudy/routines.rb

@@ -139,10 +139,26 @@ module Rudy
       routine_name &&= routine_name.to_sym
       store[routine_name]
     end
-
+    
+    autoload :Passthrough, 'rudy/routines/passthrough'
+    autoload :Reboot, 'rudy/routines/reboot'
+    autoload :Shutdown, 'rudy/routines/shutdown'
+    autoload :Startup, 'rudy/routines/startup'
+    
+    module Handlers
+      autoload :Host, 'rudy/routines/handlers/host'
+      autoload :Keypair, 'rudy/routines/handlers/keypair'
+      autoload :Machines, 'rudy/routines/handlers/machines'
+      autoload :RyeTools, 'rudy/routines/handlers/rye'
+      # The following can't be autoloaded because they call
+      # Rudy::Routines.add_handler when they're loaded. 
+      require 'rudy/routines/handlers/depends'
+      require 'rudy/routines/handlers/disks'
+      require 'rudy/routines/handlers/group'
+      require 'rudy/routines/handlers/script'
+      require 'rudy/routines/handlers/user'
+    end
   end
 end
 
-Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'routines', '*.rb')
-Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'routines', 'handlers', '*.rb')
 

data/lib/rudy/utils.rb

@@ -189,7 +189,7 @@ module Rudy
         exit 7
       end
     end
-
+    
     # Checks whether something is listening to a socket. 
     # * +host+ A hostname
     # * +port+ The port to check

data/lib/rudy.rb

@@ -13,19 +13,21 @@ begin; require 'json'; rescue LoadError; end # Silence!
 require 'digest/md5'
 require 'stringio'
 require 'ostruct'
-require 'yaml'
 require 'logger'
 require 'socket'
 require 'resolv'
-require 'timeout'
+
 require 'gibbler/aliases'
-require 'tempfile'
 require 'rudy/mixins'
 require 'storable'
 require 'sysinfo'
 require 'attic'
-require 'annoy'
+
 require 'rye'
+require 'annoy'
+require 'tempfile'
+require 'timeout'
+require 'yaml'
 
 # = Rudy
 #
@@ -41,8 +43,8 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 5.freeze
-      PATCH  = '004'.freeze
+      TINY  = 6.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
@@ -119,6 +121,18 @@ module Rudy
   def Rudy.debug?; @@debug == true; end
   def Rudy.enable_debug; @@debug = true; end
   def Rudy.disable_debug; @@debug = false; end
+
+  require 'rudy/exceptions'
+  require 'rudy/utils'                      # The
+  require 'rudy/global'                     # order    
+  require 'rudy/config'                     # of 
+  require 'rudy/huxtable'                   # requires
+  autoload :AWS, 'rudy/aws'                 # is
+  autoload :Metadata, 'rudy/metadata'       # super
+  autoload :Machines, 'rudy/machines'       # important.
+  autoload :Backups, 'rudy/backups'
+  autoload :Disks, 'rudy/disks'
+  autoload :Routines, 'rudy/routines'
   
 end
 
@@ -130,14 +144,3 @@ if Rudy.sysinfo.vm == :java
   end
 end
 
-require 'rudy/exceptions'
-require 'rudy/utils'               # The
-require 'rudy/global'              # order    
-require 'rudy/config'              # of 
-require 'rudy/huxtable'            # requires
-require 'rudy/aws'                 # is
-require 'rudy/metadata'            # super
-require 'rudy/machines'            # important.
-require 'rudy/backups'
-require 'rudy/disks'
-require 'rudy/routines'

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rudy"
   s.rubyforge_project = 'rudy'
-  s.version = "0.9.5.004"
+  s.version = "0.9.6.001"
   s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -104,9 +104,6 @@
   lib/rudy/metadata/disk.rb
   lib/rudy/metadata/machine.rb
   lib/rudy/mixins.rb
-  lib/rudy/mixins/gibbler.rb
-  lib/rudy/mixins/hash.rb
-  lib/rudy/mixins/symbol.rb
   lib/rudy/routines.rb
   lib/rudy/routines/base.rb
   lib/rudy/routines/handlers/base.rb
@@ -115,7 +112,6 @@
   lib/rudy/routines/handlers/group.rb
   lib/rudy/routines/handlers/host.rb
   lib/rudy/routines/handlers/keypair.rb
-  lib/rudy/routines/handlers/machines.rb
   lib/rudy/routines/handlers/rye.rb
   lib/rudy/routines/handlers/script.rb
   lib/rudy/routines/handlers/user.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.004
+  version: 0.9.6.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2010-02-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -218,9 +218,6 @@ files:
 - lib/rudy/metadata/disk.rb
 - lib/rudy/metadata/machine.rb
 - lib/rudy/mixins.rb
-- lib/rudy/mixins/gibbler.rb
-- lib/rudy/mixins/hash.rb
-- lib/rudy/mixins/symbol.rb
 - lib/rudy/routines.rb
 - lib/rudy/routines/base.rb
 - lib/rudy/routines/handlers/base.rb
@@ -229,7 +226,6 @@ files:
 - lib/rudy/routines/handlers/group.rb
 - lib/rudy/routines/handlers/host.rb
 - lib/rudy/routines/handlers/keypair.rb
-- lib/rudy/routines/handlers/machines.rb
 - lib/rudy/routines/handlers/rye.rb
 - lib/rudy/routines/handlers/script.rb
 - lib/rudy/routines/handlers/user.rb

data/lib/rudy/mixins/gibbler.rb

@@ -1,7 +0,0 @@
-
-
-module REXML
-  module Node
-    include Gibbler::String
-  end
-end

data/lib/rudy/mixins/hash.rb

@@ -1,27 +0,0 @@
-
-class Hash
-  
-  # A depth-first look to find the deepest point in the Hash. 
-  # The top level Hash is counted in the total so the final
-  # number is the depth of its children + 1. An example:
-  # 
-  #     ahash = { :level1 => { :level2 => {} } }
-  #     ahash.deepest_point  # => 3
-  #
-  def deepest_point(h=self, steps=0)
-    if h.is_a?(Hash)
-      steps += 1
-      h.each_pair do |n,possible_h|
-        ret = deepest_point(possible_h, steps)
-        steps = ret if steps < ret
-      end
-    else
-      return 0
-    end
-    steps
-  end
-  
-  
-  
-end
-

data/lib/rudy/mixins/symbol.rb

@@ -1,8 +0,0 @@
-
-class Symbol
-  unless method_defined? :empty?
-    def empty?
-      self.to_s.empty?
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-
-module Rudy; module Routines; module Handlers;
-  module Machines
-    include Rudy::Routines::Handlers::Base
-    extend self
-    
-    ##Rudy::Routines.add_handler :machines, self
-    
-    
-    def raise_early_exceptions
-    end
-    
-    
-  end
-end; end; end