sfn 3.0.30 → 3.0.32

data/lib/sfn/utils.rb

@@ -1,17 +1,17 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   # Utility classes and modules
   module Utils
-    autoload :Output, 'sfn/utils/output'
-    autoload :StackParameterValidator, 'sfn/utils/stack_parameter_validator'
-    autoload :StackParameterScrubber, 'sfn/utils/stack_parameter_scrubber'
-    autoload :StackExporter, 'sfn/utils/stack_exporter'
-    autoload :Debug, 'sfn/utils/debug'
-    autoload :JSON, 'sfn/utils/json'
-    autoload :Ssher, 'sfn/utils/ssher'
-    autoload :ObjectStorage, 'sfn/utils/object_storage'
-    autoload :PathSelector, 'sfn/utils/path_selector'
+    autoload :Output, "sfn/utils/output"
+    autoload :StackParameterValidator, "sfn/utils/stack_parameter_validator"
+    autoload :StackParameterScrubber, "sfn/utils/stack_parameter_scrubber"
+    autoload :StackExporter, "sfn/utils/stack_exporter"
+    autoload :Debug, "sfn/utils/debug"
+    autoload :JSON, "sfn/utils/json"
+    autoload :Ssher, "sfn/utils/ssher"
+    autoload :ObjectStorage, "sfn/utils/object_storage"
+    autoload :PathSelector, "sfn/utils/path_selector"
 
     # Provide methods directly from module for previous version compatibility
     extend JSON

data/lib/sfn/utils/debug.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -10,7 +10,7 @@ module Sfn
         #
         # @param msg [String]
         def debug(msg)
-          if ENV['DEBUG'] || (respond_to?(:config) && config[:debug])
+          if ENV["DEBUG"] || (respond_to?(:config) && config[:debug])
             puts "<sfn - debug>: #{msg}"
           end
         end

data/lib/sfn/utils/json.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils

data/lib/sfn/utils/object_storage.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -13,13 +13,13 @@ module Sfn
       # @param directory [Miasma::Models::Storage::Directory]
       # @return [String] file path
       def file_store(object, path, directory)
-        raise NotImplementedError.new 'Internal updated required! :('
+        raise NotImplementedError.new "Internal updated required! :("
         content = object.is_a?(String) ? object : Utils._format_json(object)
         directory.files.create(
           :identity => path,
           :body => content,
         )
-        loc = directory.service.service.name.split('::').last.downcase
+        loc = directory.service.service.name.split("::").last.downcase
         "#{loc}://#{directory.identity}/#{path}"
       end
     end

data/lib/sfn/utils/output.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -15,8 +15,8 @@ module Sfn
       def process(things, args = {})
         @event_ids ||= []
         processed = things.reverse.map do |thing|
-          next if @event_ids.include?(thing['id'])
-          @event_ids.push(thing['id']).compact!
+          next if @event_ids.include?(thing["id"])
+          @event_ids.push(thing["id"]).compact!
           if args[:attributes]
             args[:attributes].map do |key|
               thing[key].to_s
@@ -67,7 +67,7 @@ module Sfn
         output += process(things, :flat => true, :attributes => allowed_attributes)
         output.compact!
         if output.empty?
-          ui.warn 'No information found' unless args.include?(:ignore_empty_output)
+          ui.warn "No information found" unless args.include?(:ignore_empty_output)
         else
           ui.info "#{what.to_s.capitalize} for stack: #{ui.color(stack, :bold)}" if stack
           ui.info "#{ui.list(output, :uneven_columns_across, columns)}"

data/lib/sfn/utils/path_selector.rb

@@ -1,5 +1,5 @@
-require 'sfn'
-require 'pathname'
+require "sfn"
+require "pathname"
 
 module Sfn
   module Utils
@@ -13,8 +13,8 @@ module Sfn
       # @return [String]
       def humanize_path_basename(path)
         File.basename(path).sub(
-          File.extname(path), ''
-        ).split(/[-_]/).map(&:capitalize).join(' ')
+          File.extname(path), ""
+        ).split(/[-_]/).map(&:capitalize).join(" ")
       end
 
       # Prompt user for file selection
@@ -27,7 +27,7 @@ module Sfn
       # @option opts [String] :filter_prefix only return results matching filter
       # @return [String] file path
       def prompt_for_file(directory, opts = {})
-        file_list = Dir.glob(File.join(directory, '**', '**', '*')).find_all do |file|
+        file_list = Dir.glob(File.join(directory, "**", "**", "*")).find_all do |file|
           File.file?(file)
         end
         if opts[:filter_prefix]
@@ -39,7 +39,7 @@ module Sfn
           File.dirname(file)
         end.uniq
         files = file_list.find_all do |path|
-          path.sub(directory, '').split('/').size == 2
+          path.sub(directory, "").split("/").size == 2
         end
         if opts[:ignore_directories]
           directories.delete_if do |dir|
@@ -47,16 +47,16 @@ module Sfn
           end
         end
         if directories.empty? && files.empty?
-          ui.fatal 'No formation paths discoverable!'
+          ui.fatal "No formation paths discoverable!"
         else
-          output = ['Please select an entry']
-          output << '(or directory to list):' unless directories.empty?
-          ui.info output.join(' ')
+          output = ["Please select an entry"]
+          output << "(or directory to list):" unless directories.empty?
+          ui.info output.join(" ")
           output.clear
           idx = 1
           valid = {}
           unless directories.empty?
-            output << ui.color("#{opts.fetch(:directories_name, 'Directories')}:", :bold)
+            output << ui.color("#{opts.fetch(:directories_name, "Directories")}:", :bold)
             directories.each do |dir|
               valid[idx] = {:path => dir, :type => :directory}
               output << [idx, humanize_path_basename(dir)]
@@ -64,7 +64,7 @@ module Sfn
             end
           end
           unless files.empty?
-            output << ui.color("#{opts.fetch(:files_name, 'Files')}:", :bold)
+            output << ui.color("#{opts.fetch(:files_name, "Files")}:", :bold)
             files.each do |file|
               valid[idx] = {:path => file, :type => :file}
               output << [idx, humanize_path_basename(file)]
@@ -74,15 +74,15 @@ module Sfn
           max = idx.to_s.length
           output.map! do |o|
             if o.is_a?(Array)
-              "  #{o.first}.#{' ' * (max - o.first.to_s.length)} #{o.last}"
+              "  #{o.first}.#{" " * (max - o.first.to_s.length)} #{o.last}"
             else
               o
             end
           end
           ui.info "#{output.join("\n")}\n"
-          response = ui.ask_question('Enter selection: ').to_i
+          response = ui.ask_question("Enter selection: ").to_i
           unless valid[response]
-            ui.fatal 'How about using a real value'
+            ui.fatal "How about using a real value"
             exit 1
           else
             entry = valid[response.to_i]

data/lib/sfn/utils/ssher.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -15,10 +15,10 @@ module Sfn
       # @return [String, NilClass]
       def remote_file_contents(address, user, path, ssh_opts = {})
         if path.to_s.strip.empty?
-          raise ArgumentError.new 'No file path provided!'
+          raise ArgumentError.new "No file path provided!"
         end
-        require 'net/ssh'
-        content = ''
+        require "net/ssh"
+        content = ""
         ssh_session = Net::SSH.start(address, user, ssh_opts)
         content = ssh_session.exec!("sudo cat #{path}")
         content.empty? ? nil : content

data/lib/sfn/utils/stack_exporter.rb

@@ -1,9 +1,9 @@
 begin
-  require 'chef'
+  require "chef"
 rescue LoadError
   $stderr.puts "WARN: Failed to load Chef. Chef specific features will be disabled!"
 end
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -14,12 +14,12 @@ module Sfn
       include Sfn::Utils::JSON
 
       # default chef environment name
-      DEFAULT_CHEF_ENVIRONMENT = '_default'
+      DEFAULT_CHEF_ENVIRONMENT = "_default"
       # default instance options
       DEFAULT_OPTIONS = Mash.new(
         :chef_popsicle => true,
-        :ignored_parameters => ['Environment', 'StackCreator', 'Creator'],
-        :chef_environment_parameter => 'Environment',
+        :ignored_parameters => ["Environment", "StackCreator", "Creator"],
+        :chef_environment_parameter => "Environment",
       )
       # default structure of export payload
       DEFAULT_EXPORT_STRUCTURE = {
@@ -33,7 +33,7 @@ module Sfn
         ),
         :generator => {
           :timestamp => Time.now.to_i,
-          :name => 'SparkleFormation',
+          :name => "SparkleFormation",
           :version => Sfn::VERSION.version,
           :provider => nil,
         },
@@ -89,7 +89,7 @@ module Sfn
       # @return [Object]
       def method_missing(*args)
         m = args.first.to_s
-        if m.end_with?('?') && options.has_key?(k = m.sub('?', '').to_sym)
+        if m.end_with?("?") && options.has_key?(k = m.sub("?", "").to_sym)
           !!options[k]
         else
           super
@@ -126,7 +126,7 @@ module Sfn
       # @return [Chef::Environment]
       def environment
         unless @env
-          @env = Chef::Environment.load('_default')
+          @env = Chef::Environment.load("_default")
         end
         @env
       end
@@ -154,9 +154,9 @@ module Sfn
         rl_item = item.is_a?(Chef::RunList::RunListItem) ? item : Chef::RunList::RunListItem.new(item)
         static_content = Mash.new(:run_list => [])
         if rl_item.recipe?
-          cookbook, recipe = rl_item.name.split('::')
+          cookbook, recipe = rl_item.name.split("::")
           peg_version = allowed_cookbook_version(cookbook)
-          static_content[:run_list] << "recipe[#{[cookbook, recipe || 'default'].join('::')}@#{peg_version}]"
+          static_content[:run_list] << "recipe[#{[cookbook, recipe || "default"].join("::")}@#{peg_version}]"
         elsif rl_item.role?
           role = Chef::Role.load(rl_item.name)
           role.run_list.each do |item|
@@ -177,10 +177,10 @@ module Sfn
       # @param first_run [Hash] chef first run hash
       # @return [Hash]
       def unpack_and_freeze_runlist(first_run)
-        extracted_runlists = first_run['run_list'].map do |item|
+        extracted_runlists = first_run["run_list"].map do |item|
           extract_runlist_item(cf_replace(item))
         end
