rudy 0.8.1 → 0.8.2

data/lib/rudy/routines/helpers/userhelper.rb

@@ -1,7 +1,7 @@
 
 module Rudy; module Routines; 
   module UserHelper
-    include Rudy::Routines::HelperBase  # TODO: use execute_rbox_command
+    include Rudy::Routines::HelperBase  # TODO: use trap_rbox_errors
     extend self 
     
     def adduser?(routine)
@@ -13,22 +13,22 @@ module Rudy; module Routines;
       # explicitly so we do it for linux too for fun. 
       homedir = rbox.guess_user_home(routine.adduser.to_s)
       args = [:m, :d, homedir, :s, '/bin/bash', routine.adduser.to_s]
-      puts command_separator(rbox.preview_command(:useradd, args), rbox.user)
+      puts command_separator(rbox.preview_command(:useradd, args), rbox.user, rbox.host)
       
       # NOTE: We'll may to use platform specific code here. 
       # Linux has adduser and useradd commands:
       # adduser can prompt for info which we don't want. 
       # useradd does not prompt (on Debian/Ubuntu at least). 
       # We need to specify bash b/c the default is /bin/sh
-      execute_rbox_command { rbox.useradd(args) }
+      trap_rbox_errors { rbox.useradd(args) }
     end
     
     def authorize?(routine)
       (!routine.authorize.nil? && !routine.authorize.to_s.empty?)
     end
     def authorize(routine, machine, rbox)
-      puts command_separator(:authorize_keys_remote, rbox.user)
-      execute_rbox_command { rbox.authorize_keys_remote(routine.authorize) }
+      puts command_separator(:authorize_keys_remote, rbox.user, rbox.host)
+      trap_rbox_errors { rbox.authorize_keys_remote(routine.authorize) }
     end
     
     

data/lib/rudy/routines/passthrough.rb

@@ -4,18 +4,17 @@ module Rudy; module Routines;
   class Passthrough < Rudy::Routines::Base
     
     def init(*args)
-      @routine_name = args.first
-      @routine = fetch_routine_config(@routine_name)
+      @routine = fetch_routine_config(@cmdname)
     end
     
     # * +each_mach+ is an optional block which is executed between 
     # disk creation and the after scripts. The will receives two 
     # arguments: instances of Rudy::Machine and Rye::Box.
     def execute(&each_mach)
-      routine_separator(@routine_name)
+      routine_separator(@cmdname)
       machines = []
       generic_machine_runner(:list) do |machine,rbox|
-        puts $/ #, "[routine: #{@routine_name}]"
+        puts $/ #, "[routine: #{@cmdname}]"
         machines << machine
       end
       machines
@@ -23,14 +22,15 @@ module Rudy; module Routines;
 
     # Called by generic_machine_runner
     def raise_early_exceptions
-      raise Rudy::Error, "No routine name" unless @routine_name
-      raise NoRoutine, @routine_name unless @routine
-      rmach = Rudy::Machines.new
-      raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
+      raise Rudy::Error, "No routine name" unless @cmdname
+      raise NoRoutine, @cmdname unless @routine
+      # TODO: enable this for EC2 groups only
+      #raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
       raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
-      if !@@global.offline && !rmach.running?
-        raise MachineGroupNotRunning, current_machine_group
-      end
+      ##rmach = Rudy::Machines.new
+      ##if !@@global.offline && !rmach.running?
+      ##  raise MachineGroupNotRunning, current_machine_group
+      ##end
     end
     
   end

data/lib/rudy/routines/startup.rb

@@ -4,7 +4,7 @@ module Rudy; module Routines;
   class Startup < Rudy::Routines::Base
     
     def init(*args)
-      @routine = fetch_routine_config(:startup)
+      @routine = fetch_routine_config(:startup)   # NOTE: could use @cmdname here
     end
     
     # * +each_mach+ is an optional block which is executed between 

data/rudy.gemspec

@@ -1,22 +1,22 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.8.1"
+	s.version = "0.8.2"
 	s.summary = "Rudy: Not your grandparents' EC2 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.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.6.3'
-  s.add_dependency 'caesars', '>= 0.6.6'
-  s.add_dependency 'rye', '>= 0.6.5'
+  s.add_dependency 'caesars', '>= 0.6.8'
+  s.add_dependency 'rye', '>= 0.7.2'
   s.add_dependency 'sysinfo', '>= 0.5.1'
   s.add_dependency 'storable', '>= 0.5.2'
   s.add_dependency 'annoy', '>= 0.5.0'
@@ -49,13 +49,6 @@
   bin/rudy-ec2
   bin/rudy-s3
   bin/rudy-sdb
-  examples/README.md
-  examples/debian-sinatra-passenger/commands.rb
-  examples/debian-sinatra-passenger/machines.rb
-  examples/debian-sinatra-passenger/routines.rb
-  examples/debian-sinatra-thin/commands.rb
-  examples/debian-sinatra-thin/machines.rb
-  examples/debian-sinatra-thin/routines.rb
   lib/rudy.rb
   lib/rudy/aws.rb
   lib/rudy/aws/ec2.rb
