sfn 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503fe5b1c6c2b1fd9620fa4031e4f922e7432739
-  data.tar.gz: ce03c4291a2edfb660e7614b7202835f062ee965
+  metadata.gz: 69dfa18182936f431c28d80ce5fa6fbbc356b006
+  data.tar.gz: 5f7cff254502ffaef0a89e3fa0dc005f68a6aa93
 SHA512:
-  metadata.gz: 3ebf8bfb6f17238c53cf49b295e938bacaa04298fa79f9f2b694d8c8fd927ead75c1acf005fd7ebd63f870039bb890e98659395cd6451b83f934800b3a459ded
-  data.tar.gz: bf7061df664df0cec57c29627f57262effe53652f1bd49dc439fe4157983730adacb4831fbfe10750f30764517db8d90716a16410ce383e2f14f045a32ac5bf7
+  metadata.gz: 34e785122c57f3e05bd498a533dec705026556159c52077967f49cb3058da52cf62f793f10e72d1e202b70ffad7b510154b56f6bb8adf0190bd1a0f558a8b5f7
+  data.tar.gz: 96ec84db44330109ef9b046e0dcd9afa25a5dc9c291e93bad36257b191aed6b6c6a26099c73a0b62061f11d203621e7fab26f4e5f9f99b07be12d381e12e0004

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.3.2
+* Validate stack name prior to discovery on apply
+* Update configuration usage to allow runtime modification
+* Allow `create` command to print-only without requiring API credentials
+
 ## v0.3.0
 * Conversion from `knife-cloudformation` to `sfn`
 * Add knife subcommand alias `sparkleformation`

data/lib/sfn/command.rb

@@ -17,12 +17,19 @@ module Sfn
     autoload :Validate, 'sfn/command/validate'
 
     # Override to provide config file searching
-    def initialize(opts, args)
-      unless(opts[:config])
-        opts = opts.to_hash.to_smash(:snake)
-        discover_config(opts)
+    def initialize(cli_opts, args)
+      unless(cli_opts[:config])
+        cli_opts = cli_opts.to_hash.to_smash(:snake)
+        discover_config(cli_opts)
+      end
+      super(cli_opts, args)
+    end
+
+    # @return [Smash]
+    def config
+      memoize(:config) do
+        super
       end
-      super
     end
 
     protected

data/lib/sfn/command/create.rb

@@ -38,6 +38,15 @@ module Sfn
           unpack_nesting(name, file, :create)
         else
 
+          if(config[:print_only] && !config[:apply_stacks])
+            ui.info _format_json(
+              translate_template(
+                Sfn::Utils::StackParameterScrubber.scrub!(file)
+              )
+            )
+            return
+          end
+
           stack = provider.connection.stacks.build(
             config[:options].dup.merge(
               :name => name,

data/lib/sfn/command/events.rb

@@ -70,12 +70,17 @@ module Sfn
         end
       end
 
+      # Discover stacks defined within the resources of given stack
+      #
+      # @param stack [Miasma::Models::Orchestration::Stack]
       def discover_stacks(stack)
         stack.resources.reload.all.each do |resource|
           if(resource.type == 'AWS::CloudFormation::Stack')
             nested_stack = provider.connection.stacks.get(resource.id)
-            @stacks.push(nested_stack).uniq!
-            discover_stacks(nested_stack)
+            if(nested_stack)
+              @stacks.push(nested_stack).uniq!
+              discover_stacks(nested_stack)
+            end
           end
         end
       end

data/lib/sfn/command_module/base.rb

@@ -117,13 +117,9 @@ module Sfn
           arguments
         end
 
-        # Fetches value from local configuration (#opts) and falls
-        # back to global configuration (#options)
-        #
-        # @return [Object]
         def config
           memoize(:config) do
-            options.deep_merge(opts)
+            super
           end
         end
 

data/lib/sfn/command_module/stack.rb

@@ -18,7 +18,7 @@ module Sfn
         # @param stack [Miasma::Models::Orchestration::Stack]
         # @return [Miasma::Models::Orchestration::Stack]
         def apply_stacks!(stack)
-          remote_stacks = config.fetch(:apply_stacks, [])
+          remote_stacks = [config[:apply_stack]].flatten.compact
           remote_stacks.each do |stack_name|
             remote_stack = provider.connection.stacks.get(stack_name)
             if(remote_stack)
@@ -36,7 +36,7 @@ module Sfn
         # @param remote_stack [Miasma::Models::Orchestration::Stack] stack to inspect for nested stacks
         # @param stack [Miasma::Models::Orchestration::Stack] current stack
         # @return [Miasma::Models::Orchestration::Stack]
-        def apply_nested_stacks(remote_stack, stack)
+        def apply_nested_stacks!(remote_stack, stack)
           remote_stack.resources.all.each do |resource|
             if(resource.type == 'AWS::CloudFormation::Stack')
               nested_stack = resource.expand

data/lib/sfn/provider.rb

@@ -40,8 +40,8 @@ module Sfn
     # @option args [Numeric] :stack_list_interval interval to wait between stack list refresh
     def initialize(args={})
       args = args.to_smash
-      unless(args[:miasma][:provider])
-        best_guess = args[:miasma].keys.group_by do |key|
+      unless(args.get(:miasma, :provider))
+        best_guess = args.fetch(:miasma, {}).keys.group_by do |key|
           key.to_s.split('_').first
         end.sort do |x, y|
           y.size <=> x.size

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('0.3.0')
+  VERSION = Gem::Version.new('0.3.2')
 end

data/sfn.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'SparkleFormation CLI'
   s.license = 'Apache-2.0'
   s.require_path = 'lib'
-  s.add_dependency 'bogo-cli', '~> 0.1.6'
+  s.add_dependency 'bogo-cli', '~> 0.1.12'
   s.add_dependency 'miasma'
   s.add_dependency 'net-ssh'
   s.add_dependency 'sparkle_formation', '>= 0.2.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: miasma
   requirement: !ruby/object:Gem::Requirement