batch_manager 0.2.8 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc1M2YyMmMxMDA0MjlmN2I5NDZhNzJlNGUyMWVkZGRjZmZiMTljNA==
+    NmYzM2MwZmQyZWY1NjE3YWNjY2U0N2NlYjkwYjNlNjRjZjgwNzMyZQ==
   data.tar.gz: !binary |-
-    YzZhNmQ5MDNhZjFmNTA4NDQ0Mjg2YzJjMmI2OTI2NzUzMDhjM2NlYQ==
+    MTM2Zjk1NzA5YzQwZGRmMTJlZTkwMGRjNmYyZThmMTY1ZTQ2Yzc1Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGE1MzRlMjFiNDY0YWFjMzEyNTcyYWNlNzc4YTgzYmViNmVhOWEyMjg3MDVj
-    NDFjM2QwYTY5YzFkMzE1YTFmODY5MzZkNGE4Y2U3MTdmZjkyMTdjMDAxYWY4
-    MmM1MDQ3ZDUxZDQ2OWI3YzE3Y2VkODBkZWU2N2Q0YjJhYmZiY2Y=
+    NTM3OThhMTA0OTM3YWYyY2E4NDdmOGVjZTk5ZDIyYzdiODcxYmM1YWZiMjlj
+    OTFlZjFkY2JmYTJmNTNiYWYyNGRlMjJjNWVlOTc1NmI3YjdmZTM4MjAwN2Q0
+    N2QwYzI0MDRiZmQyYTAxNzI5OWYzZDMyN2QyMmZlNTEzMmQ5MTk=
   data.tar.gz: !binary |-
-    MzY3YzVmNzVhMGFkMjcxYWI5NmQ3YjYzZjg0MTEyMWVmZGQ0YTNkMmZjNDA3
-    OTAzNjQyZGIyMjQ3ZjFkN2RmODkwNjJkNDQ1ZjEzYjg2OTIzMGQzNDZlYjUw
-    YjgxYzEzMWQzMWMyZTg4OTM5NGQ5NWQzYzJiYjc2NGZiMTlmMGQ=
+    MjdlZWI0NDJlZjY2Y2U5Zjc3YTlmMDdkYmZmYjI5NmVmOTYyYmQ3ODQwYzUy
+    ZGQwZTQzZTExY2JlZmRhMmYzN2IwMTJiMGE3NzYzOWY5Zjc5Y2UzYjNjZTE0
+    YjA0ZGZmMTgwMWNlM2JkYzc3NjI3YzQ5NTkwNDUyMDg3OGM1YTA=

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

@@ -2,3 +2,102 @@
  *= require_self
  *= require_tree .
  */
