skyed 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4681aeb911a86e19ff48c5728d0a96d85896d76
-  data.tar.gz: b0753c54b56e424066bf53cdce98f34c2c8eea9c
+  metadata.gz: 131382b709e80832ad9b2c1ab13ed243f4b05fa3
+  data.tar.gz: b5c59a7ebae270bdc93967f2aa018d55f43a4788
 SHA512:
-  metadata.gz: f6ac335374e0d6550126002c93a388f6b0e758ad58a03929b92770d55a6e2474a058eb56685cc5a3a49d0ad835b52683663900d6314c1a2e1d6c643b60ab58eb
-  data.tar.gz: 494946d8482f9d70a99297ee46815ece8e882aa045a8adb61cf281182123baefc555633978d92cfee916819b04db6be3cc69100ae61dee367fdeeac6f21f436e
+  metadata.gz: 30d08fa187786a4aa52d625fcc38e5f8b93e3ed93d510d93019ed29e0c122d7e742a8a1af6e1ffeea455c4ebf1b30d14354c23f4d5a8c5c04fb6699f3e9ed16a
+  data.tar.gz: 1e09f08c65263731d121d1838f5ae76b1e63e979897b0dacc2016f235a45983371b6efd0f9334e8954a7160c1c2ac689d0768f76055e892dec5ce4a7b3f74c83

data/lib/skyed.rb

@@ -6,5 +6,5 @@ require 'skyed/settings'
 
 # Skyed is a set of tools for cloud computing
 module Skyed
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/skyed/commands.rb

@@ -34,6 +34,9 @@ command :run do |cmd|
   cmd.flag [:w, :wait_interval], default_value: 30,
                                  type: Integer,
                                  desc: 'Time to wait for AWS responses'
+  cmd.flag [:j, :custom_json], default_value: '',
+                               type: String,
+                               desc: 'Custom JSON to pass to OW'
   cmd.action do |global_options, options, args|
     Skyed::Run.execute(global_options, options, args)
   end

data/lib/skyed/run.rb

@@ -20,7 +20,7 @@ module Skyed
         instances = running_instances(ow, Skyed::Settings.layer_id)
         update_custom_cookbooks(ow, Skyed::Settings.stack_id, instances,
                                 options[:wait_interval])
-        execute_recipes(ow, args, instances, options[:wait_interval])
+        execute_recipes(ow, args, instances, options)
       end
 
       def deploy_status(ow, id)
@@ -103,12 +103,24 @@ module Skyed
         recipes
       end
 
-      def execute_recipes(ow, recipes, instances = nil, wait = 0)
+      def execute_recipes(
+        ow,
+        recipes,
+        instances = nil,
+        options = {})
+        options[:wait_interval] ||= 0
+        options[:custom_json] ||= ''
+        deploy_id = ow.create_deployment(
+          execute_params(recipes, instances, options[:custom_json]))
+        wait_for_deploy(ow, deploy_id, options[:wait_interval])
+      end
+
+      def execute_params(recipes, instances, custom_json)
         command = { name: 'execute_recipes', args: { recipes: recipes } }
         deploy_params = { stack_id: Skyed::Settings.stack_id, command: command }
+        deploy_params[:custom_json] = custom_json unless custom_json.empty?
         deploy_params[:instance_ids] = instances unless instances.nil?
-        deploy_id = ow.create_deployment(deploy_params)
-        wait_for_deploy(ow, deploy_id, wait)
+        deploy_params
       end
 
       def recipe_in_cookbook(recipe)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skyed
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ignasi Fosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git