right_chimp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634d307cab9b4664dd3a9ac2eb45814c485bc7cb
-  data.tar.gz: 86e20d30c6fc23dfe79704cc3085f4b8cc62d66a
+  metadata.gz: 5df5e7af3e88a247df0ca5f855360b6d81316b17
+  data.tar.gz: 45a3a90419e7f4bc8f036853f913abcfd677d6a2
 SHA512:
-  metadata.gz: b6bf575bd40a18cf89964b4cc01f333b2f689386ec64c933fbe042e1d3a52503bfc6605d5d5cd9965fb46cf79a0190875b5e93cf014fd483adf0e68a1873911f
-  data.tar.gz: 9ca670a07b44af6ed0bf700cabfbeba41bc851a520098829ad33b4c1af21d6de972cf0fbea6736ffd088bc2ab8ba18cd6f7028b6394070a1165483503ec9a8aa
+  metadata.gz: c1a9b9120dd6b2df5e2fb87e3b10c4a942bd2c987ae300b9a5f8f8500b12fb5030b665c1e83ae6cbb6b04b7c992176ad23a656f0dcb0274ab501752903b6b76d
+  data.tar.gz: 4fd99523738ac5a9b2f57ed65b581a74f17e1ed716cd54f0215a3d05fa9e38ebedc007269d5a2b8deebdbe84cb9b85ac4ad18977c755b5f7bac1484ea9e631fe

data/CHANGES

@@ -93,3 +93,8 @@ Version 1.0
 Version 1.0.1
 -------------
 * Add missing ERB template for chimpd
+
+Version 1.0.2
+-------------
+* Add support for specifying inputs on the command line when working with arrays
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (1.0.1)
+    right_chimp (1.0.2)
       progressbar (~> 0.11.0)
       rake (~> 0.9.2.2)
       rest-client (~> 1.6.7)
@@ -18,7 +18,7 @@ GEM
     i18n (0.6.1)
     json (1.7.7)
     mime-types (1.23)
-    multi_json (1.7.2)
+    multi_json (1.7.3)
     net-ssh (2.6.7)
     nokogiri (1.5.9)
     progressbar (0.11.0)

data/lib/right_chimp/Chimp.rb

@@ -5,16 +5,16 @@
 module Chimp
   class Chimp
     attr_accessor :concurrency, :delay, :retry_count, :progress, :prompt,
-                  :quiet, :use_chimpd, :chimpd_host, :chimpd_port, :tags, :array_names, 
+                  :quiet, :use_chimpd, :chimpd_host, :chimpd_port, :tags, :array_names,
                   :deployment_names, :script, :servers, :ssh, :report, :interactive, :action,
                   :limit_start, :limit_end, :dry_run, :group, :job_id, :verify
-  
+
     #
     # These class variables control verbosity
     #
     @@verbose     = false
     @@quiet       = false
-  
+
     #
     # Set up reasonable defaults
     #
@@ -27,7 +27,7 @@ module Chimp
       @verify       = true
       @dry_run      = false
       @interactive  = true
-      
+
       #
       # Job control options
       #
@@ -35,7 +35,7 @@ module Chimp
       @delay        = 0
       @retry_count  = 0
       @timeout      = 900
-      
+
       @limit_start  = 0
       @limit_end    = 0
 
@@ -46,7 +46,7 @@ module Chimp
       @group             = :default
       @group_type        = :parallel
       @group_concurrency = 1
-      
+
       #
       # Options for selecting objects to work on
       #
@@ -67,7 +67,7 @@ module Chimp
       @ignore_errors    = false
 
       @break_array_into_instances = false
-      @dont_check_templates_for_script = false      
+      @dont_check_templates_for_script = false
 
       #
       # chimpd configuration
@@ -76,22 +76,22 @@ module Chimp
       @chimpd_host                = 'localhost'
       @chimpd_port                = 9055
       @chimpd_wait_until_done     = false
-      
+
       RestClient.log = nil
     end
-        
+
     #
     # Entry point for the chimp command line application
     #
     def run
       queue = ChimpQueue.instance
-      
+
       parse_command_line if @interactive
       check_option_validity if @interactive
       disable_logging unless @@verbose