+
+body {
+  margin: 0;
+  padding: 0;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333;
+  background: #fff;
+}
+
+#wrapper {
+  width: 1200px;
+  margin: 0 auto;
+  min-height: 600px;
+}
+
+header {
+  height: 36px;
+  padding: 5px;
+  background: #F1F1F1;
+  -webkit-box-shadow: 0 1px 10px rgba(0,0,0,0.1);
+  -moz-box-shadow: 0 1px 10px rgba(0,0,0,0.1);
+  box-shadow: 0 1px 10px rgba(0,0,0,0.1);
+  border-bottom: 1px solid #d4d4d4;
+  margin-bottom: 20px;
+}
+
+header .inner {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+header h1 {
+  float: left;
+  margin: 0;
+  padding: 0;
+  font-family: "Yanone",sans-serif;
+  font-size: 18px;
+  line-height: 36px;
+  font-weight: normal;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.title {
+  padding-bottom: 20px;
+  margin-bottom: 25px;
+  border-bottom: 1px solid #e2e2e2;
+}
+
+h2 {
+  color: #777;
+  font-size: 18px;
+  line-height: 18px;
+  margin: 0;
+  padding: 0;
+}
+
+textarea {
+  border: 1px solid #ccc;
+  color: #333;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+footer {
+  text-align: center;
+  padding: 30px 0;
+  margin-top: 70px;
+  border-top: 1px solid #e5e5e5;
+  background-color: #f5f5f5;
+}
+
+footer p {
+  padding: 0;
+  margin: 0;
+  color: #999;
+  text-shadow: 0 1px 1px #ffffff;
+}
+
+footer a {
+  color: #999;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+footer a:hover {
+  color: #777;
+  text-decoration: underline;
+}
+
+.group:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}

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

@@ -0,0 +1,57 @@
+.btn {
+  display: inline-block;
+  padding: 2px 8px;
+  margin-bottom: 0;
+  font-size: 12px;
+  line-height: 12px;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  text-decoration: none;
+  border: 1px solid #bbb;
+  border-color: #BBB;
+  text-shadow: 0 1px 1px #fff;
+}
+
+.btn.large {
+  padding: 4px 12px;
+  font-size: 14px;
+  line-height: 14px;
+}
+
+.btn.info {
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), to(#e1e1e1));
+  background-image: -webkit-linear-gradient(#f1f1f1, #e1e1e1);
+  background-image: -moz-linear-gradient(#f1f1f1, #e1e1e1);
+  background-repeat: repeat-x;
+  color: #777;
+}
+
+.btn.info:hover {
+  background: #f1f1f1;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fAfAfA), to(#f1f1f1));
+  background-image: -webkit-linear-gradient(#fAfAfA, #f1f1f1);
+  background-image: -moz-linear-gradient(#fAfAfA, #f1f1f1);
+  color: #333;
+}
+
+.btn.danger {
+  background-color: #da4f49;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  color: #fff;
+  text-shadow: none;
+}
+
+.btn.danger:hover {
+  background: #EE4E49;
+}
+
+.btn.disabled {
+  color: #999;
+  background: #eee;
+}

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

@@ -0,0 +1,20 @@
+.label {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label.info {
+  background-color: #3a87ad;
+}
+
+.label.warn {
+  background-color: #f89406;
+}

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

@@ -0,0 +1,24 @@
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin: 20px auto;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  width: 600px;
+  text-align: center;
+}
+
+.alert.notice {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert.error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}

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

@@ -0,0 +1,33 @@
+table {
+  width: 100%;
+  color: #555;
+  border-collapse: collapse;
+  border-spacing: 0;
+  background-color: #ffffff;
+  background: #F9F9F9;
+  margin-bottom: 25px;
+  border: 1px solid #ccc;
+  -webkit-box-shadow: 0 0 0 3px #f1f1f1;
+  -moz-box-shadow: 0 0 0 3px #f1f1f1;
+  box-shadow: 0 0 0 3px #f1f1f1;
+}
+
+td, th {
+  border: 1px solid #ccc;
+  line-height: 13px;
+}
+
+th {
+  color: #666;
+  text-align:center;
+  padding: 10px;
+  background-color: #eee;
+  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
+  background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
+  text-shadow: 0 1px 1px #fff;
+}
+
+td {
+  padding: 10px;
+  color: #777;
+}

data/app/controllers/batch_manager/batches_controller.rb

@@ -1,12 +1,23 @@
 module BatchManager
   class BatchesController < ApplicationController
+    include BatchManager::Utils
     before_filter :retain_batch_params, :except => [:index]
+    helper_method :escape_batch_name
 
     def index
       @resque_supported = resque_supported?
       @details = BatchManager::Monitor.details
     end
 
+    def edit
+      @content = File.read(batch_full_path(@batch_name))
+    end
+
+    def update
+      File.open(batch_full_path(@batch_name), "w") { |f| f << params[:content] }
+      redirect_to(batches_url, :notice => "#{@batch_name} updated.")
+    end
+
     def exec
       if resque_supported?
         Resque.enqueue(BatchManager::ExecBatchWorker, @batch_name, :wet => @wet)
@@ -17,20 +28,33 @@ module BatchManager
       end
     end
 
+    def log
+      @offset = log_file.size
+      @content = log_file.read
+    end
+
     def async_read_log
       log_file.seek(params[:offset].to_i) if params[:offset].present?
       render :json => {:content => log_file.read, :offset => log_file.size}
     end
 
-    def log
-      @offset = log_file.size
-      @content = log_file.read
+    def remove_log
+      FileUtils.rm(BatchManager::Logger.log_file_path(@batch_name, @wet))
+      redirect_to(batches_url, :notice => "Log removed.")
+    end
+
+    def escape_batch_name(name)
+      name.gsub("/", "|")
+    end
+
+    def unescape_batch_name(name)
+      name.gsub("|", "/")
     end
 
     private
 
     def retain_batch_params
-      @batch_name = params[:batch_name]
+      @batch_name = unescape_batch_name(params[:id])
       @wet = params[:wet]
     end
 
@@ -40,7 +64,7 @@ module BatchManager
           @log_file ||= File.open(BatchManager::Logger.log_file_path(@batch_name, @wet), 'r')
           return @log_file
         rescue
-          sleep 3
+          sleep 2
           retry
         end
       end

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

@@ -0,0 +1,10 @@
+<div class="group title">
+  <h2 style="float:left;">Edit Batch</h2>
+  <div class="label" style="float:left;margin-left:25px;"><%= @batch_name %></div>
+</div>
+<%= form_tag batch_url(escape_batch_name(@batch_name)), :method => :put do %>
+  <%= text_area_tag :content, @content, style: "width:100%;height:500px;" %>
+  <div style="margin-top:15px;">
+    <%= submit_tag "Save", :class => "btn info large" %>
+  </div>
+<% end %>

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

@@ -1,9 +1,21 @@
-<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 %>
+<div class="group title">
+  <h2 style="float:left;">Batches</h2>
+  <div style="float:right;text-align:right;">
+    <% if @resque_supported %>
+      <div class="label info">Resque worker found</div>
+    <% else %>
+      <div class="label warn">Resque or Resque worker not found</div>
+    <% end %>
+  </div>
+</div>
+<div class="group">
+  <% if flash[:notice] %>
+    <div class="alert notice"><%= flash[:notice] %></div>
+  <% end %>
+  <% if flash[:error] %>
+    <div class="alert error"><%= flash[:error] %></div>
+  <% end %>
+</div>
 <table>
   <tr>
     <th>Managed?</th>
@@ -28,18 +40,26 @@
       <td style="text-align:center;"><%= status.created_at.strftime('%Y-%m-%d %H:%M:%S') if status.created_at %></td>
       <td style="text-align:center;">
         <% if File.exist?(BatchManager::Logger.log_file_path(status.name)) %>
-          <%= link_to "dry", log_batches_url(:batch_name => status.name) %>
+          <%= link_to "DRY", log_batch_url(escape_batch_name(status.name)), :class => "btn info" %>
+          <%= link_to "X", remove_log_batch_url(escape_batch_name(status.name)), :class => "btn danger", :onclick => "return confirm('Are you sure?')" %>
         <% end %>
         <% if File.exist?(BatchManager::Logger.log_file_path(status.name, true)) %>
-          <%= link_to "wet", log_batches_url(:batch_name => status.name, :wet => true) %>
+          <%= link_to "WET", log_batch_url(escape_batch_name(status.name), :wet => true), :class => "btn info" %>
+          <%= link_to "X", remove_log_batch_url(escape_batch_name(status.name), :wet => true), :class => "btn danger", :onclick => "return confirm('Are you sure?')" %>
         <% end %>
       </td>
       <td style="text-align:center;">
+        <%= link_to "EDIT", edit_batch_url(escape_batch_name(status.name)), :class => "btn info" %>
         <% if status.managed? %>
-          <%= link_to "dry run", exec_batches_url(:batch_name => status.name) %>
+          <%= link_to "DRY RUN", exec_batch_url(escape_batch_name(status.name)), :class => "btn info" %>
           <% if status.can_run? %>
-            <%= link_to "wet run", exec_batches_url(:batch_name => status.name, :wet => true), :class => "danger", :onclick => "return confirm('Are you sure?')" %>
+            <%= link_to "WET RUN", exec_batch_url(escape_batch_name(status.name), :wet => true), :class => "btn danger", :onclick => "return confirm('Are you sure?')" %>
+          <% else %>
+            <%= link_to "WET RUN", "#", :class => "btn disabled", :onclick => "return false" %>
           <% end %>
+        <% else %>
+          <%= link_to "DRY RUN", "#", :class => "btn disabled", :onclick => "return false" %>
+          <%= link_to "WET RUN", "#", :class => "btn disabled", :onclick => "return false" %>
         <% end %>
       </td>
     </tr>

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

@@ -2,7 +2,7 @@
 <script>
   function read_log() {
     offset = $("#offset").val();
-    $.get('<%= async_read_log_batches_url(:batch_name => @batch_name, :wet => @wet) %>' + '&offset=' + offset, function(data) {
+    $.get('<%= async_read_log_batch_url(escape_batch_name(@batch_name), :wet => @wet) %>' + '&offset=' + offset, function(data) {
       $("#log_box").val($("#log_box").val() + data.content);
       $("#offset").val(data.offset);
       scrollLogBoxDown();
@@ -13,12 +13,18 @@
     logBox.scrollTop(logBox[0].scrollHeight - logBox.height());
   }
   $(function() {
-    setInterval(read_log, 1000);
+    setInterval(read_log, 2000);
   });
 </script>
 <% end %>
 
-<h2><%= @batch_name %><h2>
+<div class="group title">
+  <h2><%= @batch_name %></h2>
+</div>
 
-<%= text_area_tag :log, @content, :id => "log_box" %>
+<%= text_area_tag :log, @content, :id => "log_box", style: "width:100%;height:500px;" %>
 <%= hidden_field_tag :offset, @offset, :id => :offset %>
+
+<div style="margin-top:15px;">
+  <%= link_to "Back to list", batches_url, :class => "btn info large" %>
+</div>

data/app/views/layouts/batch_manager/application.html.erb

@@ -8,7 +8,19 @@
 </head>
 <body>
 
-<%= yield %>
+  <header>
+    <div class="inner">
+      <h1>BatchManager</h1>
+    </div>
+  </header>
+
+  <div id="wrapper">
+    <%= yield %>
+  </div>
+
+  <footer>
+    <p><a href="https://github.com/cctiger36/batch_manager">BatchManager</a> VERSION <%= BatchManager::VERSION %></p>
+  </footer>
 
 </body>
 </html>

data/config/routes.rb

@@ -3,10 +3,11 @@ BatchManager::Engine.routes.draw do
   root :to => "batches#index"
 
   resources :batches do
-    collection do
+    member do
       get :exec
       get :log
       get :async_read_log
+      get :remove_log
     end
   end
 

data/lib/batch_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,9 +119,13 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/batch_manager/application.js
 - app/assets/stylesheets/batch_manager/application.css
-- app/assets/stylesheets/batch_manager/batches.css
+- app/assets/stylesheets/batch_manager/button.css
+- app/assets/stylesheets/batch_manager/label.css
+- app/assets/stylesheets/batch_manager/notice.css
+- app/assets/stylesheets/batch_manager/table.css
 - app/controllers/batch_manager/application_controller.rb
 - app/controllers/batch_manager/batches_controller.rb
+- app/views/batch_manager/batches/edit.html.erb
 - app/views/batch_manager/batches/index.html.erb
 - app/views/batch_manager/batches/log.html.erb
 - app/views/layouts/batch_manager/application.html.erb

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

@@ -1,70 +0,0 @@
-body {
-  width: 1200px;
-  margin: 0 auto;
-}
-
-table {
-  width: 100%;
-  border-collapse:collapse;
-  border-spacing:0;
-  background-color:#ffffff;
-  empty-cells:show;
-}
-
-td, th {
-  border:1px solid #663300;
-}
-
-th {
-  color:#FFF;
-  background-color:#996633;
-  background-position:left top;
-  padding:0.1em 0.5em;
-  text-align:center;
-}
-
-th a {
-  color: #FFF;
-  text-decoration: underline;;
-}
-
-td {
-  padding:0.1em 0.5em;
-}
-
-tr.odd {
-  background-color:#ffffcc;
-}
-
-tr.attention {
-  background-color:#ffaaaa;
-}
-
-tr.disable {
-  background-color:#aaaaaa;
-}
-
-tr.even.disable {
-  background-color:#bbbbbb;
-}
-
-tr.odd.disable {
-  background-color:#bbbbaa;
-}
-
-#log_box {
-  width: 100%;
-  height:500px;
-}
-
-.resque_label {
-  text-align: right;
-}
-
-.resque_label.support {
-  color: green;
-}
-
-.resque_label.not_support {
-  color: red;
-}