naf 2.1.6 → 2.1.8

data/Gemfile

@@ -13,7 +13,6 @@ gem 'will_paginate'
 gem 'facter'
 gem 'shoulda-matchers', '2.0.0'
 gem 'timecop', '0.4.5'
-gem 'open4'
 gem 'yajl-ruby'
 gem 'aws-sdk'
 gem 'fiksu-af'

data/README.rdoc

@@ -40,8 +40,8 @@ Machines have an allocate-able number of slots of a specific affinity. Applicati
 === Tags
 Scripts have tags to describe the stage/progress of the process. They can be system or custom tags. All tags are visible by the user, so set tags at different stages of your script. This is a way of knowing what is happening in the script without having to take a look at the logs.
 
-
 === Please find up-to-date information on Naf here: {Naf Wiki}[http://www.github.com/fiksu/naf/wiki]
-=== Instructions on upgrading to Naf v1.1.4: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v1.1.4]
+=== Instructions on upgrading to Naf v2.1.8: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-from-Naf-v2.1.6-to-Naf-v2.1.8]
+=== Instructions on upgrading to Naf v2.1.6: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v2.1.6]
 === Instructions on upgrading to Naf v2.0: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v2.0]
-=== Instructions on upgrading to Naf v2.1: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v2.1]
+=== Instructions on upgrading to Naf v1.1.4: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v1.1.4]

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,24 @@
 = Release Notes
 
+=== Version 2.1.8
+Bug fixes:
+* Removed check for signed message. Encrypted data generated by ActiveSupport::MessageVerifier is different depending on the ruby version.
+
+=== Version 2.1.7
+Bug fixes:
+* Boss#enqueue_command had the first two parameters switched
+* Boss#enqueue_n_commands referenced a machine object, but that object did not exist in the scope
+* Boss#enqueue_n_commands called job_affinity_tabs on a job when it should be calling historical_job_affinity_tabs
+* Foreman#limited_by_run_group? checked the affinity_classification_name of an affinity, but did not check if the affinity was null
+* Job exit status always set to 0, even after the job errors
+* Unnecessary 'open4' require statements
+* Deleted application still runs if it has an enabled schedule
+* LogArchiver did not delete empty folders
+
+Changes:
+* Created a log archival queuer script
+* Created Api Authenticator for logs
+
 === Version 2.1.6
 Bug fixes:
 * Historical jobs application_schedule_id was not getting set, causing the runner to constantly queue applications.

data/app/controllers/naf/api_simple_cluster_authenticator_application_controller.rb

@@ -0,0 +1,9 @@
+module Naf
+  class ApiSimpleClusterAuthenticatorApplicationController < ActionController::Base
+
+    def naf_cookie_valid?
+      ::Logical::Naf::UserSession.new(session[::Naf.configuration.api_domain_cookie_name]).valid?
+    end
+
+  end
+end

data/app/controllers/naf/application_controller.rb

@@ -1,11 +1,13 @@
 module Naf
-  class ApplicationController < Naf.controller_class
+  class ApplicationController < Naf.ui_controller_class
     layout Naf.layout
 
     require 'will_paginate/array'
 
     protect_from_forgery
 
+    before_filter :check_naf_cookie_presence
+
     protected
 
     # Sets current rows_per_page direction from cookies or params.
@@ -39,5 +41,20 @@ module Naf
       end
       cookies[:search_status] = @search_status
     end
+
+    private
+
+    def check_naf_cookie_presence
+      user_session = ::Logical::Naf::UserSession.new(session[domain_cookie_name])
+      if !user_session.valid?
+        session.delete(domain_cookie_name)
+        session[domain_cookie_name] = user_session.token_cookie
+      end
+    end
+
+    def domain_cookie_name
+      @domain_cookie_name ||= ::Naf.configuration.api_domain_cookie_name
+    end
+
   end
 end

data/app/controllers/naf/log_parsers_controller.rb

@@ -1,15 +1,19 @@
 module Naf
-  class LogParsersController < Naf::ApplicationController
+  class LogParsersController < Naf::ApiSimpleClusterAuthenticatorApplicationController
 
     def logs
-      response = params['logical_type'].constantize.new(params).logs
-      if response.present?
-        success = true
+      if naf_cookie_valid?
+        response = params['logical_type'].constantize.new(params).logs
+        if response.present?
+          success = true
+        else
+          success = false
+        end
+
+        render json: "convertToJsonCallback(" + { success: success }.merge(response).to_json + ")"
       else
-        success = false
+        render json: "convertToJsonCallback(" + { success: false }.to_json + ")"
       end
-
-      render json: "convertToJsonCallback(" + { success: success }.merge(response).to_json + ")"
     end
 
   end

data/app/models/logical/naf/construction_zone/boss.rb

@@ -60,8 +60,8 @@ module Logical::Naf::ConstructionZone
                         affinities = [],
                         prerequisites = [],
                         enqueue_backlogs = false)
-      work_order = WorkOrder.new(application_type,
-                                 command,
+      work_order = WorkOrder.new(command,
+                                 application_type,
                                  application_run_group_restriction,
                                  application_run_group_name,
                                  application_run_group_limit,
@@ -79,22 +79,18 @@ module Logical::Naf::ConstructionZone
 
     def enqueue_n_commands_on_machines(parameters, number_of_jobs = :from_limit, machines = [])
       logger.detail "enqueuing #{parameters[:command]} #{number_of_jobs} time(s) on #{machines.length} machine(s)"
+      # enqueue the command on each machine
       machines.each do |machine|
         number_of_jobs = (parameters[:application_run_group_quantum] || 1) if number_of_jobs == :from_limit
         logger.info "enqueuing #{parameters[:command]} #{number_of_jobs} time(s) on #{machine}"
+        # enqueue the command number_of_jobs times
         (1..number_of_jobs).each do
           machine_parameters = {
             application_run_group_restriction: ::Naf::ApplicationRunGroupRestriction.limited_per_machine
           }.merge(parameters)
-          machine_parameters[:affinities] =
-            [machine.affinity] + if machine_parameters[:affinities].nil?
-                                   []
-                                 elsif machine_parameters[:affinities].is_a? Array
-                                   machine_parameters[:affinities]
-                                 else
-                                   [machine_parameters[:affinities]]
-                                 end
-           work_order = AdHocWorkOrder.new(machine_parameters)
+          machine_parameters[:affinities] = [machine.affinity] + affinities(machine_parameters)
+          work_order = AdHocWorkOrder.new(machine_parameters)
+
           @foreman.enqueue(work_order)
         end
       end
@@ -102,7 +98,7 @@ module Logical::Naf::ConstructionZone
 
     def enqueue_n_commands(parameters, number_of_jobs = :from_limit)
       number_of_jobs = (parameters[:application_run_group_quantum] || 1) if number_of_jobs == :from_limit
-      logger.info "enqueuing #{parameters[:command]} #{number_of_jobs} time(s) on #{machine}"
+      logger.info "enqueuing #{parameters[:command]} #{number_of_jobs} time(s)"
       (1..number_of_jobs).each do
         work_order = AdHocWorkOrder.new(parameters)
         @foreman.enqueue(work_order)
@@ -115,7 +111,19 @@ module Logical::Naf::ConstructionZone
                             job.application_run_group_name,
                             job.application_run_group_limit,
                             job.priority,
-                            job.job_affinity_tabs.map{|jat| jat.affinity})
+                            job.historical_job_affinity_tabs.map{|jat| jat.affinity})
+    end
+
+    private
+
+    def affinities(params)
+      if params[:affinities].nil?
+        []
+      elsif params[:affinities].is_a? Array
+        params[:affinities]
+      else
+        [params[:affinities]]
+      end
     end
 
   end

data/app/models/logical/naf/construction_zone/foreman.rb

@@ -32,7 +32,7 @@ module Logical::Naf::ConstructionZone
         machine_affinity = nil
         affinities.each do |affinity|
           machine_affinity = ::Naf::Affinity.find_by_id(affinity[:affinity_id])
-          if machine_affinity.affinity_classification_name == 'machine'
+          if machine_affinity.present? && machine_affinity.affinity_classification_name == 'machine'
             break
           end
         end

data/app/models/logical/naf/construction_zone/proletariat.rb

@@ -3,7 +3,8 @@ module Logical::Naf::ConstructionZone
     def create_job(parameters, affinities, prerequisites)
       ::Naf::HistoricalJob.transaction do
         historical_job = create_historical_job(parameters, affinities, prerequisites)
-        queued_job = create_queued_job(historical_job)
+        create_queued_job(historical_job)
+
         return historical_job
       end
     end
@@ -11,16 +12,20 @@ module Logical::Naf::ConstructionZone
     def create_historical_job(parameters, affinities, prerequisites)
       ::Naf::HistoricalJob.transaction do
         historical_job = ::Naf::HistoricalJob.create!(parameters)
+        # Create affinity tabs, if affinities are provided
         affinities.each do |affinity|
           ::Naf::HistoricalJobAffinityTab.create(affinity.merge(historical_job_id: historical_job.id))
         end
+        # Verify there is no loop found in prerequisites
         historical_job.verify_prerequisites(prerequisites)
+        # Create historical job prerequesites, if prerequisites are provided
         prerequisites.each do |prerequisite|
           ::Naf::HistoricalJobPrerequisite.create({
                                                     historical_job_id: historical_job.id,
                                                     prerequisite_historical_job_id: prerequisite.id
                                                   })
         end
+
         return historical_job
       end
     end
@@ -36,6 +41,9 @@ module Logical::Naf::ConstructionZone
                                         priority: historical_job.priority)
       queued_job.id = historical_job.id
       queued_job.save!
+
+      return queued_job
     end
+
   end
 end

data/app/models/logical/naf/user_session.rb

@@ -0,0 +1,53 @@
+module Logical
+  module Naf
+    class UserSession
+
+      attr_reader :message
+
+      def initialize(signed_message)
+        @message = self.class.unsign_message(signed_message)
+      end
+
+      def valid?
+        message.present? && message[:value].present? &&
+          (Time.zone.now - message[:value]) < ::Naf.configuration.
+            simple_cluster_authenticator_cookie_expiration_time
+      end
+
+      def token_cookie
+        self.class.sign_message(self.class.build_token_cookie)
+      end
+
+      def self.build_token_cookie
+        {
+          value: Time.zone.now
+        }
+      end
+
+      # Sign the provided string using a MessageVerifier.
+      def self.sign_message(message)
+        self.message_verifier.generate(message) if !message.nil?
+      end
+
+      # Unsign the provided string using a MessageVerifier.
+      def self.unsign_message(message)
+        if message.nil?
+          return nil
+        end
+
+        begin
+          self.message_verifier.verify(message)
+        rescue ActiveSupport::MessageVerifier::InvalidSignature
+          nil
+        end
+      end
+
+      # Returns an ActiveSuport MessageVerifier for signing/unsigning strings seeded with the
+      # applications secret token.
+      def self.message_verifier
+        @@message_verifier ||= ActiveSupport::MessageVerifier.new(Rails.application.class.config.secret_token)
+      end
+
+    end
+  end
+end

data/app/models/naf/application_schedule.rb

@@ -106,7 +106,7 @@ module Naf
       schedules = ::Naf::ApplicationSchedule.
         joins(:run_interval_style).
         where("#{Naf.schema_name}.run_interval_styles.name IN (?)", ['at beginning of day', 'at beginning of hour']).
-        enabled.select do |schedule|
+        enabled.application_not_deleted.select do |schedule|
 
         interval_time = time.to_date
         if schedule.run_interval_style.name == 'at beginning of day'
@@ -133,7 +133,7 @@ module Naf
       schedules = ::Naf::ApplicationSchedule.
         joins(:run_interval_style).
         where("#{Naf.schema_name}.run_interval_styles.name = ?", 'after previous run').
-        enabled.select do |schedule|
+        enabled.application_not_deleted.select do |schedule|
 
         (not_finished_applications[schedule.id].nil? &&
           (application_last_runs[schedule.id].nil? ||
@@ -149,13 +149,24 @@ module Naf
       ::Naf::ApplicationSchedule.
         joins(:run_interval_style).
         where("#{Naf.schema_name}.run_interval_styles.name = ?", 'keep running').
-        enabled
+        enabled.application_not_deleted
     end
 
     def self.enabled
       where(enabled: true)
     end
 
+    def self.application_not_deleted
+      where("
+        NOT EXISTS (
+          SELECT 1
+          FROM #{Naf.schema_name}.applications AS app
+          WHERE app.id = #{Naf.schema_name}.application_schedules.application_id AND
+            app.deleted = true
+        )
+      ")
+    end
+
     def self.should_be_queued
       current_time = Time.zone.now
       # Applications that are still running

data/app/models/naf/application_type.rb

@@ -33,8 +33,14 @@ module Naf
       self.send(invocation_method.to_sym, job)
     end
 
+    # This method calls Process.spawn to excute a built command. The first part
+    # of the command is the execution of the job command, redirecting stderr to
+    # stdout. Stdout and stderr are then sent through a pipe to be used as input
+    # for the job logger. The job logger will also redirect stderr to stdout, and
+    # save any crash logs. At the end of the built command, there is a exit $PIPESTATUS
+    # command that will return the exit status of the whole command.
     def invoke(job, job_command)
-      command = job_command + " 2>&1 | #{JOB_LOGGER} >> #{LOGGING_ROOT_DIRECTORY}/naf/crash.log 2>&1"
+      command = job_command + " 2>&1 | #{JOB_LOGGER} >> #{LOGGING_ROOT_DIRECTORY}/naf/crash.log 2>&1; exit $PIPESTATUS"
       Process.spawn({ 'NAF_JOB_ID' => job.id.to_s }, command)
     end
 

data/app/models/naf/machine.rb

@@ -202,9 +202,9 @@ module Naf
         started_on(self).each do |job|
 
         marking_at = Time.zone.now
-        machine_logger.alarm "#{by_machine.id} marking #{job} as dead at #{marking_at}"
+        machine_logger.alarm "#{by_machine.try(:id)} marking #{job} as dead at #{marking_at}"
         job.request_to_terminate = job.historical_job.request_to_terminate = true
-        job.marked_dead_by_machine_id = job.historical_job.marked_dead_by_machine_id = by_machine.id
+        job.marked_dead_by_machine_id = job.historical_job.marked_dead_by_machine_id = by_machine.try(:id)
         job.marked_dead_at = job.historical_job.marked_dead_at = marking_at
         job.historical_job.finished_at = marking_at
         job.save!
@@ -216,7 +216,7 @@ module Naf
       marking_at = Time.zone.now
       machine_logger.alarm "#{by_machine.try(:id)} marking #{self} as down at #{marking_at}"
       self.marked_down = true
-      self.marked_down_by_machine_id = by_machine.id
+      self.marked_down_by_machine_id = by_machine.try(:id)
       self.marked_down_at = marking_at
       save!
       mark_processes_as_dead(by_machine)
@@ -224,7 +224,7 @@ module Naf
 
     def affinity
       return ::Naf::Affinity.
-        where(affinity_classification_id: ::Naf::AffinityClassification.location.id,
+        where(affinity_classification_id: ::Naf::AffinityClassification.machine.id,
               affinity_name: self.id.to_s).first
     end
 

data/app/models/process/naf/log_archiver.rb

@@ -66,7 +66,8 @@ module Process::Naf
       today = Time.zone.now.to_date
       files.each do |file|
         logger.info "Archived file: #{file}"
-        `rm #{file}`
+        directory = `dirname #{file}`
+        `rm -r #{directory}`
       end
     end
 

data/app/models/process/naf/log_archiver_queuer.rb

@@ -0,0 +1,25 @@
+module Process::Naf
+  class LogArchiverQueuer < ::Process::Naf::Application
+
+    def work
+      # Archive logs
+      params = { command: log_archiver.command }
+      boss.enqueue_n_commands_on_machines(params, :from_limit, machines)
+    end
+
+    private
+
+    def boss
+      ::Logical::Naf::ConstructionZone::Boss.new
+    end
+
+    def machines
+      ::Naf::Machine.enabled.up.all
+    end
+
+    def log_archiver
+      ::Naf::Application.where(command: '::Process::Naf::LogArchiver.run').first
+    end
+
+  end
+end

data/app/models/process/naf/logger/base.rb

@@ -1,5 +1,3 @@
-require 'open4'
-
 module Process::Naf::Logger
   class Base < ::Af::Application
 

data/app/views/naf/log_viewer/_log_display.html.erb

@@ -165,7 +165,12 @@
           }
         },
         error: function(response) {
-          jQuery('#stdout').prepend('Something went wrong, retry your search.');
+          message = '&nbsp;&nbsp;<span>Failed to retrieve ' + '<%= record_type %>' + '(' +
+            '<%= record_id %>' + ') logs from ' + '<%= logs_url %>'.match(/^https?\:\/\/([^\/?#]+)/).pop() + '. Please refer to ' +
+            'Naf FAQs on the' + ' wiki'.link('https://github.com/fiksu/naf/wiki/Frequently-Asked-Questions') +
+            ' for further information.<br></span>';
+
+          jQuery('#stdout').prepend(message);
         }
       });
     }

data/lib/naf.rb

@@ -21,10 +21,6 @@ module Naf
       configuration.model_class.constantize
     end
 
-    def controller_class
-      configuration.controller_class.constantize
-    end
-
     def title
       configuration.title
     end
@@ -33,6 +29,22 @@ module Naf
       configuration.layout
     end
 
+    def ui_controller_class
+      configuration.ui_controller_class.constantize
+    end
+
+    def api_controller_class
+      configuration.api_controller_class.constantize
+    end
+
+    def api_domain_cookie_name
+      configuration.api_domain_cookie_name
+    end
+
+    def simple_cluster_authenticator_cookie_expiration_time
+      configuration.simple_cluster_authenticator_cookie_expiration_time
+    end
+
     def using_another_database?
       model_class != ActiveRecord::Base
     end

data/lib/naf/configuration.rb

@@ -2,17 +2,23 @@ module Naf
   class Configuration
     attr_accessor :schema_name,
                   :model_class,
-                  :controller_class,
+                  :ui_controller_class,
+                  :api_controller_class,
                   :title,
                   :layout,
-                  :default_page_options
+                  :default_page_options,
+                  :api_domain_cookie_name,
+                  :simple_cluster_authenticator_cookie_expiration_time
 
     def initialize
       @model_class = "::ActiveRecord::Base"
-      @controller_class = "::ApplicationController"
+      @ui_controller_class = "::ApplicationController"
       @title = "Naf - a Rails Job Scheduling Engine"
       @layout = "naf_layout"
       @default_page_options = [10, 20, 50, 100, 250, 500, 750, 1000, 1500, 2000]
+      @api_controller_class = "Naf::ApiSimpleClusterAuthenticatorApplicationController"
+      @simple_cluster_authenticator_cookie_expiration_time = 1.week
+      @api_domain_cookie_name = "naf_#{Rails.application.class.parent.name.underscore}"
     end
 
   end

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = '2.1.6'
+  VERSION = '2.1.8'
 end

data/naf.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |s|
   s.name        = "naf"
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2014-03-05'
+  s.date        = '2014-03-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"
-  s.authors     = ["Keith Gabryelski", "Leonardo Meira", "Nathaniel Lim", "Aleksandr Dembskiy"]
+  s.authors     = ["Keith Gabryelski", "Leonardo Meira"]
   s.email       = ['keith@fiksu.com', 'lmeira@fiksu.com']
   s.files       = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/controllers/naf/application_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Naf
   describe ApplicationController do
     it "should inherit from specified controller" do
-      ApplicationController.superclass.should == Naf.controller_class
+      ApplicationController.superclass.should == Naf.ui_controller_class
     end
   end
 

data/spec/factories/naf.rb

@@ -224,6 +224,11 @@ FactoryGirl.define do
     end
   end
 
+  factory :run_group_restriction, class: ::Naf::ApplicationRunGroupRestriction do
+    id 4
+    application_run_group_restriction_name "restriction"
+  end
+
   #############################################################
   #######   Application Types #################################
   #############################################################
@@ -307,6 +312,16 @@ FactoryGirl.define do
     end
   end
 
+  factory :machine_affinity, class: ::Naf::Affinity do
+    id 4
+    association :affinity_classification, factory: :machine_affinity_classification
+    affinity_name "machine"
+    # Ensure single creation
+    initialize_with do
+      ::Naf::Affinity.find_or_initialize_by_id(id)
+    end
+  end
+
   factory :affinity, class: ::Naf::Affinity do
     association :affinity_classification, factory: :purpose_affinity_classification
     sequence(:affinity_name) do |n|
@@ -342,6 +357,22 @@ FactoryGirl.define do
     end
   end
 
+  factory :weight_affinity_classification, class: ::Naf::AffinityClassification do
+    id 4
+    affinity_classification_name "weight"
+    initialize_with do
+      ::Naf::AffinityClassification.find_or_initialize_by_id(id)
+    end
+  end
+
+  factory :machine_affinity_classification, class: ::Naf::AffinityClassification do
+    id 5
+    affinity_classification_name "machine"
+    initialize_with do
+      ::Naf::AffinityClassification.find_or_initialize_by_id(id)
+    end
+  end
+
   factory :affinity_classification, class: ::Naf::AffinityClassification do
     sequence(:affinity_classification_name) { |n| "affinity_classification_#{n}" }
   end
@@ -368,6 +399,14 @@ FactoryGirl.define do
     association :affinity, factory: :canary_affinity
   end
 
+  factory :weight_job_affinity_tab, parent: :job_affinity_tab_base do
+    association :affinity, factory: :weight_affinity
+  end
+
+  factory :machine_job_affinity_tab, parent: :job_affinity_tab_base do
+    association :affinity, factory: :machine_affinity
+  end
+
   # Application Schedule Affinity Tabs
 
   factory :app_schedule_affinity_tab_base, class: ::Naf::ApplicationScheduleAffinityTab do

data/spec/models/logical/naf/construction_zone/boss_rspec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+module Logical::Naf::ConstructionZone
+
+  describe Boss do
+    let!(:boss) { Logical::Naf::ConstructionZone::Boss.new }
+    let!(:work_order) {
+      Logical::Naf::ConstructionZone::WorkOrder.new('::Process::Naf::Janitor.run')
+    }
+    let(:params) { {
+      command: '::Process::Naf::Janitor.run',
+      application_type: ::Naf::ApplicationType.rails,
+      application_run_group_restriction: ::Naf::ApplicationRunGroupRestriction.
+        limited_per_all_machines,
+      application_run_group_name: '::Process::Naf::Janitor.run',
+      application_run_group_limit: 1,
+      priority: 0,
+      affinities: [],
+      prerequisites: [],
+      enqueue_backlogs: false,
+      application: nil,
+      application_schedule: nil
+    } }
+
+    shared_examples 'create one historical job' do |num_records|
+      it 'return the correct object' do
+        job.should be_a(::Naf::HistoricalJob)
+      end
+
+      it 'return correct number of historical jobs' do
+        ::Naf::HistoricalJob.should have(num_records).records
+      end
+    end
+
+    describe '#enqueue_application' do
+      let(:application) { FactoryGirl.create(:application) }
+      let!(:job) {
+        boss.enqueue_application(application,
+                                 ::Naf::ApplicationRunGroupRestriction.no_limit,
+                                 application.command)
+      }
+
+      it_should_behave_like 'create one historical job', 1
+    end
+
+    describe '#enqueue_application_schedule' do
+      let!(:job) { boss.enqueue_application_schedule(FactoryGirl.create(:schedule)) }
+
+      it_should_behave_like 'create one historical job', 1
+    end
+
+    describe '#enqueue_rails_command' do
+      let!(:job) { boss.enqueue_rails_command('::Process::Naf::Janitor.run') }
+
+      it_should_behave_like 'create one historical job', 1
+    end
+
+    describe '#enqueue_command' do
+      let!(:job) { boss.enqueue_command('::Process::Naf::Janitor.run') }
+
+      it_should_behave_like 'create one historical job', 1
+    end
+
+    describe '#enqueue_ad_hoc_command' do
+      let!(:job) { boss.enqueue_ad_hoc_command(params) }
+
+      it_should_behave_like 'create one historical job', 1
+    end
+
+    describe '#enqueue_n_commands_on_machines' do
+      let!(:affinity) { FactoryGirl.create(:normal_affinity) }
+
+      before do
+        params[:application_run_group_quantum] = 2
+        params[:application_run_group_limit] = 5
+      end
+
+      it 'not create a historical job when array of machines is empty' do
+        boss.enqueue_n_commands_on_machines({})
+        ::Naf::HistoricalJob.should have(0).records
+      end
+
+      it 'create two historical jobs when a machine is present' do
+        machine = FactoryGirl.create(:machine)
+        classification = FactoryGirl.create(:location_affinity_classification)
+        FactoryGirl.create(:affinity, id: 5,
+                                      affinity_name: machine.id.to_s,
+                                      affinity_classification: classification)
+
+        boss.enqueue_n_commands_on_machines(params, :from_limit, [machine])
+        ::Naf::HistoricalJob.should have(2).records
+      end
+    end
+
+    describe '#enqueue_n_commands' do
+      subject { boss.enqueue_n_commands(params) }
+
+      it 'create one historical jobs when application_run_group_quantum is not specified' do
+        params[:application_run_group_quantum] = 1
+        subject
+        ::Naf::HistoricalJob.should have(1).records
+      end
+
+      it 'create five historical jobs' do
+        params[:application_run_group_quantum] = 5
+        params[:application_run_group_limit] = 5
+        subject
+        ::Naf::HistoricalJob.should have(5).records
+      end
+    end
+
+    describe '#reenqueue' do
+      let!(:job) { boss.reenqueue(FactoryGirl.create(:job)) }
+
+      it_should_behave_like 'create one historical job', 2
+    end
+  end
+
+end

data/spec/models/logical/naf/construction_zone/foreman_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+module Logical::Naf::ConstructionZone
+  describe Foreman do
+
+    let!(:foreman) { Logical::Naf::ConstructionZone::Foreman.new }
+    let!(:work_order) {
+      Logical::Naf::ConstructionZone::WorkOrder.new('::Process::Naf::Janitor.run')
+    }
+
+    describe '#enqueue' do
+      it 'return historical job when enqueue_backlogs is set to true' do
+        work_order.enqueue_backlogs
+        foreman.enqueue(work_order).should be_a(::Naf::HistoricalJob)
+      end
+
+      it 'return historical job when enqueue_backlogs is set to false and there is not run group limit' do
+        foreman.enqueue(work_order).should be_a(::Naf::HistoricalJob)
+      end
+
+      it 'return nil when work order is limited by run group' do
+        foreman.should_receive(:limited_by_run_group?).and_return(true)
+        foreman.enqueue(work_order).should be_nil
+      end
+    end
+
+    describe '#limited_by_run_group?' do
+      let!(:no_limit) { FactoryGirl.create(:no_limit) }
+      let!(:limited_per_machine) { FactoryGirl.create(:limited_per_machine) }
+      let!(:limited_per_all_machines) { FactoryGirl.create(:limited_per_all_machines) }
+
+      it 'return false when run group restriction is set to no limit' do
+        foreman.limited_by_run_group?(no_limit, nil, nil, []).should be_false
+      end
+
+      it 'return false when run group limit is nil' do
+        foreman.limited_by_run_group?(limited_per_machine, 'test', nil, []).should be_false
+      end
+
+      it 'return false when run group name is nil' do
+        foreman.limited_by_run_group?(limited_per_machine, nil, 1, []).should be_false
+      end
+
+      describe 'run group restriction is set to limited per machine' do
+        let!(:machine) { FactoryGirl.create(:machine) }
+        let(:historical_job) { FactoryGirl.create(:job, application_run_group_name: 'test') }
+        let(:tab) { FactoryGirl.create(:machine_job_affinity_tab, historical_job_id: historical_job.id) }
+
+        before do
+          FactoryGirl.create(:queued_job, application_run_group_name: 'test', id: historical_job.id)
+          FactoryGirl.create(:running_job_base, application_run_group_name: 'test',
+                                                started_on_machine_id: machine.id,
+                                                application_run_group_name: 'test')
+        end
+
+        it 'return false when application does not have affinity associated with machine' do
+          foreman.limited_by_run_group?(limited_per_machine, 'test', 1, []).should be_false
+        end
+
+        it 'return false when limit is greater than number of running/queued jobs' do
+          foreman.limited_by_run_group?(
+            limited_per_machine, 'test', 5, [{ affinity_id: tab.affinity.id }]
+          ).should be_false
+        end
+
+        it 'return true when limit is equal to number of running/queued jobs' do
+          foreman.limited_by_run_group?(
+            limited_per_machine, 'test', 1, [{ affinity_id: tab.affinity.id }]
+          ).should be_true
+        end
+
+        it 'return true when limit is less than number of running/queued jobs' do
+          FactoryGirl.create(:running_job_base, application_run_group_name: 'test',
+                                                started_on_machine_id: machine.id,
+                                                application_run_group_name: 'test')
+          foreman.limited_by_run_group?(
+            limited_per_machine, 'test', 1, [{ affinity_id: tab.affinity.id }]
+          ).should be_true
+        end
+      end
+
+      describe 'run group restriction is set to limited per all machines' do
+        it 'return false when limit is greater than number of running/queued jobs' do
+          foreman.limited_by_run_group?(limited_per_all_machines, 'test', 1, []).should be_false
+        end
+
+        it 'return true when limit is equal to number of running/queued jobs' do
+          FactoryGirl.create(:queued_job, application_run_group_name: 'test')
+          foreman.limited_by_run_group?(limited_per_all_machines, 'test', 1, []).should be_true
+        end
+
+        it 'return true when limit is less than number of running/queued jobs' do
+          FactoryGirl.create(:queued_job, application_run_group_name: 'test')
+          FactoryGirl.create(:running_job_base, application_run_group_name: 'test')
+          foreman.limited_by_run_group?(limited_per_all_machines, 'test', 1, []).should be_true
+        end
+      end
+
+      it 'return true when a different run group restriction is found' do
+        restriction = FactoryGirl.create(:run_group_restriction)
+        foreman.limited_by_run_group?(restriction, 'test', 1, []).should be_true
+      end
+    end
+  end
+end

data/spec/models/logical/naf/construction_zone/proletariat_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module Logical::Naf::ConstructionZone
+
+  describe Proletariat do
+
+  	let!(:proletariat) { ::Logical::Naf::ConstructionZone::Proletariat.new }
+  	let(:application) { FactoryGirl.create(:scheduled_application) }
+  	let(:application_type) { FactoryGirl.create(:rails_app_type) }
+  	let(:restriction) { FactoryGirl.create(:no_limit) }
+  	let!(:params) {
+      {
+        command: '::Process::Naf::Janitor.run',
+        application_type_id: application_type.id,
+        application_run_group_restriction_id: restriction.id,
+        application_run_group_name: '::Process::Naf::Janitor.run',
+        application_run_group_limit: 1,
+        priority: 0,
+        application_id: application.id,
+        application_schedule_id: application.application_schedules.first.id
+      }
+  	}
+		let!(:affinity) { { affinity_id: FactoryGirl.create(:normal_affinity).id } }
+		let!(:prerequisite) { FactoryGirl.create(:job) }
+
+  	describe '#create_job' do
+  		it 'return a historical job' do
+  			proletariat.create_job(params, [], []).should be_a(::Naf::HistoricalJob)
+  		end
+  	end
+
+  	describe '#create_historical_job' do
+  		let!(:historical_job) { proletariat.create_historical_job(params, [affinity], [prerequisite]) }
+
+  		it 'return historical job when exception is not raised' do
+  			historical_job.should be_a(::Naf::HistoricalJob)
+  		end
+
+  		it 'create a historical job affinity tab' do
+  			::Naf::HistoricalJobAffinityTab.should have(1).records
+  		end
+
+  		it 'create a historical job affinity tab' do
+  			::Naf::HistoricalJobPrerequisite.should have(1).records
+  		end
+
+  		it 'raise an exception when there is a loop found in prerequisites' do
+  			prerequisite.should_receive(:prerequisites).and_raise(::Naf::HistoricalJob::JobPrerequisiteLoop.new(prerequisite))
+  			begin
+  				job = proletariat.create_historical_job(params, [affinity], [prerequisite])
+  			rescue
+  			end
+  			job.should be_nil
+  		end
+  	end
+
+  	describe '#create_queued_job' do
+  		let!(:historical_job) { FactoryGirl.create(:scheduled_job) }
+
+  		it 'return a queued job' do
+  			historical_job.application_schedule_id = historical_job.application.application_schedules.first.id
+  			proletariat.create_queued_job(historical_job).should be_a(::Naf::QueuedJob)
+  		end
+  	end
+  end
+
+end

data/spec/models/logical/naf/construction_zone/work_order_spec.rb

@@ -21,6 +21,7 @@ module Logical::Naf::ConstructionZone
           application_schedule_id: nil
         }
       }
+
       it 'return correct values' do
         work_order.historical_job_parameters.should == params
       end
@@ -49,7 +50,7 @@ module Logical::Naf::ConstructionZone
 
       it 'return hash with the affinity_id when a Machine object is provided' do
         machine = FactoryGirl.create(:machine)
-        classification = FactoryGirl.create(:location_affinity_classification)
+        classification = FactoryGirl.create(:machine_affinity_classification)
         affinity = FactoryGirl.create(:affinity, id: 4,
                                                  affinity_name: machine.id.to_s,
                                                  affinity_classification: classification)

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

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+module Logical
+  module Naf
+
+    describe UserSession do
+      let!(:user_session) { ::Logical::Naf::UserSession.new(nil) }
+
+      describe '#valid?' do
+        it 'return false when message is not present' do
+          user_session.valid?.should be_false
+        end
+
+        it 'return false when value is not present' do
+          user_session.instance_variable_set(:@message, {})
+          user_session.valid?.should be_false
+        end
+
+        it 'return false when session is expired' do
+          user_session.instance_variable_set(:@message, { value: Time.zone.now - 1.month })
+          user_session.valid?.should be_false
+        end
+
+        it 'return true for invalid signed message' do
+          user_session.instance_variable_set(:@message, { value: Time.zone.now - 1.hour })
+          user_session.valid?.should be_true
+        end
+      end
+
+      describe '#token_cookie' do
+        let!(:signed_message) { user_session.token_cookie }
+
+        it 'not be nil' do
+          signed_message.should_not be_nil
+        end
+      end
+
+      describe '#build_token_cookie' do
+        before do
+          Timecop.freeze(Time.zone.now)
+        end
+
+        after do
+          Timecop.return
+        end
+
+        it 'return hash with current time' do
+          ::Logical::Naf::UserSession.build_token_cookie.should == { value: Time.zone.now }
+        end
+      end
+
+      describe '#sign_message' do
+        it 'return nil when message is nil' do
+          ::Logical::Naf::UserSession.sign_message(nil).should be_nil
+        end
+
+        it 'sign the message when message is present' do
+          ::Logical::Naf::UserSession.sign_message(::Logical::Naf::UserSession.build_token_cookie).
+            should =~ /^.{123}={1}-{2}[a-zA-Z0-9]{40}$/
+        end
+      end
+
+      describe '#unsign_message' do
+        it 'return nil when message is not signed' do
+          ::Logical::Naf::UserSession.unsign_message(nil).should be_nil
+        end
+
+        it 'return nil when InvalidSignature exception is raised' do
+          ::Logical::Naf::UserSession.stub(:message_verifier).
+            and_raise(ActiveSupport::MessageVerifier::InvalidSignature)
+          ::Logical::Naf::UserSession.unsign_message(nil).should be_nil
+        end
+
+        it 'return message when signed message is valid' do
+          message_verifier = ActiveSupport::MessageVerifier.
+            new(Rails.application.class.config.secret_token)
+          message = { value: Time.zone.now }
+
+          ::Logical::Naf::UserSession.
+            unsign_message(message_verifier.generate(message)).should == message
+        end
+      end
+
+      describe '#message_verifier' do
+        it 'return instance of ActiveSupport::MessageVerifier' do
+          ::Logical::Naf::UserSession.message_verifier.should be_a(ActiveSupport::MessageVerifier)
+        end
+      end
+    end
+
+  end
+end

data/spec/models/naf/application_schedule_spec.rb

@@ -95,6 +95,12 @@ module Naf
         time = Time.zone.now
         ::Naf::ApplicationSchedule.exact_schedules(time, {}, {}).should == []
       end
+
+      it "return no schedules when application is deleted" do
+        schedule.application.deleted = true
+        schedule.application.save!
+        ::Naf::ApplicationSchedule.exact_schedules(time, {}, {}).should == []
+      end
     end
 
     describe "#relative_schedules" do
@@ -116,6 +122,61 @@ module Naf
         schedule.run_interval = 20
         ::Naf::ApplicationSchedule.relative_schedules(time, {}, apps).should == []
       end
+
+      it "return no schedules when application is deleted" do
+        schedule.application.deleted = true
+        schedule.application.save!
+        ::Naf::ApplicationSchedule.exact_schedules(time, {}, {}).should == []
+      end
+    end
+
+    describe "#constant_schedules" do
+      it "return schedule when it is ready" do
+        schedule.run_interval_style.name = 'keep running'
+        schedule.run_interval_style.save!
+
+        ::Naf::ApplicationSchedule.constant_schedules.should == [schedule]
+      end
+
+      it "return no schedules when application is deleted" do
+        schedule.application.deleted = true
+        schedule.application.save!
+        ::Naf::ApplicationSchedule.constant_schedules.should == []
+      end
+
+      it "return no schedules when schedule is disabled" do
+        schedule.enabled = false
+        schedule.save!
+        ::Naf::ApplicationSchedule.constant_schedules.should == []
+      end
+
+      it "return no schdules when run interval style is not keep running" do
+        ::Naf::ApplicationSchedule.constant_schedules.should == []
+      end
+    end
+
+    describe "#enabled" do
+      it "return empty array when schedule is disabled" do
+        schedule.enabled = false
+        schedule.save!
+        ::Naf::ApplicationSchedule.enabled.should == []
+      end
+
+      it "return array with schedule when schedule is enabled" do
+        ::Naf::ApplicationSchedule.enabled.should == [schedule]
+      end
+    end
+
+    describe "#application_not_deleted" do
+      it "return empty array when application is deleted" do
+        schedule.application.deleted = true
+        schedule.application.save!
+        ::Naf::ApplicationSchedule.application_not_deleted.should == []
+      end
+
+      it "return array with schedule when application is not deleted" do
+        ::Naf::ApplicationSchedule.application_not_deleted.should == [schedule]
+      end
     end
 
     #-------------------------

data/spec/models/naf/machine_spec.rb

@@ -396,10 +396,12 @@ module Naf
     end
 
     describe "#affinity" do
+      let!(:classification) { FactoryGirl.create(:machine_affinity_classification) }
       it "return affinity associated with machine's id" do
-        affinity = FactoryGirl.create(:affinity, id: 4,
-                                                 affinity_classification_id: 1,
-                                                 affinity_name: machine.id.to_s)
+        affinity = FactoryGirl.create(:affinity,
+                                      id: 4,
+                                      affinity_classification_id: FactoryGirl.create(:machine_affinity_classification).id,
+                                      affinity_name: machine.id.to_s)
         machine.affinity.should == affinity
       end
 

metadata

@@ -1,18 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8
   prerelease: 
 platform: ruby
 authors:
 - Keith Gabryelski
 - Leonardo Meira
-- Nathaniel Lim
-- Aleksandr Dembskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -239,6 +237,7 @@ files:
 - app/assets/stylesheets/naf.css
 - app/assets/stylesheets/naf/layout.css.scss
 - app/controllers/naf/affinities_controller.rb
+- app/controllers/naf/api_simple_cluster_authenticator_application_controller.rb
 - app/controllers/naf/application_controller.rb
 - app/controllers/naf/application_schedule_affinity_tabs_controller.rb
 - app/controllers/naf/application_schedules_controller.rb
@@ -287,6 +286,7 @@ files:
 - app/models/logical/naf/machine_runner_invocation.rb
 - app/models/logical/naf/pickler.rb
 - app/models/logical/naf/unpickler.rb
+- app/models/logical/naf/user_session.rb
 - app/models/naf/affinity.rb
 - app/models/naf/affinity_classification.rb
 - app/models/naf/application.rb
@@ -319,6 +319,7 @@ files:
 - 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_archiver_queuer.rb
 - app/models/process/naf/log_reader.rb
 - app/models/process/naf/logger/base.rb
 - app/models/process/naf/logger/job_log.rb
@@ -485,6 +486,9 @@ files:
 - spec/factories/naf.rb
 - spec/helpers/naf/application_helper_spec.rb
 - spec/models/logical/naf/application_spec.rb
+- spec/models/logical/naf/construction_zone/boss_rspec.rb
+- spec/models/logical/naf/construction_zone/foreman_spec.rb
+- spec/models/logical/naf/construction_zone/proletariat_spec.rb
 - spec/models/logical/naf/construction_zone/work_order_spec.rb
 - spec/models/logical/naf/job_fetcher_spec.rb
 - spec/models/logical/naf/job_spec.rb
@@ -492,6 +496,7 @@ files:
 - 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/logical/naf/user_session_spec.rb
 - spec/models/naf/affinity_classification_spec.rb
 - spec/models/naf/affinity_spec.rb
 - spec/models/naf/application_run_group_restriction_spec.rb
@@ -600,6 +605,9 @@ test_files:
 - spec/factories/naf.rb
 - spec/helpers/naf/application_helper_spec.rb
 - spec/models/logical/naf/application_spec.rb
+- spec/models/logical/naf/construction_zone/boss_rspec.rb
+- spec/models/logical/naf/construction_zone/foreman_spec.rb
+- spec/models/logical/naf/construction_zone/proletariat_spec.rb
 - spec/models/logical/naf/construction_zone/work_order_spec.rb
 - spec/models/logical/naf/job_fetcher_spec.rb
 - spec/models/logical/naf/job_spec.rb
@@ -607,6 +615,7 @@ test_files:
 - 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/logical/naf/user_session_spec.rb
 - spec/models/naf/affinity_classification_spec.rb
 - spec/models/naf/affinity_spec.rb
 - spec/models/naf/application_run_group_restriction_spec.rb