bcome 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a0b74d4c91fe7b0cb925f90991b9a39db9c974
-  data.tar.gz: de595006dc81df83c71d3b857d7a46256bf45068
+  metadata.gz: 91c96e99720b24cef61f7ba3ce161eb701289410
+  data.tar.gz: b1e99f33e302403a8e9a98855b0eeba2d68ace1f
 SHA512:
-  metadata.gz: c6cd53a6ceb112912b195578072785d7af42454377f7026acaf604959c04606f73653c395425e83b062f5cbc8991d74a98f2b005d65e4ae878de5215891666b7
-  data.tar.gz: 837a73262d6cac7ff0af4609dc86920b39c3dc621878585236a4bf77ff1a8dfdaa812ef835dfdcdad96fe8794fd50948424e2d952e537748324d32183f332d4e
+  metadata.gz: 90e7dc76e7c6dcf52801d101f6e009a998f56480cb3576a4d3abef2da4bda5d6c77ff2e09f616b91d5a81c8c5c9a426e04a074f763925d27cdaf9dfa78e3c6b9
+  data.tar.gz: e80bed4ab0d1a02123485e3905bf737a4b43d7ab15870a1d4c51a185205a036852c538179abcc8f13b53318d29b1a63ebd7d528a1b8ad6839f6f4a17f8e0d963

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/orchestrator/command_group/custom.rb

@@ -5,9 +5,9 @@ module ::Bcome::Orchestrator::CommandGroup
       super + [:bcome_command]
     end
 
-    def execute!(current_context_machines)
-      ::Bcome::Orchestrator::CustomCommand.send(@bcome_command, current_context_machines)
-    end
+    def execute!(current_context_machines, is_bootstrap)
+      ::Bcome::Orchestrator::CustomCommand.send(@bcome_command, current_context_machines, is_bootstrap)    
+   end
 
   end
 end

data/lib/orchestrator/command_group/direct.rb

@@ -19,14 +19,14 @@ module ::Bcome::Orchestrator::CommandGroup
       @commands ||= set_commands
     end
 
-    def execute!(current_context_machines)
+    def execute!(current_context_machines, bootstrap)
       # Per command group
       @direct_command_groups.each do |direct_command_group| 
         # Per unique machine instance
-        current_context_machines.each do |machine|
+        machines.each do |machine|
           kommands = []
           direct_command_group.command_instances.flatten.each do |command_instance|
-            kommands << ::Bcome::Command.new(:command => command_instance.cmd, :instance => machine, :bootstrap => command_instance.bootstrap, :success_exit_codes => command_instance.success_exit_codes) 
+            kommands << ::Bcome::Command.new(:command => command_instance.cmd, :instance => machine, :bootstrap => bootstrap, :success_exit_codes => command_instance.success_exit_codes) 
           end
 
           begin 

data/lib/orchestrator/recipe.rb

@@ -20,7 +20,7 @@ module ::Bcome::Orchestrator
 
     end
 
-    attr_reader :command_groups, :recipe_identifier, :description
+    attr_reader :command_groups, :recipe_identifier, :description, :bootstrap
 
     include ::Bcome::Orchestrator::ValidateAndSet
 
@@ -30,17 +30,25 @@ module ::Bcome::Orchestrator
     end
 
     def json_attributes
-      [:recipe_identifier, :description]
+      [:recipe_identifier, :description, :bootstrap]
     end
 
+    def optional_json_attributes
+      [:bootstrap]
+    end 
+
     def execute!(current_context_machines)
       @command_groups.each do |command_group|
         puts "\nExecuting command group".informational
-        command_group.execute!(current_context_machines)
+        command_group.execute!(current_context_machines, as_bootstrap)
         puts "\n" 
       end
     end
 
+    def as_bootstrap
+      bootstrap ? true : false
+    end  
+
     def set_command_groups(json, node_targets, all_machines, direct_commands)
       commands_json = json[:commands]
       raise "Expecting commands within an Orchestrator recipe as an Array" unless commands_json.is_a?(Array)

data/lib/orchestrator/validate_and_set.rb

@@ -2,7 +2,7 @@ module ::Bcome::Orchestrator::ValidateAndSet
   
   def validate_and_set(json)
     json_attributes.each{|attribute|
-      raise "Missing attribute #{attribute} in #{json.inspect}" unless json.has_key?(attribute)
+      raise "Missing attribute #{attribute} in #{json.inspect}" unless json.has_key?(attribute) if !json.has_key?(attribute) && !optional_json_attributes.include?(attribute)
       instance_variable_set("@#{attribute}".to_sym, json[attribute])
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk