cloudformation-tool 0.8.6 → 0.9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 16196dd229f1e0040b4b06190e90da9d72dbef2e33ac545055f08a89b3a20339
-  data.tar.gz: 93bc3913458bd350dea067ccd4c7e4ea6562c760f418f17d7b4d34eb918cf1cc
+SHA1:
+  metadata.gz: 8b4c374a9c0af1d6e1142125a3301cda3ed0f253
+  data.tar.gz: 881a2ab8d2736c26d7e0d52b81ce0b3d4fff5f4b
 SHA512:
-  metadata.gz: 685f2098bfb4278a779683c65fe35937b23a35e9470519a9f2747a912412b13e5229ef81d86c57489170d7a9b88cbb5cb88b2933746cf1fd75786f67b32725ce
-  data.tar.gz: 33278d66726b92d7a9cec30f54499be8b05ab2eab17b9922e42d212e4f66cafc94aa929d2687482bcc1e6373c51975138501ec35c6c053cb7df35901d90a6a77
+  metadata.gz: aa3d75a17b1f4fa484370737a292bf895755fef6f3f22dea7bf645edfc6880c497bcff74d1f39de280c7ff37c01d0633fdc20fdeebaa74ed26ce5cc35499fa7f
+  data.tar.gz: ac5f391cb29094cebc079b6d1cdd6b9d63089ba250939348b6fd1410437493322a59f674154c2885cc1c929cfe7256395b2e6c4631339596d25df08329152531

data/lib/cloud_formation_tool/cli/compile.rb

@@ -2,15 +2,23 @@ module CloudFormationTool
   module CLI
     
     class Compile < Clamp::Command
+      include ParamSupport
       
       parameter 'FILE', 'Template main file'
       
+      add_param_options
+      
       def execute
         if file.end_with? '.init'
           puts CloudInit.new(file).encode(false) # make sure cloud-init files obey AWS user-data restrictions, but are also printable
         else
-          puts CloudFormation.parse(file).to_yaml
-  #        raise CloudFormationTool::Errors::AppError.new("not a valid template file. Only .init and .yaml are supported")
+          tpl = CloudFormation.parse(file)
+          params = get_params
+          data = tpl.compile;
+          data['Parameters'].each do |name,param|
+            param['Default'] = params[name] if params.has_key? name
+          end
+          puts data.to_yaml
         end
       end
       

data/lib/cloud_formation_tool/cli/create.rb

@@ -4,50 +4,12 @@ require 'net/http'
 module CloudFormationTool
   module CLI
     class Create < Clamp::Command
-      
+      include ParamSupport
+
       parameter 'FILE', 'Template main file'
       parameter '[STACK_NAME]', 'Name of the stack to create. Defaults to directory name'
       
-      option [ "-p", "--param" ], "PARAM", [
-        "Parameter to use with the cloudformation, of the format Mame=Tag",
-        "Use multiple times to set multiple parameters.",
-        "See 'parameters' command to list the paramaters supported by the tempalte."
-        ].join("\n"), multivalued: true
-      option [ "-i", "--import" ], "FILE", "Import parameters from YAML file or HTTP URL.", :attribute_name => :param_file
-      option [ "-k", "--import-key" ], "KEY", [
-        "When loading parameters from a YAML file, use the specified key to load a named",
-        "map from the file, instead of using just the file itself as the parameter map"
-        ].join("\n"), :attribute_name => :param_key
-      
-      def read_param_file(file)
-        param_uri = URI(file)
-        case param_uri.scheme
-        when /^http/
-          Net::HTTP.get(param_uri)
-        else
-          File.read(file)
-        end
-      end
-      
-      def get_params
-        params = if param_file
-          yaml = YAML.load(read_param_file param_file).to_h
-          if param_key
-            raise "Missing parameter section '#{param_key}' in '#{param_file}'!" unless yaml[param_key].is_a? Hash
-            yaml[param_key]
-          else
-            yaml
-          end
-        else
-          Hash.new
-        end
-        # allow param_list to override parameters from the param file
-        param_list.inject(params) do |h, param|
-          k,v = param.split /\s*[=:]\s*/
-          h[k] = v
-          h
-        end
-      end
+      add_param_options
       
       def execute
         name = stack_name || File.basename(File.dirname(File.expand_path(file)))

data/lib/cloud_formation_tool/cli/param_support.rb

@@ -0,0 +1,60 @@
+require 'uri'
+require 'net/http'
+
+module CloudFormationTool
+  module CLI
+    module ParamSupport
+    
+      def self.included o
+        o.extend ClassMethods
+      end
+      
+      module ClassMethods
+      
+        def add_param_options
+          option [ "-p", "--param" ], "PARAM", [
+            "Parameter to use with the cloudformation, of the format Mame=Tag",
+            "Use multiple times to set multiple parameters.",
+            "See 'parameters' command to list the paramaters supported by the tempalte."
+            ].join("\n"), multivalued: true
+          option [ "-i", "--import" ], "FILE", "Import parameters from YAML file or HTTP URL.", :attribute_name => :param_file
+          option [ "-k", "--import-key" ], "KEY", [
+            "When loading parameters from a YAML file, use the specified key to load a named",
+            "map from the file, instead of using just the file itself as the parameter map"
+            ].join("\n"), :attribute_name => :param_key
+        end
+      end
+      
+      def read_param_file(file)
+        param_uri = URI(file)
+        case param_uri.scheme
+        when /^http/
+          Net::HTTP.get(param_uri)
+        else
+          File.read(file)
+        end
+      end
+      
+      def get_params
+        params = if param_file
+          yaml = YAML.load(read_param_file param_file).to_h
+          if param_key
+            raise "Missing parameter section '#{param_key}' in '#{param_file}'!" unless yaml[param_key].is_a? Hash
+            yaml[param_key]
+          else
+            yaml
+          end
+        else
+          Hash.new
+        end
+        # allow param_list to override parameters from the param file
+        param_list.inject(params) do |h, param|
+          k,v = param.split /\s*[=:]\s*/
+          h[k] = v
+          h
+        end
+      end
+      
+    end
+  end
+end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '0.8.6'
+  VERSION = '0.9.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0.1
 platform: ruby
 authors:
 - Oded Arbel
@@ -143,6 +143,7 @@ files:
 - lib/cloud_formation_tool/cli/main.rb
 - lib/cloud_formation_tool/cli/monitor.rb
 - lib/cloud_formation_tool/cli/output.rb
+- lib/cloud_formation_tool/cli/param_support.rb
 - lib/cloud_formation_tool/cli/parameters.rb
 - lib/cloud_formation_tool/cli/recycle.rb
 - lib/cloud_formation_tool/cli/scale.rb
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates