sfn 2.1.12 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1998884aef2f32da686903df01d5dbcd702e134d
-  data.tar.gz: 2d4cd76d833eaf5db2e3d05d69e815546d092b9f
+  metadata.gz: 082256b2f072109b58b33fce652d587d05d04862
+  data.tar.gz: b77d62ca66d3999d4de96f6dfea3bed304efd463
 SHA512:
-  metadata.gz: 6c7021222f98ebbf2587d876172d02ee49e20c5eca73be13862ccb332c1674c4be34031963a69ff9dcf6739e9497e0d0ae4b8b778911d0e1b9e3946c350352c3
-  data.tar.gz: 30fbcb41c8291f6e77231c4c372d3a85d32dae4280a733efae28f64ab79bb966dc881dc7b52e5d11ed9e72343f4958d573b6289b166639a9f2126f7d76f77fdb
+  metadata.gz: 6c59bdbe48b6cf3f48c007413a36511e83ebc64acc1ab050d25bf8069927d13642032dbb93f9a22cb70e10955780237717b22a70128e6966ac7e2f4860a41f82
+  data.tar.gz: ddc99d40040b35e2920c55dde47f85ddcfa3ae3d64b6e0d9e7fc9d0b0841d9072d9de263b9787ee6be37acc1e38c8ff124d3f7a067843aa32d95da9182ccfb0b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v2.2.0
+* [enhancement] Properly support list types when validating (#167)
+* [enhancement] Restrict automatic gem loading when `:sfn` group is present (#175)
+* [enhancement] Support loading configuration files with type extensions (#168)
+
 # v2.1.12
 * [fix] Provide useful error message when nesting_bucket is unset (#159)
 * [fix] Properly locate templates when relative path provided (#160)

data/bin/sfn

@@ -5,7 +5,11 @@ require 'sfn'
 
 if(defined?(Bundler))
   begin
-    Bundler.require
+    if(Bundler.definition.groups.include?(:sfn))
+      Bundler.require(:sfn)
+    else
+      Bundler.require
+    end
   rescue Bundler::GemfileNotFound
     # ignore load error
   end

data/lib/sfn/command.rb

@@ -23,6 +23,19 @@ module Sfn
     autoload :Update, 'sfn/command/update'
     autoload :Validate, 'sfn/command/validate'
 
+    # Base name of configuration file
+    CONFIG_BASE_NAME = '.sfn'
+
+    # Supported configuration file extensions
+    VALID_CONFIG_EXTENSIONS = [
+      '',
+      '.rb',
+      '.json',
+      '.yaml',
+      '.yml',
+      '.xml'
+    ]
+
     # Override to provide config file searching
     def initialize(cli_opts, args)
       unless(cli_opts['config'])
@@ -52,13 +65,19 @@ module Sfn
     # @return [Slop]
     def discover_config(opts)
       cwd = Dir.pwd.split(File::SEPARATOR)
-      until(cwd.empty? || File.exists?(cwd.push('.sfn').join(File::SEPARATOR)))
-        cwd.pop(2)
+      detected_path = ''
+      until(cwd.empty? || File.exists?(detected_path.to_s))
+        detected_path = Dir.glob(
+          (cwd + ["#{CONFIG_BASE_NAME}{#{VALID_CONFIG_EXTENSIONS.join(',')}}"]).join(
+            File::SEPARATOR
+          )
+        ).first
+        cwd.pop
       end
       if(opts.respond_to?(:fetch_option))
-        opts.fetch_option('config').value = cwd.join(File::SEPARATOR) unless cwd.empty?
+        opts.fetch_option('config').value = detected_path if detected_path
       else
-        opts['config'] = cwd.join(File::SEPARATOR) unless cwd.empty?
+        opts['config'] = detected_path if detected_path
       end
       opts
     end

data/lib/sfn/command/describe.rb

@@ -17,7 +17,7 @@ module Sfn
         name_required!
         stack_name = name_args.last
         root_stack = api_action! do
-          provider.connection.stacks.get(stack_name)
+          provider.stack(stack_name)
         end
         if(root_stack)
           ([root_stack] + root_stack.nested_stacks).compact.each do |stack|
@@ -37,7 +37,7 @@ module Sfn
           end
         else
           ui.fatal "Failed to find requested stack: #{ui.color(stack_name, :bold, :red)}"
-          exit -1
+          raise "Requested stack not found: #{stack_name}"
         end
       end
 
@@ -89,7 +89,7 @@ module Sfn
       # @param stack [Miasma::Models::Orchestration::Stack]
       def tags(stack)
         ui.info "Tags for stack: #{ui.color(stack.name, :bold)}"
-        unless(stack.tags.empty?)
+        if(stack.tags && !stack.tags.empty?)
           stack.tags.each do |key, value|
             ui.info ['  ', ui.color("#{key}:", :bold), value].join(' ')
           end

data/lib/sfn/command_module/base.rb

@@ -21,7 +21,7 @@ module Sfn
         # @return [KnifeCloudformation::Provider]
         def provider
           begin
-            memoize(:provider, :direct) do
+            memoize(:provider) do
               result = Sfn::Provider.new(
                 :miasma => config[:credentials],
                 :async => false,

data/lib/sfn/provider.rb

@@ -94,7 +94,7 @@ module Sfn
 
     # @return [String] json representation of cached stacks
     def cached_stacks(stack_id=nil)
-      unless(@initial_fetch_complete || stack_id)
+      if(!@initial_fetch_complete || stack_id)
         recache = true
         if(stack_id && @initial_fetch_complete)
           recache = !!stacks.get(stack_id)

data/lib/sfn/utils/stack_parameter_validator.rb

@@ -48,17 +48,20 @@ module Sfn
         def validate(value, parameter_definition)
           return [[:blank, 'Value cannot be blank']] if value.to_s.strip.empty?
           parameter_definition = reformat_definition(parameter_definition)
+          value_list = list_type?(parameter_definition.fetch('Type', parameter_definition['type'].to_s)) ? value.to_s.split(',') : [value]
           result = PARAMETER_VALIDATIONS.map do |validator_key|
             valid_key = parameter_definition.keys.detect do |pdef_key|
               pdef_key.downcase.gsub('_', '') == validator_key.downcase.gsub('_', '')
             end
             if(valid_key)
-              res = self.send(validator_key, value, parameter_definition[valid_key])
-              res == true ? true : [validator_key, res]
+              value_list.map do |value|
+                res = self.send(validator_key, value, parameter_definition[valid_key])
+                res == true ? true : [validator_key, res]
+              end
             else
               true
             end
-          end
+          end.flatten(1)
           result.delete_if{|x| x == true}
           result.empty? ? true : result
         end
@@ -105,7 +108,7 @@ module Sfn
         # @option pdef [String] 'AllowedPattern'
         # @return [TrueClass, String]
         def allowed_pattern(value, pdef)
-          if(value.match(/#{pdef}/))
+          if(value.match(%r{#{pdef}}))
             true
           else
             "Not a valid pattern. Must match: #{pdef}"
@@ -168,6 +171,15 @@ module Sfn
           end
         end
 
+        # Check if type is a list type
+        #
+        # @param type [String]
+        # @return [TrueClass, FalseClass]
+        def list_type?(type)
+          type = type.downcase
+          type.start_with?('comma') || type.start_with?('list<')
+        end
+
       end
     end
   end

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('2.1.12')
+  VERSION = Gem::Version.new('2.2.0')
 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_runtime_dependency 'bogo-cli', '>= 0.2.4', '< 0.4'
+  s.add_runtime_dependency 'bogo-cli', '>= 0.2.5', '< 0.4'
   s.add_runtime_dependency 'bogo-ui', '>= 0.1.13', '< 0.4'
   s.add_runtime_dependency 'miasma', '>= 0.3.0', '< 0.4'
   s.add_runtime_dependency 'miasma-aws', '>= 0.3.0', '< 0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'