solutious-rudy 0.8.2 → 0.8.3

data/CHANGES.txt

@@ -1,13 +1,26 @@
 RUDY, CHANGES
 
 
+#### 0.8.3 (2009-06-03) ###############################
 
-#### 0.8.2 (2009-05-28) ###############################
+* CHANGE: Now requires rye-0.7.3 (disable_safe_mode method)
+* CHANGE: Rye safe-mode is enabled after each routines script block to force disabling it
+  explicitly in every block it's needed. 
+* CHANGE: Removed grit dependency
+
+
+#### 0.8.2 (2009-06-01) ###############################
 
 * 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
+* CHANGE: Removed SCM classes (moved logic to the Arcade)
+* CHANGE: Moved examples to the Arcade (experimental)
+* CHANGE: Command output in routines is now displayed only when verbose is 1 or more.
+* ADDED: Routine blocks now receive command line options and arguments
+* ADDED: Commands configuration now supports inline blocks
+* ADDED: Rudy now looks for ~/.rudy/*.rb config files.
 
 
 #### 0.8.1 (2009-05-18) ###############################
@@ -31,8 +44,9 @@ RUDY, CHANGES
 #### 0.7.4 (2009-05-10) ###############################
 
 * 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/).
+          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')
@@ -96,7 +110,7 @@ to maintain consistency in documentation.
 
 * ADDED: rudy-ec2 status can now display EU status
 * FIXED: Fixed bug on instance create. Instance.groups was nil, now it returns 
-empty Array.
+         empty Array.
 
 #### 0.6.6 (2009-04-22) ###############################
 
@@ -185,9 +199,9 @@ NOTE: This is a complete re-write from 0.1
 * CHANGE: upgrade to drydock 0.3.3
 * ADDED: All time references are converted to UTC
 * ADDED: Safer "Are you sure?". Number of characters to enter is 
-       commiserate with amount of danger.  
+         commiserate with amount of danger.  
 * ADDED: CLIs: myaddress, addresses, images, instances, 
-       disks, connect, copy, stage, backups, volumes
+         disks, connect, copy, stage, backups, volumes
 * ADDED: Metadata storage to SimpleDB for disks, backups
 * ADDED: Creates EBS volumes based on startup from metadata
 * ADDED: Automated release process

data/README.rdoc

@@ -52,9 +52,9 @@ The routines configuration describes repeatable processes that you can execute o
       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
+        mkdir :p, "great"        # $ mkdir -p great
+        touch "great/scott"      # $ touch great/scott
+        ls :l, :a                # $ ls -l -a
       end                          
     end
 

data/Rudyfile

@@ -6,6 +6,7 @@
 #     ./.rudy/config
 #     ~/.rudy/config
 #
+#     ~/.rudy/*.rb
 #     ./Rudyfile
 #     ./machines.rb, ./routines.rb, ./commands.rb
 #     ./config/rudy/*.rb
@@ -48,9 +49,9 @@ machines do
       #addresses '11.22.33.44'       # Define an elastic IP to reuse
       
       disks do                       # Define EBS volumes 
-        path "/rudy/disk1" do        # The paths can be anything but
+        path '/rudy/disk1' do        # The paths can be anything but
           size 2                     # they must be unique. 
-          device "/dev/sdr"          # Devices must be unique too.
+          device '/dev/sdr'          # Devices must be unique too.
         end
       end
     end
@@ -92,11 +93,12 @@ end
 #
 commands do
   allow :make
-  allow :gem_install, "/usr/bin/gem", "install", :V, "--no-rdoc", "--no-ri"
-  allow :apt_get, "/usr/bin/apt-get", :y, :q
+  allow :gem_install, '/usr/bin/gem', 'install', :V, '--no-rdoc', '--no-ri'
+  allow :apt_get, 'apt-get', :y, :q
+  allow :floo, :time, 1 do
+  end
 end
 
-
 # ----------------------------------------------------------- ROUTINES --------
 # The routines block describes the repeatable processes for each machine group.
 # To run a routine, specify its name on the command-line: rudy startup
@@ -104,28 +106,28 @@ routines do
   
   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"
+        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
+          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
-          ls :l, :a                  # $ ls -l -a
+          mkdir :p, 'great'          # $ mkdir -p great
+          touch 'great/scott'        # $ touch great/scott
+          ls :l, :a, '*'             # $ ls -l -a *
         end                          
       end                            
                                      
       shutdown do                    # $ rudy shutdown
-        before :root do              # Run remote SSH commands before shutdown
+        script :root do              # Run remote SSH commands before shutdown
           uptime               
         end                               
         disks do                     
-          destroy "/rudy/disk1"      # Unmount and destroy the EBS volume
+          destroy '/rudy/disk1'      # Unmount and destroy the EBS volume
         end                          
       end                            
       
@@ -140,14 +142,14 @@ routines do
       
       backup do                      # $ rudy backup
         disks do                     # A simple routine that creates an EBS
-          snapshot "/rudy/disk1"     # snapshot of the specified volume.
+          snapshot '/rudy/disk1'     # snapshot of the specified volume.
         end
       end
       
-      restore_example do             # $ rudy restore_example
+      restore do                     # $ rudy restore
         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 
+          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. 
       
@@ -157,43 +159,27 @@ routines do
   # Define global routines available to all machine groups
   # This routine will update a basic Debian machine and
   # install essential libraries. 
-  # See examples/ for more.
+  # See http://github.com/rudy/arcade
   sysupdate do                       # $ rudy sysupdate
     before :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 'update'               # Update debian / ubuntu 
+      apt_get 'install', 'build-essential', 'sqlite3', 'libsqlite3-dev'
+      apt_get 'install', 'apache2-prefork-dev', 'libapr1-dev'
       gem_install 'rudy'
     end
   end
   
-  
   anything do                        # $ rudy anything
-    before :display_uptime           # Specify a dependency
-    script :rudy do                  # This is Ruby, so any valid syntax
+    before :uptime                   # Specify a dependency
+    script_local do                  # This is Ruby, so any valid syntax
       ls :l                          # can be used in the definitions. 
     end                              # See: SysInfo gem for more info.
   end
   
-  display_uptime do                  # $ rudy display-uptime
-    script :rudy do                  # NOTE: You can use 'dashes' on the
-      uptime                         # command-line instead of underscores
-    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
+  uptime do                          # $ rudy uptime
     script_local do
-      echo @tagname
+      uptime
     end
   end
-  
 end
 

data/bin/rudy

@@ -21,8 +21,8 @@ require 'rudy/cli'
 class RudyCLI < Rudy::CLI::Base
   
   debug :off
-  default :machines
-  trawler :passthrough
+  default :machines       # when no command is provided
+  trawler :passthrough    # unknown command names will forward here.
   
   # ------------------------------------------  RUDY GLOBALS  --------
   # ------------------------------------------------------------------
@@ -62,19 +62,24 @@ class RudyCLI < Rudy::CLI::Base
   
   # A "do nothing" routine. Passthrough simply executes a routine
   # config block. Drydock's trawler uses this for unknown commands.
-  about "A skeleton routine"
+  about "A passthrough for custom routines"
+  usage "rudy [custom-routine]"
+  option :m, :message, String, "A message"
   command :passthrough => Rudy::CLI::Routines
 
   about "Startup a machine group"
   usage "rudy startup"
+  option :m, :message, String, "A message"
   command :startup => Rudy::CLI::Routines
 
   about "Shutdown a machine group"
   usage "rudy shutdown"
+  option :m, :message, String, "A message"
   command :shutdown => Rudy::CLI::Routines
   
   about "Reboot a machine group"
   usage "rudy reboot"
+  option :m, :message, String, "A message"
   command :reboot => Rudy::CLI::Routines
   
 

data/lib/rudy.rb

@@ -38,7 +38,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 8.freeze
-      TINY  = 2.freeze
+      TINY  = 3.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -163,6 +163,6 @@ require 'rudy/aws'        # is
 require 'rudy/metadata'   # important
 require 'rudy/machines'
 require 'rudy/routines'
-require 'rudy/scm'
+
 
 

data/lib/rudy/cli/routines.rb

@@ -4,7 +4,7 @@ module Rudy; module CLI;
   class Routines < Rudy::CLI::CommandBase
     
     def startup_valid?
-      @rr = Rudy::Routines::Startup.new
+      @rr = Rudy::Routines::Startup.new(@alias, @option, @argv)
       @rr.raise_early_exceptions
       true
     end
@@ -17,7 +17,7 @@ module Rudy; module CLI;
     end
     
     def reboot_valid?
-      @rr = Rudy::Routines::Reboot.new
+      @rr = Rudy::Routines::Reboot.new(@alias, @option, @argv)
       @rr.raise_early_exceptions
       true
     end
@@ -29,24 +29,8 @@ module Rudy; module CLI;
       end
     end
     
-    def release_valid?
-      @rr = Rudy::Routines::Release.new(@alias) # Important: could be rerelease
-      @rr.raise_early_exceptions
-      true
-    end
-    def release
-      machines = @rr.execute
-      
-      unless machines.empty?
-        puts $/, "The following machines were processed:"
-        machines.each do |machine|
-          puts machine.to_s
-        end
-      end
-    end
-    
     def passthrough_valid?
-      @rr = Rudy::Routines::Passthrough.new(@alias)
+      @rr = Rudy::Routines::Passthrough.new(@alias, @option, @argv)
       @rr.raise_early_exceptions
       true
     end
@@ -76,7 +60,7 @@ module Rudy; module CLI;
     end
     
     def shutdown_valid?
-      @rr = Rudy::Routines::Shutdown.new
+      @rr = Rudy::Routines::Shutdown.new(@alias, @option, @argv)
       @rr.raise_early_exceptions
       true
     end

data/lib/rudy/config.rb

@@ -64,6 +64,7 @@ module Rudy
       typelist = self.keys.collect { |g| "#{g}.rb" }.join(',')
       
       # Rudy then looks for the rest of the config in these locations
+      @paths += Dir.glob(File.join(Rudy.sysinfo.home, '.rudy', '*.rb')) || []
       @paths += Dir.glob(File.join(cwd, 'Rudyfile')) || []
       @paths += Dir.glob(File.join(cwd, 'config', 'rudy', '*.rb')) || []
       @paths += Dir.glob(File.join(cwd, '.rudy', '*.rb')) || []

data/lib/rudy/config/objects.rb

@@ -33,11 +33,14 @@ class Rudy::Config
     @@processed = false
     forced_array :allow
     forced_array :deny
+    chill :allow
+    
     def init
       # We can't process the Rye::Cmd commands here because the
       # DSL hasn't been parsed yet so Rudy::Config.postprocess
       # called the following postprocess method after parsing.
     end
+    
     # Process the directives specified in the commands config.
     # NOTE: This affects the processing of the routines config
     # which only works if commands is parsed first. This works
@@ -54,52 +57,45 @@ class Rudy::Config
       # commands do
       #   allow :kill 
       #   allow :custom_script, '/full/path/2/custom_script'
-      #   allow :git_clone, "/usr/bin/git", "clone"
+      #   allow :git_clone, '/usr/bin/git', 'clone'
       # end
       # 
       # * Tells Routines to force_array on the command name.
       # This is important b/c of the way we parse commands 
       self.allow.each do |cmd|
-        cmd, path, *args = *cmd
-        
-        # If no path was specified, we can assume cmd is in the remote path so
-        # when we add the method to Rye::Cmd, we'll it the path is "cmd".
-        path ||= cmd.to_s
-        
-        # We cannot allow new commands to be defined that conflict use known
-        # routines keywords. This is based on keywords in the current config.
-        # NOTE: We can't check for this right now b/c the routines config
-        # won't necessarily have been parsed yet. TODO: Figure it out!
-        #if Caesars.known_symbol_by_glass?(:routines, cmd)
-        #  raise ReservedKeyword.new(:commands, cmd)
-        #end
+        cmd, *args = *cmd
         
         # We can allow existing commands to be overridden but we
         # print a message to STDERR so the user knows what's up.
-        STDERR.puts "Redefined #{cmd}" if Rye::Cmd.can?(cmd)
-        
-        # The second argument if supplied must be a filesystem path
-        raise PathNotString.new(:commands, cmd) if path && !path.is_a?(String)        
+        STDERR.puts "Redefining #{cmd}" if Rye::Cmd.can?(cmd)
         
-        # Insert hardcoded arguments if any were supplied. These will
-        # be sent automatically with every call to the new command.
-        # This loop prepares the hardcoded args to be passed to eval.
-        args.collect! do |arg| 
-          klass = [Symbol, String] & [arg.class]
-          raise BadArg.new(:commands, cmd) if klass.empty?
-          # Symbols sent as Symbols, Strings as Strings
-          arg.is_a?(Symbol) ? ":#{arg}" : "'#{arg}'"
+        if args.last.is_a?(Proc)
+          block = args.pop
+          Rye::Cmd.add_command(cmd, nil, args, &block)
+        else
+          # If no path was specified, we can assume cmd is in the remote path so
+          # when we add the method to Rye::Cmd, we'll it the path is "cmd".
+          path = args.shift || cmd.to_s
+          
+          raise PathNotString.new(:commands, cmd) if path && !path.is_a?(String)
+          
+          Rye::Cmd.add_command cmd, path, args
+          
         end
-        hard_args = args.empty? ? "*args" : "#{args.join(', ')}, *args"
-
-        # TODO: Use define_method 
-        Rye::Cmd.module_eval %Q{
-          def #{cmd}(*args); cmd(:'#{path}', #{hard_args}); end
-        }
+        
+        
+        ## We cannot allow new commands to be defined that conflict use known
+        ## routines keywords. This is based on keywords in the current config.
+        ## NOTE: We can't check for this right now b/c the routines config
+        ## won't necessarily have been parsed yet. TODO: Figure it out!
+        ##if Caesars.known_symbol_by_glass?(:routines, cmd)
+        ##  raise ReservedKeyword.new(:commands, cmd)
+        ##end
         
       end
+  
       ## NOTE: We now process command blocks as Procs rather than individual commands.
-      # There's currently no need to ForceRefresh here
+      ## There's currently no need to ForceRefresh here
       ##raise Caesars::Config::ForceRefresh.new(:routines)
     end
   end

data/lib/rudy/huxtable.rb

@@ -241,6 +241,7 @@ module Rudy
     # That's how Rudy knows the current group is defined. 
     def known_machine_group?
       raise NoConfig unless @@config
+      return true if default_machine_group?
       raise NoMachinesConfig unless @@config.machines
       return false if !@@config && !@@global
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
@@ -327,13 +328,20 @@ module Rudy
     def fetch_machine_param(parameter)
       raise "No parameter specified" unless parameter
       raise NoConfig unless @@config
-      raise NoMachinesConfig unless @@config.machines
+      return if !@@config.machines && default_machine_group?
+      raise NoMachinesConfig if !@@config.machines
       raise NoGlobal unless @@global
       top_level = @@config.machines.find(parameter)
       mc = fetch_machine_config
       mc[parameter] || top_level || nil
     end
     
+    # Returns true if this is the default machine environment and role
+    def default_machine_group?
+      @@global.environment == @@config.defaults.environment &&
+      @@global.role == @@config.defaults.role
+    end
+    
     def fetch_machine_config
       raise NoConfig unless @@config
       raise NoMachinesConfig unless @@config.machines