-        first_run.delete('run_list')
+        first_run.delete("run_list")
         first_run.replace(
           extracted_runlists.inject(first_run) do |memo, first_run_item|
             Chef::Mixin::DeepMerge.merge(memo, first_run_item)
@@ -208,8 +208,8 @@ module Sfn
         result = []
         case thing
         when Hash
-          if thing['content'] && thing['content']['run_list']
-            result << thing['content']
+          if thing["content"] && thing["content"]["run_list"]
+            result << thing["content"]
           else
             thing.each do |k, v|
               result += locate_runlists(v)
@@ -230,9 +230,9 @@ module Sfn
       def cf_replace(hsh)
         if hsh.is_a?(Hash)
           case hsh.keys.first
-          when 'Fn::Join'
+          when "Fn::Join"
             cf_join(*hsh.values.first)
-          when 'Ref'
+          when "Ref"
             cf_ref(hsh.values.first)
           else
             hsh

data/lib/sfn/utils/stack_parameter_scrubber.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -7,9 +7,9 @@ module Sfn
 
       # Validate attributes within Parameter blocks
       ALLOWED_PARAMETER_ATTRIBUTES = [
-        'Type', 'Default', 'NoEcho', 'AllowedValues', 'AllowedPattern',
-        'MaxLength', 'MinLength', 'MaxValue', 'MinValue', 'Description',
-        'ConstraintDescription',
+        "Type", "Default", "NoEcho", "AllowedValues", "AllowedPattern",
+        "MaxLength", "MinLength", "MaxValue", "MinValue", "Description",
+        "ConstraintDescription",
       ]
 
       # Clean the parameters of the template
@@ -17,14 +17,14 @@ module Sfn
       # @param template [Hash]
       # @return [Hash] template
       def parameter_scrub!(template)
-        parameters = template['Parameters']
+        parameters = template["Parameters"]
         if parameters
           parameters.each do |name, options|
             options.delete_if do |attribute, value|
               !ALLOWED_PARAMETER_ATTRIBUTES.include?(attribute)
             end
           end
-          template['Parameters'] = parameters
+          template["Parameters"] = parameters
         end
         template
       end

data/lib/sfn/utils/stack_parameter_validator.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   module Utils
@@ -9,34 +9,34 @@ module Sfn
 
       # HOT parameter mapping
       HEAT_CONSTRAINT_MAP = {
-        'MaxLength' => [:length, :max],
-        'MinLength' => [:length, :min],
-        'MaxValue' => [:range, :max],
-        'MinValue' => [:range, :min],
-        'AllowedValues' => [:allowed_values],
-        'AllowedPattern' => [:allowed_pattern],
+        "MaxLength" => [:length, :max],
+        "MinLength" => [:length, :min],
+        "MaxValue" => [:range, :max],
+        "MinValue" => [:range, :min],
+        "AllowedValues" => [:allowed_values],
+        "AllowedPattern" => [:allowed_pattern],
       }
 
       # GCDM parameter mapping
       GOOGLE_CONSTRAINT_MAP = {
-        'AllowedPattern' => [:pattern],
-        'MaxValue' => [:maximum],
-        'MinValue' => [:minimum],
+        "AllowedPattern" => [:pattern],
+        "MaxValue" => [:maximum],
+        "MinValue" => [:minimum],
       }
 
       # Parameter mapping identifier and content
       PARAMETER_DEFINITION_MAP = {
-        'constraints' => HEAT_CONSTRAINT_MAP,
+        "constraints" => HEAT_CONSTRAINT_MAP,
       }
 
       # Supported parameter validations
       PARAMETER_VALIDATIONS = [
-        'allowed_values',
-        'allowed_pattern',
-        'max_length',
-        'min_length',
-        'max_value',
-        'min_value',
+        "allowed_values",
+        "allowed_pattern",
+        "max_length",
+        "min_length",
+        "max_value",
+        "min_value",
       ]
 
       # Validate a parameters
@@ -51,12 +51,12 @@ module Sfn
       # @option parameter_definition [String, Integer] 'MinValue'
       # @return [TrueClass, Array<String>] true if valid. array of string errors if invalid
       def validate_parameter(value, parameter_definition)
-        return [[:blank, 'Value cannot be blank']] if value.to_s.strip.empty?
+        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]
+        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('_', '')
+            pdef_key.downcase.gsub("_", "") == validator_key.downcase.gsub("_", "")
           end
           if valid_key
             value_list.map do |value|
@@ -102,7 +102,7 @@ module Sfn
         if pdef.include?(value)
           true
         else
-          "Not an allowed value: #{pdef.join(', ')}"
+          "Not an allowed value: #{pdef.join(", ")}"
         end
       end
 
@@ -182,7 +182,7 @@ module Sfn
       # @return [TrueClass, FalseClass]
       def list_type?(type)
         type = type.downcase
-        type.start_with?('comma') || type.start_with?('list<')
+        type.start_with?("comma") || type.start_with?("list<")
       end
     end
   end

data/lib/sfn/version.rb

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

data/sfn.gemspec

@@ -1,35 +1,35 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
-require 'sfn/version'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + "/lib/"
+require "sfn/version"
 Gem::Specification.new do |s|
-  s.name = 'sfn'
+  s.name = "sfn"
   s.version = Sfn::VERSION.version
-  s.summary = 'SparkleFormation CLI'
-  s.author = 'Chris Roberts'
-  s.email = 'code@chrisroberts.org'
-  s.homepage = 'http://github.com/sparkleformation/sfn'
-  s.description = 'SparkleFormation CLI'
-  s.license = 'Apache-2.0'
-  s.require_path = 'lib'
-  s.add_runtime_dependency 'bogo-cli', '>= 0.2.5', '< 0.4'
-  s.add_runtime_dependency 'bogo-ui', '>= 0.1.22', '< 0.4'
-  s.add_runtime_dependency 'miasma', '>= 0.3.0', '< 0.4'
-  s.add_runtime_dependency 'miasma-aws', '>= 0.3.6', '< 0.4'
-  s.add_runtime_dependency 'miasma-azure', '>= 0.1.0', '< 0.3'
-  s.add_runtime_dependency 'miasma-open-stack', '>= 0.1.0', '< 0.3'
-  s.add_runtime_dependency 'miasma-rackspace', '>= 0.1.0', '< 0.3'
-  s.add_runtime_dependency 'miasma-google', '>= 0.1.0', '< 0.3'
-  s.add_runtime_dependency 'miasma-terraform', '>= 0.1.0', '< 0.2.0'
-  s.add_runtime_dependency 'jmespath'
-  s.add_runtime_dependency 'net-ssh'
-  s.add_runtime_dependency 'sparkle_formation', '>= 3.0.11', '< 4'
-  s.add_runtime_dependency 'hashdiff', '~> 0.2.2'
-  s.add_runtime_dependency 'graph', '~> 2.8.1'
-  s.add_development_dependency 'rake', '~> 10'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'rspec', '~> 3.5'
-  s.add_development_dependency 'rufo'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'yard'
-  s.executables << 'sfn'
-  s.files = Dir['{lib,bin,docs}/**/*'] + %w(sfn.gemspec README.md CHANGELOG.md LICENSE)
+  s.summary = "SparkleFormation CLI"
+  s.author = "Chris Roberts"
+  s.email = "code@chrisroberts.org"
+  s.homepage = "http://github.com/sparkleformation/sfn"
+  s.description = "SparkleFormation CLI"
+  s.license = "Apache-2.0"
+  s.require_path = "lib"
+  s.add_runtime_dependency "bogo-cli", ">= 0.2.5", "< 0.4"
+  s.add_runtime_dependency "bogo-ui", ">= 0.1.28", "< 0.4"
+  s.add_runtime_dependency "miasma", ">= 0.3.3", "< 0.4"
+  s.add_runtime_dependency "miasma-aws", ">= 0.3.15", "< 0.4"
+  s.add_runtime_dependency "miasma-azure", ">= 0.1.0", "< 0.3"
+  s.add_runtime_dependency "miasma-open-stack", ">= 0.1.0", "< 0.3"
+  s.add_runtime_dependency "miasma-rackspace", ">= 0.1.0", "< 0.3"
+  s.add_runtime_dependency "miasma-google", ">= 0.1.0", "< 0.3"
+  s.add_runtime_dependency "miasma-terraform", ">= 0.1.0", "< 0.2.0"
+  s.add_runtime_dependency "jmespath"
+  s.add_runtime_dependency "net-ssh"
+  s.add_runtime_dependency "sparkle_formation", ">= 3.0.11", "< 4"
+  s.add_runtime_dependency "hashdiff", "~> 0.2.2"
+  s.add_runtime_dependency "graph", "~> 2.8.1"
+  s.add_development_dependency "rake", "~> 10"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rspec", "~> 3.5"
+  s.add_development_dependency "rufo", "~> 0.3.0"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "yard"
+  s.executables << "sfn"
+  s.files = Dir["{lib,bin,docs}/**/*"] + %w(sfn.gemspec README.md CHANGELOG.md LICENSE)
 end