sfn 3.0.28 → 3.0.30

data/lib/sfn/command/destroy.rb

@@ -3,7 +3,6 @@ require 'sfn'
 module Sfn
   class Command
     class Destroy < Command
-
       include Sfn::CommandModule::Base
 
       # Run the stack destruction action
@@ -14,7 +13,7 @@ module Sfn
         globs = stacks.find_all do |s|
           s !~ /^[a-zA-Z0-9-]+$/
         end
-        unless(globs.empty?)
+        unless globs.empty?
           glob_stacks = provider.connection.stacks.all.find_all do |remote_stack|
             globs.detect do |glob|
               File.fnmatch(glob, remote_stack.name)
@@ -28,7 +27,7 @@ module Sfn
         ui.confirm "Destroy listed stack#{plural}?"
         stacks.each do |stack_name|
           stack = provider.connection.stacks.get(stack_name)
-          if(stack)
+          if stack
             nested_stack_cleanup!(stack)
             begin
               api_action!(:api_stack => stack) do
@@ -44,12 +43,12 @@ module Sfn
             ui.warn "Failed to locate requested stack: #{ui.color(stack_name, :bold)}"
           end
         end
-        if(config[:poll])
-          if(stacks.size == 1)
+        if config[:poll]
+          if stacks.size == 1
             begin
               poll_stack(stacks.first)
             rescue Miasma::Error::ApiError::RequestError => error
-              unless(error.response.code == 404)
+              unless error.response.code == 404
                 raise error
               end
             end
@@ -69,12 +68,12 @@ module Sfn
           provider.connection.data[:stack_types].include?(resource['Type'])
         end.each do |resource|
           url = resource['Properties']['TemplateURL']
-          if(url && url.is_a?(String))
+          if url && url.is_a?(String)
             _, bucket_name, path = URI.parse(url).path.split('/', 3)
             bucket = provider.connection.api_for(:storage).buckets.get(bucket_name)
-            if(bucket)
+            if bucket
               file = bucket.files.get(path)
-              if(file)
+              if file
                 file.destroy
                 ui.info "Deleted nested stack template! (Bucket: #{bucket_name} Template: #{path})"
               else
@@ -86,7 +85,6 @@ module Sfn
           end
         end
       end
-
     end
   end
 end

data/lib/sfn/command/diff.rb

@@ -6,7 +6,6 @@ module Sfn
   class Command
     # Diff command
     class Diff < Command
-
       include Sfn::CommandModule::Base
       include Sfn::CommandModule::Template
       include Sfn::CommandModule::Stack
@@ -22,7 +21,7 @@ module Sfn
           stack = nil
         end
 
-        if(stack)
+        if stack
           config[:print_only] = true
           file = load_template_file
           file = parameter_scrub!(file.dump)
@@ -38,7 +37,7 @@ module Sfn
       end
 
       # @todo needs updates for better provider compat
-      def diff_stack(stack, file, parent_names=[])
+      def diff_stack(stack, file, parent_names = [])
         stack_template = stack.template
         nested_stacks = Hash[
           file.fetch('Resources', file.fetch('resources', {})).find_all do |name, value|
@@ -49,7 +48,7 @@ module Sfn
           n_stack = stack.nested_stacks(false).detect do |ns|
             ns.data[:logical_id] == name
           end
-          if(n_stack)
+          if n_stack
             diff_stack(n_stack, value['Properties']['Stack'], [*parent_names, stack.data.fetch(:logical_id, stack.name)].compact)
           end
           file['Resources'][name]['Properties'].delete('Stack')
@@ -59,12 +58,11 @@ module Sfn
 
         stack_diff = HashDiff.diff(stack.template, file)
 
-        if(config[:raw_diff])
+        if config[:raw_diff]
           ui.info "Dumping raw template diff:"
           require 'pp'
           pp stack_diff
         else
-
           added_resources = stack_diff.find_all do |item|
             item.first == '+' && item[1].match(/Resources\.[^.]+$/)
           end
@@ -77,12 +75,11 @@ module Sfn
               !item[1].include?('Properties.Parameters')
           end - added_resources - removed_resources
 
-          if(added_resources.empty? && removed_resources.empty? && modified_resources.empty?)
+          if added_resources.empty? && removed_resources.empty? && modified_resources.empty?
             ui.info 'No changes detected'
             ui.puts
           else
-
-            unless(added_resources.empty?)
+            unless added_resources.empty?
               ui.info ui.color('Added Resources:', :green, :bold)
               added_resources.each do |item|
                 ui.print ui.color("  -> #{item[1].split('.').last}", :green)
@@ -91,7 +88,7 @@ module Sfn
               ui.puts
             end
 
-            unless(modified_resources.empty?)
+            unless modified_resources.empty?
               ui.info ui.color('Modified Resources:', :yellow, :bold)
               m_resources = Hash.new.tap do |hash|
                 modified_resources.each do |item|
@@ -102,8 +99,8 @@ module Sfn
                   matched = hash[key][prefix].detect do |i|
                     i[:path] == a_key
                   end
-                  if(matched)
-                    if(item.first == '-')
+                  if matched
+                    if item.first == '-'
                       matched[:original] = item[2]
                     else
                       matched[:new] = item[2]
@@ -137,7 +134,7 @@ module Sfn
               ui.puts
             end
 
-            unless(removed_resources.empty?)
+            unless removed_resources.empty?
               ui.info ui.color('Removed Resources:', :red, :bold)
               removed_resources.each do |item|
                 ui.print ui.color("  <- #{item[1].split('.').last}", :red)
@@ -147,21 +144,17 @@ module Sfn
             end
 
             run_callbacks_for(:after_stack_diff,
-              :diff => stack_diff,
-              :diff_info => {
-                :added => added_resources,
-                :modified => modified_resources,
-                :removed => removed_resources
-              },
-              :api_stack => stack,
-              :new_template => file
-            )
+                              :diff => stack_diff,
+                              :diff_info => {
+                                :added => added_resources,
+                                :modified => modified_resources,
+                                :removed => removed_resources,
+                              },
+                              :api_stack => stack,
+                              :new_template => file)
           end
-
         end
-
       end
-
     end
   end
 end

data/lib/sfn/command/events.rb

@@ -4,7 +4,6 @@ module Sfn
   class Command
     # Events command
     class Events < Command
-
       include Sfn::CommandModule::Base
 
       # @return [Miasma::Models::Orchestration::Stack]
@@ -17,14 +16,14 @@ module Sfn
         ui.info "Events for Stack: #{ui.color(name, :bold)}\n"
         @seen_events = []
         @stack = provider.stack(name)
-        if(stack)
+        if stack
           api_action!(:api_stack => stack) do
             table = ui.table(self) do
               table(:border => false) do
                 events = get_events
                 row(:header => true) do
                   allowed_attributes.each do |attr|
-                    width_val = events.map{|e| e[attr].to_s.length}.push(attr.length).max + 2
+                    width_val = events.map { |e| e[attr].to_s.length }.push(attr.length).max + 2
                     width_val = width_val > 70 ? 70 : width_val < 20 ? 20 : width_val
                     column attr.split('_').map(&:capitalize).join(' '), :width => width_val
                   end
@@ -38,10 +37,10 @@ module Sfn
                 end
               end
             end.display
-            if(config[:poll])
-              while(stack.reload.in_progress?)
+            if config[:poll]
+              while (stack.reload.in_progress?)
                 to_wait = config.fetch(:poll_wait_time, 10).to_f
-                while(to_wait > 0)
+                while (to_wait > 0)
                   sleep(0.1)
                   to_wait -= 0.1
                 end
@@ -65,13 +64,13 @@ module Sfn
         stack_events = discover_stacks(stack).map do |i_stack|
           i_events = []
           begin
-            if(@initial_complete && i_stack.in_progress?)
+            if @initial_complete && i_stack.in_progress?
               i_events = i_stack.events.update!
             else
               i_events = i_stack.events.all
             end
           rescue => e
-            if(e.class.to_s.start_with?('Errno'))
+            if e.class.to_s.start_with?('Errno')
               ui.warn "Connection error encountered: #{e.message} (retrying)"
               ui.debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
             else
