rudy 0.7.3 → 0.7.4

data/CHANGES.txt

@@ -7,30 +7,53 @@ RUDY, CHANGES
 * TODO: Support for product codes
 * TODO: Tests for AWS HTTPS
 
+#### 0.7.4 (2009-05-10) ###############################
 
-#### 0.7.2 (2009-04-04) ###############################
+* CHANGE: Keypairs now include zone. This was necessary to allow US and EU keypairs to
+be stored in the same directory. 
+* CHANGE: Moved non-rudy specific modules to separate projects (storable, sysinfo, annoy, console -> Drydock, escape -> Rye, tryouts -> tryouts/).
+* CHANGE: Renamed restart routine to reboot to make it clear it's about the machine
+* CHANGE: Renamed Rudy::Disk to Rudy::MetaData::Disk
+* CHANGE: Short alias for rudy-ec2 snapshot is now 's' (instead of 't')
+* CHANGE: Removed highline-1.5.1 from vendor (it's now available as a gem)
+* FIXED: Bug in Huxtable when loading global. Wasn't reloaded after config was updated. 
+* FIXED: Closed gh-12 (thanks sabat)
+* ADDED: Routines now support dependencies
+* ADDED: Disk routines now support mount, umount, snapshot, and restore
+* ADDED: rudy disk command now displays backups with -b switch
+* ADDED: RE-added basic support for creating Linux images (with security warning)
+* ADDED: Routines with underscores can now be called with dashes (a_routine vs a-routine)
+
+
+#### 0.7.3 (2009-05-05) ###############################
+
+* FIXED: Corrected a few minor interface errors in rudy-ec2
+* ADDED: rudy-ec2 console can now display the decoded admin password for Windows instances. 
+
+
+#### 0.7.2 (2009-05-04) ###############################
 
 * FIXED: cli/routine.rb release method wasn't sending command alias (which broke rerelease)
 * ADDED: global.offline for being cool when Internet is down
 * ADDED: Better handling in aws/sdb when call returns nil (Internet is down)
 
 
-#### 0.7.1 (2009-04-04) ###############################
+#### 0.7.1 (2009-05-04) ###############################
 
 * FIXED: rudy wasn't honouring -C option for specifying a config file
 * FIXED: Was disabling, but not enabling colour
 * FIXED: Symbol errors in 1.8 
 * FIXED: Command blocks for root user are always run first now in Routines config.
-* ADDED: "script" keyword to routines config. 
 * CHANGE: routines before, after, and script blocks are now processed by Rye::Box.batch as Procs. 
 * CHANGE: deny was removed from commands config (it will come back later). 
-* ADDED: examples/
 * CHANGE: Rudy now checks the current working directory for machines, commands, etc... configs
+* ADDED: examples/
+* ADDED: "script" keyword to routines config. 
 * ADDED: script_local
 * ADDED: Routine now checks whether there are any remote tasks. If not, it doesn't loop through machines. 
 
 
-#### 0.7.0 (2009-04-02) ###############################
+#### 0.7.0 (2009-05-02) ###############################
 
 * CHANGE: Upgrade to Drydock 0.6, Caesars 0.6, and Rye 0.6
 * CHANGE: Updated Routines configuration syntax for specifying shell commands 

data/README.rdoc

@@ -87,6 +87,7 @@ NOTE: <em>If you are not installing via RubyGems, you need to make sure the depe
 * Jamis Buck for Net::SSH and friends
 * Glenn Rempe for amazon-ec2
 * Marcel Molina Jr. for aws-s3
+* sabat[http://github.com/sabat] 
 * Keshia Knight Pulliam
 
 
@@ -102,7 +103,6 @@ I'm very open to contributions!
 
 * Delano Mandelbaum (delano@solutious.com)
 * Rudy::AWS::SDB adapted from aws_sdb by Tim Dysinger (http://dysinger.net)
-* Escape, Copyright (C) 2006,2007 Tanaka Akira  <akr@fsij.org>
 
 
 == License

data/Rudyfile

@@ -1,4 +1,4 @@
-# = Rudy -- Example configuration
+# = Rudy -- Skeleton configuration
 # 
 # Rudy automatically looks for configuration files in the following 
 # locations (in this order):
@@ -7,6 +7,7 @@
 #     ~/.rudy/config
 #
 #     ./Rudyfile
+#     ./machines.rb, ./routines.rb, ./commands.rb
 #     ./config/rudy/*.rb
 #     ./.rudy/*.rb
 #     /etc/rudy/*.rb
@@ -23,15 +24,14 @@
 #
 
 # ---------------------------------------------------------  MACHINES  --------
-# The machines block describes the "physical" characteristics
-# of your environments. 
+# The machines block describes the "physical" characteristics of your machines. 
 machines do
   
   zone :"us-east-1b" do
-    ami 'ami-235fba4a'               # Amazon Getting Started AMI (US)
+    ami 'ami-e348af8a'               # Alestic Debian 5.0, 32-bit (US)
   end
   zone :"eu-west-1b" do
-    ami 'ami-e40f2790'               # Amazon Getting Started AMI (EU)
+    ami 'ami-6ecde51a'               # Alestic Debian 5.0, 32-bit (EU)
   end
   
   hostname :rudy                     # One of: :default, :rudy, "your-name"
@@ -40,8 +40,7 @@ machines do
   # The configuration inside the env block is available to all its 
   # roles. The configuration inside the role blocks is available only
   # to machines in that specific role. 
-  env :stage do
-    ami "ami-e348af8a"               # Debian 5.0, 32-bit (Alestic)
+  env :stage, :prod do
     size 'm1.small'                  # EC2 machine type for all machines
                                      # in the "stage" environment
     role :app do
@@ -103,17 +102,17 @@ end
 # To run a routine, specify its name on the command-line: rudy startup
 routines do
   
-  env :stage do                      # We'll define routines for the
-    role :app do                     # stage-app machine group
+  env :stage, :prod do               # We'll define routines for the stage-app
+    role :app do                     # and prod-app machine groups
                                      
       startup do                     # $ rudy startup
         adduser :rudy                # Create a user called "rudy"
         authorize :rudy              # Enable passwordless logins as rudy
-                                     
+                                     #
         disks do                     # Define EBS volume routines
           create "/rudy/disk1"       # Create an EBS volume, attach it, give
         end                          # it a filesystem, and mount it.
-                                     
+                                     #
         after :rudy do               # Run remote SSH commands after startup
           mkdir :p, "great"          # $ mkdir -p great
           touch "great/scott"        # $ touch great/scott
@@ -123,30 +122,63 @@ routines do
                                      
       shutdown do                    # $ rudy shutdown
         before :root do              # Run remote SSH commands before shutdown
-          #mysqld_initd               
-        end                          
-                                     
+          uptime               
+        end                               
         disks do                     
           destroy "/rudy/disk1"      # Unmount and destroy the EBS volume
         end                          
       end                            
-                                     
+      
+      reboot do                      # $ rudy reboot
+        before :root do              # Run any pre-reboot tasks like stopping
+          uptime                     # web servers and databases. 
+        end                          #
+        after :root do               # Run any startup tasks like starting
+          uptime                     # processes or initializing the filesystem
+        end
+      end
+      
+      backup do                      # $ rudy backup
+        disks do                     # A simple routine that creates an EBS
+          snapshot "/rudy/disk1"     # snapshot of the specified volume.
+        end
+      end
+      
+      restore_example do             # $ rudy restore_example
+        disks do                     # A contrived example of restoring a 
+          destroy "/rudy/disk1"      # disk from a backup. NOTE: You'll need
+          restore "/rudy/disk1"      # to run "rudy backup" at least once 
+        end                          # before otherise there are no backups
+      end                            # to restore from. 
+      
     end                              
   end                                
   
-  # Define global routines available
-  # to every environment and role.
+  # Define global routines available to all machine groups
+  # This routine will update a basic Debian machine and
+  # install essential libraries. 
+  # See examples/ for more.
   sysupdate do                       # $ rudy sysupdate
     before :root do                  
       apt_get "update"               # Update debian / ubuntu 
-      apt_get "install", "apache2-prefork-dev", "libapr1-dev"
       apt_get "install", "build-essential", "sqlite3", "libsqlite3-dev"
+      apt_get "install", "apache2-prefork-dev", "libapr1-dev"
       gem_install 'rudy'
     end
   end
   
-  # Define your own routines
   anything do                        # $ rudy anything
+    before :display_uptime           # Specify a dependency
+    script Rudy.sysinfo.user do      # This is Ruby, so any valid syntax
+      ls :l, Rudy.sysinfo.home       # can be used in the definitions. 
+    end                              # See: SysInfo gem for more info.
   end
+  
+  display_uptime do                  # $ rudy display-uptime
+    script Rudy.sysinfo.user do      # NOTE: You can use 'dashes' on the
+      uptime                         # command-line instead of underscores
+    end
+  end
+  
 end
 

data/bin/ird

@@ -0,0 +1,153 @@
+#!/usr/bin/ruby
+
+# = Interactive Rudy (experimental)
+# 
+# === Not your granparent's deployment tool
+#
+#   See ird -h for usage
+#
+
+$:.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{drydock caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+require 'rubygems'
+
+# SEE: http://github.com/rubyspec/matzruby/blob/a34130eb7c4ecc164115a59aa1b76c643bd98202/lib/irb/xmp.rb
+# SEE: http://github.com/blackwinter/wirble/tree/master
+require "irb"
+require 'irb/completion'
+
+require 'rudy'
+require 'drydock'
+require 'rudy/cli'
+
+
+class RudyCLI_Interactive < Rudy::CLI::Base # :nodoc:all
+
+  include Readline
+
+  default :interactive
+  debug :off
+  about "An interactive REPL for Rudy."
+  usage "#{$0} [global options]"
+  command :interactive do |obj|
+  
+    @@rmach = Rudy::Machines.new(:global => obj.global)
+    @@rkey = Rudy::KeyPairs.new(:global => obj.global)
+    @@rgrp = Rudy::Groups.new(:global => obj.global)
+    @@rvol = Rudy::Volumes.new(:global => obj.global)
+    @@radd = Rudy::Addresses.new(:global => obj.global)
+  
+    puts Rudy::CLI.generate_header(@@rmach.global, @@rmach.config)
+    puts Rudy::Utils.without_indent(%Q`
+    ------------------------------------------------------------
+    Welcome Interactive Rudy! (EXPERIMENTAL)
+    ------------------------------------------------------------
+  
+    `)
+    h
+  
+    # What's the deal with this error message when defining a help method?
+    # => rb: warn: can't alias help from irb_help
+    if __FILE__ == $0
+      IRB.start(__FILE__)
+    else
+      # check -e option
+      if /^-e$/ =~ $0
+        IRB.start(__FILE__)
+      else
+        IRB.start(__FILE__)
+      end
+    end
+  
+  end
+  
+  
+  
+  
+  def h;
+    puts (%Q`
+  HELP
+
+    h             Help (this screen)
+    m             Rudy::Machines instance
+    g             Rudy::Groups instance
+    k             Rudy::KeyPairs instance
+    v             Rudy::Volumes instance
+    a             Rudy::Addresses instance
+    ssh [GROUP]   Connect to a machine
+    example       Start an EC2 instance from scratch.
+    `)
+  end
+  def example
+    puts (%Q`
+  EXAMPLE
+      Start an EC2 instance from scratch.
+
+      # Create a security group
+      >> g.create
+      => #<Rudy::AWS::EC2::Group @name="stage-app" ...>
+
+      # Create a keypair (used to login as root)
+      >> k.create
+      => #<Rudy::AWS::EC2::KeyPair @name="key-stage-app" ...>
+
+      # Start an EC2 machine instance:    
+      >> m.create
+      Instance: i-228def51
+      Waiting for the instance to startup
+      ........It's up!
+
+      # Login to the new instance
+      >> ssh 
+
+      All commands in Rudy refer to the global defaults unless
+      otherwise specified. "stage" is the default environment and 
+      "app" is the default role. You can change these with command 
+      line arguments or by modifying the defaults in your Rudy 
+      config file: #{@@rmach.config_dirname}
+
+      You can also specify your own names by providing
+      one as the first argument: g.create 'group5000'.
+
+      # List instances in stage-app
+      >> m.list :running
+      => [#<Rudy::AWS::EC2::Instance:0x18c5888 ...>]
+
+      # Print the instance in a human readable way
+      >> puts m.list.first.to_s
+
+      # Print instance system console output
+      >> puts m.console
+
+      # Destroy ALL INSTANCES in stage-app
+      >> m.destroy
+    `)
+  end
+
+  def m; @@rmach; end
+  def k; @@rkey; end
+  def g; @@rgrp; end
+  def v; @@rvol; end
+  def a; @@radd; end
+
+  # Change Group
+  #def cg(name); end
+
+  def ssh(*args)
+    @@rmach.switch_user :root
+    @@rmach.connect(*args)
+    @@rmach.switch_user # back to previous user
+    nil
+  end
+  
+  
+end
+
+#include RudyCLI_Interactive  # So we don't have to say CLI.example in the REPL. 
+
+
+__END__
+#@rbox = Rye::Box.new('ec2-174-129-173-3.compute-1.amazonaws.com', 'root')
+#@rbox2 = Rye::Box.new('ec2-174-129-173-3.compute-1.amazonaws.com', 'root')
+#@rbox.add_keys('/Users/delano/Projects/git/rudy/.rudy/key-test-app.private')

data/bin/rudy

@@ -9,8 +9,7 @@
 # 
 
 $:.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{net-ssh amazon-ec2 caesars drydock rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'drydock', 'lib') 
 #require 'rubygems'
 
 #$SAFE = 1   # require is unsafe in Ruby 1.9??
@@ -19,7 +18,6 @@ require 'drydock'
 require 'rudy'
 require 'rudy/cli'
 
-
 # Command-line interface for /bin/rudy
 class RudyCLI < Rudy::CLI::Base
   
@@ -37,26 +35,17 @@ class RudyCLI < Rudy::CLI::Base
 
   # ------------------------------------------  RUDY OBJECTS  --------
   # ------------------------------------------------------------------
-
-  #usage "rudy [global options] backups [-C] [disk name]"
-  #about "Manage Backups"
-  #option :s, :snapshot, String, "Create a backup entry from an existing snapshot"
-  #action :Z, :sync, "Check for and delete backup metadata with no snapshot. DOES NOT delete snapshots."
-  ##action :T, :tidy, "Tidy existing backups"
-  #action :D, :destroy, "Destroy a backup and DELETE its snapshots."
-  #action :C, :create, "Create a backup"
-  #argv :disk
-  #command :'backup' => Rudy::CLI::Backups
-  #command_alias :backup, :bu
-  
-  about "Manage Machines"
+  
+  about "View Machines"
   option :l, :all, "Display all machines"
   action :W, :wash, "Wash machine metadata."
   command :machines => Rudy::CLI::Machines
   command_alias :machines, :m
   
-  about "Manage Disks"
+  about "View Disks"
   action :W, :wash, "Wash disk metadata."
+  option :b, :backups, "Display backups"
+  option :l, :all, "Display all disks"
   command :disks => Rudy::CLI::Disks
   command_alias :disks, :d
   
@@ -80,20 +69,18 @@ class RudyCLI < Rudy::CLI::Base
   about "Startup a machine group"
   usage "rudy startup"
   command :startup => Rudy::CLI::Routines
-  command_alias :startup, :s
 
   about "Shutdown a machine group"
   usage "rudy shutdown"
   command :shutdown => Rudy::CLI::Routines
   
-  #about "Restart a machine group"
-  #usage "rudy restart"
-  #command :restart => Rudy::CLI::Routines
+  about "Reboot a machine group"
+  usage "rudy reboot"
+  command :reboot => Rudy::CLI::Routines
   
   about "Create a release"
   usage "rudy release"
   command :release => Rudy::CLI::Routines
-  command_alias :release, :r
   command_alias :release, :rerelease
   
   #about "Update the release currently running in a machine group"
@@ -122,10 +109,14 @@ class RudyCLI < Rudy::CLI::Base
   argv :name
   command :config => Rudy::CLI::Config
   
+  command :print_global => Rudy::CLI::Config
+  command_alias :print_global, :global
   
   about "Initialize Rudy configuration"
   command :init do |obj|
-  
+    
+    Rudy::Huxtable.update_config
+    
     unless File.exists?(Rudy::CONFIG_FILE)
       Rudy::Config.init_config_dir
     end
@@ -209,6 +200,10 @@ class RudyCLI < Rudy::CLI::Base
     end
   end
   
+  
+  command :sysinfo do
+    puts Rudy.sysinfo.to_yaml
+  end
 end
 
 # We call Drydock specifically otherwise it will run at_exit. Rye also