-      
+
       puts "chimp #{VERSION} executing..." if (@interactive and not @use_chimpd) and not @@quiet
-      
+
       #
       # Wait for chimpd to complete tasks
       #
@@ -113,11 +113,11 @@ module Chimp
       # ahead and start making API calls to select the objects
       # to operate upon
       #
-      get_array_info      
+      get_array_info
       get_server_info
       get_template_info
       get_executable_info
-      
+
       #
       # Optionally display the list of objects to operate on
       # and prompt the user
@@ -125,14 +125,14 @@ module Chimp
       if @prompt and @interactive
         list_of_objects = make_human_readable_list_of_objects
         confirm = (list_of_objects.size > 0 and @action != :action_none) or @action == :action_none
-        
+
         verify("Your command will be executed on the following:", list_of_objects, confirm)
-        
+
         if @servers.length >= 2 and @server_template and @executable and not @dont_check_templates_for_script
           warn_if_rightscript_not_in_all_servers @servers, @server_template, @executable
         end
       end
-      
+
       #
       # Load the queue with work
       #
@@ -145,16 +145,16 @@ module Chimp
       if @action == :action_none or queue.group[@group].size == 0
         puts "No actions to perform." unless @@quiet
       else
-        do_work      
+        do_work
       end
     end
-    
+
     #
     # Process a non-interactive chimp object command
     # Used by chimpd
     #
     def process
-      get_array_info      
+      get_array_info
       get_server_info
       get_template_info
       get_executable_info
@@ -170,7 +170,7 @@ module Chimp
         @server_template = detect_server_template(@template, @script, @servers, @array_names)
       end
     end
-    
+
     #
     # Get the Executable (RightScript) info from the API
     #
@@ -180,7 +180,7 @@ module Chimp
         puts "Using SSH command: \"#{@ssh}\"" if @action == :action_ssh
       end
     end
-      
+
     #
     # Parse command line options
     #
@@ -221,7 +221,7 @@ module Chimp
           [ '--timeout', '-5',  GetoptLong::REQUIRED_ARGUMENT ],
           [ '--noverify', '-6', GetoptLong::NO_ARGUMENT ]
         )
-      
+
         opts.each do |opt, arg|
           case opt
             when '--help', '-h'
@@ -322,7 +322,7 @@ module Chimp
         help
         exit 1
       end
-      
+
       #
       # Before we're totally done parsing command line options,
       # let's make sure that a few things make sense
@@ -330,9 +330,9 @@ module Chimp
       if @group_concurrency > @concurrency
         @concurrency = @group_concurrency
       end
-      
+
     end
-    
+
     #
     # Check for any invalid combinations of command line options
     #
@@ -342,14 +342,14 @@ module Chimp
         help
         exit 1
       end
-      
+
       if not @array_names.empty? and ( not @tags.empty? or not @deployment_names.empty? )
         puts "ERROR: You cannot mix ServerArray queries with other types of queries."
         help
         exit 1
       end
     end
-    
+
     #
     # Go through each of the various ways to specify servers via
     # the command line (tags, deployments, etc.) and get all the info
@@ -360,7 +360,7 @@ module Chimp
       @servers += get_servers_by_deployment(@deployment_names)
       @servers = filter_out_non_operational_servers(@servers)
     end
-    
+
     #
     # Load up @array with server arrays to operate on
     #
@@ -373,11 +373,11 @@ module Chimp
       # into Servers as necessary.
       #
       if @break_array_into_instances
-        Log.debug "Breaking array into instances..." 
+        Log.debug "Breaking array into instances..."
         @servers += get_servers_by_array(@array_names)
         @array_names = []
       end
-      
+
       @array_names.each do |array_name|
         Log.debug "Querying API for ServerArray \'#{array_name}\'..."
         a = Ec2ServerArray.find_by(:nickname) { |n| n =~ /^#{array_name}/i }.first
@@ -392,7 +392,7 @@ module Chimp
         end
       end
     end
-    
+
     #
     # Get servers to operate on via a tag query
     #
@@ -401,7 +401,7 @@ module Chimp
     def get_servers_by_tag(tags)
       return([]) unless tags.size > 0
       servers = ::Tag.search("ec2_instance", tags, :match_all => @match_all)
-      
+
       if tags.size > 0 and servers.nil? or servers.empty?
         if @ignore_errors
           Log.warn "Tag query returned no results: #{tags.join(" ")}"
@@ -409,10 +409,10 @@ module Chimp
            raise "Tag query returned no results: #{tags.join(" ")}"
         end
       end
-      
+
       return(servers)
     end
-    
+
     #
     # Parse deployment names and get Server objects
     #
@@ -420,28 +420,28 @@ module Chimp
     #
     def get_servers_by_deployment(names)
       servers = []
-      
+
       if names.size > 0
         names.each do |deployment|
           d = ::Deployment.find_by_nickname(deployment).first
-          
+
           if d == nil
             if @ignore_errors
               Log.warn "cannot find deployment #{deployment}"
-            else 
+            else
               raise "cannot find deployment #{deployment}"
             end
           else
             d.servers_no_reload.each do |s|
               servers << s
-            end      
+            end
           end
         end
       end
-      
+
       return(servers)
     end
-    
+
     #
     # Parse array names
     #
@@ -452,7 +452,7 @@ module Chimp
       if names.size > 0
         names.each do |array_name|
           all_arrays = ::Ec2ServerArray.find_by(:nickname) { |n| n =~ /^#{array_name}/i }
-          
+
           if all_arrays != nil and all_arrays.first != nil
             all_arrays.first.instances.each do |s|
               array_servers << s
@@ -460,10 +460,10 @@ module Chimp
           end
         end
       end
-     
+
       return(array_servers)
     end
-    
+
     #
     # ServerTemplate auto-detection
     #
@@ -471,21 +471,21 @@ module Chimp
     #
     def detect_server_template(template, script, servers, array_names_to_detect)
       st = nil
-      
+
       #
       # If we have a script name but no template, check
       # each server for the script until we locate it.
       #
       if script and template == nil
         Log.debug "getting template URI..."
-        
+
         if not servers.empty?
           for i in (0..servers.size - 1)
-          
-            template = servers[i]['server_template_href'] if not servers[i].empty?  
+
+            template = servers[i]['server_template_href'] if not servers[i].empty?
             break if template
           end
-        
+
         elsif not array_names_to_detect.empty?
           array_names_to_detect.each do |array_name|
             a = Ec2ServerArray.find_by(:nickname) { |n| n =~ /^#{array_name}/i }.first
@@ -494,41 +494,41 @@ module Chimp
             break if template
           end
         end
-        
+
         raise "Unable to locate ServerTemplate!" unless template
         Log.debug "Template: #{template}"
       end
-      
+
       #
       # Now look up the ServerTemplate via the RightScale API
       #
       if template
-        Log.debug "Looking up template..." 
-        
+        Log.debug "Looking up template..."
+
         if template =~ /^http/
           st = ::ServerTemplate.find(template)
         else
           st = ::ServerTemplate.find_by_nickname(template).first
         end
-        
+
         if st == nil
           raise "No matching ServerTemplate found!"
         else
-          Log.debug "ServerTemplate: \"#{st['nickname']}\"" 
+          Log.debug "ServerTemplate: \"#{st['nickname']}\""
         end
       end
-      
+
       return(st)
     end
-        
+
     #
     # Look up the RightScript
     #
     # Returns: RestConnection::Executable
     #
     def detect_right_script(st, script)
-      executable = nil 
-      
+      executable = nil
+
       if script == ""
         if not @interactive
           puts "Error: empty --script= option is supported only in interactive mode. Exiting."
@@ -538,16 +538,16 @@ module Chimp
         op_script_names = ['dummy name']      # Placeholder for #0 since we want to offer choices 1..n
         op_script_hrefs = [ 'dummy href' ]
         st.executables.each do |ex|
-            if ex.apply == "operational" 
+            if ex.apply == "operational"
               op_script_names.push( ex.name )
-              op_script_hrefs.push( ex.href )             
+              op_script_hrefs.push( ex.href )
             end
         end
         if op_script_names.length <= 1
           puts "Warning: No operational scripts found on the server(s). "
-          puts "         (Search performed on server template '#{st.nickname}')" 
+          puts "         (Search performed on server template '#{st.nickname}')"
         else
-          puts "List of available operational scripts in the server template: ('#{st.nickname}')" 
+          puts "List of available operational scripts in the server template: ('#{st.nickname}')"
           puts "------------------------------------------------------------"
           for i in 1..op_script_names.length - 1
             puts "  %3d. #{op_script_names[i]}" % i
@@ -567,7 +567,7 @@ module Chimp
           script = op_script_hrefs[ op_script_id ]
         end
       end
-        
+
       if script
         if script =~ /^http/ or script =~ /^\d+$/
           if script =~ /^\d+$/
@@ -575,10 +575,10 @@ module Chimp
             script = url_prefix + "/right_scripts/#{script}"
           end
           script_URI = script
-          Log.debug "Looking for script href \"#{script_URI}\"" 
-          puts 
-          # First look up the script URI in the template. 
-          # It *will* be found if we came here from the 'if script = ""' block 
+          Log.debug "Looking for script href \"#{script_URI}\""
+          puts
+          # First look up the script URI in the template.
+          # It *will* be found if we came here from the 'if script = ""' block
           script = st.executables.detect { |ex| ex.href == script }
           if not script
              script_obj = ::RightScript.find(script_URI)
@@ -586,24 +586,24 @@ module Chimp
              script_data[ 'name' ] = script_obj.params['name']
              script = ::RightScript.new({ :href => script_URI, :right_script => script_data })
           end
-        else  
-          Log.debug "looking for script \"#{script}\"" 
+        else
+          Log.debug "looking for script \"#{script}\""
           script = st.executables.detect { |ex| ex.name =~ /#{script}/ }
         end
-       
+
        if script != nil and script['right_script'] != nil
          puts "RightScript: \"#{script['right_script']['name']}\"" if @interactive
        else
          puts "No matching RightScript found!"
          raise "No matching RightScript found!"
        end
-      
+
        executable = script
       end
-      
+
       return(executable)
     end
-    
+
     #
     # Load up the queue with work
     #
@@ -613,14 +613,14 @@ module Chimp
       counter = 0
       tasks = []
       Log.debug "Loading queue..."
-      
+
       #
       # Configure group
       #
       if not ChimpQueue[@group]
         ChimpQueue.instance.create_group(@group, @group_type, @group_concurrency)
       end
-      
+
       #
       # Process ServerArray selection
       #
@@ -628,12 +628,12 @@ module Chimp
       if not queue_arrays.empty?
         queue_arrays.each do |array|
           instances = filter_out_non_operational_servers(array.instances)
-          
+
           if not instances
             Log.error("no instances in array!")
             break
           end
-          
+
           instances.each do |array_instance|
             #
             # Handle limiting options
@@ -641,31 +641,39 @@ module Chimp
             counter += 1
             next if @limit_start.to_i > 0 and counter < @limit_start.to_i
             break if @limit_end.to_i > 0 and counter > @limit_end.to_i
-            a = ExecArray.new(:array => array, :server => array_instance, :exec => queue_executable, :template => queue_template, :verbose => @@verbose, :quiet => @@quiet)
+            a = ExecArray.new(
+              :array => array,
+              :server => array_instance,
+              :exec => queue_executable,
+              :inputs => @inputs,
+              :template => queue_template,
+              :verbose => @@verbose,
+              :quiet => @@quiet
+            )
             a.dry_run = @dry_run
             ChimpQueue.instance.push(@group, a)
           end
         end
       end
-            
+
       #
       # Process Server selection
       #
       Log.debug("Processing server selection")
-      
+
       queue_servers.sort! { |a,b| a['nickname'] <=> b['nickname'] }
       queue_servers.each do |server|
-        
+
         #
         # Handle limiting options
         #
         counter += 1
         next if @limit_start.to_i > 0 and counter < @limit_start.to_i
         break if @limit_end.to_i > 0 and counter > @limit_end.to_i
-        
+
         #
         # Construct the Server object
-        #        
+        #
         s = ::Server.new
         s.href = server['href']
         s.current_instance_href = server['current_instance_href']
@@ -673,7 +681,7 @@ module Chimp
         s.nickname = s.name
         s.ip_address = server['ip-address'] || server['ip_address']
         e = nil
-        
+
         if queue_executable
           e = ExecRightScript.new(
             :server => s,
@@ -683,7 +691,7 @@ module Chimp
             :verbose => @@verbose,
             :quiet => @@quiet
           )
-        elsif @ssh    
+        elsif @ssh
           e = ExecSSH.new(
             :server => s,
             :ssh_user => @ssh_user,
@@ -708,22 +716,22 @@ module Chimp
           e = ExecSetTags.new(:server => s, :verbose => @@verbose, :quiet => @@quiet)
           e.tags = set_tags
         end
-        
+
         if e != nil
           e.dry_run = @dry_run
           e.quiet   = @@quiet
           tasks.push(e)
         end
-        
+
       end
-      
+
       return(tasks)
     end
-    
+
     def add_to_queue(a)
       a.each { |task| ChimpQueue.instance.push(@group, task) }
     end
-    
+
     #
     # Execute the user's command and provide for retrys etc.
     #
@@ -733,18 +741,18 @@ module Chimp
       queue.delay = delay
       queue.retry_count = retry_count
       total_queue_size = queue.size
-      
+
       puts "Executing..." unless progress or not quiet
       pbar = ProgressBar.new("Executing", 100) if progress
       queue.start
-      
+
       queue.wait_until_done(@group) do
         pbar.set(((total_queue_size.to_f - queue.size.to_f)/total_queue_size.to_f*100).to_i) if progress
       end
-        
+
       pbar.finish if progress
     end
-    
+
     #
     # Set the action
     #
@@ -752,13 +760,13 @@ module Chimp
       raise ArgumentError.new "Cannot reset action" unless @action == :action_none
       @action = a
     end
-    
+
     #
     # Allow user to verify results and retry if necessary
     #
     def verify_results(group = :default)
       failed_workers, results_display = get_results(group)
-    
+
       #
       # If no workers failed, then we're done.
       #
@@ -768,13 +776,13 @@ module Chimp
       # Some workers failed; offer the user a chance to retry them
       #
       verify("The following objects failed:", results_display, false)
-      
+
       while true
         puts "(R)etry failed jobs"
         puts "(A)bort chimp run"
         puts "(I)gnore errors and continue"
         command = gets()
-        
+
         if command =~ /^a/i
           puts "Aborting!"
           exit 1
@@ -784,11 +792,11 @@ module Chimp
         elsif command =~ /^r/i
           puts "Retrying..."
           ChimpQueue.instance.group[group].requeue_failed_jobs!
-          return false    
+          return false
         end
       end
     end
-        
+
     #
     # Get the results from the QueueRunner and format them
     # in a way that's easy to display to the user
@@ -799,7 +807,7 @@ module Chimp
       results = queue.group[@group].results()
       failed_workers = []
       results_display = []
-    
+
       results.each do |result|
         next if result == nil
 
@@ -811,20 +819,20 @@ module Chimp
           results_display << "#{name.ljust(40)} #{message}"
         end
       end
-      
+
       return [failed_workers, results_display]
     end
-    
+
     def print_timings
       ChimpQueue.instance.group[@group].results.each do |task|
         puts "Host: #{task[:host]} Type: #{task[:name]} Time: #{task[:total]} seconds"
       end
     end
-    
+
     def get_failures
       return get_results(@group)
     end
-    
+
     #
     # Filter out non-operational servers
     # Then add operational servers to the list of objects to display
@@ -834,61 +842,61 @@ module Chimp
       servers.reject! { |s| s == nil || s['state'] != "operational" }
       return(servers)
     end
-    
+
     #
     # Do work: either by submitting to chimpd
     # or running it ourselves.
     #
     def do_work
       done = false
-      
+
       while not done
         queue_runner(@concurrency, @delay, @retry_count, @progress)
-        
+
         if @interactive and @verify
-          done = verify_results(@group) 
+          done = verify_results(@group)
         else
           done = true
         end
       end
-      
+
       if not @verify
         failed_workers, results_display = get_results(group)
         exit 1 if failed_workers.size > 0
       end
-      
-      puts "chimp run complete"      
+
+      puts "chimp run complete"
     end
-    
+
     #
     # Completely process a non-interactive chimp object command
     #
     def process
-      get_array_info      
+      get_array_info
       get_server_info
       get_template_info
       get_executable_info
       return generate_jobs(@servers, @arrays, @server_template, @executable)
     end
-    
+
     #
     # Always returns 0. Used for chimpd compatibility.
     #
     def job_id
       return 0
     end
-    
+
     #
     # Connect to chimpd and wait for the work queue to empty, and
     # prompt the user if there are any errors.
     #
     def chimpd_wait_until_done
       local_queue = ChimpQueue.instance
-      
+
       begin
         while true
           local_queue = ChimpQueue.instance
-        
+
           #
           # load up remote chimpd jobs into the local queue
           # this makes all the standard queue control methods available to us
@@ -896,7 +904,7 @@ module Chimp
           retry_count = 1
           while true
             local_queue.reset!
-            
+
             begin
               puts "Waiting for chimpd jobs to complete for group #{@group}..."
               all = ChimpDaemonClient.retrieve_group_info(@chimpd_host, @chimpd_port, @group, :all)
@@ -906,25 +914,25 @@ module Chimp
                 sleep 5
                 retry
               end
-              
-              if @ignore_errors 
+
+              if @ignore_errors
                 exit 0
               else
                 $stderr.puts "ERROR: Group \"#{group}\" not found!"
                 exit 1
               end
             end
-            
+
             ChimpQueue.instance.create_group(@group)
             ChimpQueue[@group].set_jobs(all)
-            
+
             break if ChimpQueue[@group].done?
 
             $stdout.print "."
             $stdout.flush
             sleep 5
           end
-        
+
           #
           # If verify_results returns true, then ask chimpd to requeue all failed jobs.
           #
@@ -946,17 +954,17 @@ module Chimp
       ENV['REST_CONNECTION_LOG'] = "/dev/null"
       ENV['RESTCLIENT_LOG'] = "/dev/null"
     end
-    
+
     #
     # Configure the Log object
     #
     def self.set_verbose(v=true, q=false)
       @@verbose = v
       @@quiet = q
-      
+
       STDOUT.sync = true
       STDERR.sync = true
-      
+
       if @@verbose == true
         Log.threshold = Logger::DEBUG
       elsif @@quiet == true
@@ -965,22 +973,22 @@ module Chimp
         Log.threshold = Logger::INFO
       end
     end
-    
+
     def self.verbose?
       return @@verbose
     end
-    
+
     #
     # Always returns 0. Used for chimpd compatibility.
     #
     def job_id
       return 0
     end
-    
+
     ####################################################
     private
     ####################################################
-    
+
     #
     # Allow the user to verify the list of servers that an
     # operation will be run against.
@@ -988,22 +996,22 @@ module Chimp
     def verify(message, items, confirm=true)
       puts message
       puts "=================================================="
-    
+
       i = 0
       items.sort.each do |item|
         i += 1
         puts "  %03d. #{item}" % i
       end
-    
+
       puts "=================================================="
-      
+
       if confirm
         puts "Press enter to confirm or ^C to exit"
         gets
-      end 
+      end
     end
 
-    # 
+    #
     # Verify that the given rightscript_executable (the object corresponding to the script)
     # that is associated with the server_template exists in all servers
     # (No need to check server arrays, they must all have the same template.)
@@ -1017,7 +1025,7 @@ module Chimp
       main_server_template      = server_template
       main_server_template_name = main_server_template.params['nickname']
       main_server_template_href = main_server_template.params['href']
-      
+
       # Find which server has the specified template (the "main" template)
       server_that_has_main_template = nil
       for i in (0..servers.length - 1)
@@ -1030,18 +1038,18 @@ module Chimp
         puts "internal error validating rightscript presence in all servers"
         return
       end
-      
+
       some_servers_have_different_template = false
       num_servers_missing_rightscript      = 0
-        
+
       for i in (0..servers.length - 1)
         next if servers[i].empty?
-        
+
         this_server_template_href = servers[i]['server_template_href']
-        
+
         # If the server's template has the same href, this server is good
         next if this_server_template_href == main_server_template_href
-        
+
         if not some_servers_have_different_template
           some_servers_have_different_template = true
           if not @@quiet
@@ -1053,7 +1061,7 @@ module Chimp
             end
           end
         end
-        
+
         this_server_template = ::ServerTemplate.find(this_server_template_href)
         next if this_server_template == nil
         if not @@quiet
@@ -1063,7 +1071,7 @@ module Chimp
             puts "                         href: '#{this_server_template.params['href']}'"
           end
         end
-        
+
         # Now check if the offending template has the rightscript in question
         has_script = false
         this_server_template.executables.each do |cur_script|
@@ -1084,7 +1092,7 @@ module Chimp
           end
         end
       end
-      if some_servers_have_different_template 
+      if some_servers_have_different_template
         if num_servers_missing_rightscript == 0
           puts "Script OK. The servers have different templates, but they all contain the script, \'#{rightscript_executable['right_script']['name']}\'"
         else
@@ -1097,17 +1105,17 @@ module Chimp
       end
       puts
     end
-    
+
     #
     # Generate a human readable list of objects
     #
     def make_human_readable_list_of_objects
       list_of_objects = []
-      
+
       if @servers
         list_of_objects += @servers.map { |s| s['nickname'] }
       end
-      
+
       if @arrays
         @arrays.each do |a|
           i = filter_out_non_operational_servers(a.instances)
@@ -1116,7 +1124,7 @@ module Chimp
       end
       return(list_of_objects)
     end
-                
+
     #
     # Print out help information
     #
@@ -1127,7 +1135,7 @@ module Chimp
       puts "To select servers using tags:"
       puts "  --tag=<tag>                       example: --tag=service:dataservice=true"
       puts "  --tag-use-and                     'and' all tags when selecting servers (default)"
-      puts "  --tag-use-or                      'or' all tags when selecting servers" 
+      puts "  --tag-use-or                      'or' all tags when selecting servers"
       puts
       puts "To select arrays or deployments:"
       puts "  --array=<name>                    array to execute upon"
@@ -1146,7 +1154,7 @@ module Chimp
       puts "  --group=<name>                    specify an execution group"
       puts "  --group-type=<serial|parallel>    specify group execution type"
       puts "  --group-concurrency=<n>           specify group concurrency, e.g. for parallel groups"
-      puts 
+      puts
       puts "  --concurrency=<n>                 number of concurrent actions to perform. Default: 1"
       puts "  --delay=<seconds>                 delay a number of seconds between operations"
       puts
@@ -1175,7 +1183,7 @@ module Chimp
       puts "    server_template_href, deployment_href, created_at, updated_at"
       puts
     end
-    
+
   end
 end
 

data/lib/right_chimp/exec/ExecArray.rb

@@ -6,17 +6,10 @@ module Chimp
     def run
       run_with_retry do
         audit_entry = []
-        
-        #
-        # If we have API 0.1 access, then use the 0.1 version of this call.
-        # Otherwise use the 1.0 version.
-        #
-        if @array.internal
-          audit_entry = @array.internal.run_script_on_instances(@exec, @server['href'], {})
-        else
-          audit_entry = @array.run_script_on_instances(@exec, @server['href'], {})
-        end
-        
+        options = @inputs
+
+        audit_entry = @array.run_script_on_instances(@exec, @server['href'], options)
+
         if audit_entry
           audit_entry.each do |a|
             a.wait_for_completed
@@ -26,18 +19,18 @@ module Chimp
         end
       end
     end
-    
+
     def describe_work
       return "ExecArray job_id=#{@job_id} script=\"#{@exec['right_script']['name']}\" server=\"#{@server['nickname']}\""
     end
-    
+
     def info
       return @exec['right_script']['name']
     end
-    
+
     def target
       return @server['nickname']
     end
-    
+
   end
 end

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Christopher Deutsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar