rspec-terraform 0.1.0.pre.39 → 0.1.0.pre.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e77a423f915bda9a4d02a980a21a1755a6dde139dc3d1890414eacfa72c1c8
-  data.tar.gz: 6e2ff10778fd5641f717fb2cf9e23d59e39312179a76cffa40d49ece0ae7a001
+  metadata.gz: cbb48dde98e84c35ba49c8416a4363ee64388ad4912e0758392d5f8a9228ef21
+  data.tar.gz: 4eb898798fb7090a3211bada0de62d0087becf44b51ff8cb8736eb9171d55c6c
 SHA512:
-  metadata.gz: a74ba985ec614bcdf6bcf1c9d031d663341f5f41a40feb513d03313d41cbbd97104c784c806ca5a64b38dffeaf5eea822722a0db2e3f1f78bd402ab18a19093a
-  data.tar.gz: e7c2d9563eb65a3931a4d51d775d1c07e9449a748b15cd1a06e1404a3c9d74d4f65634674d2a88ce736982a75642a3bfb2d6bcadeaef39db9f2182dacc3b3a51
+  metadata.gz: 57f20880cfd73436cede9c132204ec6dc5c6f329850eba87c56be738554f2c1c6b5f925307d9284b2ab3b2aec19349b244519b1f0cb18d01d3914f097fc4d103
+  data.tar.gz: d4dc0cb70c7977d85a3bdbf98aa47dcd078e9babeb75b77b91f89677d1f4bdc3c3ecae9a11408db387fc580e607ce60d270a5285ec6ba6dba4ec427747489b8a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.39)
+    rspec-terraform (0.1.0.pre.42)
       confidante (>= 0.27)
       rspec (>= 3.0)
       ruby-terraform (= 1.7.0.pre.16)
@@ -205,4 +205,4 @@ DEPENDENCIES
   terminal-notifier-guard
 
 BUNDLED WITH
-   2.3.21
+   2.3.22

data/lib/rspec/terraform/helpers/apply.rb

@@ -7,15 +7,26 @@ require_relative '../configuration/var_captor'
 module RSpec
   module Terraform
     module Helpers
+      # rubocop:disable Metrics/ClassLength
       class Apply
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -97,11 +108,11 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def apply_command
-          RubyTerraform::Commands::Apply.new(binary: binary)
+          RubyTerraform::Commands::Apply.new(command_options)
         end
 
         def init_parameters(parameters)
@@ -134,7 +145,18 @@ module RSpec
           apply_parameters
         end
         # rubocop:enable Metrics/MethodLength
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/rspec/terraform/helpers/destroy.rb

@@ -7,15 +7,26 @@ require_relative '../configuration/var_captor'
 module RSpec
   module Terraform
     module Helpers
+      # rubocop:disable Metrics/ClassLength
       class Destroy
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -89,19 +100,18 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def destroy_command
-          RubyTerraform::Commands::Destroy.new(binary: binary)
+          RubyTerraform::Commands::Destroy.new(command_options)
         end
 
         def init_parameters(parameters)
-          init_parameters =
-            parameters.merge(
-              chdir: parameters[:configuration_directory],
-              input: false
-            )
+          init_parameters = parameters.merge(
+            chdir: parameters[:configuration_directory],
+            input: false
+          )
           if execution_mode == :isolated
             init_parameters =
               init_parameters.merge(from_module: parameters[:source_directory])
@@ -127,7 +137,18 @@ module RSpec
           destroy_parameters
         end
         # rubocop:enable Metrics/MethodLength
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/rspec/terraform/helpers/output.rb

@@ -5,15 +5,26 @@ require 'ruby_terraform'
 module RSpec
   module Terraform
     module Helpers
+      # rubocop:disable Metrics/ClassLength
       class Output
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -90,11 +101,11 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def output_command(opts = {})
-          RubyTerraform::Commands::Output.new(opts.merge(binary: binary))
+          RubyTerraform::Commands::Output.new(command_options.merge(opts))
         end
 
         def init_parameters(parameters)
@@ -123,7 +134,18 @@ module RSpec
 
           output_parameters
         end
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rspec/terraform/helpers/plan.rb

@@ -12,13 +12,23 @@ module RSpec
       # rubocop:disable Metrics/ClassLength
       class Plan
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -116,15 +126,15 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def plan_command
-          RubyTerraform::Commands::Plan.new(binary: binary)
+          RubyTerraform::Commands::Plan.new(command_options)
         end
 
         def show_command(opts = {})
-          RubyTerraform::Commands::Show.new(opts.merge(binary: binary))
+          RubyTerraform::Commands::Show.new(command_options.merge(opts))
         end
 
         def init_parameters(parameters)
@@ -167,6 +177,16 @@ module RSpec
             json: true
           )
         end
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
       # rubocop:enable Metrics/ClassLength
     end

data/lib/rspec/terraform/helpers.rb

@@ -46,6 +46,10 @@ module RSpec
 
         {
           binary: config.terraform_binary,
+          logger: config.terraform_logger,
+          stdin: config.terraform_stdin,
+          stdout: config.terraform_stdout,
+          stderr: config.terraform_stderr,
           execution_mode: config.terraform_execution_mode,
           configuration_provider: config.terraform_configuration_provider
         }

data/lib/rspec/terraform/logging.rb

@@ -5,11 +5,15 @@ module RSpec
     module Logging
       class << self
         def resolve_streams(opts = {})
-          streams = opts[:streams] || []
+          opts = resolve_opts(opts)
+          streams = opts[:streams]
+          level = opts[:level]
           devices = devices(opts)
 
+          resolve_opts(opts)
+
           {
-            logger: resolve_logger(opts[:logger], streams, devices),
+            logger: resolve_logger(opts[:logger], streams, devices, level),
             stdout: resolve_stdout(opts[:stdout], streams, devices),
             stderr: resolve_stderr(opts[:stderr], streams, devices)
           }
@@ -17,14 +21,28 @@ module RSpec
 
         private
 
-        def resolve_logger(logger, streams, devices)
+        def resolve_opts(opts)
+          streams = opts[:streams] || []
+          level = opts[:level] || Logger::INFO
+
+          if streams.include?(:file) && !opts[:file_path]
+            raise(
+              ArgumentError,
+              'File logging requested but no file path provided'
+            )
+          end
+
+          opts.merge(streams: streams, level: level)
+        end
+
+        def resolve_logger(logger, streams, devices, level)
           return logger if logger
 
           log_devices = []
           log_devices << devices[:file] if streams.include?(:file)
           log_devices << devices[:stdout] if streams.include?(:standard)
 
-          multi_io(log_devices)
+          Logger.new(multi_io(log_devices), level: level)
         end
 
         def resolve_stdout(stdout, streams, devices)
@@ -48,13 +66,34 @@ module RSpec
         end
 
         def devices(opts)
+          streams = opts[:streams]
+          file_path = opts[:file_path]
+          stdout = opts[:stdout]
+
           {
-            file: log_device(opts[:file_path] || File::NULL),
-            stdout: log_device($stdout),
-            stderr: log_device($stderr)
+            file: log_device(resolve_file_path(file_path, streams)),
+            stdout: log_device(resolved_stdout(stdout)),
+            stderr: log_device(resolved_stderr)
           }
         end
 
+        def resolve_file_path(file_path, streams)
+          resolved_file_path = File::NULL
+          if streams.include?(:file) && file_path
+            FileUtils.mkdir_p(File.dirname(file_path))
+            resolved_file_path = file_path
+          end
+          resolved_file_path
+        end
+
+        def resolved_stdout(stdout)
+          stdout || $stdout
+        end
+
+        def resolved_stderr
+          $stderr
+        end
+
         def log_device(io)
           Logger::LogDevice.new(io)
         end

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.39'
+    VERSION = '0.1.0.pre.42'
   end
 end

data/lib/rspec/terraform.rb

@@ -2,6 +2,7 @@
 
 require 'rspec/core'
 require 'ruby_terraform'
+require 'logger'
 
 require_relative 'terraform/version'
 require_relative 'terraform/configuration'
@@ -12,7 +13,6 @@ require_relative 'terraform/logging'
 # TODO
 # ====
 #
-# * Logging
 # * Test session
 # * Before support in matchers
 # * Reference support in matchers
@@ -27,6 +27,7 @@ RSpec.configure do |config|
   config.add_setting(:terraform_binary, default: 'terraform')
 
   config.add_setting(:terraform_log_file_path, default: nil)
+  config.add_setting(:terraform_log_level, default: Logger::INFO)
   config.add_setting(:terraform_log_streams, default: [:standard])
 
   config.add_setting(:terraform_logger, default: nil)
@@ -44,6 +45,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     resolved_streams = RSpec::Terraform::Logging.resolve_streams(
       file_path: RSpec.configuration.terraform_log_file_path,
+      level: RSpec.configuration.terraform_log_level,
       streams: RSpec.configuration.terraform_log_streams,
       logger: RSpec.configuration.terraform_logger,
       stdout: RSpec.configuration.terraform_stdout,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.39
+  version: 0.1.0.pre.42
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-03 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confidante