ruby-terraform 1.8.0.pre.7 → 1.8.0.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36fc9d207f09fd5b4f339dc3457ba9c6fe8e6a62fa378402737e50818011356d
-  data.tar.gz: e02c7b49ad9c7dc67340b783ccfe0ed2c7069a04f992d62d432d3a78386a42c8
+  metadata.gz: 908fc48e01d74bb56dfb1f87a6c644745e6e2cb20fc54e12b1d7a6b1faf6c246
+  data.tar.gz: 93f6b5277831d620241132bed8ace26fb817fa1ee7d65f4b44b915de3f7c334d
 SHA512:
-  metadata.gz: 909dc06efb67d6d83ca2f1e4b26445d80beb3b8af6f8ec52ac9abb5391344ab21e2248237b97bfaa6e45ef23f850a0a670d6f11e773dbffcbf06047a7a0df8cf
-  data.tar.gz: b832fd4404b1f34e4377569c740d7a451040064160f4d440599f087aee8316f0a4cc4a416a1c70540bcade21cae362161bc8f4ad7fc8446280d21f6916ae7f19
+  metadata.gz: 1cac9d3ce236f366ca205e24fd7706866278d04af7dd8b281d887848a0b0a8d1535756045fb45753e572d9c9999a6105f7f54cb888e94a683dbc4840f49fe34b
+  data.tar.gz: d4eb8e29739ac35a4a75de7ebbf18ca36f321965676be132e5cf51a9e3548d7aa19263c682ce0c8affba89b74900bef847650858af71652e84438cfae86d6d42

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (1.8.0.pre.7)
+    ruby-terraform (1.8.0.pre.8)
       immutable-struct (~> 2.4)
-      lino (= 3.2.0.pre.7)
+      lino (= 3.2.0.pre.9)
 
 GEM
   remote: https://rubygems.org/
@@ -31,7 +31,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     drb (2.2.1)
-    excon (0.110.0)
+    excon (0.111.0)
     faker (3.4.1)
       i18n (>= 1.8.11, < 2)
     faraday (2.10.0)
@@ -66,7 +66,7 @@ GEM
     immutable-struct (2.4.1)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    lino (3.2.0.pre.7)
+    lino (3.2.0.pre.9)
       childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)

data/lib/ruby_terraform/commands/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'lino'
+require 'tempfile'
 
 require_relative '../errors'
 
@@ -12,12 +13,12 @@ module RubyTerraform
       # Constructs an instance of the command.
       #
       def initialize(opts = {})
-        @binary  = opts[:binary]  || RubyTerraform.configuration.binary
-        @logger  = opts[:logger]  || RubyTerraform.configuration.logger
+        @binary = opts[:binary] || RubyTerraform.configuration.binary
+        @logger = opts[:logger] || RubyTerraform.configuration.logger
         @options = opts[:options] || RubyTerraform.configuration.options
-        @stdin   = opts[:stdin]   || RubyTerraform.configuration.stdin
-        @stdout  = opts[:stdout]  || RubyTerraform.configuration.stdout
-        @stderr  = opts[:stderr]  || RubyTerraform.configuration.stderr
+        @stdin = opts[:stdin] || RubyTerraform.configuration.stdin
+        @stdout = opts[:stdout] || RubyTerraform.configuration.stdout
+        @stderr = opts[:stderr] || RubyTerraform.configuration.stderr
       end
 
       # rubocop:enable Metrics/AbcSize
@@ -32,30 +33,24 @@ module RubyTerraform
       # @option invocation_options [Hash<String, String>] :environment A map
       #   of environment variables to expose at command invocation time.
       def execute(parameters = {}, invocation_options = {})
+        parameters = resolve_parameters(parameters)
+        invocation_options = resolve_invocation_options(invocation_options)
+
         do_before(parameters)
-        build_and_execute_command(parameters, invocation_options)
+        result = build_and_execute_command(parameters, invocation_options)
         do_after(parameters)
+
+        prepare_result(result, parameters, invocation_options)
       rescue Lino::Errors::ExecutionError
         message = "Failed while running '#{command_name}'."
         logger.error(message)
         raise Errors::ExecutionError, message
       end
 
-      protected
+      private
 
       attr_reader :binary, :logger, :stdin, :stdout, :stderr
 
-      def build_and_execute_command(parameters, invocation_options)
-        command = build_command(parameters, invocation_options)
-
-        logger.debug("Running '#{command}'.")
-        command.execute(
-          stdin:,
-          stdout:,
-          stderr:
-        )
-      end
-
       def command_name
         self.class.to_s.split('::')[-1].downcase
       end
@@ -64,11 +59,7 @@ module RubyTerraform
 
       def do_after(_parameters); end
 
-      private
-
       def build_command(parameters, invocation_options)
-        parameters = resolve_parameters(parameters)
-
         Lino::CommandLineBuilder
           .for_command(@binary)
           .with_environment_variables(invocation_options[:environment] || {})
@@ -80,10 +71,8 @@ module RubyTerraform
           .build
       end
 
-      def resolve_parameters(parameters)
-        parameter_defaults(parameters)
-          .merge(parameters)
-          .merge(parameter_overrides(parameters))
+      def process_result(result, _parameters, _invocation_options)
+        result
       end
 
       def parameter_defaults(_parameters)
@@ -94,6 +83,10 @@ module RubyTerraform
         {}
       end
 
+      def invocation_option_defaults(_invocation_options)
+        { capture: [], result: :processed }
+      end
+
       def subcommands
         []
       end
@@ -105,6 +98,59 @@ module RubyTerraform
       def arguments(_parameters)
         []
       end
+
+      def build_and_execute_command(parameters, invocation_options)
+        command = build_command(parameters, invocation_options)
+        stdout = resolve_stdout(invocation_options)
+        stderr = resolve_stderr(invocation_options)
+
+        logger.debug("Running '#{command}'.")
+        command.execute(stdin:, stdout:, stderr:)
+
+        process_streams(invocation_options, stdout, stderr)
+      end
+
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
+      end
+
+      def resolve_invocation_options(invocation_options)
+        invocation_option_defaults(invocation_options)
+          .merge(invocation_options)
+      end
+
+      def resolve_stdout(invocation_options)
+        invocation_options[:capture].include?(:stdout) ? Tempfile.new : @stdout
+      end
+
+      def resolve_stderr(invocation_options)
+        invocation_options[:capture].include?(:stderr) ? Tempfile.new : @stderr
+      end
+
+      def process_streams(invocation_options, stdout, stderr)
+        cap = invocation_options[:capture]
+
+        return nil if cap == []
+
+        result = {}
+        result = add_contents_to_result(cap, result, :stdout, stdout, :output)
+        add_contents_to_result(cap, result, :stderr, stderr, :error)
+      end
+
+      def add_contents_to_result(capture, result, stream_name, stream, type)
+        return result unless capture.include?(stream_name)
+
+        stream.rewind
+        result.merge({ type => stream.read })
+      end
+
+      def prepare_result(result, parameters, invocation_options)
+        return result if invocation_options[:result] == :raw
+
+        process_result(result, parameters, invocation_options)
+      end
     end
   end
 end

data/lib/ruby_terraform/commands/output.rb

@@ -42,8 +42,8 @@ module RubyTerraform
       include RubyTerraform::Options::Global
 
       # @!visibility private
-      def stdout
-        @stdout.respond_to?(:string) ? @stdout : (@stdout = StringIO.new)
+      def invocation_option_defaults(invocation_options)
+        super.merge(capture: [:stdout])
       end
 
       # @!visibility private
@@ -67,9 +67,8 @@ module RubyTerraform
       end
 
       # @!visibility private
-      def do_after(parameters)
-        result = stdout.string
-        parameters[:name] ? result.chomp : result
+      def process_result(result, parameters, _invocation_options)
+        parameters[:name] ? result[:output].chomp : result[:output]
       end
     end
   end

data/lib/ruby_terraform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyTerraform
-  VERSION = '1.8.0.pre.7'
+  VERSION = '1.8.0.pre.8'
 end

data/lib/ruby_terraform.rb

@@ -1618,7 +1618,7 @@ module RubyTerraform
       @binary = 'terraform'
       @logger = default_logger
       @options = default_options
-      @stdin = ''
+      @stdin = nil
       @stdout = $stdout
       @stderr = $stderr
     end

data/ruby_terraform.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'immutable-struct', '~> 2.4'
-  spec.add_dependency 'lino', '3.2.0.pre.7'
+  spec.add_dependency 'lino', '3.2.0.pre.9'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.7
+  version: 1.8.0.pre.8
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: immutable-struct
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.pre.7
+        version: 3.2.0.pre.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.pre.7
+        version: 3.2.0.pre.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement