sfn 3.0.28 → 3.0.30

data/lib/sfn/config.rb

@@ -13,14 +13,14 @@ module Sfn
     # @param type [Class, Array<Class>] valid types
     # @param info [Hash] attribute information
     # @return [Hash]
-    def self.attribute(name, type, info=Smash.new)
-      if([type].flatten.any?{|t| t.ancestors.include?(Hash)})
-        unless(info[:coerce])
+    def self.attribute(name, type, info = Smash.new)
+      if [type].flatten.any? { |t| t.ancestors.include?(Hash) }
+        unless info[:coerce]
           info[:coerce] = lambda do |v|
             case v
             when String
               Smash[
-                v.split(',').map do |item_pair|
+                v.split(/,(?=[^,]*:)/).map do |item_pair|
                   item_pair.split(/[=:]/, 2)
                 end
               ]
@@ -62,65 +62,65 @@ module Sfn
     attribute(
       :config, String,
       :description => 'Configuration file path',
-      :short_flag => 'c'
+      :short_flag => 'c',
     )
 
     attribute(
       :credentials, Smash,
       :description => 'Provider credentials',
-      :short_flag => 'C'
+      :short_flag => 'C',
     )
     attribute(
       :ignore_parameters, String,
       :multiple => true,
       :description => 'Parameters to ignore during modifications',
-      :short_flag => 'i'
+      :short_flag => 'i',
     )
     attribute(
       :interactive_parameters, [TrueClass, FalseClass],
       :default => true,
       :description => 'Prompt for template parameters',
-      :short_flag => 'I'
+      :short_flag => 'I',
     )
     attribute(
       :poll, [TrueClass, FalseClass],
       :default => true,
       :description => 'Poll stack events on modification actions',
-      :short_flag => 'p'
+      :short_flag => 'p',
     )
     attribute(
       :defaults, [TrueClass, FalseClass],
       :description => 'Automatically accept default values',
-      :short_flag => 'd'
+      :short_flag => 'd',
     )
     attribute(
       :yes, [TrueClass, FalseClass],
       :description => 'Automatically accept any requests for confirmation',
-      :short_flag => 'y'
+      :short_flag => 'y',
     )
     attribute(
       :debug, [TrueClass, FalseClass],
       :description => 'Enable debug output',
-      :short_flag => 'u'
+      :short_flag => 'u',
     )
     attribute(
       :colors, [TrueClass, FalseClass],
       :description => 'Enable colorized output',
-      :default => true
+      :default => true,
     )
 
-    attribute :conf, Conf, :coerce => proc{|v| Conf.new(v)}
-    attribute :create, Create, :coerce => proc{|v| Create.new(v)}
-    attribute :update, Update, :coerce => proc{|v| Update.new(v)}
-    attribute :destroy, Destroy, :coerce => proc{|v| Destroy.new(v)}
-    attribute :events, Events, :coerce => proc{|v| Events.new(v)}
-    attribute :export, Export, :coerce => proc{|v| Export.new(v)}
-    attribute :import, Import, :coerce => proc{|v| Import.new(v)}
-    attribute :inspect, Inspect, :coerce => proc{|v| Inpsect.new(v)}
-    attribute :describe, Describe, :coerce => proc{|v| Describe.new(v)}
-    attribute :list, List, :coerce => proc{|v| List.new(v)}
-    attribute :promote, Promote, :coerce => proc{|v| Promote.new(v)}
-    attribute :validate, Validate, :coerce => proc{|v| Validate.new(v)}
+    attribute :conf, Conf, :coerce => proc { |v| Conf.new(v) }
+    attribute :create, Create, :coerce => proc { |v| Create.new(v) }
+    attribute :update, Update, :coerce => proc { |v| Update.new(v) }
+    attribute :destroy, Destroy, :coerce => proc { |v| Destroy.new(v) }
+    attribute :events, Events, :coerce => proc { |v| Events.new(v) }
+    attribute :export, Export, :coerce => proc { |v| Export.new(v) }
+    attribute :import, Import, :coerce => proc { |v| Import.new(v) }
+    attribute :inspect, Inspect, :coerce => proc { |v| Inpsect.new(v) }
+    attribute :describe, Describe, :coerce => proc { |v| Describe.new(v) }
+    attribute :list, List, :coerce => proc { |v| List.new(v) }
+    attribute :promote, Promote, :coerce => proc { |v| Promote.new(v) }
+    attribute :validate, Validate, :coerce => proc { |v| Validate.new(v) }
 
     # Provide all options for config class (includes global configs)
     #
@@ -139,25 +139,24 @@ module Sfn
     def self._options_for(klass, shorts)
       Smash[
         ([klass] + klass.ancestors).map do |a|
-          if(a.ancestors.include?(Bogo::Config) && !a.attributes.empty?)
+          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|
+        end.compact.reverse.inject(Smash.new) { |m, n| m.deep_merge(n) }.map do |name, info|
           next unless info[:description]
           short = info[:short_flag]
-          if(!short.to_s.empty? && shorts.include?(short))
+          if !short.to_s.empty? && shorts.include?(short)
             raise ArgumentError.new "Short flag already in use! (`#{short}` not available for `#{klass}`)"
           end
-          unless(short.to_s.empty?)
+          unless short.to_s.empty?
             shorts << short
             info[:short] = short
           end
           info[:long] = name.tr('_', '-')
-          info[:boolean] = [info[:type]].compact.flatten.all?{|t| BOOLEAN_VALUES.include?(t)}
+          info[:boolean] = [info[:type]].compact.flatten.all? { |t| BOOLEAN_VALUES.include?(t) }
           [name, info]
         end.compact
       ]
     end
-
   end
 end

data/lib/sfn/config/conf.rb

@@ -4,13 +4,11 @@ module Sfn
   class Config
     # Config command configuration (subclass create to get all the configs)
     class Conf < Create
-
       attribute(
         :generate, [TrueClass, FalseClass],
         :description => 'Generate a basic configuration file',
-        :short_flag => 'g'
+        :short_flag => 'g',
       )
-
     end
   end
 end

data/lib/sfn/config/create.rb

@@ -4,30 +4,28 @@ module Sfn
   class Config
     # Create command configuration
     class Create < Update
-
       attribute(
         :timeout, Integer,
-        :coerce => proc{|v| v.to_i},
+        :coerce => proc { |v| v.to_i },
         :description => 'Seconds to wait for stack to complete',
-        :short_flag => 'M'
+        :short_flag => 'M',
       )
       attribute(
         :rollback, [TrueClass, FalseClass],
         :description => 'Rollback stack on failure',
-        :short_flag => 'O'
+        :short_flag => 'O',
       )
       attribute(
         :options, Smash,
         :description => 'Extra options to apply to the API call',
-        :short_flag => 'S'
+        :short_flag => 'S',
       )
       attribute(
         :notification_topics, String,
         :multiple => true,
         :description => 'Notification endpoints for stack events',
-        :short_flag => 'z'
+        :short_flag => 'z',
       )
-
     end
   end
 end

data/lib/sfn/config/describe.rb

@@ -3,25 +3,23 @@ require 'sfn'
 module Sfn
   class Config
     class Describe < Config
-
       attribute(
         :resources, [TrueClass, FalseClass],
         :description => 'Display stack resource list',
-        :short_flag => 'r'
+        :short_flag => 'r',
       )
 
       attribute(
         :outputs, [TrueClass, FalseClass],
         :description => 'Display stack outputs',
-        :short_flag => 'o'
+        :short_flag => 'o',
       )
 
       attribute(
         :tags, [TrueClass, FalseClass],
         :description => 'Display stack tags',
-        :short_flag => 't'
+        :short_flag => 't',
       )
-
     end
   end
 end

data/lib/sfn/config/diff.rb

@@ -8,7 +8,7 @@ module Sfn
         :raw_diff, [TrueClass, FalseClass],
         :default => false,
         :description => 'Display raw diff information',
-        :short_flag => 'w'
+        :short_flag => 'w',
       )
     end
   end

data/lib/sfn/config/events.rb

@@ -4,31 +4,29 @@ module Sfn
   class Config
     # Events command configuration
     class Events < Config
-
       attribute(
         :attribute, String,
         :multiple => true,
         :description => 'Event attribute to display',
-        :short_flag => 'a'
+        :short_flag => 'a',
       )
       attribute(
         :poll_delay, Integer,
         :default => 20,
         :description => 'Seconds to pause between each event poll',
-        :coerce => lambda{|v| v.to_i},
-        :short_flag => 'P'
+        :coerce => lambda { |v| v.to_i },
+        :short_flag => 'P',
       )
       attribute(
         :all_attributes, [TrueClass, FalseClass],
         :description => 'Display all event attributes',
-        :short_flag => 'A'
+        :short_flag => 'A',
       )
       attribute(
-        :all_events,  [TrueClass, FalseClass],
+        :all_events, [TrueClass, FalseClass],
         :description => 'Display all available events',
-        :short_flag => 'L'
+        :short_flag => 'L',
       )
-
     end
   end
 end

data/lib/sfn/config/export.rb

@@ -5,25 +5,22 @@ module Sfn
 
     # Export command configuration
     class Export < Config
-
       attribute(
         :name, String,
-        :description => 'Export file base name'
+        :description => 'Export file base name',
       )
       attribute(
         :path, String,
-        :description => 'Local path prefix for dump file'
+        :description => 'Local path prefix for dump file',
       )
       attribute(
         :bucket, String,
-        :description => 'Remote storage bucket'
+        :description => 'Remote storage bucket',
       )
       attribute(
         :bucket_prefix, String,
-        :description => 'Remote key prefix within bucket for dump file'
+        :description => 'Remote key prefix within bucket for dump file',
       )
-
     end
-
   end
 end

data/lib/sfn/config/graph.rb

@@ -4,33 +4,31 @@ module Sfn
   class Config
     # Generate graph
     class Graph < Validate
-
       attribute(
         :output_file, String,
         :description => 'Directory to write graph files',
         :short_flag => 'O',
-        :default => File.join(Dir.pwd, 'sfn-graph')
+        :default => File.join(Dir.pwd, 'sfn-graph'),
       )
 
       attribute(
         :output_type, String,
         :description => 'File output type (Requires graphviz package for non-dot types)',
         :short_flag => 'e',
-        :default => 'dot'
+        :default => 'dot',
       )
 
       attribute(
         :graph_style, String,
         :description => 'Style of graph (`dependency`, `creation`)',
-        :default => 'creation'
+        :default => 'creation',
       )
 
       attribute(
         :luckymike, [TrueClass, FalseClass],
         :description => 'Force `dependency` style graph',
-        :default => false
+        :default => false,
       )
-
     end
   end
 end

data/lib/sfn/config/import.rb

@@ -5,20 +5,18 @@ module Sfn
 
     # Import command configuration
     class Import < Config
-
       attribute(
         :path, String,
-        :description => 'Directory path JSON export files are located'
+        :description => 'Directory path JSON export files are located',
       )
       attribute(
         :bucket, String,
-        :description => 'Remote storage bucket JSON export files are located'
+        :description => 'Remote storage bucket JSON export files are located',
       )
       attribute(
         :bucket_prefix, String,
-        :description => 'Remote key prefix within bucket for dump file'
+        :description => 'Remote key prefix within bucket for dump file',
       )
-
     end
   end
 end

data/lib/sfn/config/init.rb

@@ -4,7 +4,6 @@ module Sfn
   class Config
     # Init command configuration
     class Init < Config
-
     end
   end
 end

data/lib/sfn/config/inspect.rb

@@ -4,45 +4,43 @@ module Sfn
   class Config
     # Inspect command configuration
     class Inspect < Config
-
       attribute(
         :attribute, String,
         :multiple => true,
         :description => 'Dot delimited attribute to view',
-        :short_flag => 'a'
+        :short_flag => 'a',
       )
       attribute(
         :nodes, [TrueClass, FalseClass],
         :description => 'Locate all instances and display addresses',
-        :short_flag => 'n'
+        :short_flag => 'n',
       )
       attribute(
         :load_balancers, [TrueClass, FalseClass],
         :description => 'Locate all load balancers, display addresses and server states',
-        :short_flag => 'l'
+        :short_flag => 'l',
       )
       attribute(
         :instance_failure, [TrueClass, FalseClass],
         :description => 'Display log file error from failed not if possible',
-        :short_flag => 'N'
+        :short_flag => 'N',
       )
       attribute(
         :failure_log_path, String,
         :description => 'Path to remote log file for display on failure',
         :default => '/var/log/chef/client.log',
-        :short_flag => 'f'
+        :short_flag => 'f',
       )
       attribute(
         :identity_file, String,
         :description => 'SSH identity file for authentication',
-        :short_flag => 'D'
+        :short_flag => 'D',
       )
       attribute(
         :ssh_user, String,
         :description => 'SSH username for inspection connect',
-        :short_flag => 's'
+        :short_flag => 's',
       )
-
     end
   end
 end

data/lib/sfn/config/lint.rb

@@ -7,22 +7,22 @@ module Sfn
       attribute(
         :lint_directory, String,
         :description => 'Directory containing lint rule sets',
-        :multiple => true
+        :multiple => true,
       )
       attribute(
         :disabled_rule_set, String,
         :description => 'Disable rule set from being applied',
-        :multiple => true
+        :multiple => true,
       )
       attribute(
         :enabled_rule_set, String,
         :description => 'Only apply this rule set',
-        :multiple => true
+        :multiple => true,
       )
       attribute(
         :local_rule_sets_only, [TrueClass, FalseClass],
         :description => 'Only apply rule sets provided by lint directory',
-        :default => false
+        :default => false,
       )
     end
   end