@@ -81,23 +80,23 @@ module Sfn
             sleep(5)
             retry
           end
-          if(i_events)
+          if i_events
             i_events.map do |e|
               e.attributes.merge(:stack_name => i_stack.name).to_smash
             end
           end
-        end.flatten.compact.find_all{|e| e[:time] }.reverse
-        stack_events.delete_if{|evt| @seen_events.include?(evt)}
+        end.flatten.compact.find_all { |e| e[:time] }.reverse
+        stack_events.delete_if { |evt| @seen_events.include?(evt) }
         @seen_events.concat(stack_events)
-        unless(@initial_complete)
-          stack_events = stack_events.sort_by{|e| e[:time] }
-          unless(config[:all_events])
+        unless @initial_complete
+          stack_events = stack_events.sort_by { |e| e[:time] }
+          unless config[:all_events]
             start_index = stack_events.rindex do |item|
               item[:stack_name] == stack.name &&
                 item[:resource_state].to_s.end_with?('in_progress') &&
                 item[:resource_status_reason].to_s.downcase.include?('user init')
             end
-            if(start_index)
+            if start_index
               stack_events.slice!(0, start_index)
             end
           end
@@ -121,7 +120,7 @@ module Sfn
       # @return [Array<String>] allowed attributes for events
       def allowed_attributes
         result = super
-        unless(@stacks.size > 1)
+        unless @stacks.size > 1
           result.delete('stack_name')
         end
         result

data/lib/sfn/command/export.rb

@@ -4,7 +4,6 @@ module Sfn
   class Command
     # Export command
     class Export < Command
-
       include Sfn::CommandModule::Base
       include Sfn::Utils::ObjectStorage
 
@@ -15,7 +14,7 @@ module Sfn
         ui.info "#{ui.color('Stack Export:', :bold)} #{stack_name}"
         ui.confirm 'Perform export'
         stack = provider.stacks.get(stack_name)
-        if(stack)
+        if stack
           export_options = Smash.new.tap do |opts|
             [:chef_popsicle, :chef_environment_parameter, :ignore_parameters].each do |key|
               opts[key] = config[key] unless config[key].nil?
@@ -25,14 +24,14 @@ module Sfn
           result = exporter.export
           outputs = [
             write_to_file(result, stack),
-            write_to_bucket(result, stack)
+            write_to_bucket(result, stack),
           ].compact
-          if(outputs.empty?)
+          if outputs.empty?
             ui.warn 'No persistent output location defined. Printing export:'
             ui.info _format_json(result)
           end
           ui.info "#{ui.color('Stack export', :bold)} (#{name_args.first}): #{ui.color('complete', :green)}"
-          unless(outputs.empty?)
+          unless outputs.empty?
             outputs.each do |output|
               ui.info ui.color("  -> #{output}", :blue)
             end
@@ -49,8 +48,8 @@ module Sfn
       # @return [String] file name
       def export_file_name(stack)
         name = config[:file]
-        if(name)
-          if(name.respond_to?(:call))
+        if name
+          if name.respond_to?(:call)
             name.call(stack)
           else
             name.to_s
@@ -67,16 +66,15 @@ module Sfn
       # @return [String, NilClass] path to file
       def write_to_file(payload, stack)
         raise NotImplementedError
-        if(config[:path])
+        if config[:path]
           full_path = File.join(
             config[:path],
             export_file_name(stack)
           )
           _, bucket, path = full_path.split('/', 3)
           directory = provider.service_for(:storage,
-            :provider => :local,
-            :local_root => '/'
-          ).directories.get(bucket)
+                                           :provider => :local,
+                                           :local_root => '/').directories.get(bucket)
           file_store(payload, path, directory)
         end
       end
@@ -88,16 +86,14 @@ module Sfn
       # @return [String, NilClass] remote bucket key
       def write_to_bucket(payload, stack)
         raise NotImplementedError
-        if(bucket = config[:bucket])
+        if bucket = config[:bucket]
           key_path = File.join(*[
-              bucket_prefix(stack),
-              export_file_name(stack)
-            ].compact
-          )
+            bucket_prefix(stack),
+            export_file_name(stack),
+          ].compact)
           file_store(payload, key_path, provider.service_for(:storage).directories.get(bucket))
         end
       end
-
     end
   end
 end

data/lib/sfn/command/graph.rb

@@ -5,7 +5,6 @@ module Sfn
   class Command
     # Graph command
     class Graph < Command
-
       autoload :Provider, 'sfn/command/graph/provider'
 
       include Sfn::CommandModule::Base
@@ -15,7 +14,7 @@ module Sfn
       # Valid graph styles
       GRAPH_STYLES = [
         'creation',
-        'dependency'
+        'dependency',
       ]
 
       # Generate graph
@@ -24,13 +23,13 @@ module Sfn
         validate_graph_style!
         file = load_template_file
         provider = Bogo::Utility.camel(file.provider).to_sym
-        if(Provider.constants.include?(provider))
+        if Provider.constants.include?(provider)
           graph_const = Provider.const_get(provider)
           ui.debug "Loading provider graph implementation - #{graph_const}"
           extend graph_const
           @outputs = Smash.new
           ui.info "Template resource graph generation - Style: #{ui.color(config[:graph_style], :bold)}"
-          if(config[:file])
+          if config[:file]
             ui.puts "  -> path: #{config[:file]}"
           end
           template_dump = file.compile.sparkle_dump!.to_smash
@@ -49,7 +48,7 @@ module Sfn
           end
           run_action 'Writing graph result' do
             FileUtils.mkdir_p(File.dirname(config[:output_file]))
-            if(config[:output_type] == 'dot')
+            if config[:output_type] == 'dot'
               File.open("#{config[:output_file]}.dot", 'w') do |o_file|
                 o_file.puts graph.to_s
               end
@@ -59,7 +58,7 @@ module Sfn
             nil
           end
         else
-          valid_providers = Provider.constants.sort.map{ |provider|
+          valid_providers = Provider.constants.sort.map { |provider|
             Bogo::Utility.snake(provider)
           }.join('`, `')
           ui.error "Graphing for provider `#{file.provider}` not currently supported."
@@ -67,14 +66,14 @@ module Sfn
         end
       end
 
-      def generate_graph(template, args={})
+      def generate_graph(template, args = {})
         graph = ::Graph.new
         @root_graph = graph unless @root_graph
         graph.graph_attribs << ::Graph::Attribute.new('overlap = false')
         graph.graph_attribs << ::Graph::Attribute.new('splines = true')
         graph.graph_attribs << ::Graph::Attribute.new('pack = true')
         graph.graph_attribs << ::Graph::Attribute.new('start = "random"')
-        if(args[:name])
+        if args[:name]
           graph.name = "cluster_#{args[:name]}"
           labelnode_key = "cluster_#{args[:name]}"
           graph.plaintext << graph.node(labelnode_key)
@@ -88,7 +87,7 @@ module Sfn
 
       def colorize(string)
         hash = string.chars.inject(0) do |memo, chr|
-          if(memo + chr.ord > 127)
+          if memo + chr.ord > 127
             (memo - chr.ord).abs
           else
             memo + chr.ord
@@ -98,7 +97,7 @@ module Sfn
         3.times do |i|
           color << (255 ^ hash).to_s(16)
           new_val = hash + (hash * (1 / (i + 1.to_f))).to_i
-          if(hash * (i + 1) < 127)
+          if hash * (i + 1) < 127
             hash = new_val
           else
             hash = hash / (i + 1)
@@ -108,16 +107,15 @@ module Sfn
       end
 
       def validate_graph_style!
-        if(config[:luckymike])
+        if config[:luckymike]
           ui.warn 'Detected luckymike power override. Forcing `dependency` style!'
           config[:graph_style] = 'dependency'
         end
         config[:graph_style] = config[:graph_style].to_s
-        unless(GRAPH_STYLES.include?(config[:graph_style]))
+        unless GRAPH_STYLES.include?(config[:graph_style])
           raise ArgumentError.new "Invalid graph style provided `#{config[:graph_style]}`. Valid: `#{GRAPH_STYLES.join('`, `')}`"
         end
       end
-
     end
   end
 end