naf 2.0.4 → 2.1.0

data/spec/controllers/naf/applications_controller_spec.rb

@@ -16,54 +16,6 @@ module Naf
       response.should be_success
     end
 
-    context "with regard to the edit action" do
-
-      it "should build a new application schedule if it was destroyed" do
-        @id = 5
-        controller.stub(:check_application_run_group_name).and_return(nil)
-        app_mock = mock_model(Application)
-        schedule_mock = mock_model(ApplicationSchedule)
-        schedule_prerequisites = mock_model(ApplicationSchedulePrerequisite)
-        Application.should_receive(:find).with("5").and_return(app_mock)
-        app_mock.should_receive(:application_schedule).and_return(nil)
-        app_mock.should_receive(:build_application_schedule).and_return(schedule_mock)
-        schedule_mock.should_receive(:application_schedule_prerequisites).and_return(schedule_prerequisites)
-        schedule_prerequisites.should_receive(:build).and_return(nil)
-      end
-
-      it "should respond without building a new application schedule" do
-        @id = 5
-        controller.stub(:check_application_run_group_name).and_return(nil)
-        app_mock = mock_model(Application)
-        schedule_mock = mock_model(ApplicationSchedule)
-        schedule_prerequisites = mock_model(ApplicationSchedulePrerequisite)
-        app_mock.should_receive(:application_schedule).and_return(schedule_mock)
-        Application.should_receive(:find).with("5").and_return(app_mock)
-        schedule_mock.should_receive(:application_schedule_prerequisites).and_return(schedule_prerequisites)
-        schedule_prerequisites.should_not_receive(:build)
-        app_mock.should_not_receive(:build_application_schedule)
-      end
-
-      after(:each) do
-        get :edit, id: @id
-        response.should render_template("naf/applications/edit")
-        response.should be_success
-      end
-    end
-
-    it "should respond with affinity new" do
-      app = double('app')
-      app_schedule = double('application_schedule')
-      schedule_prerequisites = double('schedule_prerequisites')
-      Application.should_receive(:new).and_return(app)
-      app.should_receive(:build_application_schedule).and_return(app_schedule)
-      app_schedule.should_receive(:application_schedule_prerequisites).and_return(schedule_prerequisites)
-      schedule_prerequisites.should_receive(:build).and_return(nil)
-      get :new
-      response.should render_template("naf/applications/new")
-      response.should be_success
-    end
-
     context "on the create action" do
       let(:application_schedule) { mock_model(ApplicationSchedule, application_run_group_name: 'command', prerequisites: []) }
       let(:valid_app) { mock_model(Application, save: true, id: 5, update_attributes: true, application_schedule: application_schedule) }

data/spec/factories/naf.rb

@@ -153,10 +153,12 @@ FactoryGirl.define do
   factory :application, parent: :application_base do
     sequence(:command) { |n| "::Naf::HistoricalJob.test hello_#{n}" }
     sequence(:title) { |n| "Test #{n}" }
-  end
 
-  factory :scheduled_application, parent: :application do
-    association :application_schedule, factory: :schedule
+    factory :scheduled_application do
+      after(:create) do |application|
+        create_list(:schedule, 1, application: application)
+      end
+    end
   end
 
   #############################################################
@@ -166,20 +168,24 @@ FactoryGirl.define do
   factory :schedule_base, class: ::Naf::ApplicationSchedule do
     association :application, factory: :application
     association :application_run_group_restriction, factory: :no_limit
+    association :run_interval_style, factory: :run_interval_style
+    run_interval 0
   end
 
   factory :schedule, parent: :schedule_base do
-    run_interval 1
     sequence(:application_run_group_name) { |n| "Run Group #{n}" }
   end
 
-  factory :schedule_at_time, parent: :schedule do
-    run_interval nil
-    run_start_minute 5
+  #############################################################
+  #######   Application Schedule Prerequisites ################
+  #############################################################
+
+  factory :run_interval_style, class: ::Naf::RunIntervalStyle do
+    name 'at beginning of day'
   end
 
   #############################################################
-  #######   Application Schedules ############ ################
+  #######   Application Schedules Prerequisite ################
   #############################################################
 
   factory :schedule_prerequisite, class: ::Naf::ApplicationSchedulePrerequisite do

data/spec/models/logical/naf/application_spec.rb

