right_chimp 1.0.9 → 1.1.0

data/CHANGES

@@ -117,3 +117,7 @@ Version 1.0.9
 -------------
 * Feature: Improved support for running chimp commands on any chimp daemon port
 * Feature: Added inverted hot dog stand theme
+
+Version 1.1.0
+-------------
+* Feature: Add a job state called 'holding' where jobs can be held until the user queues them

data/lib/right_chimp/Chimp.rb

@@ -4,7 +4,7 @@
 
 module Chimp
   class Chimp
-    attr_accessor :concurrency, :delay, :retry_count, :progress, :prompt,
+    attr_accessor :concurrency, :delay, :retry_count, :hold, :progress, :prompt,
                   :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
@@ -34,6 +34,7 @@ module Chimp
       @concurrency  = 1
       @delay        = 0
       @retry_count  = 0
+      @hold         = false
       @timeout      = 900
 
       @limit_start  = 0
@@ -205,6 +206,7 @@ module Chimp
           [ '--concurrency', '-c', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--delay', '-d', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--retry', '-y', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--hold', '-7', GetoptLong::NO_ARGUMENT ],
           [ '--dry-run', '-n', GetoptLong::NO_ARGUMENT ],
           [ '--limit', '-l', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--version', '-1', GetoptLong::NO_ARGUMENT ],
@@ -282,6 +284,8 @@ module Chimp
               @concurrency = arg.to_i
             when '--delay', '-d'
               @delay = arg.to_i
+            when '--hold', '-7'
+              @hold = true
             when '--retry', '-y'
               @retry_count = arg.to_i
             when '--limit', '-l'
@@ -478,7 +482,7 @@ module Chimp
       # each server for the script until we locate it.
       #
       if script and template == nil
-        Log.debug "getting template URI..."
+        Log.debug "Getting template URI..."
 
         if not servers.empty?
           for i in (0..servers.size - 1)
@@ -588,7 +592,7 @@ module Chimp
              script = ::RightScript.new({ :href => script_URI, :right_script => script_data })
           end
         else
-          Log.debug "looking for script \"#{script}\""
+          Log.debug "Looking for script \"#{script}\""
           script = st.executables.detect { |ex| ex.name =~ /#{script}/ }
         end
 
@@ -721,6 +725,8 @@ module Chimp
         if e != nil
           e.dry_run = @dry_run
           e.quiet   = @@quiet
+          e.status  = Executor::STATUS_HOLDING if @hold
+
           tasks.push(e)
         end
 
@@ -1164,6 +1170,7 @@ module Chimp
       puts "chimpd options:"
       puts "  --chimpd=<port>                   send jobs to chimpd listening on <port> on localhost"
       puts "  --chimpd-wait-until-done          wait until all chimpd jobs are done"
+      puts "  --hold                            create a job in chimpd without executing until requested"
       puts
       puts "Misc Notes:"
       puts "  * If you leave the name of a --script or --ssh command blank, chimp will prompt you"

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -473,6 +473,7 @@ module Chimp
 
           count_jobs_running = queue.get_jobs_by_status(:running).size
           count_jobs_queued  = queue.get_jobs_by_status(:none).size
+          count_jobs_holding  = queue.get_jobs_by_status(:holding).size
           count_jobs_failed  = queue.get_jobs_by_status(:error).size
           count_jobs_done    = queue.get_jobs_by_status(:done).size
 

data/lib/right_chimp/exec/Executor.rb

@@ -11,6 +11,7 @@ module Chimp
     attr_reader   :error, :results
     
     STATUS_NONE =     :none
+    STATUS_HOLDING =  :holding
     STATUS_RUNNING =  :running
     STATUS_RETRYING = :retrying
     STATUS_ERROR =    :error
@@ -93,6 +94,8 @@ module Chimp
     # This is called from the subclass with a code block to yield to
     #
     def run_with_retry(&block)
+      Log.debug "Running job '#{@job_id}' with status '#{@status}'"
+
       @status = STATUS_RUNNING
       @time_start = Time.now
       Log.info self.describe_work_start unless @quiet

data/lib/right_chimp/queue/ChimpQueue.rb

@@ -48,6 +48,13 @@ module Chimp
     # Push a task into the queue
     #
     def push(g, w)
+      if w.exec.right_script && w.exec.right_script.kind_of?(Hash)
+        Log.debug "Pushing job '#{w.exec.right_script['name']}' into group '#{g}'"
+        if w.status == Executor::STATUS_HOLDING
+          Log.info "Holding job '#{w.exec.right_script['name']}'"
+        end
+      end
+
       raise "no group specified" unless g
       create_group(g) if not ChimpQueue[g]
       ChimpQueue[g].push(w)
@@ -70,6 +77,7 @@ module Chimp
         @group.values.each do |group|
           if group.ready?
             r = group.shift
+            Log.debug "Shifting job '#{r.job_id}' from group '#{group.group_id}'"
             break
           end
         end      

data/lib/right_chimp/queue/ExecutionGroup.rb

@@ -50,9 +50,18 @@ module Chimp
     # Take something from the queue
     #
     def shift
-      x = @queue.shift
+      updated_queue = []
+      found_job = nil
+      @queue.each do |job|
+        if found_job || job.status == Executor::STATUS_HOLDING
+          updated_queue.push(job)
+        else
+          found_job = job
+        end
+      end
+      @queue = updated_queue
       @time_start = Time.now if @time_start == nil
-      return x
+      return found_job
     end
 
     #
@@ -191,6 +200,7 @@ module Chimp
     # Requeue a job by id
     #
     def requeue(id)
+      Log.debug "Requeuing job id #{id}"
       job = @jobs_by_id[id]
       job.status = Executor::STATUS_NONE
       job.owner = nil

data/lib/right_chimp/templates/all_jobs.erb

@@ -35,6 +35,9 @@ SINCE 2012</p>
 <tr>
   <td>Jobs running:</td>
   <td><%= count_jobs_running %>
+</tr><tr>
+  <td>Jobs holding:</td>
+  <td><%= count_jobs_holding %>
 </tr><tr>
   <td>Jobs waiting:</td>
   <td><%= count_jobs_queued %>
@@ -60,14 +63,16 @@ SINCE 2012</p>
 </div>
 
 
-<h3>Filter Results</h3>
+<h3>Filter Results By Job Status</h3>
 
 <p>[
-<% if job_filter == 'running' or job_filter == nil %>running jobs <% else %><a href="/display/running">running jobs</a><% end %> |
-<% if job_filter == 'all' %>all jobs <% else %><a href="/display/all">all jobs</a> <% end %> |
-<% if job_filter == 'done' %>complete jobs <% else %><a href="/display/done">complete jobs</a><% end %> |
-<% if job_filter == 'error' %>failed jobs <% else %><a href="/display/error">failed jobs</a><% end %>
- ]
+<% if job_filter == 'running' or job_filter == nil %>running<% else %><a href="/display/running">running</a><% end %> |
+<% if job_filter == 'none' %>waiting<% else %><a href="/display/none">waiting</a> <% end %> |
+<% if job_filter == 'holding' %>holding<% else %><a href="/display/holding">holding</a> <% end %> |
+<% if job_filter == 'done' %>completed<% else %><a href="/display/done">completed</a><% end %> |
+<% if job_filter == 'error' %>failed<% else %><a href="/display/error">failed</a><% end %>
+ |
+<% if job_filter == 'all' %>all<% else %><a href="/display/all">all</a> <% end %> ]
 </p>
 
 <h3>Commands</h3>
@@ -147,12 +152,16 @@ jobs.each do |j|
     <% end %>
 
     <li> <span class="action">
-    <% if status == Executor::STATUS_ERROR %>
+    <% case status
+        when Executor::STATUS_ERROR %>
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/ack')">ack</a> |
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">retry</a>
-    <% elsif status == Executor::STATUS_RUNNING %>
+    <%  when Executor::STATUS_RUNNING, Executor::STATUS_RETRYING, Executor::STATUS_NONE  %>
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/cancel')">cancel</a>
+    <%  when Executor::STATUS_HOLDING %>
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">queue</a>
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/cancel')">cancel</a>
-    <% else %>
+    <%  when Executor::STATUS_DONE %>
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">requeue</a>
     <% end %>
     </li>

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_connection