Merge branch 'master' into dependabot/github_actions/ruby/setup-ruby-…

…1.192.0

.version

@@ -1 +1 @@
-2.3.0
+2.3.1

doc/optionsref.md

@@ -66,7 +66,10 @@ Usage: octocatalog-diff [command line options]
         --[no-]display-source        Show source file and line for each difference
         --[no-]validate-references "before,require,subscribe,notify"
                                      References to validate
-        --[no-]compare-file-text     Compare text, not source location, of file resources
+        --[no-]compare-file-text[=force]
+                                     Compare text, not source location, of file resources
+        --storeconfigs-backend TERMINUS
+                                     Set the terminus used for storeconfigs
         --[no-]storeconfigs          Enable integration with puppetdb for collected resources
         --retry-failed-catalog N     Retry building a failed catalog N times
         --no-enc                     Disable ENC
@@ -106,7 +109,7 @@ Usage: octocatalog-diff [command line options]
         --puppetdb-token-file PATH   Path containing token for PuppetDB API, relative or absolute
         --puppetdb-url URL           PuppetDB base URL
         --puppetdb-ssl-ca FILENAME   CA certificate that signed the PuppetDB certificate
-        --puppetdb-ssl-crl FILENAME  Certificate Revocation List of the CA that signed PuppetDB's certificate.
+        --puppetdb-ssl-crl FILENAME  Certificate Revocation List provided by the Puppetserver
         --puppetdb-ssl-client-cert FILENAME
                                      SSL client certificate to connect to PuppetDB
         --puppetdb-ssl-client-key FILENAME
@@ -373,7 +376,14 @@ diffing activity. The catalog will be printed to STDOUT or written to the output
       When a file is specified with `source => 'puppet:///modules/something/foo.txt'`, remove
 the 'source' attribute and populate the 'content' attribute with the text of the file.
 This allows for a diff of the content, rather than a diff of the location, which is
-what is most often desired. (<a href="../lib/octocatalog-diff/cli/options/compare_file_text.rb">compare_file_text.rb</a>)
+what is most often desired.
+This has historically been a binary option, so --compare-file-text with no argument will
+set this to `true` and --no-compare-file-text will set this to `false`. Note that
+--no-compare-file-text does not accept an argument.
+File text comparison will be auto-disabled in circumstances other than compiling and
+comparing two catalogs. To force file text comparison to be enabled at other times,
+set --compare-file-text=force. This allows the content of the file to be substituted
+in to --catalog-only compilations, for example. (<a href="../lib/octocatalog-diff/cli/options/compare_file_text.rb">compare_file_text.rb</a>)
     </td>
   </tr>
 
@@ -388,7 +398,14 @@ what is most often desired. (<a href="../lib/octocatalog-diff/cli/options/compar
       When a file is specified with `source => 'puppet:///modules/something/foo.txt'`, remove
 the 'source' attribute and populate the 'content' attribute with the text of the file.
 This allows for a diff of the content, rather than a diff of the location, which is
-what is most often desired. (<a href="../lib/octocatalog-diff/cli/options/compare_file_text.rb">compare_file_text.rb</a>)
+what is most often desired.
+This has historically been a binary option, so --compare-file-text with no argument will
+set this to `true` and --no-compare-file-text will set this to `false`. Note that
+--no-compare-file-text does not accept an argument.
+File text comparison will be auto-disabled in circumstances other than compiling and
+comparing two catalogs. To force file text comparison to be enabled at other times,
+set --compare-file-text=force. This allows the content of the file to be substituted
+in to --catalog-only compilations, for example. (<a href="../lib/octocatalog-diff/cli/options/compare_file_text.rb">compare_file_text.rb</a>)
     </td>
   </tr>
 
@@ -1441,19 +1458,6 @@ matches the name you are using to connecting. (<a href="../lib/octocatalog-diff/
     </td>
   </tr>
 
-  <tr>
-    <td valign=top>
-      <pre><code>--puppetdb-ssl-crl FILENAME</code></pre>
-    </td>
-    <td valign=top>
-      Certificate Revocation List that is supplied by Puppetserver
-    </td>
-    <td valign=top>
-      Specify the Certificate Revocation List file.
-      (<a href="../lib/octocatalog-diff/cli/options/puppetdb_ssl_crl.rb">puppetdb_ssl_crl.rb</a>)
-    </td>
-  </tr>
-
   <tr>
     <td valign=top>
       <pre><code>--puppetdb-ssl-client-cert FILENAME</code></pre>
@@ -1506,6 +1510,18 @@ the text of the password won't appear in the process list. (<a href="../lib/octo
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--puppetdb-ssl-crl FILENAME</code></pre>
+    </td>
+    <td valign=top>
+      Certificate Revocation List provided by the Puppetserver
+    </td>
+    <td valign=top>
+      Specify the Certificate Revocation List for PuppetDB SSL. (<a href="../lib/octocatalog-diff/cli/options/puppetdb_ssl_crl.rb">puppetdb_ssl_crl.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--puppetdb-token TOKEN</code></pre>
@@ -1614,6 +1630,18 @@ cached directory). (<a href="../lib/octocatalog-diff/cli/options/safe_to_delete_
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--storeconfigs-backend TERMINUS</code></pre>
+    </td>
+    <td valign=top>
+      Set the terminus used for storeconfigs
+    </td>
+    <td valign=top>
+      Set storeconfigs (integration with PuppetDB for collected resources) (<a href="../lib/octocatalog-diff/cli/options/storeconfigs_backend.rb">storeconfigs_backend.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--suppress-absent-file-details

octocatalog-diff.gemspec

@@ -1,6 +1,6 @@
 require 'json'
 
-DEFAULT_PUPPET_VERSION = '5.5.22'.freeze
+DEFAULT_PUPPET_VERSION = '7.32.1'.freeze
 
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6.0'
@@ -30,8 +30,8 @@ EOF
   s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
   s.add_runtime_dependency 'parallel', '>= 1.12.0'
   s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
-  s.add_runtime_dependency 'puppet', puppet_version
-  s.add_development_dependency 'puppet', puppet_version
+  s.add_runtime_dependency 'puppet', '>= 5.5.0'
+  s.add_development_dependency 'puppet', '>= 5.5.0'
   s.add_development_dependency 'rspec', '~> 3.4.0'
   s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'parallel_tests', '2.7.1'