solutious-rudy 0.8.1 → 0.8.2

data/CHANGES.txt

@@ -1,11 +1,19 @@
 RUDY, CHANGES
 
 
+
+#### 0.8.2 (2009-05-28) ###############################
+
+* CHANGE: Removed release routine code (it's now a passthrough) and scmhelper. All release stuff should
+  be implemented using the routine blocks. 
+* CHANGE: Passthrough routines no longer check if machine group is running. 
+* CHANGE: Local routines blocks now run from current working directory
+
+
 #### 0.8.1 (2009-05-18) ###############################
 
 * FIXED: The shutdown routine was not working for Windows instances
 
-
 #### 0.8.0 (2009-05-18) ###############################
 
 * ADDED: Better windows instance support during routines
@@ -20,7 +28,6 @@ RUDY, CHANGES
 * CHANGE: rudy-ec2 console now displays windows password automatically if keypair is supplied.
 * ADDED: register and destroy commands to rudy-ec2 images
 
-
 #### 0.7.4 (2009-05-10) ###############################
 
 * CHANGE: Keypairs now include zone. This was necessary to allow US and EU keypairs to
@@ -44,7 +51,6 @@ be stored in the same directory.
 * 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)

data/README.rdoc

@@ -18,6 +18,48 @@ All configuration is organized into the zones, environments, and roles that you
 
 <em>NOTE: This is a BETA release. That means Rudy's not ready for production use! See Project-Status[http://wiki.github.com/solutious/rudy/project-status].</em>
 
+== Configuration
+
+=== Machines
+
+The machines configuration describes the "physical" characteristics of your infrastructure. 
+
+    env :stage do         # Define an environment
+      ami 'ami-e348af8a'         
+                             
+      role :app do        # Define a role
+        addresses '11.22.33.44'  # Use elastic IPs
+                             
+        disks do          # Create EBS volumes
+          path "/rudy/disk1" do  
+            size 100             
+            device "/dev/sdr"     
+          end                       
+        end
+      end
+    end
+
+=== Routines
+
+The routines configuration describes repeatable processes that you can execute on your machines. 
+
+    startup do            # $ rudy startup
+      adduser :rudy       
+      authorize :rudy     # Enable passwordless login
+                             
+      disks do                   # Create a disk 
+        restore "/rudy/disk1"    # from a backup
+      end                       
+                            
+      after :rudy do      # Run remote SSH commands
+        mkdir :p, "great"       # $ mkdir -p great
+        touch "great/scott"     # $ touch great/scott
+        ls :l, :a               # $ ls -l -a
+      end                          
+    end
+
+
+
 == Features
 
 * Create complex environments with a single command
@@ -112,7 +154,7 @@ I'm very open to contributions!
 * Rubber -- http://github.com/wr0ngway/rubber/wikis
 * Moonshine -- http://github.com/railsmachine/moonshine/tree
 * Boto -- http://code.google.com/p/boto/
-
+* Fabric -- http://www.nongnu.org/fab/
 
 == License
 

data/Rudyfile

@@ -167,6 +167,7 @@ routines do
     end
   end
   
+  
   anything do                        # $ rudy anything
     before :display_uptime           # Specify a dependency
     script :rudy do                  # This is Ruby, so any valid syntax
@@ -180,5 +181,19 @@ routines do
     end
   end
   
+  git_example do
+    before_local do
+      # Store variables using global variables. But be
+      # aware that the dollar sign variables can be set 
+      # anywhere. 
+      @sha = git 'rev-parse', '--short', 'HEAD'
+      @tagname = Time.now.strftime("%Y-%m-%d-#{Rudy.sysinfo.user}-#{@sha}")
+      git 'tag', :a, @tagname, :m, "Another release by Rudy"
+    end
+    script_local do
+      echo @tagname
+    end
+  end
+  
 end
 

data/bin/rudy

@@ -77,18 +77,6 @@ class RudyCLI < Rudy::CLI::Base
   usage "rudy reboot"
   command :reboot => Rudy::CLI::Routines
   
-  about "Create a release"
-  usage "rudy release"
-  command :release => Rudy::CLI::Routines
-  command_alias :release, :rerelease
-  
-  #about "Update the release currently running in a machine group"
-  #command :rerelease => Rudy::CLI::Routines
-  #command_alias :rerelease, :rere
-
-  #about "Deploy disk snapshots from one machine to another"
-  #command :deploy => Rudy::CLI::Routines
-  
 
   # ------------------------------------  RUDY MISCELLANEOUS  --------
   # ------------------------------------------------------------------

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

@@ -61,7 +61,7 @@ routines do
         thin :c, sinatra_home, "stop"
       end
     end
-
+    
     
   end
   

data/lib/rudy.rb

@@ -38,7 +38,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 8.freeze
-      TINY  = 1.freeze
+      TINY  = 2.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/lib/rudy/routines.rb

@@ -81,6 +81,7 @@ module Rudy
           if Rudy::Routines::ScriptHelper.before_local?(routine)  # before_local
             # Runs "before_local" scripts of routines config. 
             puts task_separator("LOCAL SHELL")
+            lbox.cd Dir.pwd # Run local command block from current working directory
             Rudy::Routines::ScriptHelper.before_local(routine, sconf, lbox)
           end
         }
@@ -90,12 +91,13 @@ module Rudy
             # Runs "script_local" scripts of routines config. 
             # NOTE: This is synonymous with before_local
             puts task_separator("LOCAL SHELL")
+            lbox.cd Dir.pwd # Run local command block from current working directory
             Rudy::Routines::ScriptHelper.script_local(routine, sconf, lbox)
           end
         }
         
         # Execute the action (create, list, destroy, restart)
-        machines = enjoy_every_sandwich([]) { rmach.send(machine_action) }
+        machines = enjoy_every_sandwich([]) { rmach.send(machine_action) } || []
         
         machines.each do |machine|
           puts machine_separator(machine.name, machine.awsid) unless skip_header
@@ -239,6 +241,7 @@ module Rudy
         enjoy_every_sandwich {
           if Rudy::Routines::ScriptHelper.after_local?(routine)   # after_local
             puts task_separator("LOCAL SHELL")
+            lbox.cd Dir.pwd # Run local command block from current working directory
             # Runs "after_local" scripts of routines config
             Rudy::Routines::ScriptHelper.after_local(routine, sconf, lbox)
           end

data/lib/rudy/routines/helper.rb

@@ -5,7 +5,7 @@ module Rudy
     module HelperBase
      include Rudy::Huxtable
      
-     def execute_rbox_command(ret=nil, &command)
+     def trap_rbox_errors(ret=nil, &command)
        begin
          ret = command.call if command
          return unless ret.is_a?(Rye::Rap)

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

@@ -1,7 +1,7 @@
 
 module Rudy; module Routines; 
   module DependsHelper
-    include Rudy::Routines::HelperBase  # TODO: use execute_rbox_command
+    include Rudy::Routines::HelperBase  # TODO: use trap_rbox_errors
     extend self 
     
     def has_depends?(timing, routine)

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

@@ -2,7 +2,7 @@
 
 module Rudy; module Routines; 
   module DiskHelper
-    include Rudy::Routines::HelperBase  # TODO: use execute_rbox_command
+    include Rudy::Routines::HelperBase  # TODO: use trap_rbox_errors
     extend self
     
     def disks?(routine)
@@ -271,7 +271,7 @@ module Rudy; module Routines;
         
         if disk.mounted?
           print "Unmounting #{disk.path}..."
-          execute_rbox_command { @rbox.umount(disk.path) }
+          trap_rbox_errors { @rbox.umount(disk.path) }
           puts " done"
           sleep 0.5
         end
@@ -307,7 +307,7 @@ module Rudy; module Routines;
 
         if disk.mounted?
           print "Unmounting #{disk.path}..."
-          execute_rbox_command { @rbox.umount(disk.path) }
+          trap_rbox_errors { @rbox.umount(disk.path) }
           puts " done"
           sleep 0.5
         end

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

@@ -5,11 +5,11 @@ module Rudy; module Routines;
   # TODO: Rename to ShellHelper
   #++
   module ScriptHelper
-    include Rudy::Routines::HelperBase  # TODO: use execute_rbox_command
+    include Rudy::Routines::HelperBase  # TODO: use trap_rbox_errors
     extend self
 
     @@script_types = [:after, :before, :after_local, :before_local, :script, :script_local]
-    @@script_config_file = "rudy-config.yml"
+    @@script_config_file_name = "rudy-config.yml"
     
     # TODO: refactor using this_method
     
@@ -99,8 +99,12 @@ module Rudy; module Routines;
       raise "ScriptHelper: Not a Rye::Box" unless rbox.is_a?(Rye::Box)
       raise "ScriptHelper: #{timing}?" unless @@script_types.member?(timing)
       
+      # The config file that gets created on each remote machine
+      # will be created in the user's home directory. 
+      script_config_remote_path = File.join(rbox.getenv['HOME'], @@script_config_file_name)
+      
       if sconf && !sconf.empty?
-        tf = Tempfile.new(@@script_config_file)
+        tf = Tempfile.new(@@script_config_file_name)
         Rudy::Utils.write_to_file(tf.path, sconf.to_hash.to_yaml, 'w')
       end
       
@@ -131,7 +135,7 @@ module Rudy; module Routines;
             next
           end
           
-          execute_rbox_command {
+          trap_rbox_errors {
             # We need to create the config file for every script, 
             # b/c the user may change and it would not be accessible.
             # We turn off safe mode so we can write the config file via SSH. 
@@ -139,8 +143,8 @@ module Rudy; module Routines;
             # TODO: Replace with rbox.upload. Make it safe again!
             conf_str = StringIO.new
             conf_str.puts sconf.to_hash.to_yaml
-            rbox.upload(conf_str, @@script_config_file)
-            rbox.chmod(600, @@script_config_file)
+            rbox.upload(conf_str, script_config_remote_path)
+            rbox.chmod(600, script_config_remote_path)
           }
           
           begin
@@ -172,15 +176,8 @@ module Rudy; module Routines;
             exit 12 unless keep_going?
           end
           
-          # I was gettings errors about script_config_file not existing. There
-          # might be a race condition when the rm command is called too quickly. 
-          # It's also quite possible I'm off my rocker!
-          ## NOTE: I believe this was an issue with Rye. I fixed it when I was
-          ## noticing the same error in another place. It hasn't repeated. 
-          ## sleep 0.1
-          
           rbox.cd # reset to home dir
-          rbox.rudy_tmp_rm(@@script_config_file)
+          rbox.rudy_tmp_rm(:f, script_config_remote_path)  # -f to ignore errors
         end
         
         # Return the borrowed rbox instance to the user it was provided with

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)
@@ -20,7 +20,7 @@ module Rudy; module Routines;
       # 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)
@@ -28,7 +28,7 @@ module Rudy; module Routines;
     end
     def authorize(routine, machine, rbox)
       puts command_separator(:authorize_keys_remote, rbox.user)
-      execute_rbox_command { rbox.authorize_keys_remote(routine.authorize) }
+      trap_rbox_errors { rbox.authorize_keys_remote(routine.authorize) }
     end
     
     

data/lib/rudy/routines/passthrough.rb

@@ -28,9 +28,9 @@ module Rudy; module Routines;
       rmach = Rudy::Machines.new
       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
+      #if !@@global.offline && !rmach.running?
+      #  raise MachineGroupNotRunning, current_machine_group
+      #end
     end
     
   end

data/lib/rudy/scm.rb

@@ -36,7 +36,7 @@ module Rudy
       def raise_early_exceptions; raise "override raise_early_exceptions"; end
       
       # copied from routines/helper.rb
-      def execute_rbox_command(ret=nil, &command)
+      def trap_rbox_errors(ret=nil, &command)
         begin
           ret = command.call
           puts '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?

data/lib/rudy/scm/git.rb

@@ -69,10 +69,10 @@ module Rudy
       
       def delete_rtag(rtag=nil)
         rtag ||= @rtag
-        ret = execute_rbox_command { Rye.shell(:git, 'tag', :d, rtag) }
+        ret = trap_rbox_errors { Rye.shell(:git, 'tag', :d, rtag) }
         raise ret.stderr.join($/) if ret.exit_code > 0 # TODO: retest
         # Equivalent to: "git push origin :tag-name" which deletes a remote tag
-        ret = execute_rbox_command { Rye.shell(:git, "push #{@remote} :#{rtag}") } if @remote
+        ret = trap_rbox_errors { Rye.shell(:git, "push #{@remote} :#{rtag}") } if @remote
         raise ret.stderr.join($/) if ret.exit_code > 0
         true
       end
@@ -144,11 +144,11 @@ module Rudy
           rbox.upload(known_hosts, '.ssh/known_hosts')
           rbox.chmod('0600', '.ssh/known_hosts')
 
-          execute_rbox_command {
+          trap_rbox_errors {
             rbox.git('clone', get_remote_uri, @path)
           }
           rbox.cd(@path)
-          execute_rbox_command {
+          trap_rbox_errors {
             rbox.git('checkout', :b, @rtag)
           }
         rescue Rye::CommandError => ex

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @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"
@@ -106,12 +106,10 @@
   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
@@ -123,27 +121,6 @@
   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: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -204,12 +204,10 @@ 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
@@ -221,27 +219,6 @@ files:
 - 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
 post_install_message: