batch_manager 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2M2ODYwMWZjOWY0NjQyZTZiN2ExYjk2MTAyYzk3MzVkZTc4Mzk0Mw==
+    Mjc1M2YyMmMxMDA0MjlmN2I5NDZhNzJlNGUyMWVkZGRjZmZiMTljNA==
   data.tar.gz: !binary |-
-    MjliZTg3YzE4Mzk5ZjZkZjgxY2U3MmE4MDBkNzhiYmM1Y2QzYmI5Ng==
+    YzZhNmQ5MDNhZjFmNTA4NDQ0Mjg2YzJjMmI2OTI2NzUzMDhjM2NlYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODZkMzU2MDQ1NWM0NWZjZTljOGRiM2M0NWVlMDc1ZWNhMDQzNDViZWM5NWJl
-    ZjE3YzkxMzE5ZDE2NjYxZWQxNWI4MWE3NGZkMDNjNGI4NDg0MjhhZTJiMzIw
-    YjE2YWRkMGYwNzIxMTFiNjlkNDc4NTBlZWM4ZGM3OTlmMjQ5N2Y=
+    OGE1MzRlMjFiNDY0YWFjMzEyNTcyYWNlNzc4YTgzYmViNmVhOWEyMjg3MDVj
+    NDFjM2QwYTY5YzFkMzE1YTFmODY5MzZkNGE4Y2U3MTdmZjkyMTdjMDAxYWY4
+    MmM1MDQ3ZDUxZDQ2OWI3YzE3Y2VkODBkZWU2N2Q0YjJhYmZiY2Y=
   data.tar.gz: !binary |-
-    YzI1YWYwMWFmZjEwOThkNDFjODYxOTIwMGMwN2Q2NzMxM2MyN2I5YmExYzZl
-    OGFlYjc4NTg4NDY5NDE0OTk5ZjdjNTJkZWFmZWMwNjg2MDg0NWQ1OTZlMjhi
-    NjJlOTgyMjk0YTM4NmFhMmUzZmQ5NjllMTcxYjUyMmY5NGUyZTc=
+    MzY3YzVmNzVhMGFkMjcxYWI5NmQ3YjYzZjg0MTEyMWVmZGQ0YTNkMmZjNDA3
+    OTAzNjQyZGIyMjQ3ZjFkN2RmODkwNjJkNDQ1ZjEzYjg2OTIzMGQzNDZlYjUw
+    YjgxYzEzMWQzMWMyZTg4OTM5NGQ5NWQzYzJiYjc2NGZiMTlmMGQ=

data/README.md

@@ -82,6 +82,8 @@ You can also use web interface to execute batches.
 
 If [resque](https://github.com/resque/resque) installed in you application, the batch script can be executed asynchronous. And the log can be checked on real time in the brower.
 
+The QUEUE's name will be **"batch_manager".**
+
 ## Rake Tasks
 
 show all batches

data/app/assets/stylesheets/batch_manager/batches.css

@@ -56,3 +56,15 @@ tr.odd.disable {
   width: 100%;
   height:500px;
 }
+
+.resque_label {
+  text-align: right;
+}
+
+.resque_label.support {
+  color: green;
+}
+
+.resque_label.not_support {
+  color: red;
+}

data/app/controllers/batch_manager/application_controller.rb

@@ -1,4 +1,19 @@
 module BatchManager
   class ApplicationController < ActionController::Base
+    def resque_supported?
+      begin
+        require 'resque'
+        if defined?(Resque)
+          queue_names = []
+          Resque.workers.map do |worker|
+            queue_names += worker.id.split(':')[-1].split(',')
+          end
+          return true if queue_names.include?(BatchManager::ExecBatchWorker.queue_name) || queue_names.include?("*")
+        end
+        false
+      rescue
+        false
+      end
+    end
   end
 end

data/app/controllers/batch_manager/batches_controller.rb

@@ -3,13 +3,14 @@ module BatchManager
     before_filter :retain_batch_params, :except => [:index]
 
     def index
+      @resque_supported = resque_supported?
       @details = BatchManager::Monitor.details
     end
 
     def exec
       if resque_supported?
         Resque.enqueue(BatchManager::ExecBatchWorker, @batch_name, :wet => @wet)
-        redirect_to(log_batches_url(:batch_name => @batch_name, :wet => @wet))
+        redirect_to(log_batches_url(:batch_name => @batch_name, :wet => @wet, :refresh => true))
       else
         BatchManager::Executor.exec(@batch_name, :wet => @wet)
         redirect_to(batches_url)
@@ -33,15 +34,6 @@ module BatchManager
       @wet = params[:wet]
     end
 
-    def resque_supported?
-      begin
-        require 'resque'
-        defined?(Resque)
-      rescue
-        false
-      end
-    end
-
     def log_file
       20.times do
         begin

data/app/views/batch_manager/batches/index.html.erb

@@ -1,4 +1,9 @@
 <h2>Batches</h2>
+<% if @resque_supported %>
+  <div class="resque_label support">Resque worker found</div>
+<% else %>
+  <div class="resque_label not_support">Resque or Resque worker not found</div>
+<% end %>
 <table>
   <tr>
     <th>Managed?</th>

data/app/views/batch_manager/batches/log.html.erb

@@ -1,3 +1,4 @@
+<% if params[:refresh] %>
 <script>
   function read_log() {
     offset = $("#offset").val();
@@ -15,6 +16,7 @@
     setInterval(read_log, 1000);
   });
 </script>
+<% end %>
 
 <h2><%= @batch_name %><h2>
 

data/app/workers/batch_manager/exec_batch_worker.rb

@@ -6,5 +6,8 @@ module BatchManager
       BatchManager::Executor.exec(batch_name, :wet => options[:wet])
     end
 
+    def self.queue_name
+      @queue
+    end
   end
 end

data/lib/batch_manager/version.rb

@@ -1,3 +1,3 @@
 module BatchManager
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails