batch_manager 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODcwYWZkOTU1ZGMwZGZjNjE4YjAyZGQxNGNlMjA4NDk0YzJmOThjMg==
+    Yzg5MzM1MGQzMTFhNDJlM2YzZDljODRmNjQ0NzQyODJkZDI1YTU4Mg==
   data.tar.gz: !binary |-
-    MGVlYTY5OTc5YWFmODNhNDAxZmU1YTAzZWQ5Y2I0NzkxOGMwMWUzZg==
+    MzViMWU3NTE1OGNjNDU2MzcxMDA0M2U0ZWI1ZmE3ZDY3ZDkzZjcwZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQ5ZTYyM2YzZWMyMGFkMTlhNGM3MTEwZWExZmJiMDQ4NzU2MzIzM2I4ZjVk
-    M2E5YmFmMTljMzUxNjhmZTEzZjYxYmIwN2M5OTdiZGNlMTZiZmJiNTQ1MWM3
-    ZGU5NzYwZWU4Njc2ZWNkODllZTFkNzk1NWRiMWIyZDk2ZTVhODI=
+    NzQ0NDcyOTQyYTNmNmMyZTUyMTc5NjE0YTA0YjQ1ZTg5N2VkMWVjOTYyZjIy
+    NjhhN2U3ODZhMzZlNGQ0MzkwNmUyMjc0NmU1MzhjNjU1YTYwZDRmNWUxODhm
+    ZGFhMmE4NThjMzQxYTdkZjE3MDAwMDQ2NjIxNDc0YjdmOTY1Nzk=
   data.tar.gz: !binary |-
-    NTczYzk1OTJmYjRmMjZlNTE4YjQ5ODIzMjE0NWJmN2M0ZGJlNWY0ZjNlYjky
-    ZGNlNmUwYzhiNzk1YzM5ODEwNmZlNjFjYjk3MjdlM2I4YjgwYjFmMmRhOGM3
-    NzNhYmY2NzQwZGVlMDMyZmIwYTZiNjc4YTNlMjRlZGZjYjU2ZjM=
+    Mjc4ZTVmYTUzMGE3ZDhiMTQ3NDJhMmM1MjExMWRiZjI0ZDc0YmMxMGE3Yjdj
+    ODA4ODRkNGE3YjI4ZmJhYTg5M2EyMWFjNGM4NDk4MzJmMThiY2ZlYTZkMDA5
+    NjlkNjQ1NTQ1OWI0ZGNiYThiM2MyN2U1NTAyZjBlOTIyNzExNWE=

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

@@ -43,16 +43,61 @@ header h1 {
   font-size: 18px;
   line-height: 36px;
   font-weight: normal;
-  color: #777777;
   text-shadow: 0 1px 0 #ffffff;
 }
 
+header h1 a {
+  color: #777777;
+  text-decoration: none;
+}
+
+header .new_link {
+  float: right;
+  font-size: 14px;
+  line-height: 36px;
+  font-weight: bold;
+}
+
+header .new_link a {
+  color: #ccc;
+  text-shadow: 0 1px 1px #ffffff;
+  text-decoration: none;
+}
+
+header .new_link a:hover {
+  color: #aaa;
+  text-decoration: underline;
+}
+
 .title {
   padding-bottom: 20px;
   margin-bottom: 25px;
   border-bottom: 1px solid #e2e2e2;
 }
 
+.title .new_batch {
+  color: #aaa;
+  line-height: 22px;
+}
+
+.title input {
+  margin: 0;
+  margin-top: -2px;
+  padding: 2px 5px;
+  font-size: 14px;
+  line-height: 18px;
+  width: 250px;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  color: #555;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
 h2 {
   color: #777;
   font-size: 18px;
@@ -86,6 +131,11 @@ a.cancel:hover {
   text-decoration: underline;
 }
 
+.divider {
+  padding: 0 5px;
+  color: #aaa;
+}
+
 footer {
   text-align: center;
   padding: 30px 0;

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

@@ -1,24 +1,17 @@
 .alert {
-  padding: 8px 35px 8px 14px;
+  border-bottom: 1px solid #e2e2e2;
   margin: 20px auto;
+  padding-bottom: 20px;
   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;
+  font-weight: bold;
+  font-size: 15px;
 }
 
 .alert.notice {
   color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
 }
 
 .alert.error {
   color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
 }

data/app/controllers/batch_manager/batches_controller.rb

@@ -1,7 +1,9 @@
+require 'generators/batch/batch_generator'
+
 module BatchManager
   class BatchesController < ApplicationController
     include BatchManager::Utils
-    before_filter :retain_batch_params, :except => [:index]
+    before_filter :retain_batch_params, :except => [:index, :new, :create]
     helper_method :escape_batch_name
 
     def index
@@ -9,6 +11,24 @@ module BatchManager
       @details = BatchManager::Monitor.details
     end
 
+    def new
+      template = File.read(File.join(Rails::Generators::BatchGenerator.source_root, "batch.rb"))
+      @content = ERB.new(template).result(binding)
+    end
+
+    def create
+      batch_name = params[:batch_name]
+      if batch_name.blank?
+        flash[:error] = "Please input the batch name."
+        redirect_to(new_batch_url) and return 
+      end
+      file_path = File.join(BatchManager.batch_dir, batch_name)
+      file_path << ".rb" unless file_path.end_with?(".rb")
+      FileUtils.mkdir_p(File.dirname(file_path)) if batch_name.include?("/")
+      File.open(file_path, "w") { |f| f << params[:content] }
+      redirect_to(batches_url, :notice => "#{batch_name} created.")
+    end
+
     def edit
       @content = File.read(batch_full_path(@batch_name))
     end

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

@@ -0,0 +1,8 @@
+<%= hidden_field_tag :content, @content, :id => "content" %>
+<div id="editor"><%= @content %></div>
+<div class="group" style="margin-top:15px;">
+  <div style="float:left;"><%= submit_tag "Save", :class => "btn info large" %></div>
+  <div style="margin-left:15px;float:left;padding-top:6px;">
+    <%= link_to "Cancel", batches_url, :class => "cancel" %>
+  </div>
+</div>

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

@@ -6,12 +6,5 @@
 </div>
 
 <%= form_tag batch_url(escape_batch_name(@batch_name)), :method => :put do %>
-  <%= hidden_field_tag :content, @content, :id => "content" %>
-  <div id="editor"><%= @content %></div>
-  <div class="group" style="margin-top:15px;">
-    <div style="float:left;"><%= submit_tag "Save", :class => "btn info large" %></div>
-    <div style="margin-left:15px;float:left;padding-top:6px;">
-      <%= link_to "Cancel", batches_url, :class => "cancel" %>
-    </div>
-  </div>
+  <%= render "form_content" %>
 <% end %>

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

@@ -8,14 +8,6 @@
     <% 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>
@@ -31,7 +23,7 @@
     <tr>
       <td><%= status.managed?? "Yes" : "" %></td>
       <td><%= status.name %></td>
-      <td style="text-align:right;"><%= schema_batch.try(:ran_times).to_i %>/<%= status.times_limit || 0 %></td>
+      <td style="text-align:right;"><%= schema_batch.try(:ran_times).to_i %><span class="divider">/</span><%= status.times_limit || 0 %></td>
       <td style="text-align:center;">
         <% if last_ran_at = schema_batch.try(:last_ran_at) %>
           <%= last_ran_at.strftime('%Y-%m-%d %H:%M:%S') %>

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

@@ -0,0 +1,9 @@
+<%= javascript_include_tag "batch_manager/editor" %>
+
+<%= form_tag batches_url do %>
+  <div class="group title">
+    <h2 style="float:left;">New Batch</h2>
+    <div class="new_batch" style="float:left;margin-left:25px;"><%= text_field_tag :batch_name, nil, :placeholder => "Batch name here..." %></div>
+  </div>
+  <%= render "form_content" %>
+<% end %>

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

@@ -10,11 +10,20 @@
 
   <header>
     <div class="inner">
-      <h1>BatchManager</h1>
+      <h1><%= link_to "BatchManager", batches_url %></h1>
+      <div class="new_link"><%= link_to "NEW BATCH", new_batch_url %></div>
     </div>
   </header>
 
   <div id="wrapper">
+    <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>
     <%= yield %>
   </div>
 

data/lib/batch_manager/version.rb

@@ -1,3 +1,3 @@
 module BatchManager
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,9 +130,11 @@ files:
 - 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/_form_content.html.erb
 - 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/batch_manager/batches/new.html.erb
 - app/views/layouts/batch_manager/application.html.erb
 - app/workers/batch_manager/exec_batch_worker.rb
 - config/routes.rb