sfn 3.0.28 → 3.0.30

data/lib/sfn/provider.rb

@@ -4,7 +4,6 @@ require 'sfn'
 module Sfn
   # Remote provider interface
   class Provider
-
     include Bogo::AnimalStrings
 
     # Minimum number of seconds to wait before re-expanding in
@@ -38,15 +37,15 @@ module Sfn
     # @option args [Logger] :logger use custom logger
     # @option args [Numeric] :stack_expansion_interval interval to wait between stack data expands
     # @option args [Numeric] :stack_list_interval interval to wait between stack list refresh
-    def initialize(args={})
+    def initialize(args = {})
       args = args.to_smash
-      unless(args.get(:miasma, :provider))
+      unless args.get(:miasma, :provider)
         best_guess = (args[:miasma] || {}).keys.group_by do |key|
           key.to_s.split('_').first
         end.sort do |x, y|
           y.size <=> x.size
         end.first
-        if(best_guess)
+        if best_guess
           provider = best_guess.first.to_sym
         else
           raise ArgumentError.new 'Cannot auto determine :provider value for credentials'
@@ -54,15 +53,15 @@ module Sfn
       else
         provider = args[:miasma].delete(:provider).to_sym
       end
-      if(provider == :aws)
-        if(args[:miasma][:region])
+      if provider == :aws
+        if args[:miasma][:region]
           args[:miasma][:aws_region] = args[:miasma].delete(:region)
         end
       end
-      if(ENV['DEBUG'].to_s.downcase == 'true')
+      if ENV['DEBUG'].to_s.downcase == 'true'
         log_to = STDOUT
       else
-        if(Gem.win_platform?)
+        if Gem.win_platform?
           log_to = 'NUL'
         else
           log_to = '/dev/null'
@@ -74,7 +73,7 @@ module Sfn
       @connection = Miasma.api(
         :provider => provider,
         :type => :orchestration,
-        :credentials => args[:miasma]
+        :credentials => args[:miasma],
       )
       @cache = args.fetch(:cache, Cache.new(:local))
       @async = args.fetch(:async, true)
@@ -82,21 +81,21 @@ module Sfn
       cache.init(:stacks_lock, :lock, :timeout => 0.1)
       cache.init(:stacks, :stamped)
       cache.init(:stack_expansion_lock, :lock, :timeout => 0.1)
-      if(args.fetch(:fetch, false))
+      if args.fetch(:fetch, false)
         async ? update_stack_list! : fetch_stacks
       end
     end
 
     # @return [Miasma::Orchestration::Stacks]
-    def stacks(stack_id=nil)
+    def stacks(stack_id = nil)
       connection.stacks.from_json(cached_stacks(stack_id))
     end
 
     # @return [String] json representation of cached stacks
-    def cached_stacks(stack_id=nil)
-      if(!@initial_fetch_complete || stack_id)
+    def cached_stacks(stack_id = nil)
+      if !@initial_fetch_complete || stack_id
         recache = true
-        if(stack_id && @initial_fetch_complete)
+        if stack_id && @initial_fetch_complete
           recache = !!stacks.get(stack_id)
         end
         fetch_stacks(stack_id) if recache
@@ -145,7 +144,7 @@ module Sfn
     # @param stack [Miasma::Models::Orchestration::Stack]
     def expand_stack(stack)
       logger.info "Stack expansion requested (#{stack.id})"
-      if((stack.in_progress? && Time.now.to_i - stack.attributes['Cached'].to_i > stack_expansion_interval) ||
+      if ((stack.in_progress? && Time.now.to_i - stack.attributes['Cached'].to_i > stack_expansion_interval) ||
           !stack.attributes['Cached'])
         begin
           expanded = false
@@ -154,7 +153,7 @@ module Sfn
             stack.reload
             stack.data['Cached'] = Time.now.to_i
           end
-          if(expanded)
+          if expanded
             save_expanded_stack(stack.id, stack.to_json)
           end
         rescue => e
@@ -168,10 +167,10 @@ module Sfn
     # Request stack information and store in cache
     #
     # @return [TrueClass]
-    def fetch_stacks(stack_id=nil)
+    def fetch_stacks(stack_id = nil)
       cache.locked_action(:stacks_lock) do
         logger.info "Lock aquired for stack update. Requesting stacks from upstream. (#{Thread.current})"
-        if(stack_id)
+        if stack_id
           single_stack = connection.stacks.get(stack_id)
           stacks = single_stack ? {single_stack.id => single_stack} : {}
         else
@@ -181,11 +180,11 @@ module Sfn
             end
           ]
         end
-        if(cache[:stacks].value)
+        if cache[:stacks].value
           existing_stacks = MultiJson.load(cache[:stacks].value)
           # Force common types
           stacks = MultiJson.load(MultiJson.dump(stacks))
-          if(stack_id)
+          if stack_id
             stacks = existing_stacks.to_smash.deep_merge(stacks)
           else
             # Remove stacks that have been deleted
@@ -207,8 +206,8 @@ module Sfn
     #
     # @return [TrueClass, FalseClass]
     def update_stack_list!
-      if(updater.nil? || !updater.alive?)
-        self.updater = Thread.new{
+      if updater.nil? || !updater.alive?
+        self.updater = Thread.new {
           loop do
             begin
               fetch_stacks
@@ -231,7 +230,6 @@ module Sfn
     def service_for(service)
       connection.api_for(service)
     end
-
   end
 end
 

data/lib/sfn/utils.rb

@@ -3,7 +3,6 @@ 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'
@@ -18,6 +17,5 @@ module Sfn
     extend JSON
     extend ObjectStorage
     extend Bogo::AnimalStrings
-
   end
 end

data/lib/sfn/utils/debug.rb

@@ -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
@@ -28,6 +28,5 @@ module Sfn
         end
       end
     end
-
   end
 end

data/lib/sfn/utils/json.rb

@@ -13,6 +13,7 @@ module Sfn
       def _to_json(thing)
         MultiJson.dump(thing)
       end
+
       alias_method :dump_json, :_to_json
 
       # Load JSON data
@@ -22,6 +23,7 @@ module Sfn
       def _from_json(thing)
         MultiJson.load(thing)
       end
+
       alias_method :load_json, :_from_json
 
       # Format object into pretty JSON
@@ -32,9 +34,8 @@ module Sfn
         thing = _from_json(thing) if thing.is_a?(String)
         MultiJson.dump(thing, :pretty => true)
       end
-      alias_method :format_json, :_format_json
 
+      alias_method :format_json, :_format_json
     end
-
   end
 end

data/lib/sfn/utils/object_storage.rb

@@ -17,12 +17,11 @@ module Sfn
         content = object.is_a?(String) ? object : Utils._format_json(object)
         directory.files.create(
           :identity => path,
-          :body => content
+          :body => content,
         )
         loc = directory.service.service.name.split('::').last.downcase
         "#{loc}://#{directory.identity}/#{path}"
       end
-
     end
   end
 end

data/lib/sfn/utils/output.rb

@@ -12,12 +12,12 @@ module Sfn
       # @option args [TrueClass, FalseClass] :flat flatten result array
       # @option args [Array] :attributes attributes to extract
       # @todo this was extracted from events and needs to be cleaned up
-      def process(things, args={})
+      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!
-          if(args[:attributes])
+          if args[:attributes]
             args[:attributes].map do |key|
               thing[key].to_s
             end
@@ -34,9 +34,9 @@ module Sfn
       # @param args [Hash]
       # @option args [Array] :attributes
       # @return [Array<String>] formatted titles
-      def get_titles(thing, args={})
+      def get_titles(thing, args = {})
         attrs = args[:attributes] || []
-        if(attrs.empty?)
+        if attrs.empty?
           hash = thing.is_a?(Array) ? thing.first : thing
           hash ||= {}
           attrs = hash.keys
@@ -44,8 +44,8 @@ module Sfn
         titles = attrs.map do |key|
           camel(key).gsub(/([a-z])([A-Z])/, '\1 \2')
         end.compact
-        if(args[:format])
-          titles.map{|s| @ui.color(s, :bold)}
+        if args[:format]
+          titles.map { |s| @ui.color(s, :bold) }
         else
           titles
         end
@@ -58,7 +58,7 @@ module Sfn
       # @param what [String] description of things for output
       # @param args [Symbol] options (:ignore_empty_output)
       def things_output(stack, things, what, *args)
-        unless(args.include?(:no_title))
+        unless args.include?(:no_title)
           output = get_titles(things, :format => true, :attributes => allowed_attributes)
         else
           output = []
@@ -66,14 +66,13 @@ module Sfn
         columns = allowed_attributes.size
         output += process(things, :flat => true, :attributes => allowed_attributes)
         output.compact!
-        if(output.empty?)
+        if output.empty?
           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)}"
         end
       end
-
     end
   end
 end

data/lib/sfn/utils/path_selector.rb

@@ -26,11 +26,11 @@ module Sfn
       # @option opts [String] :files_name title for files
       # @option opts [String] :filter_prefix only return results matching filter
       # @return [String] file path
-      def prompt_for_file(directory, opts={})
+      def prompt_for_file(directory, opts = {})
         file_list = Dir.glob(File.join(directory, '**', '**', '*')).find_all do |file|
           File.file?(file)
         end
-        if(opts[:filter_prefix])
+        if opts[:filter_prefix]
           file_list = file_list.find_all do |file|
             file.start_with?(options[:filter_prefix])
           end
@@ -41,12 +41,12 @@ module Sfn
         files = file_list.find_all do |path|
           path.sub(directory, '').split('/').size == 2
         end
-        if(opts[:ignore_directories])
+        if opts[:ignore_directories]
           directories.delete_if do |dir|
             opts[:ignore_directories].include?(File.basename(dir))
           end
         end
-        if(directories.empty? && files.empty?)
+        if directories.empty? && files.empty?
           ui.fatal 'No formation paths discoverable!'
         else
           output = ['Please select an entry']
@@ -55,7 +55,7 @@ module Sfn
           output.clear
           idx = 1
           valid = {}
-          unless(directories.empty?)
+          unless directories.empty?
             output << ui.color("#{opts.fetch(:directories_name, 'Directories')}:", :bold)
             directories.each do |dir|
               valid[idx] = {:path => dir, :type => :directory}
@@ -63,7 +63,7 @@ module Sfn
               idx += 1
             end
           end
-          unless(files.empty?)
+          unless files.empty?
             output << ui.color("#{opts.fetch(:files_name, 'Files')}:", :bold)
             files.each do |file|
               valid[idx] = {:path => file, :type => :file}
@@ -73,7 +73,7 @@ module Sfn
           end
           max = idx.to_s.length
           output.map! do |o|
-            if(o.is_a?(Array))
+            if o.is_a?(Array)
               "  #{o.first}.#{' ' * (max - o.first.to_s.length)} #{o.last}"
             else
               o
@@ -81,12 +81,12 @@ module Sfn
           end
           ui.info "#{output.join("\n")}\n"
           response = ui.ask_question('Enter selection: ').to_i
-          unless(valid[response])
+          unless valid[response]
             ui.fatal 'How about using a real value'
             exit 1
           else
             entry = valid[response.to_i]
-            if(entry[:type] == :directory)
+            if entry[:type] == :directory
               prompt_for_file(entry[:path], opts)
             elsif Pathname(entry[:path]).absolute?
               entry[:path]
@@ -96,7 +96,6 @@ module Sfn
           end
         end
       end
-
     end
   end
 end

data/lib/sfn/utils/ssher.rb

@@ -13,8 +13,8 @@ module Sfn
       # @param path [String] remote file path
       # @param ssh_opts [Hash]
       # @return [String, NilClass]
-      def remote_file_contents(address, user, path, ssh_opts={})
-        if(path.to_s.strip.empty?)
+      def remote_file_contents(address, user, path, ssh_opts = {})
+        if path.to_s.strip.empty?
           raise ArgumentError.new 'No file path provided!'
         end
         require 'net/ssh'
@@ -23,7 +23,6 @@ module Sfn
         content = ssh_session.exec!("sudo cat #{path}")
         content.empty? ? nil : content
       end
-
     end
   end
 end

data/lib/sfn/utils/stack_exporter.rb

@@ -10,7 +10,6 @@ module Sfn
 
     # Stack serialization helper
     class StackExporter
-
       include Bogo::AnimalStrings
       include Sfn::Utils::JSON
 
@@ -20,7 +19,7 @@ module Sfn
       DEFAULT_OPTIONS = Mash.new(
         :chef_popsicle => true,
         :ignored_parameters => ['Environment', 'StackCreator', 'Creator'],
-        :chef_environment_parameter => 'Environment'
+        :chef_environment_parameter => 'Environment',
       )
       # default structure of export payload
       DEFAULT_EXPORT_STRUCTURE = {
@@ -29,15 +28,15 @@ module Sfn
           :options => {
             :parameters => Mash.new,
             :capabilities => [],
-            :notification_topics => []
-          }
+            :notification_topics => [],
+          },
         ),
         :generator => {
           :timestamp => Time.now.to_i,
           :name => 'SparkleFormation',
           :version => Sfn::VERSION.version,
-          :provider => nil
-        }
+          :provider => nil,
+        },
       }
 
       # @return [Miasma::Models::Orchestration::Stack]
@@ -55,7 +54,7 @@ module Sfn
       # @option options [TrueClass, FalseClass] :chef_popsicle freeze run list
       # @option options [Array<String>] :ignored_parameters
       # @option options [String] :chef_environment_parameter
-      def initialize(stack, options={})
+      def initialize(stack, options = {})
         @stack = stack
         @options = DEFAULT_OPTIONS.merge(options)
         @stack_export = Smash.new
@@ -67,14 +66,14 @@ module Sfn
       def export
         @stack_export = Smash.new(DEFAULT_EXPORT_STRUCTURE).tap do |stack_export|
           [:parameters, :capabilities, :notification_topics].each do |key|
-            if(val = stack.send(key))
+            if val = stack.send(key)
               stack_export[:stack][key] = val
             end
           end
           stack_export[:stack][:template] = stack.template
           stack_export[:generator][:timestamp] = Time.now.to_i
           stack_export[:generator][:provider] = stack.provider.connection.provider
-          if(chef_popsicle? && defined?(Chef))
+          if chef_popsicle? && defined?(Chef)
             freeze_runlists(stack_export)
           end
           remove_ignored_parameters(stack_export)
@@ -90,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
@@ -106,7 +105,7 @@ module Sfn
       # @return [Hash]
       def remove_ignored_parameters(export)
         options[:ignored_parameters].each do |param|
-          if(export[:stack][:options][:parameters])
+          if export[:stack][:options][:parameters]
             export[:stack][:options][:parameters].delete(param)
           end
         end
@@ -118,7 +117,7 @@ module Sfn
       # @param export [Hash] current export state
       # @return [String] environment name
       def chef_environment_name(export)
-        if(chef_environment_parameter?)
+        if chef_environment_parameter?
           name = export[:stack][:options][:parameters][options[:chef_environment_parameter]]
         end
         name || DEFAULT_CHEF_ENVIRONMENT
@@ -126,7 +125,7 @@ module Sfn
 
       # @return [Chef::Environment]
       def environment
-        unless(@env)
+        unless @env
           @env = Chef::Environment.load('_default')
         end
         @env
@@ -154,11 +153,11 @@ module Sfn
       def extract_runlist_item(item)
         rl_item = item.is_a?(Chef::RunList::RunListItem) ? item : Chef::RunList::RunListItem.new(item)
         static_content = Mash.new(:run_list => [])
-        if(rl_item.recipe?)
+        if rl_item.recipe?
           cookbook, recipe = rl_item.name.split('::')
           peg_version = allowed_cookbook_version(cookbook)
           static_content[:run_list] << "recipe[#{[cookbook, recipe || 'default'].join('::')}@#{peg_version}]"
-        elsif(rl_item.role?)
+        elsif rl_item.role?
           role = Chef::Role.load(rl_item.name)
           role.run_list.each do |item|
             static_content = Chef::Mixin::DeepMerge.merge(static_content, extract_runlist_item(item))
@@ -209,10 +208,10 @@ module Sfn
         result = []
         case thing
         when Hash
-          if(thing['content'] && thing['content']['run_list'])
+          if thing['content'] && thing['content']['run_list']
             result << thing['content']
           else
-            thing.each do |k,v|
+            thing.each do |k, v|
               result += locate_runlists(v)
             end
           end
@@ -229,7 +228,7 @@ module Sfn
       # @param hsh [Object] stack template item
       # @return [Object]
       def cf_replace(hsh)
-        if(hsh.is_a?(Hash))
+        if hsh.is_a?(Hash)
           case hsh.keys.first
           when 'Fn::Join'
             cf_join(*hsh.values.first)
@@ -248,11 +247,11 @@ module Sfn
       # @param ref_name [Hash]
       # @return [Object] value in parameters
       def cf_ref(ref_name)
-        if(stack.parameters.has_key?(ref_name))
+        if stack.parameters.has_key?(ref_name)
           stack.parameters[ref_name]
         else
           raise KeyError.new("No parameter found with given reference name (#{ref_name}). " <<
-            "Only parameter based references supported!")
+                             "Only parameter based references supported!")
         end
       end
 
@@ -263,7 +262,7 @@ module Sfn
       # @return [String]
       def cf_join(delim, args)
         args.map do |arg|
-          if(arg.is_a?(Hash))
+          if arg.is_a?(Hash)
             cf_replace(arg)
           else
             arg.to_s