naf 2.1.8 → 2.1.9

data/README.rdoc

@@ -41,7 +41,7 @@ Machines have an allocate-able number of slots of a specific affinity. Applicati
 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 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.9: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-from-Naf-v2.1.6-to-Naf-v2.1.9]
 === 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 v1.1.4: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v1.1.4]

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,9 @@
 = Release Notes
 
+=== Version 2.1.9
+Bug fixes:
+* Logical::Naf::ConstructionZone doesn't properly propagate affinity parameters
+
 === Version 2.1.8
 Bug fixes:
 * Removed check for signed message. Encrypted data generated by ActiveSupport::MessageVerifier is different depending on the ruby version.

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

@@ -6,7 +6,7 @@ module Logical::Naf::ConstructionZone
             application_schedule.application_run_group_name,
             application_schedule.application_run_group_limit,
             application_schedule.priority,
-            application_schedule.affinities,
+            application_schedule.application_schedule_affinity_tabs,
             application_schedule.prerequisites,
             application_schedule.enqueue_backlogs,
             application_schedule)

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

@@ -73,6 +73,10 @@ module Logical::Naf::ConstructionZone
           }
         elsif affinity.is_a? ::Naf::ApplicationScheduleAffinityTab
           # affinity_for application_schedule_affinity_tab
+          {
+            affinity_id: affinity.affinity_id,
+            affinity_parameter: affinity.affinity_parameter
+          }
         elsif affinity.is_a? Hash
           # should have key: :affinity_id or :affinity_short_name or :affinity_name
           # may have key: :affinity_parameter

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = '2.1.8'
+  VERSION = '2.1.9'
 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-03-24'
+  s.date        = '2014-03-25'
   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/models/logical/naf/construction_zone/work_order_spec.rb

@@ -59,10 +59,11 @@ module Logical::Naf::ConstructionZone
           should == [{ affinity_id: affinity.id }]
       end
 
-      it 'return nil when an ApplicationScheduleAffintyTab object is provided' do
-        tab = FactoryGirl.build(:app_schedule_affinity_tab_base)
+      it 'return hash when an ApplicationScheduleAffintyTab object is provided' do
+        tab = FactoryGirl.build(:normal_app_schedule_affinity_tab, affinity_parameter: 1.0)
         work_order.instance_variable_set(:@affinities, [tab])
-        work_order.historical_job_affinity_tab_parameters.should == [nil]
+        work_order.historical_job_affinity_tab_parameters.
+          should == [{ affinity_id: tab.affinity_id, affinity_parameter: tab.affinity_parameter }]
       end
 
       it 'return hash with the affinity_id when a Hash object is provided' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails