terraform_landscape 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f56c81628fd52e150c2c121b0e055ebfa522fe6
-  data.tar.gz: b69ef81b1212ede1381668fa34959e607ce41f59
+SHA256:
+  metadata.gz: 306ca967b3047b11062b571b5e9839ea1fb4d9e7f8edb3e4782f01dd78b52d1c
+  data.tar.gz: 8ddc10200bea03580c889c12dfe2ea9301af8a4a011fd29cff155fccb560070d
 SHA512:
-  metadata.gz: 42a32534faf4ed27b60ea2012100cab84d2e001b41b4fc2130a3afc1376db5d681fadc22af5b9c5bbc7c2665cbd3b7673adb1dfe45ed8d3323d2b93c49446fdc
-  data.tar.gz: 463f7422c21b4864e18bc9629938ac75edeb7bc531b90cf113b9e42271f0b82e46dd0f75a314be383ec7ac35161e111e98519b68d072cff0e49951b2715e5cdc
+  metadata.gz: fe4496da96c56269be1cd9a671a864fbe5f008495f68b2ed73b58de05a509b74920c046db0be7169cc32ee2a72a87d0821e8e9f5a224c5bfaa3309136cb7f847
+  data.tar.gz: '07407046298b9b37ee82fe4e3acb73af21689af22f946e4064b2aac86b7ae343c5f5528571dd401ea0efa583375fb378c918f146e6abeb0bd9133c6a1b4bec67'

data/lib/terraform_landscape/output.rb

@@ -104,6 +104,13 @@ module TerraformLandscape
       @out.respond_to?(:tty?) && @out.tty?
     end
 
+    # Connect directly to a readable stream
+    def write_from(other_io)
+      while (line = other_io.gets)
+        print line
+      end
+    end
+
     private
 
     # Print output in the specified color.

data/lib/terraform_landscape/printer.rb

@@ -8,7 +8,8 @@ module TerraformLandscape
       @output = output
     end
 
-    def process_stream(io)
+    def process_stream(io) # rubocop:disable Metrics/MethodLength
+      apply = nil
       buffer = StringIO.new
       begin
         block_size = 1024
@@ -20,23 +21,28 @@ module TerraformLandscape
 
           readable_fds.each do |f|
             begin
-              buffer << f.read_nonblock(block_size)
+              buffer << strip_ansi(f.read_nonblock(block_size))
             rescue IO::WaitReadable # rubocop:disable Lint/HandleExceptions
               # Ignore; we'll call IO.select again
             rescue EOFError
               done = true
             end
           end
+
+          apply = apply_prompt(buffer.string)
+          done = true if apply
         end
+        process_string(buffer.string)
+
+        @output.print apply if apply
+        @output.write_from(io)
       ensure
         io.close
       end
-
-      process_string(buffer.string)
     end
 
-    def process_string(plan_output)
-      scrubbed_output = plan_output.gsub(/\e\[\d+m/, '')
+    def process_string(plan_output) # rubocop:disable Metrics/MethodLength
+      scrubbed_output = strip_ansi(plan_output)
 
       # Remove initialization messages like
       # "- Downloading plugin for provider "aws" (1.1.0)..."
@@ -70,5 +76,16 @@ module TerraformLandscape
       plan.display(@output)
       @output.puts plan_summary
     end
+
+    private
+
+    def strip_ansi(string)
+      string.gsub(/\e\[\d+m/, '')
+    end
+
+    def apply_prompt(output)
+      return unless output =~ /Enter a value:\s+$/
+      output[/Do you want to perform these actions\?.*$/m, 0]
+    end
   end
 end

data/lib/terraform_landscape/terraform_plan.rb

@@ -64,13 +64,19 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
 
   private
 
-  def display_resource(resource)
+  def display_resource(resource) # rubocop:disable Metrics/MethodLength
     change_color = CHANGE_SYMBOL_TO_COLOR[resource[:change]]
 
     resource_header = "#{resource[:change]} #{resource[:resource_type]}." \
                       "#{resource[:resource_name]}".colorize(change_color)
-    resource_header += " (#{resource[:reason]})".colorize(:magenta) if resource[:reason]
-    resource_header += " (#{resource[:additional_reason]})".colorize(:magenta) if resource[:additional_reason]
+
+    if resource[:reason]
+      resource_header += " (#{resource[:reason]})".colorize(:magenta)
+    end
+
+    if resource[:additional_reason]
+      resource_header += " (#{resource[:additional_reason]})".colorize(:magenta)
+    end
 
     @out.puts resource_header
 
@@ -117,11 +123,11 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
   def display_diff(old, new, indent)
     @out.print Diffy::Diff.new(old, new, { context: @diff_context_lines })
       .to_s(String.disable_colorization ? :text : :color)
-      .gsub("\n", "\n" + indent)
-      .strip
+                          .gsub("\n", "\n" + indent)
+                          .strip
   end
 
-  def display_attribute(
+  def display_attribute( # rubocop:disable Metrics/ParameterLists
     resource,
     change_color,
     attribute_name,
@@ -131,7 +137,7 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
   )
     attribute_value_indent = ' ' * attribute_value_indent_amount
 
-    if [:~, :'-/+'].include?(resource[:change])
+    if %i[~ -/+].include?(resource[:change])
       display_modified_attribute(change_color,
                                  attribute_name,
                                  attribute_value,
@@ -147,7 +153,7 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
     end
   end
 
-  def display_modified_attribute( # rubocop:disable Metrics/MethodLength
+  def display_modified_attribute( # rubocop:disable Metrics/ParameterLists
     change_color,
     attribute_name,
     attribute_value,
@@ -163,7 +169,7 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
     return if old == new # Don't show unchanged attributes
 
     @out.print "    #{attribute_name}:".ljust(attribute_value_indent_amount, ' ')
-      .colorize(change_color)
+                                       .colorize(change_color)
 
     if json?(new)
       # Value looks like JSON, so prettify it to make it more readable
@@ -180,7 +186,9 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
       @out.print '"' + new.colorize(:green) + '"'
     end
 
-    @out.print " (#{attribute_change_reason})".colorize(:magenta) if attribute_change_reason
+    if attribute_change_reason
+      @out.print " (#{attribute_change_reason})".colorize(:magenta)
+    end
 
     @out.newline
   end
@@ -193,13 +201,13 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
     attribute_value_indent_amount
   )
     @out.print "    #{attribute_name}:".ljust(attribute_value_indent_amount, ' ')
-      .colorize(change_color)
+                                       .colorize(change_color)
 
     evaluated_string = eval(attribute_value) # rubocop:disable Security/Eval
     if json?(evaluated_string)
       @out.print to_pretty_json(evaluated_string).gsub("\n",
                                                        "\n#{attribute_value_indent}")
-        .colorize(change_color)
+                                                 .colorize(change_color)
     else
       @out.print "\"#{evaluated_string.colorize(change_color)}\""
     end

data/lib/terraform_landscape/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module TerraformLandscape
-  VERSION = '0.1.17'.freeze
+  VERSION = '0.1.18'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terraform_landscape
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Coinbase
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Pretty-print Terraform plan output