@@ -106,44 +99,18 @@
   lib/rudy/routines/helper.rb
   lib/rudy/routines/helpers/dependshelper.rb
   lib/rudy/routines/helpers/diskhelper.rb
-  lib/rudy/routines/helpers/scmhelper.rb
   lib/rudy/routines/helpers/scripthelper.rb
   lib/rudy/routines/helpers/userhelper.rb
   lib/rudy/routines/passthrough.rb
   lib/rudy/routines/reboot.rb
-  lib/rudy/routines/release.rb
   lib/rudy/routines/shutdown.rb
   lib/rudy/routines/startup.rb
-  lib/rudy/scm.rb
-  lib/rudy/scm/git.rb
-  lib/rudy/scm/svn.rb
   lib/rudy/utils.rb
   rudy.gemspec
   support/mailtest
   support/randomize-root-password
   support/rudy-ec2-startup
   support/update-ec2-ami-tools
-  test/01_mixins/10_hash_test.rb
-  test/10_config/00_setup_test.rb
-  test/10_config/30_machines_test.rb
-  test/15_scm/00_setup_test.rb
-  test/15_scm/20_git_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
   )
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -04:00
+date: 2009-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.6
+        version: 0.6.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.5
+        version: 0.7.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -147,13 +147,6 @@ files:
 - bin/rudy-ec2
 - bin/rudy-s3
 - bin/rudy-sdb
-- examples/README.md
-- examples/debian-sinatra-passenger/commands.rb
-- examples/debian-sinatra-passenger/machines.rb
-- examples/debian-sinatra-passenger/routines.rb
-- examples/debian-sinatra-thin/commands.rb
-- examples/debian-sinatra-thin/machines.rb
-- examples/debian-sinatra-thin/routines.rb
 - lib/rudy.rb
 - lib/rudy/aws.rb
 - lib/rudy/aws/ec2.rb
@@ -204,44 +197,18 @@ files:
 - lib/rudy/routines/helper.rb
 - lib/rudy/routines/helpers/dependshelper.rb
 - lib/rudy/routines/helpers/diskhelper.rb
-- lib/rudy/routines/helpers/scmhelper.rb
 - lib/rudy/routines/helpers/scripthelper.rb
 - lib/rudy/routines/helpers/userhelper.rb
 - lib/rudy/routines/passthrough.rb
 - lib/rudy/routines/reboot.rb
-- lib/rudy/routines/release.rb
 - lib/rudy/routines/shutdown.rb
 - lib/rudy/routines/startup.rb
-- lib/rudy/scm.rb
-- lib/rudy/scm/git.rb
-- lib/rudy/scm/svn.rb
 - lib/rudy/utils.rb
 - rudy.gemspec
 - support/mailtest
 - support/randomize-root-password
 - support/rudy-ec2-startup
 - support/update-ec2-ami-tools
-- test/01_mixins/10_hash_test.rb
-- test/10_config/00_setup_test.rb
-- test/10_config/30_machines_test.rb
-- test/15_scm/00_setup_test.rb
-- test/15_scm/20_git_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
 has_rdoc: true
 homepage: http://github.com/solutious/rudy
 licenses: []
@@ -270,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rudy
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: "Rudy: Not your grandparents' EC2 deployment tool."

data/examples/README.md

@@ -1,10 +0,0 @@
-# Rudy Configuration Examples
-
-*NOTE: The examples are a work in progress*
-
-## Contributions
-
-I'm very open to contributions! Rudy supports all Linux-based platforms (with partial Solaris support) and software (rails, sinatra, MySQL, PostgreSQL, etc...) so it's possible to write examples for pretty much anything. If you're interested in writing new examples, I'll gladly accept them and include them here (with credit of course!). 
-
-
-

data/examples/debian-sinatra-passenger/commands.rb

@@ -1,19 +0,0 @@
-# ----------------------------------------------------------- COMMANDS --------
-# The commands block defines shell commands that can be used in routines. The
-# ones defined here are added to the default list defined by Rye::Cmd (Rudy 
-# executes all SSH commands via Rye). 
-#
-# Usage: 
-#
-# allow COMMAND-NAME
-# allow COMMAND-NAME, '/path/2/COMMAND'
-# allow COMMAND-NAME, '/path/2/COMMAND', 'default argument', 'another arg'
-#
-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 :passenger_install_apache2, "passenger-install-apache2-module", '--auto'
-  allow :passenger_install_nginx, "passenger-install-nginx-module", '--auto', '--autodownload'
-  allow :apache2ctl
-end

data/examples/debian-sinatra-passenger/machines.rb

@@ -1,32 +0,0 @@
-
-# ---------------------------------------------------------  MACHINES  --------
-# The machines block describes the "physical" characteristics
-# of your environments. 
-machines do
-  
-  # We've defined an environment called "stage" with one role: "app". 
-  # 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 :dev, :stage, :prod do
-    ami "ami-e348af8a"   # Debian 5.0 32-bit, Alestic
-    size 'm1.small'
-    
-    role :app do
-      # You can define disks for the stage-app machines. Rudy uses 
-      # this configuration when it executes a routine (see below).
-      disks do
-        path "/rudy/disk1" do
-          size 10
-          device "/dev/sdr"
-          fstype 'ext3'
-        end
-      end
-    
-    end
-
-  end  
-  
-end
-
-

data/examples/debian-sinatra-passenger/routines.rb

@@ -1,30 +0,0 @@
-
-routines do
-  
-  sysupdate do
-    script :root do                  
-      apt_get "update"               
-      apt_get "install", "build-essential", "git-core"
-      apt_get "install", "sqlite3", "libsqlite3-dev"
-      apt_get "install", "ruby1.8-dev", "rubygems"
-      apt_get "install", "nginx"
-      apt_get "install", "apache2-mpm-prefork", "apache2-prefork-dev", "libapr1-dev"
-      apt_get "install", "libfcgi-dev", "libfcgi-ruby1.8"
-      gem_sources :a, "http://gems.github.com"
-    end
-  end
-  
-  installdeps do
-    script :root do
-      gem_install "test-spec", "rspec", "camping", "fcgi", "memcache-client"
-      gem_install "rake", "passenger"
-      passenger_install_apache2
-      passenger_install_nginx
-      gem_install "rack", :v, "0.9.1"   # 0.9.1 required by sinatra
-      gem_install "sinatra"
-    end
-  end
-  
-  
-  
-end

data/examples/debian-sinatra-thin/commands.rb

@@ -1,17 +0,0 @@
-# ----------------------------------------------------------- COMMANDS --------
-# The commands block defines shell commands that can be used in routines. The
-# ones defined here are added to the default list defined by Rye::Cmd (Rudy 
-# executes all SSH commands via Rye). 
-#
-# Usage: 
-#
-# allow COMMAND-NAME
-# allow COMMAND-NAME, '/path/2/COMMAND'
-# allow COMMAND-NAME, '/path/2/COMMAND', 'default argument', 'another arg'
-#
-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 :thin, "/usr/local/bin/thin", :d, :R, './config.ru', :l, './thin.log', :P, './thin.pid'
-end

data/examples/debian-sinatra-thin/machines.rb

@@ -1,35 +0,0 @@
-# THIS EXAMPLE IS INCOMPLETE -- 2009-05-03
-
-# ---------------------------------------------------------  MACHINES  --------
-# The machines block describes the "physical" characteristics
-# of your environments. 
-machines do
-  
-  # We've defined an environment called "stage" with one role: "app". 
-  # 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 :dev, :stage, :prod do
-    ami "ami-e348af8a"   # Debian 5.0 32-bit, Alestic
-    size 'm1.small'
-    
-    role :app do
-      #positions 2
-    
-      # You can define disks for the stage-app machines. Rudy uses 
-      # this configuration when it executes a routine (see below).
-      disks do
-        path "/rudy/disk1" do
-          size 10
-          device "/dev/sdr"
-          fstype 'ext2'
-        end
-      end
-    
-    end
-
-  end  
-  
-end
-
-

data/examples/debian-sinatra-thin/routines.rb

@@ -1,72 +0,0 @@
-# THIS EXAMPLE IS INCOMPLETE -- 2009-05-03
-
-# Rudy -- debian-sinatra-thin
-#
-# Notes:
-# * Change :rudy to the name of your user remote deployment user
-# 
-sinatra_home = "/rudy/disk1/sinatra"
-routines do
-  
-  sysupdate do
-    script :root do                  
-      apt_get "update"               
-      apt_get "install", "build-essential", "git-core"
-      apt_get "install", "sqlite3", "libsqlite3-dev"
-      apt_get "install", "ruby1.8-dev", "rubygems"
-      apt_get "install", "apache2-prefork-dev", "libapr1-dev"
-      apt_get "install", "libfcgi-dev", "libfcgi-ruby1.8"
-      gem_sources :a, "http://gems.github.com"
-    end
-  end
-  
-  installdeps do
-    script :root do
-      gem_install "test-spec", "rspec", "camping", "fcgi", "memcache-client"
-      gem_install "mongrel"
-      gem_install 'ruby-openid', :v, "2.0.4" # thin requires 2.0.x
-      gem_install "rack", :v, "0.9.1"
-      gem_install "macournoyer-thin"         # need 1.1.0 which works with rack 0.9.1
-      gem_install "sinatra"
-    end
-  end
-  
-  environment :dev, :stage do
-
-    startup do      
-      adduser :rudy
-      authorize :rudy  
-      disks do
-        create "/rudy/disk1"
-      end
-    end
-    shutdown do
-      disks do
-        destroy "/rudy/disk1"   
-      end
-    end
-    
-    restart do
-      after :rudy do
-        thin :c, sinatra_home, "restart"
-      end
-    end
-    start do
-      after :rudy do
-        thin :c, sinatra_home, "start"
-      end
-    end
-    stop do
-      after :rudy do
-        thin :c, sinatra_home, "stop"
-      end
-    end
-
-    
-  end
-  
-end
-
-
-
-