@@ -2,26 +2,21 @@ require 'spec_helper'
 
 module Logical
   module Naf
+
     describe Application do
       let(:columns) { [:id,
                        :title,
                        :short_name,
                        :script_type_name,
-                       :application_run_group_name,
-                       :application_run_group_restriction_name,
-                       :application_run_group_limit,
-                       :enabled,
-                       :enqueue_backlogs,
-                       :run_time,
-                       :affinities,
-                       :prerequisites,
-                       :deleted,
-                       :visible] }
-      let(:physical_app) { FactoryGirl.create(:application, application_schedule: FactoryGirl.create(:schedule_base)) }
+                       :application_schedules,
+                       :deleted] }
+      let(:physical_app) { FactoryGirl.create(:application) }
       let!(:logical_app) { Application.new(physical_app) }
-      let(:scheduled_physical_app) {
-        FactoryGirl.create(:scheduled_application, application_schedule: FactoryGirl.create(:schedule_at_time))
-      }
+      let(:scheduled_physical_app) { FactoryGirl.create(:scheduled_application) }
+
+      before do
+        physical_app.application_schedules << FactoryGirl.create(:schedule_base)
+      end
 
       context "Class Methods" do
         it "search method should return array of wrapper around physical application" do
@@ -39,29 +34,6 @@ module Logical
       it "to_hash should have the specified columns" do
         logical_app.to_hash.keys.should == columns
       end
-
-      it "should render run_start_minute" do
-        scheduled_physical_app.application_schedule.run_start_minute.should be_a(Fixnum)
-
-        Application.new(scheduled_physical_app).run_start_minute.should be_a(String)
-      end
-
-      it "should delegate methods to its schedule" do
-        methods = [:application_run_group_restriction_name,
-                   :run_interval,
-                   :application_run_group_name,
-                   :run_start_minute]
-        schedule = scheduled_physical_app.application_schedule
-        logical_scheduled_app = Application.new(scheduled_physical_app)
-
-        methods.each do |m|
-          schedule.should_receive(m).and_return(nil)
-        end
-
-        methods.each do |m|
-          logical_scheduled_app.send(m)
-        end
-      end
     end
 
   end

data/spec/models/logical/naf/machine_spec.rb

@@ -21,7 +21,7 @@ module Logical
 
       describe '#self.all' do
         it 'return an array of logical wrappers around machines' do
-          ::Logical::Naf::Machine.all.map(&:id).should == [physical_machine.id, physical_machine_two.id]
+          ::Logical::Naf::Machine.all.map(&:id).sort.should == [physical_machine.id, physical_machine_two.id]
         end
       end
 

data/spec/models/naf/application_schedule_spec.rb

@@ -12,10 +12,10 @@ module Naf
      :priority,
      :visible,
      :enabled,
-     :run_start_minute,
      :application_run_group_limit,
      :application_schedule_prerequisites_attributes,
-     :enqueue_backlogs].each do |a|
+     :enqueue_backlogs,
+     :run_interval_style_id].each do |a|
       it { should allow_mass_assignment_of(a) }
     end
 
@@ -31,6 +31,7 @@ module Naf
 
     it { should belong_to(:application) }
     it { should belong_to(:application_run_group_restriction) }
+    it { should belong_to(:run_interval_style) }
     it { should have_many(:application_schedule_affinity_tabs) }
     it { should have_many(:affinities) }
     it { should have_many(:application_schedule_prerequisites) }
@@ -71,27 +72,49 @@ module Naf
     # *** Class Methods ***
     #++++++++++++++++++++++
 
+    let!(:time) { Time.zone.now.beginning_of_day }
+
     describe "#exact_schedules" do
-      it "return schedule when run_start_minute is set" do
-        schedule.update_attributes!(run_start_minute: 1, run_interval: nil)
-        ::Naf::ApplicationSchedule.exact_schedules.should == [schedule]
+      let!(:job) { FactoryGirl.create(:finished_job) }
+      it "return schedule when it is ready" do
+        ::Naf::ApplicationSchedule.exact_schedules(time, {}, {}).should == [schedule]
+      end
+
+      it "return no schedules when application has not finished running" do
+        apps = { schedule.id => job }
+        ::Naf::ApplicationSchedule.exact_schedules(time, apps, {}).should == []
       end
 
-      it "return no schedules when run_start_minute is not set" do
-        schedule.update_attributes!(run_start_minute: nil, run_interval: nil)
-        ::Naf::ApplicationSchedule.exact_schedules.should == []
+      it "return no schedules when interval time has not passed" do
+        apps = { schedule.id => job }
+        schedule.run_interval = 20
+        ::Naf::ApplicationSchedule.exact_schedules(time, {}, apps).should == []
+      end
+
+      it "return no schedules when it is not time to run the application" do
+        time = Time.zone.now
+        ::Naf::ApplicationSchedule.exact_schedules(time, {}, {}).should == []
       end
     end
 
     describe "#relative_schedules" do
-      it "return schedule when run_interval is set" do
-        schedule.update_attributes!(run_interval: 60)
-        ::Naf::ApplicationSchedule.relative_schedules.should == [schedule]
+      let!(:job) { FactoryGirl.create(:finished_job) }
+      it "return schedule when it is ready" do
+        schedule.run_interval_style.name = 'after previous run'
+        schedule.run_interval_style.save
+
+        ::Naf::ApplicationSchedule.relative_schedules(time, {}, {}).should == [schedule]
+      end
+
+      it "return no schedules when application has not finished running" do
+        apps = { schedule.application_id => job }
+        ::Naf::ApplicationSchedule.relative_schedules(time, apps, {}).should == []
       end
 
-      it "return no schedules when run_interval is not set" do
-        schedule.update_attributes!(run_interval: nil)
-        ::Naf::ApplicationSchedule.relative_schedules.should == []
+      it "return no schedules when interval time has not passed" do
+        apps = { schedule.application_id => job }
+        schedule.run_interval = 20
+        ::Naf::ApplicationSchedule.relative_schedules(time, {}, apps).should == []
       end
     end
 
@@ -107,7 +130,7 @@ module Naf
 
       it "return correct parsing of app" do
         schedule.to_s.should == "::Naf::ApplicationSchedule<ENABLED, id: #{schedule.id}, " +
-          "\"App1\", start every: 1 minutes>"
+          "\"App1\", #{::Logical::Naf::ApplicationSchedule.new(schedule).display}>"
       end
     end
 
@@ -127,40 +150,5 @@ module Naf
       end
     end
 
-    describe "#enabled_application_id_unique" do
-      let(:error_message) { {
-        application_id: ['is enabled and has already been taken']
-      } }
-
-      it "return nil if enabled is false" do
-        schedule.enabled = false
-        schedule.enabled_application_id_unique.should == nil
-      end
-
-      it "return nil if enabled is false" do
-        schedule2 = FactoryGirl.create(:schedule)
-        schedule2.application_id = schedule.application_id
-        schedule2.enabled_application_id_unique
-
-        schedule2.errors.messages.should == error_message
-      end
-    end
-
-    describe "#run_interval_at_time_check" do
-      let(:error_messages) { {
-        run_interval: ['or Run start minute must be nil'],
-        run_start_minute: ['or Run interval must be nil']
-      } }
-
-      before do
-        schedule.run_start_minute = 1
-        schedule.run_interval_at_time_check
-      end
-
-      it "add errors to schedule" do
-        schedule.errors.messages.should == error_messages
-      end
-    end
-
   end
 end

data/spec/models/naf/application_spec.rb

@@ -10,8 +10,8 @@ module Naf
      :log_level,
      :short_name,
      :deleted,
-     :application_schedule,
-     :application_schedule_attributes].each do |a|
+     :application_schedules,
+     :application_schedules_attributes].each do |a|
       it { should allow_mass_assignment_of(a) }
     end
 
@@ -26,7 +26,7 @@ module Naf
     #+++++++++++++++++++++
 
     it { should belong_to(:application_type) }
-    it { should have_one(:application_schedule) }
+    it { should have_many(:application_schedules) }
     it { should have_many(:historical_jobs) }
 
     #--------------------

data/spec/models/naf/historical_job_spec.rb

@@ -11,6 +11,7 @@ module Naf
 
     # Mass-assignment
     [:application_id,
+     :application_schedule_id,
      :application_type_id,
      :command,
      :application_run_group_restriction_id,
@@ -40,6 +41,7 @@ module Naf
     # *** Associations ***
     #+++++++++++++++++++++
 
+    it { should belong_to(:application_schedule) }
     it { should belong_to(:application_type) }
     it { should belong_to(:started_on_machine) }
     it { should belong_to(:marked_dead_by_machine) }
@@ -103,13 +105,13 @@ module Naf
 
     describe "#application_last_runs" do
       before do
-        historical_job.update_attributes!(application_id: FactoryGirl.create(:application).id)
+        historical_job.update_attributes!(application_schedule_id: FactoryGirl.create(:scheduled_application).id)
       end
 
       it "return job when it finished running" do
         historical_job.finished_at = Time.zone.now
         historical_job.save!
-        ::Naf::HistoricalJob.application_last_runs.first.application.should == historical_job.application
+        ::Naf::HistoricalJob.application_last_runs.first.application_schedule.should == historical_job.application_schedule
       end
 
       it "return nil when job has not finished running" do

data/spec/models/naf/queued_job_spec.rb

@@ -4,6 +4,7 @@ module Naf
   describe QueuedJob do
     # Mass-assignment
     [:application_id,
+     :application_schedule_id,
      :application_type_id,
      :command,
      :application_run_group_restriction_id,
@@ -25,6 +26,7 @@ module Naf
 
     it { should belong_to(:historical_job) }
     it { should belong_to(:application) }
+    it { should belong_to(:application_schedule) }
     it { should belong_to(:application_type) }
     it { should belong_to(:application_run_group_restriction) }
 

data/spec/models/naf/run_interval_style_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+module Naf
+  describe RunIntervalStyle do
+    # Mass-assignment
+    [:name].each do |a|
+      it { should allow_mass_assignment_of(a) }
+    end
+
+    [:id,
+     :created_at].each do |a|
+      it { should_not allow_mass_assignment_of(a) }
+    end
+
+    #---------------------
+    # *** Associations ***
+    #+++++++++++++++++++++
+
+    it { should have_many(:application_schedules) }
+
+    #--------------------
+    # *** Validations ***
+    #++++++++++++++++++++
+
+    it { should validate_presence_of(:name) }
+
+  end
+end

data/spec/models/naf/running_job_spec.rb

@@ -6,6 +6,7 @@ module Naf
 
     # Mass-assignment
     [:application_id,
+     :application_schedule_id,
      :application_type_id,
      :command,
      :application_run_group_restriction_id,
@@ -33,6 +34,7 @@ module Naf
 
     it { should belong_to(:historical_job) }
     it { should belong_to(:application) }
+    it { should belong_to(:application_schedule) }
     it { should belong_to(:application_type) }
     it { should belong_to(:application_run_group_restriction) }
     it { should belong_to(:started_on_machine) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,6 +221,7 @@ files:
 - app/assets/images/ui-icons_cd0a0a_256x240.png
 - app/assets/images/up_arrow.gif
 - app/assets/javascripts/col_reorder_with_resize.js
+- app/assets/javascripts/dataTablesTemplates/application_schedules.js
 - app/assets/javascripts/dataTablesTemplates/applications.js
 - app/assets/javascripts/dataTablesTemplates/jobs.js
 - app/assets/javascripts/dataTablesTemplates/machine_runner_invocations.js
@@ -240,6 +241,7 @@ files:
 - app/controllers/naf/affinities_controller.rb
 - app/controllers/naf/application_controller.rb
 - app/controllers/naf/application_schedule_affinity_tabs_controller.rb
+- app/controllers/naf/application_schedules_controller.rb
 - app/controllers/naf/applications_controller.rb
 - app/controllers/naf/historical_job_affinity_tabs_controller.rb
 - app/controllers/naf/historical_jobs_controller.rb
@@ -256,6 +258,7 @@ files:
 - app/helpers/naf/application_helper.rb
 - app/helpers/naf/time_helper.rb
 - app/models/logical/naf/application.rb
+- app/models/logical/naf/application_schedule.rb
 - app/models/logical/naf/construction_zone/ad_hoc_work_order.rb
 - app/models/logical/naf/construction_zone/application_schedule_work_order.rb
 - app/models/logical/naf/construction_zone/application_work_order.rb
@@ -265,7 +268,6 @@ files:
 - app/models/logical/naf/construction_zone/work_order.rb
 - app/models/logical/naf/create_infrastructure.rb
 - app/models/logical/naf/job.rb
-- app/models/logical/naf/job_creator.rb
 - app/models/logical/naf/job_fetcher.rb
 - app/models/logical/naf/job_statuses/errored.rb
 - app/models/logical/naf/job_statuses/finished.rb
@@ -311,10 +313,13 @@ files:
 - app/models/naf/machine_runner_invocation.rb
 - app/models/naf/naf_base.rb
 - app/models/naf/queued_job.rb
+- app/models/naf/run_interval_style.rb
 - app/models/naf/running_job.rb
 - app/models/process/naf/application.rb
+- app/models/process/naf/data_migration/backfill_application_schedule_run_interval.rb
 - app/models/process/naf/janitor.rb
 - app/models/process/naf/log_archiver.rb
+- app/models/process/naf/log_reader.rb
 - app/models/process/naf/machine_manager.rb
 - app/models/process/naf/machine_upgrader.rb
 - app/models/process/naf/runner.rb
@@ -327,8 +332,13 @@ files:
 - app/views/naf/application_schedule_affinity_tabs/_form.html.erb
 - app/views/naf/application_schedule_affinity_tabs/edit.html.erb
 - app/views/naf/application_schedule_affinity_tabs/new.html.erb
-- app/views/naf/applications/_application_schedule.html.erb
-- app/views/naf/applications/_application_schedule_prerequisites.html.erb
+- app/views/naf/application_schedules/_application_schedule_prerequisites.html.erb
+- app/views/naf/application_schedules/_form.html.erb
+- app/views/naf/application_schedules/edit.html.erb
+- app/views/naf/application_schedules/index.html.erb
+- app/views/naf/application_schedules/index.json.erb
+- app/views/naf/application_schedules/new.html.erb
+- app/views/naf/application_schedules/show.html.erb
 - app/views/naf/applications/_form.html.erb
 - app/views/naf/applications/_search_container.html.erb
 - app/views/naf/applications/_show.html.erb
@@ -404,6 +414,8 @@ files:
 - db/migrate/20120820023848_naf_schema.rb
 - db/migrate/20131106162436_add_uuid_column_to_machine_runner_invocations.rb
 - db/migrate/20131121185222_move_tabs_column_from_historical_jobs_to_running_jobs.rb
+- db/migrate/20131219195439_add_run_interval_styles_table.rb
+- db/migrate/20140113183243_drop_run_start_minute_from_application_schedules.rb
 - doc/README_FOR_APP
 - lib/generators/naf_generator.rb
 - lib/generators/templates/config/logging/af.yml
@@ -471,7 +483,6 @@ files:
 - spec/factories/naf.rb
 - spec/helpers/naf/application_helper_spec.rb
 - spec/models/logical/naf/application_spec.rb
-- spec/models/logical/naf/job_creator_spec.rb
 - spec/models/logical/naf/job_fetcher_spec.rb
 - spec/models/logical/naf/job_spec.rb
 - spec/models/logical/naf/log_file_spec.rb
@@ -499,6 +510,7 @@ files:
 - spec/models/naf/machine_spec.rb
 - spec/models/naf/naf_base_spec.rb
 - spec/models/naf/queued_job_spec.rb
+- spec/models/naf/run_interval_style_spec.rb
 - spec/models/naf/running_job_spec.rb
 - spec/models/process/naf/application_spec.rb
 - spec/models/process/naf/janitor_spec.rb
@@ -585,7 +597,6 @@ test_files:
 - spec/factories/naf.rb
 - spec/helpers/naf/application_helper_spec.rb
 - spec/models/logical/naf/application_spec.rb
-- spec/models/logical/naf/job_creator_spec.rb
 - spec/models/logical/naf/job_fetcher_spec.rb
 - spec/models/logical/naf/job_spec.rb
 - spec/models/logical/naf/log_file_spec.rb
@@ -613,6 +624,7 @@ test_files:
 - spec/models/naf/machine_spec.rb
 - spec/models/naf/naf_base_spec.rb
 - spec/models/naf/queued_job_spec.rb
+- spec/models/naf/run_interval_style_spec.rb
 - spec/models/naf/running_job_spec.rb
 - spec/models/process/naf/application_spec.rb
 - spec/models/process/naf/janitor_spec.rb