sfn 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd51de01219d49eab04ff9c65a559496d12af4e
-  data.tar.gz: 54531dc80ac6f15fe3c712449533e74ea6c2706f
+  metadata.gz: 0c3196ce66fd00b722a64b80efff9ed0cdd47103
+  data.tar.gz: 4a1d7fb290a7908253b92f4c822f70f5f0463b11
 SHA512:
-  metadata.gz: e8fd31d72271d235c0e2a267cb0f978a95a61f0182cdebfed3e2e763efaa6a4222ab62c02d75e4544b8556f9a6dd5d941f120ffab01aa7b2743cc5996eb977f9
-  data.tar.gz: 4355c6cd7c2c75537c3c120bf5a961e1cd46e6483c3101ba144b12e2bcd0d273458300d8b2e3def53f10712fd93cdf5e67ec6907d04133eea6341da4790df3a0
+  metadata.gz: eaec77115434aa9b9c984b7148e4cdd691838ccc97843b9a1ca323cd1beb2fcd552f82f39713f2cbad054771ba204b50a7bd2deca8cae22cf723771e9ae03fdf
+  data.tar.gz: 14110bca18d73ca198d2f1514be1446710283e6efbddada42fe75299cbf6ae73fba4fd7ca45ba0d20c240de897685f8aa9b26b0bdcd5e280075663bd2ccf1623

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.4.0
+* Fix parameters passed on CLI (#11)
+* Fix credential overrides from the CLI (#14)
+* Properly process CLI options through custom config classes
+* Include AWS STS support via miasma-aws version bump
+
+***NOTE***: Some CLI **short** flags have changed in this release. This is due to
+	some updates on flag generation to help keep things more
+	consistent now and into the future. Please refer to the help
+	output for a given command to view short flags.
+
 ## v0.3.8
 * Fix result output from `update` command (#9)
 * Fix `inspect` command to properly support multiple attribute flags

data/lib/sfn/command.rb

@@ -48,5 +48,15 @@ module Sfn
       opts
     end
 
+    # @return [Class] attempt to return customized configuration class
+    def config_class
+      klass_name = self.class.name.split('::').last
+      if(Sfn::Config.const_defined?(klass_name))
+        Sfn::Config.const_get(klass_name)
+      else
+        super
+      end
+    end
+
   end
 end

data/lib/sfn/command_module/stack.rb

@@ -107,39 +107,50 @@ module Sfn
         # @param stack [Hash] stack template
         # @return [Hash]
         def populate_parameters!(stack, current_params={})
-          if(config[:interactive_parameters])
-            if(stack['Parameters'])
-              unless(config.get(:parameters))
-                config.set(:parameters, Smash.new)
-              end
-              stack.fetch('Parameters', {}).each do |k,v|
-                next if config[:parameters][k]
-                attempt = 0
-                valid = false
-                until(valid)
-                  attempt += 1
-                  default = config[:parameters].fetch(
-                    k, current_params.fetch(
-                      k, v['Default']
-                    )
+          if(stack['Parameters'])
+            if(config.get(:parameter).is_a?(Array))
+              config[:parameter] = Smash[
+                *config.get(:parameter).map(&:to_a)
+              ]
+            end
+            if(config.get(:parameters))
+              config.set(:parameters,
+                config.get(:parameters).merge(config[:parameter])
+              )
+            else
+              config.set(:parameters, config.fetch(:parameter, Smash.new))
+            end
+            stack.fetch('Parameters', {}).each do |k,v|
+              next if config[:parameters][k]
+              attempt = 0
+              valid = false
+              until(valid)
+                attempt += 1
+                default = config[:parameters].fetch(
+                  k, current_params.fetch(
+                    k, v['Default']
                   )
+                )
+                if(config[:interactive_parameters])
                   answer = ui.ask_question("#{k.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}", :default => default)
-                  validation = Sfn::Utils::StackParameterValidator.validate(answer, v)
-                  if(validation == true)
-                    unless(answer == v['Default'])
-                      config[:parameters][k] = answer
-                    end
-                    valid = true
-                  else
-                    validation.each do |validation_error|
-                      ui.error validation_error.last
-                    end
+                else
+                  answer = default
+                end
+                validation = Sfn::Utils::StackParameterValidator.validate(answer, v)
+                if(validation == true)
+                  unless(answer == v['Default'])
+                    config[:parameters][k] = answer
                   end
-                  if(attempt > MAX_PARAMETER_ATTEMPTS)
-                    ui.fatal 'Failed to receive allowed parameter!'
-                    exit 1
+                  valid = true
+                else
+                  validation.each do |validation_error|
+                    ui.error validation_error.last
                   end
                 end
+                if(attempt > MAX_PARAMETER_ATTEMPTS)
+                  ui.fatal 'Failed to receive allowed parameter!'
+                  exit 1
+                end
               end
             end
           end

data/lib/sfn/config.rb

@@ -22,11 +22,22 @@ module Sfn
     autoload :Update, 'sfn/config/update'
     autoload :Validate, 'sfn/config/validate'
 
+    attribute(
+      :config, String,
+      :description => 'Configuration file path'
+    )
+
     attribute(
       :credentials, Smash,
       :coerce => proc{|v|
-        v = Smash[v.split(',').map{|x| v.split('=')}] if v.is_a?(String)
-        v.to_smash
+        case v
+        when String
+          Smash[v.split(',').map{|x| v.split(/[=:]/)}]
+        when Hash
+          v.to_smash
+        else
+          v
+        end
       },
       :description => 'Provider credentials'
     )
@@ -53,10 +64,6 @@ module Sfn
       :yes, [TrueClass, FalseClass],
       :description => 'Automatically accept any requests for confirmation'
     )
-    attribute(
-      :config, String,
-      :description => 'Configuration file path'
-    )
 
     attribute :create, Create, :coerce => proc{|v| Create.new(v)}
     attribute :update, Update, :coerce => proc{|v| Update.new(v)}
@@ -76,9 +83,7 @@ module Sfn
     # @return [Smash]
     def self.options_for(klass)
       shorts = ['h'] # always reserve `-h` for help
-      _options_for(self, shorts).merge(
-        _options_for(klass, shorts)
-      )
+      _options_for(klass, shorts)
     end
 
     # Provide options for config class
@@ -88,7 +93,11 @@ module Sfn
     # @return [Smash]
     def self._options_for(klass, shorts)
       Smash[
-        klass.attributes.sort_by(&:first).map do |name, info|
+        ([klass] + klass.ancestors).map do |a|
+          if(a.ancestors.include?(Bogo::Config) && !a.attributes.empty?)
+            a.attributes
+          end
+        end.compact.reverse.inject(Smash.new){|m, n| m.deep_merge(n)}.map do |name, info|
           next unless info[:description]
           short = name.chars.zip(name.chars.map(&:upcase)).flatten.detect do |c|
             !shorts.include?(c)

data/lib/sfn/config/describe.rb

@@ -2,7 +2,7 @@ require 'sfn'
 
 module Sfn
   class Config
-    class Describe < Bogo::Config
+    class Describe < Config
 
       attribute(
         :resources, [TrueClass, FalseClass],

data/lib/sfn/config/destroy.rb

@@ -3,7 +3,7 @@ require 'sfn'
 module Sfn
   class Config
     # Destroy command configuration
-    class Destroy < Bogo::Config
+    class Destroy < Config
     end
   end
 end

data/lib/sfn/config/events.rb

@@ -3,7 +3,7 @@ require 'sfn'
 module Sfn
   class Config
     # Events command configuration
-    class Events < Bogo::Config
+    class Events < Config
 
       attribute(
         :attribute, String,

data/lib/sfn/config/export.rb

@@ -4,7 +4,7 @@ module Sfn
   class Config
 
     # Export command configuration
-    class Export < Bogo::Config
+    class Export < Config
 
       attribute(
         :name, String,

data/lib/sfn/config/import.rb

@@ -4,7 +4,7 @@ module Sfn
   class Config
 
     # Import command configuration
-    class Import < Bogo::Config
+    class Import < Config
 
       attribute(
         :path, String,

data/lib/sfn/config/inspect.rb

@@ -3,7 +3,7 @@ require 'sfn'
 module Sfn
   class Config
     # Inspect command configuration
-    class Inspect < Bogo::Config
+    class Inspect < Config
 
       attribute(
         :attribute, String,

data/lib/sfn/config/list.rb

@@ -3,7 +3,7 @@ require 'sfn'
 module Sfn
   class Config
     # List command configuration
-    class List < Bogo::Config
+    class List < Sfn::Config
 
       attribute(
         :attribute, String,

data/lib/sfn/config/promote.rb

@@ -3,7 +3,7 @@ require 'sfn'
 module Sfn
   class Config
     # Promote command configuration
-    class Promote < Bogo::Config
+    class Promote < Config
 
       attribute(
         :accounts, String,

data/lib/sfn/config/update.rb

@@ -14,6 +14,14 @@ module Sfn
         :multiple => true,
         :description => 'Apply outputs from stack to input parameters'
       )
+      attribute(
+        :parameter, Smash,
+        :multiple => true,
+        :description => 'Pass template parameters directly (ParamName:ParamValue)',
+        :coerce => lambda{|v|
+          v.is_a?(String) ? Smash[*v.split(/[=:]/, 2)] : v
+        }
+      )
 
     end
   end

data/lib/sfn/config/validate.rb

@@ -3,7 +3,7 @@ require 'sfn'
 module Sfn
   class Config
     # Validate command configuration
-    class Validate < Bogo::Config
+    class Validate < Config
 
       attribute(
         :processing, [TrueClass, FalseClass],

data/lib/sfn/version.rb

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

data/sfn.gemspec

@@ -10,9 +10,9 @@ 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.16'
+  s.add_dependency 'bogo-cli', '~> 0.1.21'
   s.add_dependency 'miasma', '~> 0.2.20'
-  s.add_dependency 'miasma-aws', '~> 0.1.8'
+  s.add_dependency 'miasma-aws', '~> 0.1.16'
   s.add_dependency 'net-ssh'
   s.add_dependency 'sparkle_formation', '>= 0.2.8'
   s.executables << 'sfn'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-06-08 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.16
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.16
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: miasma
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -162,4 +162,3 @@ signing_key:
 specification_version: 4
 summary: SparkleFormation CLI
 test_files: []
-has_rdoc: