terraform_landscape 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a71818264c2488766b447e16abbd2be9eb743ddd8faf717df0b0652742ea36
-  data.tar.gz: 883c3799319b75efb960a6e185897a581d2362e4499c0f442dcf155669221d04
+  metadata.gz: 7eb8ec1bcf22cf01150a1934248b46c2e0603bc16bdb1ac0cbfd32a8ef8a54d4
+  data.tar.gz: 23f41d4a701ae0aa315352976cabb088cd05efa83e0c9e7b07ab56b5713bd09e
 SHA512:
-  metadata.gz: d49d670112420768a487c6f69a009923a75607d8cfcc58beffa8824c96aec6ddd931a8c71b2281a69ea300558be4b05ce2058fb57b0ac1df101dac3e7fee0104
-  data.tar.gz: 42b90645cf8ab30928c2257afc11ebf943afe1216e9983f14c652808e8d22cd0a7b3cc9e988fa384b0158003696ed60b985b0b18959b7c2b80ff99497b574382
+  metadata.gz: ce15fc65aecbcca148c1c0fa773dd5e8ab4b13ec4305b5c7b7b921f2f7e4dbfd380ef61642c2734dd1fcfa22deae637e6bac578254d0182186b90d106e714829
+  data.tar.gz: f433aef801d0e0d02d8669075785f3817a5bf3febf6c4a26235c79e989953cc1a4981dc8a83584f3855089f5d08cde567f2f70b3fddd1c221684c3c94a0cb15f

data/lib/terraform_landscape/cli.rb

@@ -30,9 +30,14 @@ module TerraformLandscape
 
     def define_commands
       command :print do |c|
-        c.action do
-          print
+        c.action do |_args, options|
+          print(options.__hash__)
         end
+        c.description = <<-TXT
+  Pretty-prints your Terraform plan output.
+
+  If an error occurs while parsing the Terraform output, print will automatically fall back on the original Terraform output. To view the stack trace instead, provide the global --trace option.
+        TXT
       end
 
       global_option '--no-color', 'Do not output any color' do
@@ -43,9 +48,9 @@ module TerraformLandscape
       default_command :print
     end
 
-    def print
+    def print(options)
       printer = Printer.new(@output)
-      printer.process_stream(STDIN)
+      printer.process_stream(STDIN, options)
     end
   end
 end

data/lib/terraform_landscape/constants.rb

@@ -6,4 +6,7 @@ module TerraformLandscape
 
   REPO_URL = 'https://github.com/coinbase/terraform_landscape'.freeze
   BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
+
+  FALLBACK_MESSAGE = 'Terraform Landscape: a parsing error occured.' \
+                     ' Falling back to original Terraform output...'.freeze
 end

data/lib/terraform_landscape/printer.rb

@@ -8,9 +8,10 @@ module TerraformLandscape
       @output = output
     end
 
-    def process_stream(io) # rubocop:disable Metrics/MethodLength
+    def process_stream(io, options = {}) # rubocop:disable Metrics/MethodLength
       apply = nil
       buffer = StringIO.new
+      original_tf_output = StringIO.new
       begin
         block_size = 1024
 
@@ -21,7 +22,9 @@ module TerraformLandscape
 
           readable_fds.each do |f|
             begin
-              buffer << strip_ansi(f.read_nonblock(block_size))
+              new_output = f.read_nonblock(block_size)
+              original_tf_output << new_output
+              buffer << strip_ansi(new_output)
             rescue IO::WaitReadable # rubocop:disable Lint/HandleExceptions
               # Ignore; we'll call IO.select again
             rescue EOFError
@@ -34,9 +37,17 @@ module TerraformLandscape
                                                     replace: ''))
           done = true if apply
         end
-        process_string(buffer.string)
 
-        @output.print apply if apply
+        begin
+          process_string(buffer.string)
+          @output.print apply if apply
+        rescue ParseError, TerraformPlan::ParseError => e
+          raise e if options[:trace]
+
+          @output.warning FALLBACK_MESSAGE
+          @output.print original_tf_output.string
+        end
+
         @output.write_from(io)
       ensure
         io.close

data/lib/terraform_landscape/terraform_plan.rb

@@ -2,7 +2,6 @@ require 'colorize'
 require 'diffy'
 require 'json'
 require 'treetop'
-require 'string_undump'
 
 ########################################################################
 # Represents the parsed output of `terraform plan`.

data/lib/terraform_landscape/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terraform_landscape
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Coinbase
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -53,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: string_undump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -112,15 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Pretty-print Terraform plan output