rspec-terraform 0.1.0.pre.11 → 0.1.0.pre.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e4c8fee87d53c406e5f9194007504e3f9c68a2b77f55a0c7fb18a84d4f6fbdd
-  data.tar.gz: 52a46c856d5e0a4fe3655b504a916e62570effaa5e0032969d2a09f43da41a45
+  metadata.gz: 91f52906b222af912b150dfe8adeccfcf2a96c6397a925b16e010fe95fdedc7f
+  data.tar.gz: 5f8339be7af3ef1e8734e4eb20114f9da5a92a7bf01d12ccc8b25c29918b39fa
 SHA512:
-  metadata.gz: 7d88f8512b916e5159c0230d52043e671eb2f852e8f090e1a85d4b94883363830e095f103fc805d48cd7bce8c75fa02a11422717e88e7209d3d38deb12a807b7
-  data.tar.gz: 3830deddb0e6252eebfc807d103c615a2532f74adf671b732c019c56ef397d3467a2eb8fd645a5e7d251623dcd00698ca85a0941cf4803abe1f252ef5ca42c8c
+  metadata.gz: 0fc145bf6e79e9a925ede3dee1f01ff0e9d8f645da18edad9ba825d31788cb663cd018b181ea4b2a18c19051690cb4354e6267e0b6775cd06215d400c744303b
+  data.tar.gz: 5593bf9db223bce19a841beb644043b6d9395bb37102aa0e56a39bb7e6b7dd64c36aa6ab1e9f3e2e41c16a3027c46486e78bded63954027dddfd9fda09c950ee

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.11)
+    rspec-terraform (0.1.0.pre.14)
       rspec (>= 3.0)
-      ruby-terraform (= 1.7.0.pre.6)
+      ruby-terraform (= 1.7.0.pre.9)
 
 GEM
   remote: https://rubygems.org/
@@ -21,7 +21,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     excon (0.92.4)
-    faker (2.21.0)
+    faker (2.22.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.3.0)
       faraday-net_http (~> 2.0)
@@ -83,14 +83,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.31.2)
+    rubocop (1.32.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.19.1)
@@ -100,7 +100,7 @@ GEM
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    ruby-terraform (1.7.0.pre.6)
+    ruby-terraform (1.7.0.pre.9)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby2_keywords (0.0.5)
@@ -142,4 +142,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.18
+   2.3.19

data/lib/rspec/terraform/matchers/include_resource_change.rb

@@ -5,6 +5,9 @@ require 'rspec/matchers'
 require 'rspec/matchers/built_in/eq'
 require 'rspec/matchers/built_in/count_expectation'
 
+require 'ruby_terraform/models/path'
+require 'ruby_terraform/models/path_set'
+
 module RSpec
   module Terraform
     module Matchers
@@ -34,6 +37,8 @@ module RSpec
         def with_attribute_value(*args)
           stage, path, value = args.count == 3 ? args : [:after, *args]
           path = [path] if path.is_a?(Symbol)
+          path = RubyTerraform::Models::Path.new(path)
+          value = maybe_box_value(value)
           @attributes << { stage: stage, path: path, value: value }
           self
         end
@@ -66,18 +71,24 @@ module RSpec
           end
         end
 
+        def maybe_box_value(value)
+          if value.respond_to?(:matches?)
+            value
+          else
+            RubyTerraform::Models::Objects.box(value)
+          end
+        end
+
         def attribute_matcher(attribute)
           expected = attribute[:value]
           return expected if expected.respond_to?(:matches?)
 
-          RSpec::Matchers::BuiltIn::Eq.new(
-            RubyTerraform::Models::Objects.box(expected)
-          )
+          RSpec::Matchers::BuiltIn::Eq.new(expected)
         end
 
         def attribute_value(object, attribute)
           expected = attribute[:value]
-          actual = object.dig(*attribute[:path])
+          actual = attribute[:path].read(object)
           return actual&.unbox if expected.respond_to?(:matches?)
 
           actual
@@ -127,16 +138,26 @@ module RSpec
               "a plan including #{amount} matching " \
               "resource change#{plurality}."
 
-            unless attributes.empty?
-              got_line =
-                "#{got_line}\n          relevant resource changes are:" \
-                "\n#{relevant_resource_change_lines}"
-            end
+            with_available_resource_changes(
+              maybe_with_relevant_resource_changes(got_line)
+            )
+          end
+        end
+
+        def with_available_resource_changes(got_line)
+          "#{got_line}\n          available resource changes are:" \
+            "\n#{available_resource_change_lines}"
+        end
 
-            "#{got_line}\n          available resource changes are:" \
-              "\n#{available_resource_change_lines}"
+        def maybe_with_relevant_resource_changes(got_line)
+          unless attributes.empty?
+            got_line =
+              "#{got_line}\n          relevant resource changes are:" \
+              "\n#{relevant_resource_change_lines}"
           end
+          got_line
         end
+
         # rubocop:enable Metrics/MethodLength
 
         def cardinality_fragment
@@ -172,28 +193,26 @@ module RSpec
         end
 
         def expected_attribute_lines
-          indent = '            '
-          attribute_fragments = attributes.collect do |a|
-            "#{indent}#{render(a[:path])} = #{a[:value].inspect}"
+          paths = attributes.collect { |attribute| attribute[:path] }
+          path_set = RubyTerraform::Models::PathSet.new(paths)
+          values = attributes.collect do |attribute|
+            with_matcher_renderable(attribute[:value])
           end
-          attribute_fragments.join("\n")
+          object = RubyTerraform::Models::Objects.object(path_set, values)
+          object.render(level: 6, bare: true)
         end
 
-        # rubocop:disable Metrics/MethodLength
         def relevant_resource_change_lines
           relevant_lines = definition_matches(plan).collect do |rc|
             address = rc.address
             actions = rc.change.actions.join(', ')
             attributes = rc.change.after_object
-            attribute_lines = attributes.collect do |key, value|
-              "                #{key} = #{value.inspect}"
-            end
-            attribute_lines = attribute_lines.join("\n")
+            attribute_lines = attributes.render(level: 8, bare: true)
+
             "            - #{address} (#{actions})\n#{attribute_lines}"
           end
           relevant_lines.join("\n")
         end
-        # rubocop:enable Metrics/MethodLength
 
         def available_resource_change_lines
           available_lines = plan.resource_changes.collect do |rc|
@@ -204,8 +223,14 @@ module RSpec
           available_lines.join("\n")
         end
 
-        def render(path)
-          path.collect { |elem| elem.to_s }.join(',')
+        def with_matcher_renderable(value)
+          return value if value.respond_to?(:render)
+
+          value.define_singleton_method(:render) do |_|
+            "a value satisfying: #{value.description}"
+          end
+
+          value
         end
       end
 

data/lib/rspec/terraform/version.rb

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

data/rspec-terraform.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'rspec', '>= 3.0'
-  spec.add_dependency 'ruby-terraform', '1.7.0.pre.6'
+  spec.add_dependency 'ruby-terraform', '1.7.0.pre.9'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.11
+  version: 0.1.0.pre.14
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.6
+        version: 1.7.0.pre.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.6
+        version: 1.7.0.pre.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement