naf 1.1.4 → 2.0.0

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

@@ -4,8 +4,9 @@ module Logical
   module Naf
 
     describe Machine do
-      let(:physical_machine) { FactoryGirl.create(:machine)  }
-      let(:physical_machine_two) { FactoryGirl.create(:machine_two) }
+      let!(:physical_machine) { FactoryGirl.create(:machine, server_name: 'example.com')  }
+      let!(:physical_machine_two) { FactoryGirl.create(:machine_two) }
+      let!(:logical_machine) { ::Logical::Naf::Machine.new(physical_machine) }
       let(:columns) { [:id,
                        :server_name,
                        :server_address,
@@ -18,43 +19,112 @@ module Logical
                        :affinities,
                        :marked_down] }
 
-      it "to_hash should return with the specified columns" do
-        logical_machine = Machine.new(physical_machine)
-        logical_machine.to_hash.keys.should eql(columns)
+      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]
+        end
+      end
+
+      describe '#process_pool_size' do
+        it 'return the correct value' do
+          physical_machine.thread_pool_size = 5
+          logical_machine.process_pool_size.should == 5
+        end
       end
 
-      it "should alias the thread_pool_size method, as process_pool_size" do
-        logical_machine = Machine.new(physical_machine)
-        logical_machine.should_receive(:thread_pool_size).and_return(5)
-        logical_machine.process_pool_size
+      describe '#last_checked_schedules_at' do
+        it 'render result nicely' do
+          physical_machine.mark_checked_schedule
+          logical_machine.should_receive(:time_ago_in_words).and_return('')
+          logical_machine.last_checked_schedules_at.split(',').first.should =~ /ago$/
+        end
+      end
+
+      describe '#last_seen_alive_at' do
+        it 'render result nicely' do
+          physical_machine.mark_alive
+          logical_machine.should_receive(:time_ago_in_words).and_return('')
+          logical_machine.last_seen_alive_at.split(',').first.should =~ /ago$/
+        end
+      end
+
+      describe '#to_hash' do
+        it 'return with the specified columns' do
+          logical_machine.to_hash.keys.should == columns
+        end
+      end
+
+      describe '#affinities' do
+        let!(:slot) { FactoryGirl.create(:normal_machine_affinity_slot, machine: physical_machine) }
+
+        it 'return short_name and affinity_parameter when both are present' do
+          slot.update_attributes!(affinity_parameter: 5)
+          logical_machine.affinities.should == 'short_name(5.0)'
+        end
+
+        it 'return short_name when affinity_parameter is not present' do
+          logical_machine.affinities.should == 'short_name'
+        end
+
+        it 'return classification and affinity names as last resort' do
+          slot.affinity.update_attributes!(affinity_short_name: nil)
+          logical_machine.affinities.should == 'purpose_normal'
+        end
       end
 
-      it "should render last_checked_schedules_at nicely" do
-        physical_machine.mark_checked_schedule
-        logical_machine = Machine.new(physical_machine)
-        logical_machine.should_receive(:time_ago_in_words).and_return("")
-        logical_machine.last_checked_schedules_at.split(',').first.should =~ /ago$/
+      describe '#name' do
+        it 'return short_name when present' do
+          physical_machine.short_name = 'short_name1'
+          logical_machine.name.should == 'short_name1'
+        end
+
+        it 'return server_name when short_name is not present' do
+          physical_machine.short_name = nil
+          logical_machine.name.should == 'example.com'
+        end
+
+        it 'return server_address when server_name is not present' do
+          physical_machine.short_name = nil
+          physical_machine.server_name = nil
+          logical_machine.name.should == '0.0.0.1'
+        end
       end
 
-      it "should render last_seen_alive_at nicely" do
-        physical_machine.mark_alive
-        logical_machine = Machine.new(physical_machine)
-        logical_machine.should_receive(:time_ago_in_words).and_return("")
-        logical_machine.last_seen_alive_at.split(',').first.should =~ /ago$/
+      describe '#status' do
+        let!(:runner) { FactoryGirl.create(:machine_runner, machine: physical_machine) }
+        let!(:invocation) { FactoryGirl.create(:machine_runner_invocation, machine_runner: runner) }
+
+        it 'report correctly when runner is up' do
+          hash = {
+            server_name: logical_machine.name,
+            status: 'Good',
+            notes: ''
+          }
+          logical_machine.status.should == hash
+        end
+
+        it 'report correctly when runner is down' do
+          hash = {
+            server_name: logical_machine.name,
+            status: 'Bad',
+            notes: 'Runner down'
+          }
+          invocation.update_attributes!(wind_down_at: Time.zone.now, dead_at: Time.zone.now)
+          logical_machine.status.should == hash
+        end
       end
 
-      context "Class Methods," do
-        it "all should return an array of logical wrappers around machines" do
-          machine = physical_machine
-          machine_two = physical_machine_two
+      describe '#runner' do
+        it 'return server_name when present' do
+          logical_machine.runner.should == 'example.com'
+        end
 
-          logical_machine = Machine.new(machine)
-          Machine.all.map(&:id).should include(machine.id)
-          Machine.all.map(&:id).should include(machine_two.id)
-          Machine.all.should be_a(Array)
-          Machine.all.should have(2).items
+        it 'return server_address when server_address is not present' do
+          physical_machine.server_name = nil
+          logical_machine.runner.should == '0.0.0.1'
         end
       end
+
     end
 
   end

data/spec/models/naf/affinity_classification_spec.rb

@@ -52,5 +52,25 @@ module Naf
       end
     end
 
+    describe "#weight" do
+      let!(:weight_affinity_classification) { FactoryGirl.create(:affinity_classification,
+                                                                 affinity_classification_name: 'weight',
+                                                                 id: 4) }
+
+      it "return the weight affinity classification" do
+        ::Naf::AffinityClassification.weight.should == weight_affinity_classification
+      end
+    end
+
+    describe "#machine" do
+      let!(:machine_affinity_classification) { FactoryGirl.create(:affinity_classification,
+                                                                  affinity_classification_name: 'machine',
+                                                                  id: 5) }
+
+      it "return the machine affinity classification" do
+        ::Naf::AffinityClassification.machine.should == machine_affinity_classification
+      end
+    end
+
   end
 end

data/spec/models/naf/affinity_spec.rb

@@ -81,6 +81,27 @@ module Naf
       end
     end
 
+    describe '#validate_affinity_name' do
+      it 'return nil when classification is not present' do
+        normal.affinity_classification = nil
+        normal.validate_affinity_name.should be_nil
+      end
+
+      it 'return proper message when machine associated with affinity is not found' do
+        normal.affinity_classification.affinity_classification_name = 'machine'
+        normal.validate_affinity_name.should == "There isn't a machine with that id!"
+      end
+
+      it 'return proper message when pair value (affinity_classification_id, affinity_name) already exists' do
+        normal.affinity_name = FactoryGirl.create(:machine).id.to_s
+        normal.affinity_classification.affinity_classification_name = 'machine'
+        normal.save
+        normal.affinity_classification.save
+
+        normal.validate_affinity_name.should == 'An affinity with the pair value (affinity_classification_id, affinity_name) already exists!'
+      end
+    end
+
     #----------------------
     # *** Class Methods ***
     #++++++++++++++++++++++

data/spec/models/naf/historical_job_spec.rb

@@ -26,7 +26,6 @@ module Naf
      :request_to_terminate,
      :marked_dead_by_machine_id,
      :log_level,
-     :tags,
      :machine_runner_invocation_id].each do |a|
       it { should allow_mass_assignment_of(a) }
     end
@@ -47,6 +46,8 @@ module Naf
     it { should belong_to(:application) }
     it { should belong_to(:application_run_group_restriction) }
     it { should belong_to(:machine_runner_invocation) }
+    it { should have_one(:running_job) }
+    it { should have_one(:queued_job) }
     it { should have_many(:historical_job_prerequisites) }
     it { should have_many(:prerequisites) }
     it { should have_many(:historical_job_affinity_tabs) }
@@ -287,48 +288,5 @@ module Naf
       end
     end
 
-    describe "#add_tags" do
-      before do
-        historical_job.tags = "{$pre-work}"
-      end
-
-      it "insert unique tag" do
-        historical_job.add_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:work]])
-        historical_job.tags.should == "{$pre-work,$work}"
-      end
-
-      it "not insert non-unique tag" do
-        historical_job.add_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:pre_work]])
-        historical_job.tags.should == "{$pre-work}"
-      end
-    end
-
-    describe "#remove_tags" do
-      before do
-        historical_job.tags = "{$pre-work}"
-      end
-
-      it "remove existing tag" do
-        historical_job.remove_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:pre_work]])
-        historical_job.tags.should == "{}"
-      end
-
-      it "not update tags when removing non-existing tag" do
-        historical_job.remove_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:work]])
-        historical_job.tags.should == "{$pre-work}"
-      end
-    end
-
-    describe "#remove_all_tags" do
-      before do
-        historical_job.tags = "{$pre-work}"
-      end
-
-      it "remove any existing tags" do
-        historical_job.remove_all_tags
-        historical_job.tags.should == "{}"
-      end
-    end
-
   end
 end

data/spec/models/naf/machine_runner_invocation_spec.rb

@@ -10,7 +10,8 @@ module Naf
      :commit_information,
      :branch_name,
      :repository_name,
-     :deployment_tag].each do |a|
+     :deployment_tag,
+     :uuid].each do |a|
       it { should allow_mass_assignment_of(a) }
     end
 
@@ -34,5 +35,20 @@ module Naf
     it { should validate_presence_of(:machine_runner_id) }
     it { should validate_presence_of(:pid) }
 
+    #----------------------
+    # *** Class Methods ***
+    #++++++++++++++++++++++
+
+    describe "#recently_marked_dead" do
+      let!(:invocation) { FactoryGirl.create(:machine_runner_invocation, dead_at: Time.zone.now - 1.hour) }
+      before do
+        FactoryGirl.create(:machine_runner_invocation, dead_at: Time.zone.now - 40.hours)
+      end
+
+      it "return the correct invocation" do
+        ::Naf::MachineRunnerInvocation.recently_marked_dead(24.hours).should == [invocation]
+      end
+    end
+
   end
 end

data/spec/models/naf/running_job_spec.rb

@@ -16,7 +16,8 @@ module Naf
      :request_to_terminate,
      :marked_dead_by_machine_id,
      :log_level,
-     :started_at].each do |a|
+     :started_at,
+     :tags].each do |a|
       it { should allow_mass_assignment_of(a) }
     end
 
@@ -61,6 +62,22 @@ module Naf
       end
     end
 
+    describe "#started_on_invocation" do
+      let!(:invocation) { FactoryGirl.create(:machine_runner_invocation) }
+      before do
+        running_job.historical_job.machine_runner_invocation = invocation
+        running_job.historical_job.save!
+      end
+
+      it "return the correct job record" do
+        ::Naf::RunningJob.started_on_invocation(invocation.id).should == [running_job]
+      end
+
+      it "return nothing when no running jobs are associated invocation" do
+        ::Naf::RunningJob.started_on_invocation(invocation.id + 1).should == []
+      end
+    end
+
     describe "#in_run_group" do
       it "return the correct job record" do
         ::Naf::RunningJob.should_receive(:where).and_return([running_job])
@@ -102,6 +119,52 @@ module Naf
       end
     end
 
+    #-------------------------
+    # *** Instance Methods ***
+    #+++++++++++++++++++++++++
+
+    describe "#add_tags" do
+      before do
+        running_job.tags = "{$pre-work}"
+      end
+
+      it "insert unique tag" do
+        running_job.add_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:work]])
+        running_job.tags.should == "{$pre-work,$work}"
+      end
+
+      it "not insert non-unique tag" do
+        running_job.add_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:pre_work]])
+        running_job.tags.should == "{$pre-work}"
+      end
+    end
+
+    describe "#remove_tags" do
+      before do
+        running_job.tags = "{$pre-work}"
+      end
+
+      it "remove existing tag" do
+        running_job.remove_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:pre_work]])
+        running_job.tags.should == "{}"
+      end
+
+      it "not update tags when removing non-existing tag" do
+        running_job.remove_tags([::Naf::HistoricalJob::SYSTEM_TAGS[:work]])
+        running_job.tags.should == "{$pre-work}"
+      end
+    end
+
+    describe "#remove_all_tags" do
+      before do
+        running_job.tags = "{$pre-work}"
+      end
+
+      it "remove any existing tags" do
+        running_job.remove_all_tags
+        running_job.tags.should == "{}"
+      end
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,7 +181,8 @@ description: A cloud based distributed cron, application framework and operation
 email:
 - keith@fiksu.com
 - lmeira@fiksu.com
-executables: []
+executables:
+- naf
 extensions: []
 extra_rdoc_files: []
 files:
@@ -196,9 +197,9 @@ files:
 - app/assets/images/clock.png
 - app/assets/images/control_play_blue.png
 - app/assets/images/down_arrow.gif
-- app/assets/images/papertrail_job.png
-- app/assets/images/papertrail_machine.png
-- app/assets/images/papertrail_machine_runner.png
+- app/assets/images/job.png
+- app/assets/images/machine.png
+- app/assets/images/machine_runner.png
 - app/assets/images/terminate.png
 - app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
 - app/assets/images/ui-bg_flat_0_ffffff_40x100.png
@@ -219,6 +220,7 @@ files:
 - app/assets/images/ui-icons_888888_256x240.png
 - 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/applications.js
 - app/assets/javascripts/dataTablesTemplates/jobs.js
 - app/assets/javascripts/dataTablesTemplates/machine_runner_invocations.js
@@ -242,14 +244,17 @@ files:
 - app/controllers/naf/historical_job_affinity_tabs_controller.rb
 - app/controllers/naf/historical_jobs_controller.rb
 - app/controllers/naf/janitorial_assignments_controller.rb
+- app/controllers/naf/log_parsers_controller.rb
+- app/controllers/naf/log_viewer_controller.rb
 - app/controllers/naf/logger_names_controller.rb
 - app/controllers/naf/logger_styles_controller.rb
 - app/controllers/naf/machine_affinity_slots_controller.rb
 - app/controllers/naf/machine_runner_invocations_controller.rb
 - app/controllers/naf/machine_runners_controller.rb
 - app/controllers/naf/machines_controller.rb
+- app/controllers/naf/status_controller.rb
 - app/helpers/naf/application_helper.rb
-- app/models/log4r/papertrail_outputter.rb
+- app/helpers/naf/time_helper.rb
 - app/models/logical/naf/application.rb
 - app/models/logical/naf/construction_zone/ad_hoc_work_order.rb
 - app/models/logical/naf/construction_zone/application_schedule_work_order.rb
@@ -269,6 +274,12 @@ files:
 - app/models/logical/naf/job_statuses/running.rb
 - app/models/logical/naf/job_statuses/terminated.rb
 - app/models/logical/naf/job_statuses/waiting.rb
+- app/models/logical/naf/log_file.rb
+- app/models/logical/naf/log_parser/base.rb
+- app/models/logical/naf/log_parser/job.rb
+- app/models/logical/naf/log_parser/machine.rb
+- app/models/logical/naf/log_parser/runner.rb
+- app/models/logical/naf/log_reader.rb
 - app/models/logical/naf/machine.rb
 - app/models/logical/naf/machine_runner.rb
 - app/models/logical/naf/machine_runner_invocation.rb
@@ -303,9 +314,11 @@ files:
 - app/models/naf/running_job.rb
 - app/models/process/naf/application.rb
 - app/models/process/naf/janitor.rb
+- app/models/process/naf/log_archiver.rb
 - app/models/process/naf/machine_manager.rb
 - app/models/process/naf/machine_upgrader.rb
 - app/models/process/naf/runner.rb
+- app/models/process/naf/runner_log.rb
 - app/views/naf/affinities/_form.html.erb
 - app/views/naf/affinities/edit.html.erb
 - app/views/naf/affinities/index.html.erb
@@ -331,7 +344,6 @@ files:
 - app/views/naf/historical_jobs/_form.html.erb
 - app/views/naf/historical_jobs/_runners.html.erb
 - app/views/naf/historical_jobs/_search_container.html.erb
-- app/views/naf/historical_jobs/edit.html.erb
 - app/views/naf/historical_jobs/index.html.erb
 - app/views/naf/historical_jobs/index.json.erb
 - app/views/naf/historical_jobs/new.html.erb
@@ -343,6 +355,14 @@ files:
 - app/views/naf/janitorial_assignments/index.js.erb
 - app/views/naf/janitorial_assignments/new.html.erb
 - app/views/naf/layouts/jquery_datatables.json.erb
+- app/views/naf/log_viewer/_job_logs.html.erb
+- app/views/naf/log_viewer/_log_display.html.erb
+- app/views/naf/log_viewer/_log_layout.html.erb
+- app/views/naf/log_viewer/_machine_logs.html.erb
+- app/views/naf/log_viewer/_runner_logs.html.erb
+- app/views/naf/log_viewer/_search_options.html.erb
+- app/views/naf/log_viewer/_update_page_title.html.erb
+- app/views/naf/log_viewer/index.html.erb
 - app/views/naf/logger_names/_form.html.erb
 - app/views/naf/logger_names/edit.html.erb
 - app/views/naf/logger_names/new.html.erb
@@ -364,7 +384,6 @@ files:
 - app/views/naf/machine_runners/show.html.erb
 - app/views/naf/machines/_filter.html.erb
 - app/views/naf/machines/_form.html.erb
-- app/views/naf/machines/_show.html.erb
 - app/views/naf/machines/edit.html.erb
 - app/views/naf/machines/index.html.erb
 - app/views/naf/machines/index.json.erb
@@ -372,13 +391,19 @@ files:
 - app/views/naf/machines/show.html.erb
 - app/views/naf/record.html.erb
 - app/views/naf/shared/_application.html.erb
+- app/views/naf/shared/_auto_resize_width.html.erb
+- app/views/naf/shared/_date_select.html.erb
 - app/views/naf/shared/_information_container.html.erb
 - app/views/naf/shared/_select_per_page.html.erb
+- app/views/naf/status/index.html.erb
+- bin/naf
 - ci/test-build.sh
 - ci/travis.sh
 - config/initializers/naf.rb
 - config/routes.rb
 - 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
 - doc/README_FOR_APP
 - lib/generators/naf_generator.rb
 - lib/generators/templates/config/logging/af.yml
@@ -449,6 +474,9 @@ files:
 - 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
+- spec/models/logical/naf/machine_runner_invocation_spec.rb
+- spec/models/logical/naf/machine_runner_spec.rb
 - spec/models/logical/naf/machine_spec.rb
 - spec/models/naf/affinity_classification_spec.rb
 - spec/models/naf/affinity_spec.rb
@@ -560,6 +588,9 @@ test_files:
 - 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
+- spec/models/logical/naf/machine_runner_invocation_spec.rb
+- spec/models/logical/naf/machine_runner_spec.rb
 - spec/models/logical/naf/machine_spec.rb
 - spec/models/naf/affinity_classification_spec.rb
 - spec/models/naf/affinity_spec.rb