ruby-terraform 0.39.0.pre.pre.1 → 0.39.0.pre.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15814ddd80516c55b1b513bbacd254ff0fe65220fac48e0c070860731ec17a9b
-  data.tar.gz: d961254ad57da11e228e93af7f92a743a1aa5799a33da5268701b1418ca4b83a
+  metadata.gz: 75556dce8a559e6ff860bf9f21ea1ed798b04399b53930ee1df6db65e2ba3ac2
+  data.tar.gz: 734b3a9d311a68b3258629c5575cb03c7d2cd4a2b8824f8ea640a718b03546f3
 SHA512:
-  metadata.gz: 4cf3ec4306aa0cfb551525ea69e02f68735ab43b22826b778092b0682ff16f4383399c78a1c5f1c7e8cd3fce4e1acd9db712b99186392ab1fd33907fe85c32b7
-  data.tar.gz: b68c324cbbb60630b65c2bfbef753f42d23109294684b83dbfddd8fb4dc79a354c98063588a8398d18cf124a7158ddf04fa7d2f376a00efd4a2e394eeb2ee2dc
+  metadata.gz: 5071f1b85706c3322ae793f0ead129c3f43a804c24ae12b3d45e6742ed950e97a0995edf50fcb92c90d1af95a0d45fb2382b3444d3b5ef3acf0fbeeef9c74dcf
+  data.tar.gz: 21551855b1c15fa1b4485a3770f655e690f891eaa4c0ebf6cdd4b5884a4d1d8545cabe196e9db8622112ad772400191d53064abd647919313787a8206f9b2e87

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.39.0.pre.pre.1)
+    ruby-terraform (0.39.0.pre.pre.2)
       lino (~> 1.1)
 
 GEM

data/lib/ruby_terraform/commands/base.rb

@@ -1,11 +1,11 @@
 require 'lino'
+require_relative '../errors'
 
 module RubyTerraform
   module Commands
     class Base
-      attr_reader :binary
-
-      def initialize(binary: nil, logger: nil, stdin: nil, stdout: nil, stderr: nil)
+      def initialize(
+          binary: nil, logger: nil, stdin: nil, stdout: nil, stderr: nil)
         @binary = binary || RubyTerraform.configuration.binary
         @logger = logger || RubyTerraform.configuration.logger
         @stdin = stdin || RubyTerraform.configuration.stdin
@@ -13,34 +13,31 @@ module RubyTerraform
         @stderr = stderr || RubyTerraform.configuration.stderr
       end
 
-      def stdin
-        @stdin
-      end
-
-      def stdout
-        @stdout
-      end
-
-      def stderr
-        @stderr
-      end
-
       def execute(opts = {})
         builder = instantiate_builder
 
         do_before(opts)
-        command = configure_command(builder, opts)
-                    .build
-        @logger.debug "Running '#{command.to_s}'."
+        command = configure_command(builder, opts).build
+        logger.debug("Running '#{command.to_s}'.")
 
         command.execute(
-          stdin: stdin,
-          stdout: stdout,
-          stderr: stderr
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
         )
         do_after(opts)
       rescue Open4::SpawnError
-        @logger.error "Terraform has failed while running '#{command_name}'."
+        message = "Failed while running '#{command_name}'."
+        logger.error(message)
+        raise Errors::ExecutionError, message
+      end
+
+      protected
+
+      attr_reader :binary, :logger, :stdin, :stdout, :stderr
+
+      def command_name
+        self.class.to_s.split("::")[-1].downcase
       end
 
       def instantiate_builder
@@ -57,11 +54,6 @@ module RubyTerraform
 
       def do_after(opts)
       end
-
-      def command_name
-        self.class.to_s.split("::")[-1].downcase
-      end
-      protected :command_name
     end
   end
 end

data/lib/ruby_terraform/commands/clean.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 module RubyTerraform
   module Commands
     class Clean
+      attr_reader :logger
+
       def initialize(directory: nil, logger: nil)
         @directory = directory ? directory : '.terraform'
         @logger = logger || RubyTerraform.configuration.logger
@@ -10,10 +12,12 @@ module RubyTerraform
 
       def execute(opts = {})
         directory = opts[:directory] || @directory
-        @logger.info "Cleaning terraform directory '#{directory}'."
-        FileUtils.rm_r(directory, :secure => true)
-      rescue Errno::ENOENT => e
-        @logger.error "Couldn't clean '#{directory}': #{e.message}"
+        begin
+          logger.info "Cleaning terraform directory '#{directory}'."
+          FileUtils.rm_r(directory, :secure => true)
+        rescue Errno::ENOENT => e
+          logger.error "Couldn't clean '#{directory}': #{e.message}"
+        end
       end
     end
   end

data/lib/ruby_terraform/commands/output.rb

@@ -5,7 +5,8 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Output < Base
-      def stdout
+      def initialize(**kwargs)
+        super(**kwargs)
         @stdout = StringIO.new unless
             defined?(@stdout) && @stdout.respond_to?(:string)
       end
@@ -18,17 +19,17 @@ module RubyTerraform
 
         builder = builder
             .with_subcommand('output') do |sub|
-              sub = sub.with_flag('-no-color') if no_color
-              sub = sub.with_option('-state', state) if state
-              sub = sub.with_option('-module', mod) if mod
-              sub
-            end
+          sub = sub.with_flag('-no-color') if no_color
+          sub = sub.with_option('-state', state) if state
+          sub = sub.with_option('-module', mod) if mod
+          sub
+        end
         builder = builder.with_argument(name) if name
         builder
       end
 
       def do_after(opts)
-        result = @stdout.string
+        result = stdout.string
         opts[:name] ? result.chomp : result
       end
     end

data/lib/ruby_terraform/commands.rb

@@ -14,4 +14,4 @@ require_relative 'commands/workspace'
 module RubyTerraform
   module Commands
   end
-end
+end

data/lib/ruby_terraform/errors/execution_error.rb

@@ -0,0 +1,6 @@
+module RubyTerraform
+  module Errors
+    class ExecutionError < StandardError
+    end
+  end
+end

data/lib/ruby_terraform/errors.rb

@@ -0,0 +1,6 @@
+require_relative 'errors/execution_error'
+
+module RubyTerraform
+  module Errors
+  end
+end

data/lib/ruby_terraform/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = "0.39.0-pre.1"
+  VERSION = "0.39.0-pre.2"
 end

data/lib/ruby_terraform.rb

@@ -1,4 +1,5 @@
 require 'ruby_terraform/version'
+require 'ruby_terraform/errors'
 require 'ruby_terraform/commands'
 require 'logger'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.39.0.pre.pre.1
+  version: 0.39.0.pre.pre.2
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -131,6 +131,8 @@ files:
 - lib/ruby_terraform/commands/show.rb
 - lib/ruby_terraform/commands/validate.rb
 - lib/ruby_terraform/commands/workspace.rb
+- lib/ruby_terraform/errors.rb
+- lib/ruby_terraform/errors/execution_error.rb
 - lib/ruby_terraform/version.rb
 - ruby_terraform.gemspec
 - scripts/ci/common/configure-git.sh