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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9616ce6b70683138de564ce5a8e7ff68a892ec5ad3c6db8e8ac5904d07ba889
-  data.tar.gz: cdf25b73c0af2057c9c00130dca4ac9b1a69e282c9134d1389e0ae3862f995d3
+  metadata.gz: 7e4c8fee87d53c406e5f9194007504e3f9c68a2b77f55a0c7fb18a84d4f6fbdd
+  data.tar.gz: 52a46c856d5e0a4fe3655b504a916e62570effaa5e0032969d2a09f43da41a45
 SHA512:
-  metadata.gz: f27156422ee5fb0742682fec4113fad7429ce5f434c06bd599b5d3fb644988642da7ac582f48950d80060c12ef6215f4859a0f08298da0d7b3d7adbd0eca9b59
-  data.tar.gz: 779b8685fa9858f25bf70ed1455baedebd96f19ec4134f47f8ee3d14fe67dd438e708675c3c6d8f52289798742ca54149f27b3c83476e936fa9e90e0497da02b
+  metadata.gz: 7d88f8512b916e5159c0230d52043e671eb2f852e8f090e1a85d4b94883363830e095f103fc805d48cd7bce8c75fa02a11422717e88e7209d3d38deb12a807b7
+  data.tar.gz: 3830deddb0e6252eebfc807d103c615a2532f74adf671b732c019c56ef397d3467a2eb8fd645a5e7d251623dcd00698ca85a0941cf4803abe1f252ef5ca42c8c

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.8)
+    rspec-terraform (0.1.0.pre.11)
       rspec (>= 3.0)
-      ruby-terraform (= 1.7.0.pre.5)
+      ruby-terraform (= 1.7.0.pre.6)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,7 @@ GEM
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    excon (0.92.3)
+    excon (0.92.4)
     faker (2.21.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.3.0)
@@ -100,7 +100,7 @@ GEM
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    ruby-terraform (1.7.0.pre.5)
+    ruby-terraform (1.7.0.pre.6)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby2_keywords (0.0.5)
@@ -116,7 +116,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
 

data/Rakefile

@@ -66,7 +66,7 @@ namespace :library do
   task check: [:rubocop]
 
   desc 'Attempt to automatically fix issues with the library'
-  task fix: [:'rubocop:autocorrect']
+  task fix: [:'rubocop:autocorrect_all']
 end
 
 namespace :test do

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

@@ -8,10 +8,11 @@ require 'rspec/matchers/built_in/count_expectation'
 module RSpec
   module Terraform
     module Matchers
+      # rubocop:disable Metrics/ClassLength
       class IncludeResourceChange
         include RSpec::Matchers::BuiltIn::CountExpectation
 
-        attr_reader :definition, :plan
+        attr_reader :definition, :attributes, :plan
 
         def initialize(definition = {})
           @definition = definition
@@ -83,41 +84,132 @@ module RSpec
         end
 
         def positive_expected_line
-          cardinality = 'at least one'
-          expected_line = "a plan including #{cardinality} resource change"
+          maybe_with_expected_attributes(
+            maybe_with_definition(
+              positive_plan_line
+            )
+          )
+        end
+
+        def positive_plan_line
+          cardinality = cardinality_fragment
+          plurality = expected_count.nil? || expected_count == 1 ? '' : 's'
+
+          "a plan including #{cardinality} resource change#{plurality}"
+        end
 
+        def maybe_with_definition(expected_line)
           unless @definition.empty?
             expected_line =
               "#{expected_line} matching definition:\n#{definition_lines}"
           end
+          expected_line
+        end
 
+        def maybe_with_expected_attributes(expected_line)
+          unless @attributes.empty?
+            expected_line =
+              "#{expected_line}\n          with attribute values after " \
+              "the resource change is applied of:\n#{expected_attribute_lines}"
+          end
           expected_line
         end
 
+        # rubocop:disable Metrics/MethodLength
         def positive_got_line
           if plan.resource_changes.empty?
-            return 'a plan including no resource changes'
+            'a plan including no resource changes.'
+          else
+            count = attribute_matches(plan).count
+            amount = count.zero? ? 'no' : cardinality_amount(count)
+            plurality = count == 1 ? '' : 's'
+            got_line =
+              "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
+
+            "#{got_line}\n          available resource changes are:" \
+              "\n#{available_resource_change_lines}"
+          end
+        end
+        # rubocop:enable Metrics/MethodLength
+
+        def cardinality_fragment
+          qualifier = cardinality_qualifier
+          amount = cardinality_amount(expected_count)
+          "#{qualifier} #{amount}"
+        end
+
+        def cardinality_qualifier
+          case count_expectation_type
+          when :<= then 'at most'
+          when nil, :>= then 'at least'
+          when :== then 'exactly'
+          when :<=> then 'between'
           end
+        end
 
-          "a plan with resource changes:\n#{resource_change_lines}"
+        def cardinality_amount(count)
+          case count
+          when Range then "#{count.first} and #{count.last}"
+          when nil, 1 then 'one'
+          when 2 then 'two'
+          when 3 then 'three'
+          else count.to_s
+          end
         end
 
         def definition_lines
+          indent = '            '
           definition
-            .collect { |k, v| "            #{k}: #{v}" }
+            .collect { |k, v| "#{indent}#{k} = #{v.inspect}" }
             .join("\n")
         end
 
-        def resource_change_lines
-          plan.resource_changes
-            .collect do |rc|
-              address = rc.address
-              actions = rc.change.actions.join(', ')
-              "            - #{address} (#{actions})"
+        def expected_attribute_lines
+          indent = '            '
+          attribute_fragments = attributes.collect do |a|
+            "#{indent}#{render(a[:path])} = #{a[:value].inspect}"
+          end
+          attribute_fragments.join("\n")
+        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
-            .join("\n")
+            attribute_lines = attribute_lines.join("\n")
+            "            - #{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|
+            address = rc.address
+            actions = rc.change.actions.join(', ')
+            "            - #{address} (#{actions})"
+          end
+          available_lines.join("\n")
+        end
+
+        def render(path)
+          path.collect { |elem| elem.to_s }.join(',')
         end
       end
+
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.8'
+    VERSION = '0.1.0.pre.11'
   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.5'
+  spec.add_dependency 'ruby-terraform', '1.7.0.pre.6'
 
   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.8
+  version: 0.1.0.pre.11
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-20 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.5
+        version: 1.7.0.pre.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.5
+        version: 1.7.0.pre.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement