sfn 3.0.22 → 3.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279982d00c24881c257eff78a3d14ed604952146
-  data.tar.gz: 9a093919f17154f3fc20920b933691f0438c0583
+  metadata.gz: 4c7a832bd18a4660d0184280dc1818f2fe13aeaa
+  data.tar.gz: 6fd33f44b62ac8c3ca7836963e9c22ba355d5e9a
 SHA512:
-  metadata.gz: 01741b34e7ef10214fa4f8902d2d35d1f175752d822f632e8f21e20ffdf5721e0a667fdf2f5ed1d5d56c87e87d3c8afb24319622bcbd62af70aa8e4c509b1a45
-  data.tar.gz: 57220d7bc625e74aa0b7f9f5ecbbc4fc22e77f56d11a3fda68bd1d5583ef4b84bb0084322496f7188b16d061212c51eeaf839c731290bc12e85ec523733a61ec
+  metadata.gz: 7a2392c1bbfe0bd9f7a1c5bebf5f1c9ec316a262286757cecbdfd9b56df3c8bc1bb7e79b606f993149f3f5994fa31d8bc4a69644f0f9ab7dcc1d1978da247eec
+  data.tar.gz: f66df1b8a616ed132f51a2ec06d7495fc3eb93499d79171b16f38a4346fe7f67900a0e76d70eb99c57ba1e768f070985c9cae112f45020f2a8a7327b0b854d5c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v3.0.24
+* [fix] Quieter print only output (#258)
+* [fix] Require all modules for lint (#248)
+* [fix] Fix parameter processing when no template provided
+* [enhancement] Default provider to aws when unset (#251)
+* [enhancement] Only delete remote templates when URL is full string (#250)
+* [enhancement] Support YAML output when printing (#252)
+
 # v3.0.22
 * [fix] Properly match compile time parameters (#235)
 * [fix] Remove AWS policy statements for undefined resources (#240)

data/README.md

@@ -18,12 +18,15 @@ with orchestration APIs.
 ## Documentation
 
 * [User Documentation](http://www.sparkleformation.io/docs/sfn/)
+* [sfn API Documentation](http://www.sparkleformation.io/docs/sfn/)
 
 # Info
 
 * Repository: https://github.com/sparkleformation/sfn
 * Website: http://www.sparkleformation.io/docs/sfn/
 * Mailing List: https://groups.google.com/forum/#!forum/sparkleformation
-* IRC: Freenode @ #sparkleformation
+* IRC: [#sparkleformation @ Freenode](https://webchat.freenode.net/?channels=#sparkleformation)
+* Gitter: [![Join at https://gitter.im/SparkleFormation/sparkleformation](https://badges.gitter.im/SparkleFormation/sparkleformation.svg)](https://gitter.im/SparkleFormation/sparkleformation?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[miasma]: http://miasma-rb.github.io/miasma/
+
+[miasma]: http://miasma-rb.github.io/miasma/

data/lib/sfn/command/destroy.rb

@@ -69,7 +69,7 @@ module Sfn
           provider.connection.data[:stack_types].include?(resource['Type'])
         end.each do |resource|
           url = resource['Properties']['TemplateURL']
-          if(url)
+          if(url && url.is_a?(String))
             _, bucket_name, path = URI.parse(url).path.split('/', 3)
             bucket = provider.connection.api_for(:storage).buckets.get(bucket_name)
             if(bucket)

data/lib/sfn/command/print.rb

@@ -15,7 +15,13 @@ module Sfn
         config[:print_only] = true
         file = load_template_file
 
-        json_content = format_json(parameter_scrub!(template_content(file)))
+        output_content = parameter_scrub!(template_content(file))
+        if(config[:yaml])
+          require 'yaml'
+          output_content = YAML.dump(output_content)
+        else
+          output_content = format_json(output_content)
+        end
 
         if(config[:write_to_file])
           unless(File.directory?(File.dirname(config[:write_to_file])))
@@ -25,11 +31,11 @@ module Sfn
             end
           end
           run_action "Writing template to file - #{config[:write_to_file]}" do
-            File.write(config[:write_to_file], json_content)
+            File.write(config[:write_to_file], output_content)
             nil
           end
         else
-          ui.puts json_content
+          ui.puts output_content
         end
       end
 

data/lib/sfn/command/update.rb

@@ -58,7 +58,9 @@ module Sfn
           raise "Failed to locate stack: #{name}"
         end
 
-        ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('update', :green)}"
+        unless(config[:print_only])
+          ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('update', :green)}"
+        end
 
         unless(file)
           if(config[:template])
@@ -68,7 +70,9 @@ module Sfn
             stack_info << " #{ui.color('(no template update)', :yellow)}"
           end
         end
-        ui.info "  -> #{stack_info}"
+        unless(config[:print_only])
+          ui.info "  -> #{stack_info}"
+        end
         if(file)
           if(config[:print_only])
             ui.puts format_json(parameter_scrub!(template_content(file)))

data/lib/sfn/command_module/callbacks.rb

@@ -32,6 +32,7 @@ module Sfn
           callbacks_for(c_type)
         end.flatten(1).compact.uniq.each do |item|
           callback_name, callback, quiet = item
+          quiet = true if config[:print_only]
           ui.info "Callback #{ui.color(type.to_s, :bold)} #{callback_name}: #{ui.color('starting', :yellow)}" unless quiet
           if(args.empty?)
             callback.call

data/lib/sfn/command_module/stack.rb

@@ -109,17 +109,21 @@ module Sfn
         # @param sparkle [SparkleFormation, Hash] template instance
         # @return [Array<Array<String>, Smash>] prefix value, parameters
         def prefix_parameters_setup(sparkle)
-          if(sparkle.is_a?(SparkleFormation))
+          case sparkle
+          when SparkleFormation
             parameter_prefix = sparkle.root? ? [] : (sparkle.root_path - [sparkle.root]).map do |s|
               Bogo::Utility.camel(s.name)
             end
             stack_parameters = sparkle.compile.parameters
             stack_parameters = stack_parameters.nil? ? Smash.new : stack_parameters._dump
-          else
+          when Hash
             parameter_prefix = []
             stack_parameters = TEMPLATE_PARAMETER_LOCATIONS.map do |loc_key|
               sparkle[loc_key]
             end.compact.first || Smash.new
+          else
+            parameter_prefix = []
+            stack_parameters = Smash.new
           end
           [parameter_prefix, stack_parameters]
         end
@@ -236,11 +240,12 @@ module Sfn
           current_parameters = opts[:current_parameters] || {}
           current_stack = opts[:stack]
           parameter_prefix, stack_parameters = prefix_parameters_setup(sparkle)
+          sparkle_root_name = sparkle.is_a?(SparkleFormation) ? sparkle.root.name : nil
           unless(stack_parameters.empty?)
             format_config_parameters!
             param_banner = false
             stack_parameters.each do |param_name, param_value|
-              ns_key = locate_config_parameter_key(parameter_prefix, param_name, sparkle.root.name)
+              ns_key = locate_config_parameter_key(parameter_prefix, param_name, sparkle_root_name)
               # When parameter is a hash type, it is being set via
               # intrinsic function and we don't modify
               if(function_set_parameter?(current_parameters[param_name]))

data/lib/sfn/command_module/template.rb

@@ -12,6 +12,8 @@ module Sfn
       TEMPLATE_IGNORE_DIRECTORIES = %w(components dynamics registry)
       # maximum number of attempts to get valid parameter value
       MAX_PARAMETER_ATTEMPTS = 5
+      # default provider used when credentials are unset
+      DEFAULT_PROVIDER_NAME = :aws
 
       module InstanceMethods
 
@@ -123,17 +125,17 @@ module Sfn
         def sparkle_collection
           memoize(:sparkle_collection) do
             collection = SparkleFormation::SparkleCollection.new(
-              :provider => config.get(:credentials, :provider)
+              :provider => config.fetch(:credentials, :provider, DEFAULT_PROVIDER_NAME)
             )
             begin
               if(config[:base_directory])
                 root_pack = SparkleFormation::SparklePack.new(
                   :root => config[:base_directory],
-                  :provider => config.get(:credentials, :provider)
+                  :provider => config.fetch(:credentials, :provider, DEFAULT_PROVIDER_NAME)
                 )
               else
                 root_pack = SparkleFormation::SparklePack.new(
-                  :provider => config.get(:credentials, :provider)
+                  :provider => config.fetch(:credentials, :provider, DEFAULT_PROVIDER_NAME)
                 )
               end
               collection.set_root(root_pack)
@@ -599,7 +601,8 @@ module Sfn
           include Sfn::CommandModule::Template::InstanceMethods
           include Sfn::Utils::PathSelector
           include Sfn::Utils::StackParameterScrubber
-         end
+          include Sfn::Utils::StackParameterValidator
+        end
       end
 
     end

data/lib/sfn/config/print.rb

@@ -16,6 +16,11 @@ module Sfn
         :description => 'Do not use provider customized dump behavior'
       )
 
+      attribute(
+        :yaml, [TrueClass, FalseClass],
+        :description => 'Output template content in YAML format'
+      )
+
     end
   end
 end

data/lib/sfn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.0.22
+  version: 3.0.24
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli