zergrush_cf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWMzZjIyNWQ4NzJmYWUzYzNmNzg2NTgwZmM2NjY4OWIxYjMwMDIyNw==
+    ODdlMmM0ODNkOTU5ZTE5MTNiMTBmZGM2Y2JiYzhjM2VkYTM2ZWM4OA==
   data.tar.gz: !binary |-
-    MjdiZDgwNmFlZmE5M2IxY2ZlNDVhZTUwYjJkNzExZjBiMWJlZDA1OQ==
+    YjgwMWRlNDg0YmY2M2MxNzkzNDU5YzNlOWU3ZGU0MjUwZjc3MGQyNA==
 SHA512:
   metadata.gz: !binary |-
-    MTRlOTY3MzAyNDAyMDQ2MTI0Y2E0OWExYzhmMjg5ZDE3OWM5YjcwNTc1NTA5
-    YzNjODA3MDA0ZmQ1MzJiYzM0MDc3NDY0NmYxNmM2ZjI5NjM0ZGYwODE1NDQz
-    MDNlNGYzYWU5ZDY2Yzg4ZmUzNjg3MDY4MjZmY2VhZDdiMzkzYTI=
+    NGRmNjhlYzUyYTUwOWJkYjUxY2RjZTFhY2RlMjFjZmFlZTA0NDVkYzg1YWVl
+    NDJhYTQ0ZTQxODM4MjE3NWY4ODc2NzZhYWVmN2Q1NjA5ZTUxZGQzNjM2NzU5
+    MjM1YWVkNTI4MDZlZmJkNWU2ZmM4NzAzMzljNmNlYjdmOWNmMjE=
   data.tar.gz: !binary |-
-    Y2Y3MmI1MmVkZGNkMTE1ZDNhZTEyMzEyOGYwNTcwMmI1ZmZiODM0M2E2Nzg3
-    NjNjNDQ1MTg0OTA3YjI2MDM3YmYzODVlMDk4N2U2MmJlMDdmZDVhODQwYTA3
-    MzcwNGM1ODNlYmM3Mzk5ODVmMDZhN2I3MTg0YmFkYTgyYTk5ZDg=
+    MzVjY2FlNDk1N2I1NDllZTFjY2M5MmFjYjc4MTUzMjdiMDVjNWQ2ZGVhM2E0
+    ZjRkYmRiODBiYTQ0MGI3ZDNjZTk4ZWI1M2EzNmExMTRkMjI1MjVjYTJjOGZj
+    MTFhMTg2Mjg3MGE1MjNmODU0YTg1ZTZiOTUzMzAwOWJlOTBjMTc=

data/README.md

@@ -13,8 +13,9 @@ Additional properties defined
 
 - access_key_id - AWS access key id
 - secret_access_key - AWS secret. 
-- template - body of a AWS CloudFormation template
-- template_parameters - 
+- template - body of a AWS CloudFormation template (use this OR template_file)
+- template_file - file containing the CloudFormation template. Path is relative to location of .ke task file in .hive (use this OR template)
+- template_parameters - parameter values for the cloudformation template
 
 Example use:
 ```
@@ -28,6 +29,7 @@ Example use:
             "template": {
                 ...
             },
+            "template_file": "template_file.json",
             "template_parameters": {
                 "Param1": "value",
                 "Param2": "ENV['SOME_VARIABLE']"

data/lib/zergrush_cf/renderer.rb

@@ -22,6 +22,7 @@
 #++
 
 require 'fileutils'
+require 'json'
 
 module ZergrushCF
     class Renderer
@@ -30,6 +31,7 @@ module ZergrushCF
             @vm = task_hash["vm"]
             @name = task_name
             @template = task_hash["vm"]["driver"]["driveroptions"][0]["template"]
+            @template_file = task_hash["vm"]["driver"]["driveroptions"][0]["template_file"]
             @driver = task_hash["vm"]["driver"]["drivertype"] 
             @hive_location = hive_location
         end
@@ -37,14 +39,17 @@ module ZergrushCF
         def render
             puts ("Rendering driver templates...")
 
-            # write cloudformation template to a separate file
-            abort("CloudFormation template not specified!") unless @template != nil
+            abort("ERROR: Can't specify both template and template_file") unless @template == nil || @template_file == nil
+            abort("ERROR: Must specify template or template_file") unless @template != nil || @template_file != nil
+
+            template_body = (@template != nil) ? @template : JSON.parse( IO.read(File.join(@hive_location, @name, @template_file)) )
+
 
             puts ("Writing #{File.join(@hive_location, "driver", @driver, @name, "template.json")}...")
             FileUtils.mkdir_p(File.join(@hive_location, "driver", @driver, @name))
-            File.open(File.join("#{@hive_location}", "driver", @vm["driver"]["drivertype"], @name, "template.json"), 'w') { |file| file.write(@template.to_json) }
+            File.open(File.join("#{@hive_location}", "driver", @vm["driver"]["drivertype"], @name, "template.json"), 'w') { |file| file.write(template_body.to_json) }
 
-            return @template
+            return template_body
         end
     end
 end

data/lib/zergrush_cf/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module ZergrushCF
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/resources/option_schema.template

@@ -7,6 +7,9 @@
 "template": {
     "type": "object"
 },
+"template_file": {
+    "type": "string"
+},
 "template_parameters": {
     "type": "object"
 },

data/zergrush_cf.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "zergrush", ">= 0.0.10"
+  s.add_development_dependency "zergrush", ">= 0.0.11"
 
   s.add_dependency "fog", ">=1.20.0"
   s.add_dependency "ruby-progressbar", "1.4.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zergrush_cf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - MTN Satellite Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement