naf 2.0.4 → 2.1.0

data/app/views/naf/applications/index.json.erb

@@ -1,11 +1,27 @@
 <%
   rows = @applications.each do |application|
-		app = Naf::Application.find(application.first)
-    application.insert(10, naf_last_queued_at_link(app))
-    application.insert(13,(link_to image_tag('control_play_blue.png',
-																						  class: 'action',
-																							title: "Enqueue Application(\nid: #{app.id},\ntitle: #{app.title},\ncommand: #{app.command})"),
-																							"#", { class: "enqueue", id: application[0] }))
+    app = Naf::Application.find(application.first)
+    schedules = application[4]
+    application[4] = ''
+    schedules.each do |schedule|
+      logical_schedule = ::Logical::Naf::ApplicationSchedule.new(schedule)
+      if application[4].present?
+				application[4] << (link_to logical_schedule.display,
+                                   application_schedule_path(schedule.id),
+                                   title: logical_schedule.help_title)
+      else
+				application[4] = (link_to logical_schedule.display,
+                                  application_schedule_path(schedule.id),
+                                  title: logical_schedule.help_title)
+      end
+      application[4] << ", ".html_safe
+    end
+    application[4] = application[4][0..-3]
+    application.insert(5, naf_last_queued_at_link(app))
+    application.insert(6,(link_to image_tag('control_play_blue.png',
+                                             class: 'action',
+                                             title: "Enqueue Application(\nid: #{app.id},\ntitle: #{app.title},\ncommand: #{app.command})"),
+                                             "#", { class: "enqueue", id: application[0] }))
   end
 %>
 <%= raw rows %>

data/app/views/naf/applications/show.html.erb

@@ -1,37 +1,38 @@
 <% content_for :body do %>
   <div id="flash_message">
-      <% unless notice.blank? %>
-        <script type='text/javascript'>
-          jQuery("<p id='notice'><%= notice %></p>")
-              .appendTo('#flash_message')
-              .slideDown().delay(5000).slideUp();
-        </script>
-      <% end %>
+    <% unless notice.blank? %>
+      <script type='text/javascript'>
+        jQuery("<p id='notice'><%= notice %></p>")
+          .appendTo('#flash_message')
+          .slideDown().delay(5000).slideUp();
+      </script>
+    <% end %>
   </div>
 
   <% content_for :javascripts do %>
     <script type='text/javascript'>
-        jQuery(document).ready(function () {
-            jQuery(document).delegate('.enqueue', "click", function(){
-                var postSource = "<%= naf.historical_jobs_path %>";
-                var answer = confirm("Adding application as a job on the queue?");
-                if (!answer) {
-                    return false;
-                }
-                jQuery.post(postSource, { "historical_job[application_id]":jQuery(this).attr('id') }, function (data) {
-                    if (data.success) {
-                        jQuery("<p id='notice'>Congratulations, a Job " + data.title + " was added!</p>").
-                        appendTo('#flash_message').slideDown().delay(5000).slideUp();
-                        setTimeout('window.location.reload()', 5600);
-                    }
-                    else {
-                      jQuery("<div class='error'>Sorry, \'" +  data.title + "\' cannot add a Job to the queue right now!</div>").
-                              appendTo('#flash_message').slideDown().delay(5000).slideUp();
-                      jQuery('#datatable').dataTable().fnDraw();
-                    }
-                });
-            });
+      jQuery(document).ready(function () {
+        jQuery(document).delegate('.enqueue', "click", function(){
+          var postSource = "<%= naf.historical_jobs_path %>";
+          var answer = confirm("Adding application as a job on the queue?");
+          if (!answer) {
+            return false;
+          }
+          jQuery.post(postSource, { "historical_job[application_id]":jQuery(this).attr('id') }, function (data) {
+            if (data.success) {
+              jQuery("<p id='notice'>Congratulations, a Job " + data.title + " was added!</p>").
+              appendTo('#flash_message').slideDown().delay(5000).slideUp();
+              setTimeout('window.location.reload()', 5600);
+            }
+            else {
+              jQuery("<div class='error'>Sorry, \'" +  data.title +
+                "\' cannot add a Job to the queue right now!</div>").
+                appendTo('#flash_message').slideDown().delay(5000).slideUp();
+              jQuery('#datatable').dataTable().fnDraw();
+            }
+          });
         });
+      });
     </script>
   <% end %>
 
@@ -40,10 +41,10 @@
     <%= link_to 'Back to Applications', applications_path %>
     &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
     <%= link_to 'Edit', edit_application_path(@application) %>
-    <% if @application.application_schedule.present? -%>
-      &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-      <%= link_to "Add Affinity", new_application_application_schedule_application_schedule_affinity_tab_path(@application, @application.application_schedule) %>
-    <% end -%>
+    &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
+    <%= link_to "Add Schedule", controller: 'application_schedules',
+                                action: 'new',
+                                application_id: @application.id %>
     </br>
     </br>
 
@@ -95,56 +96,26 @@
           <td>Script Type Name</td>
           <td><%= @logical_application.script_type_name %></td>
         </tr>
-        <% if @application.application_schedule.present? %>
-          <tr>
-            <td>Application Run Group Name</td>
-            <td style="white-space: pre-wrap;"><%= @logical_application.application_run_group_name %></td>
-          </tr>
-          <tr>
-            <td>Application Run Group Limit</td>
-            <td><%= @application.application_schedule.application_run_group_limit %></td>
-          </tr>
-          <tr>
-            <td>Application Run Group Restriction Name</td>
-            <td><%= @logical_application.application_run_group_restriction_name %></td>
-          </tr>
-          <tr>
-            <td>Run Interval</td>
-            <td><%= @logical_application.run_interval %></td>
-          </tr>
-          <tr>
-            <td>Run Start Minute</td>
-            <td><%= @logical_application.run_start_minute %></td>
-          </tr>
-          <tr>
-            <td>Priority</td>
-            <td><%= @logical_application.priority %></td>
-          </tr>
-          <tr>
-            <td>Visible</td>
-            <td><%= @logical_application.visible %></td>
-          </tr>
-          <tr>
-            <td>Enabled</td>
-            <td><%= @logical_application.enabled %></td>
-          </tr>
-          <tr>
-            <td>Enqueue Backlogs</td>
-            <td><%= @logical_application.enqueue_backlogs %></td>
-          </tr>
-          <tr>
-            <td><%= link_to "Application Schedule Affinity Tabs",
-                    application_application_schedule_application_schedule_affinity_tabs_path(@application, @application.application_schedule) %>
-            </td>
-            <td><%= @logical_application.affinities %></td>
-          </tr>
-        <% end %>
+        <tr>
+          <td>Application Schedules</td>
+          <td>
+            <% output = '' %>
+            <% @logical_application.application_schedules.each do |schedule|
+                  logical_schedule = ::Logical::Naf::ApplicationSchedule.new(schedule)
+                  output << (link_to logical_schedule.display, naf.application_schedule_path(schedule.id))
+                  output << ', '
+                end
+                output = output[0..-3] %>
+            <%= output.html_safe %>
+          </td>
+        </tr>
         <tr>
           <td>Add Script to Jobs Queue</td>
           <td>
             <%= link_to image_tag('control_play_blue.png',
                   class: 'action',
-                  title: "Enqueue Application(\nid: #{@application.id},\ntitle: #{@application.title},\ncommand: #{@application.command})"),
+                  title: "Enqueue Application(\nid: #{@application.id},\n" +
+                    "title: #{@application.title},\ncommand: #{@application.command})"),
                   "#", { class: "enqueue", id: @application.id } %>
           </td>
         </tr>
@@ -152,27 +123,6 @@
     </table>
     </br>
 
-    <% if @application.application_schedule.present? %>
-      <h2>Prerequisites</h2>
-      <table id="naf_table_show">
-        <thead>
-          <tr>
-            <th width="10%">ID</th>
-            <th>Command</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @application.application_schedule.application_schedule_prerequisites.each do |prereq| -%>
-          <tr>
-            <td><%= link_to prereq.prerequisite_application_schedule.id, application_path(prereq.prerequisite_application_schedule.application) %></td>
-            <td style="white-space: pre-wrap;"><%= prereq.prerequisite_application_schedule.application.command %></td>
-          </tr>
-          <% end -%>
-        </tbody>
-      </table>
-      </br>
-    <% end %>
-
     <h2>Last Queued Job</h2>
     <table id="naf_table_show">
       <thead>

data/app/views/naf/logger_styles/_form.html.erb

@@ -17,11 +17,8 @@
   </div>
   </br>
 
-
   <%= naf_link_to_add_fields "Add the following pair of Name - Level", f, :logger_style_names %>
 
-
-
   <br>
   <br />
   <div class="actions">

data/app/views/naf/machines/_form.html.erb

@@ -1,9 +1,8 @@
 <%= form_for(@machine) do |f| %>
-
   <% if @machine.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%= pluralize(@machine.errors.count, "error") %> prohibited machine from being saved:</h2>
-  </div>
+    <div id="errorExplanation">
+      <h2><%= pluralize(@machine.errors.count, "error") %> prohibited machine from being saved:</h2>
+    </div>
   <% end %>
   </br>
 

data/config/routes.rb

@@ -3,10 +3,9 @@ Naf::Engine.routes.draw do
     resources :historical_job_affinity_tabs, except: [:destroy]
   end
 
-  resources :applications, except: [:destroy] do
-    resources :application_schedules, only: [] do
-      resources :application_schedule_affinity_tabs
-    end
+  resources :applications, except: [:destroy]
+  resources :application_schedules do
+    resources :application_schedule_affinity_tabs
   end
 
   resources :machines, except: [:destroy] do

data/db/migrate/20131219195439_add_run_interval_styles_table.rb

@@ -0,0 +1,49 @@
+class AddRunIntervalStylesTable < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      CREATE TABLE #{Naf.schema_name}.run_interval_styles
+      (
+        id              SERIAL NOT NULL PRIMARY KEY,
+        created_at      TIMESTAMP NOT NULL default now(),
+        name            TEXT NOT NULL
+      );
+
+      INSERT INTO #{Naf.schema_name}.run_interval_styles (name)
+        VALUES ('at beginning of day'), ('at beginning of hour'), ('after previous run'), ('keep running');
+
+      ALTER TABLE #{Naf.schema_name}.application_schedules
+        ADD COLUMN run_interval_style_id INTEGER NULL REFERENCES #{Naf.schema_name}.run_interval_styles;
+      ALTER TABLE #{Naf.schema_name}.application_schedules ADD COLUMN application_run_group_quantum INTEGER NULL;
+      ALTER TABLE #{Naf.schema_name}.application_schedules
+        DROP CONSTRAINT application_schedules_check1;
+      DROP INDEX #{Naf.schema_name}.applications_have_one_schedule_udx ;
+      ALTER TABLE #{Naf.schema_name}.application_schedules
+        DROP CONSTRAINT application_schedules_application_id_key;
+
+      ALTER TABLE #{Naf.schema_name}.historical_jobs
+        ADD COLUMN application_schedule_id INTEGER NULL REFERENCES #{Naf.schema_name}.application_schedules;
+      ALTER TABLE #{Naf.schema_name}.running_jobs
+        ADD COLUMN application_schedule_id INTEGER NULL REFERENCES #{Naf.schema_name}.application_schedules;
+      ALTER TABLE #{Naf.schema_name}.queued_jobs
+        ADD COLUMN application_schedule_id INTEGER NULL REFERENCES #{Naf.schema_name}.application_schedules;
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      ALTER TABLE #{Naf.schema_name}.queued_jobs DROP COLUMN application_schedule_id;
+      ALTER TABLE #{Naf.schema_name}.running_jobs DROP COLUMN application_schedule_id;
+      ALTER TABLE #{Naf.schema_name}.historical_jobs DROP COLUMN application_schedule_id;
+
+      ALTER TABLE #{Naf.schema_name}.application_schedules
+        ADD CONSTRAINT application_schedules_application_id_key UNIQUE (application_id);
+      CREATE UNIQUE INDEX applications_have_one_schedule_udx
+        ON #{Naf.schema_name}.application_schedules (application_id) WHERE enabled = true;
+      ALTER TABLE #{Naf.schema_name}.application_schedules ADD CONSTRAINT application_schedules_check1
+        CHECK (run_start_minute IS NULL OR run_interval IS NULL);
+      ALTER TABLE #{Naf.schema_name}.application_schedules DROP COLUMN application_run_group_quantum;
+      ALTER TABLE #{Naf.schema_name}.application_schedules DROP COLUMN run_interval_style_id;
+      DROP TABLE #{Naf.schema_name}.run_interval_styles;
+    SQL
+  end
+end

data/db/migrate/20140113183243_drop_run_start_minute_from_application_schedules.rb

@@ -0,0 +1,18 @@
+class DropRunStartMinuteFromApplicationSchedules < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+			ALTER TABLE #{Naf.schema_name}.application_schedules DROP COLUMN run_start_minute;
+			ALTER TABLE #{Naf.schema_name}.application_schedules ALTER COLUMN run_interval SET NOT NULL;
+			ALTER TABLE #{Naf.schema_name}.application_schedules ALTER COLUMN run_interval_style_id SET NOT NULL;
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      ALTER TABLE #{Naf.schema_name}.application_schedules ADD COLUMN run_start_minute INTEGER NULL
+      	CHECK (run_start_minute >= 0 and run_start_minute < (24 * 60));
+			ALTER TABLE #{Naf.schema_name}.application_schedules ALTER COLUMN run_interval DROP NOT NULL;
+			ALTER TABLE #{Naf.schema_name}.application_schedules ALTER COLUMN run_interval_style_id DROP NOT NULL;
+    SQL
+  end
+end

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

data/naf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = "naf"
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2014-01-10'
+  s.date        = '2014-01-24'
   s.summary     = "Creates infrastructure for a customizable and robust Postgres-backed script scheduling/running"
   s.description = "A cloud based distributed cron, application framework and operations console. Naf works as a distributed script running " +
                   "system that provides scheduling, logging, alarming, machine redundancy, and the ability to set constraint during script execution"

data/spec/controllers/naf/application_schedule_affinity_tabs_controller_spec.rb

@@ -6,29 +6,29 @@ module Naf
     let(:model_class) { ApplicationScheduleAffinityTab }
 
     it "should respond with index action nested under application schedule" do
-      model_class.should_receive(:where).with({ application_schedule_id: "1" }).and_return([])
+      model_class.should_receive(:where).with({ application_schedule_id: '1' }).and_return([])
       get :index, application_schedule_id: 1
-      response.should render_template("naf/datatable")
+      response.should render_template('naf/datatable')
       response.should be_success
     end
 
     it "should respond with the show action" do
-      model_class.should_receive(:find).with("5").and_return(nil)
+      model_class.should_receive(:find).with('5').and_return(nil)
       schedule = double('schedule')
       schedule.should_receive(:application).and_return(nil)
-      ApplicationSchedule.should_receive(:find).with("1").and_return(schedule)
+      ApplicationSchedule.should_receive(:find).with('1').and_return(schedule)
       get :show, id: 5, application_schedule_id: 1
-      response.should render_template("naf/record")
+      response.should render_template('naf/record')
       response.should be_success
     end
 
     it "should respond with the edit action" do
-      model_class.should_receive(:find).with("5").and_return(nil)
+      model_class.should_receive(:find).with('5').and_return(nil)
       schedule = double('schedule')
       schedule.should_receive(:application).and_return(nil)
-      ApplicationSchedule.should_receive(:find).with("1").and_return(schedule)
+      ApplicationSchedule.should_receive(:find).with('1').and_return(schedule)
       get :edit, id: 5, application_schedule_id: 1
-      response.should render_template("naf/application_schedule_affinity_tabs/edit")
+      response.should render_template('naf/application_schedule_affinity_tabs/edit')
       response.should be_success
     end
 
@@ -36,14 +36,17 @@ module Naf
       model_class.should_receive(:new).and_return(nil)
       schedule = double('schedule')
       schedule.should_receive(:application).and_return(nil)
-      ApplicationSchedule.should_receive(:find).with("1").and_return(schedule)
+      ApplicationSchedule.should_receive(:find).with('1').and_return(schedule)
       get :new, id: 5, application_schedule_id: 1
-      response.should render_template("naf/application_schedule_affinity_tabs/new")
+      response.should render_template('naf/application_schedule_affinity_tabs/new')
       response.should be_success
     end
 
     context "on the create action" do
-      let(:valid_tab)   { mock_model(model_class, save: true, id: 5, application_schedule_id: 1, application_id: 1) }
+      let(:valid_tab)   { mock_model(model_class, save: true,
+                                                  id: 5,
+                                                  application_schedule_id: 1,
+                                                  application_id: 1) }
       let(:invalid_tab) { mock_model(model_class, save: false) }
       let(:schedule)    { mock_model(ApplicationSchedule, id: 1) }
       let(:application) { mock_model(Application, id: 1)  }
@@ -52,47 +55,51 @@ module Naf
           post :create, application_schedule_id: 1, application_id: 1
       end
 
-      before(:each) do
-        Application.should_receive(:find).with("1").and_return(application)
-        ApplicationSchedule.should_receive(:find).with("1").and_return(schedule)
+      before do
+        ApplicationSchedule.should_receive(:find).with('1').and_return(schedule)
       end
 
       it "should redirect to show when valid" do
         model_class.should_receive(:new).and_return(valid_tab)
-        valid_tab.stub(:affinity_name).and_return("Test Name")
-        path = application_application_schedule_application_schedule_affinity_tab_path(application, schedule, valid_tab)
+        valid_tab.stub(:affinity_name).and_return('Test Name')
+        path = application_schedule_application_schedule_affinity_tab_path(schedule, valid_tab)
         subject.should redirect_to(path)
       end
       it "should re-render to new when invalid" do
         model_class.should_receive(:new).and_return(invalid_tab)
-        subject.should render_template("naf/application_schedule_affinity_tabs/new")
+        subject.should render_template('naf/application_schedule_affinity_tabs/new')
       end
     end
 
     context "on the update action" do
-      let(:valid_tab)   { mock_model(model_class, update_attributes: true, id: 5, application_schedule_id: 1, application_id: 1)  }
-      let(:invalid_tab) { mock_model(model_class, update_attributes: false, id: 5, application_schedule_id: 1, application_id: 1) }
+      let(:valid_tab)   { mock_model(model_class, update_attributes: true,
+                                                  id: 5,
+                                                  application_schedule_id: 1,
+                                                  application_id: 1)  }
+      let(:invalid_tab) { mock_model(model_class, update_attributes: false,
+                                                  id: 5,
+                                                  application_schedule_id: 1,
+                                                  application_id: 1) }
       let(:schedule)    { mock_model(ApplicationSchedule, id: 1) }
-      let(:application) { mock_model(Application, id: 1)  }
 
       subject do
-          put :update, application_schedule_id: 1, application_id: 1, id: 5
+        put :update, application_schedule_id: 1, id: 5
       end
 
-      before(:each) do
-        Application.should_receive(:find).with("1").and_return(application)
-        ApplicationSchedule.should_receive(:find).with("1").and_return(schedule)
+      before do
+        ApplicationSchedule.should_receive(:find).with('1').and_return(schedule)
       end
 
       it "should redirect to show when valid" do
         model_class.should_receive(:find).and_return(valid_tab)
-        valid_tab.stub(:affinity_name).and_return("Test Name")
-        path = application_application_schedule_application_schedule_affinity_tab_path(application, schedule, valid_tab)
+        valid_tab.stub(:affinity_name).and_return('Test Name')
+        path = application_schedule_application_schedule_affinity_tab_path(schedule, valid_tab)
         subject.should redirect_to(path)
       end
+
       it "should re-render to edit  when invalid" do
         model_class.should_receive(:find).and_return(invalid_tab)
-        subject.should render_template("naf/application_schedule_affinity_tabs/edit")
+        subject.should render_template('naf/application_schedule_affinity_tabs/edit')
       end
     end