octocatalog-diff 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75c0856d744b0c909315a69aceb6e2d5e416991b
-  data.tar.gz: 127ac1617cc437a73d716ff68a0eea0623e62c8b
+  metadata.gz: 67cc184b1ece4c4982d29bd714a674cc118f649d
+  data.tar.gz: b2f18b550db7705f998cc2facab1525ded036399
 SHA512:
-  metadata.gz: a4a873ed14e553d8362267e88fdac5eeaf46e5929275601871048959805f93515af9f8d8152115e49f1c15ddf17fc38fa70158b1e001be71d20a0646f05c422e
-  data.tar.gz: 7c3f9a881d1e2b9d8669c96d6ffbb9953a25b8ff2c63f2a9c3151201c09be9ee95c6182b040370b08a54720c830e98f701cbe3f903c7b876ae80ec140b08a3b0
+  metadata.gz: a22fdaab74c77e8e195bb7de464330f441444da4abe76729d98ea74a2c2958cc299ec030644f7804e99972ae162272b191062857d19fe47409877a05222ce2f3
+  data.tar.gz: 08f100f0cec01c5821154341ee4bf4c3abe2d2b1350a41391716a605b966cf11948179a3f0b5452ddfd8782a937841bc6e9d53962e6178f3559027ed2239ce4d

data/.version

@@ -1 +1 @@
-1.2.0
+1.3.0

data/doc/CHANGELOG.md

@@ -8,6 +8,18 @@
 </tr>
 </thead><tbody>
 <tr valign=top>
+<td>1.3.0</td>
+<td>2017-06-09</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/121">#121</a>: (Enhancement) Allow different fact files for the "from" and "to" catalogs</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/129">#129</a>: (Enhancement) Allow YAML facts in "facter -y" format</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/126">#126</a>: (Enhancement) Allow saving of catalogs when catalog diffing</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/122">#122</a>: (Bug) Handle File resources with no parameters</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/125">#125</a>: (Bug) Fix error when parameters with integer values are added</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/131">#131</a>: (Bug) Do not use override fact file for both catalogs when only `--to-fact-file` is specified</li>
+</td>
+</tr>
+<tr valign=top>
 <td>1.2.0</td>
 <td>2017-05-18</td>
 <td>

data/doc/optionsref.md

@@ -33,7 +33,12 @@ Usage: octocatalog-diff [command line options]
         --ignore "Type1[Title1],Type2[Title2],..."
                                      More resources to ignore in format type[title]
         --[no-]include-tags          Include changes to tags in the diff output
-        --fact-file FILENAME         Fact file to use instead of node lookup
+        --fact-file STRING           Override fact globally
+        --to-fact-file STRING        Override fact for the to branch
+        --from-fact-file STRING      Override fact for the from branch
+        --save-catalog STRING        Save intermediate catalogs into files globally
+        --to-save-catalog STRING     Save intermediate catalogs into files for the to branch
+        --from-save-catalog STRING   Save intermediate catalogs into files for the from branch
         --cached-master-dir PATH     Cache bootstrapped origin/master at this path
         --master-cache-branch BRANCH Branch to cache
         --safe-to-delete-cached-master-dir PATH
@@ -305,6 +310,18 @@ diffing activity. The catalog will be printed to STDOUT or written to the output
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--command-line STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Command line arguments globally
+    </td>
+    <td valign=top>
+      Provide additional command line flags to set when running Puppet to compile catalogs. (<a href="../lib/octocatalog-diff/cli/options/command_line.rb">command_line.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--compare-file-text
@@ -321,6 +338,19 @@ what is most often desired. (<a href="../lib/octocatalog-diff/cli/options/compar
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--create-symlinks STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Symlinks to create globally
+    </td>
+    <td valign=top>
+      Specify which directories from the base should be symlinked into the temporary compilation
+environment. This is useful only in conjunction with `--preserve-environments`. (<a href="../lib/octocatalog-diff/cli/options/create_symlinks.rb">create_symlinks.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>-d
@@ -417,16 +447,57 @@ difference. (<a href="../lib/octocatalog-diff/cli/options/display_datatype_chang
 
   <tr>
     <td valign=top>
-      <pre><code>--fact-file FILENAME</code></pre>
+      <pre><code>--enc-override STRING1[,STRING2[,...]]</code></pre>
     </td>
     <td valign=top>
-      Fact file to use instead of node lookup
+      Override parameter from ENC globally
+    </td>
+    <td valign=top>
+      Allow override of ENC parameters on the command line. ENC parameter overrides can be supplied for the 'to' or 'from' catalog,
+or for both. There is some attempt to handle data types here (since all items on the command line are strings)
+by permitting a data type specification as well. For parameters nested in hashes, use `::` as the delimiter. (<a href="../lib/octocatalog-diff/cli/options/enc_override.rb">enc_override.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--environment STRING</code></pre>
+    </td>
+    <td valign=top>
+      Environment for catalog compilation globally
+    </td>
+    <td valign=top>
+      Specify the environment to use when compiling the catalog. This is useful only in conjunction
+with `--preserve-environments`. (<a href="../lib/octocatalog-diff/cli/options/environment.rb">environment.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--fact-file STRING</code></pre>
+    </td>
+    <td valign=top>
+      Override fact globally
     </td>
     <td valign=top>
       Allow an existing fact file to be provided, to avoid pulling facts from PuppetDB. (<a href="../lib/octocatalog-diff/cli/options/fact_file.rb">fact_file.rb</a>)
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--fact-override STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Override fact globally
+    </td>
+    <td valign=top>
+      Allow override of facts on the command line. Fact overrides can be supplied for the 'to' or 'from' catalog,
+or for both. There is some attempt to handle data types here (since all items on the command line are strings)
+by permitting a data type specification as well. (<a href="../lib/octocatalog-diff/cli/options/fact_override.rb">fact_override.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--facts-terminus STRING</code></pre>
@@ -482,6 +553,31 @@ These files must exist and be in Puppet catalog format. (<a href="../lib/octocat
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--from-command-line STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Command line arguments for the from branch
+    </td>
+    <td valign=top>
+      Provide additional command line flags to set when running Puppet to compile catalogs. (<a href="../lib/octocatalog-diff/cli/options/command_line.rb">command_line.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-create-symlinks STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Symlinks to create for the from branch
+    </td>
+    <td valign=top>
+      Specify which directories from the base should be symlinked into the temporary compilation
+environment. This is useful only in conjunction with `--preserve-environments`. (<a href="../lib/octocatalog-diff/cli/options/create_symlinks.rb">create_symlinks.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--from-enc PATH</code></pre>
@@ -494,6 +590,150 @@ These files must exist and be in Puppet catalog format. (<a href="../lib/octocat
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--from-enc-override STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Override parameter from ENC for the from branch
+    </td>
+    <td valign=top>
+      Allow override of ENC parameters on the command line. ENC parameter overrides can be supplied for the 'to' or 'from' catalog,
+or for both. There is some attempt to handle data types here (since all items on the command line are strings)
+by permitting a data type specification as well. For parameters nested in hashes, use `::` as the delimiter. (<a href="../lib/octocatalog-diff/cli/options/enc_override.rb">enc_override.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-environment STRING</code></pre>
+    </td>
+    <td valign=top>
+      Environment for catalog compilation for the from branch
+    </td>
+    <td valign=top>
+      Specify the environment to use when compiling the catalog. This is useful only in conjunction
+with `--preserve-environments`. (<a href="../lib/octocatalog-diff/cli/options/environment.rb">environment.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-fact-file STRING</code></pre>
+    </td>
+    <td valign=top>
+      Override fact for the from branch
+    </td>
+    <td valign=top>
+      Allow an existing fact file to be provided, to avoid pulling facts from PuppetDB. (<a href="../lib/octocatalog-diff/cli/options/fact_file.rb">fact_file.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-fact-override STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Override fact for the from branch
+    </td>
+    <td valign=top>
+      Allow override of facts on the command line. Fact overrides can be supplied for the 'to' or 'from' catalog,
+or for both. There is some attempt to handle data types here (since all items on the command line are strings)
+by permitting a data type specification as well. (<a href="../lib/octocatalog-diff/cli/options/fact_override.rb">fact_override.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-binary STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to puppet binary for the from branch
+    </td>
+    <td valign=top>
+      Set --puppet-binary, --to-puppet-binary, --from-puppet-binary (<a href="../lib/octocatalog-diff/cli/options/puppet_binary.rb">puppet_binary.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master STRING</code></pre>
+    </td>
+    <td valign=top>
+      Hostname or Hostname:PortNumber for Puppet Master for the from branch
+    </td>
+    <td valign=top>
+      Specify the hostname, or hostname:port, for the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master.rb">puppet_master.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-api-version STRING</code></pre>
+    </td>
+    <td valign=top>
+      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
+    </td>
+    <td valign=top>
+      Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
+version 3.x PuppetMaster by specifying the API version as 2, or for a version 4.x PuppetMaster by
+specifying API version as 3. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_api_version.rb">puppet_master_api_version.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-ssl-ca STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to CA certificate that signed the Puppet Master certificate for the from branch
+    </td>
+    <td valign=top>
+      Specify the CA certificate for Puppet Master. If specified, this will enable SSL verification
+that the certificate being presented has been signed by this CA, and that the common name
+matches the name you are using to connecting. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_ca.rb">puppet_master_ssl_ca.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-ssl-client-cert STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to certificate file for SSL client auth to Puppet Master for the from branch
+    </td>
+    <td valign=top>
+      Specify the SSL client certificate for Puppet Master. This makes it possible to authenticate with a
+client certificate keypair to the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb">puppet_master_ssl_client_cert.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-ssl-client-key STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to key file for SSL client auth to Puppet Master for the from branch
+    </td>
+    <td valign=top>
+      Specify the SSL client key for Puppet Master. This makes it possible to authenticate with a
+client certificate keypair to the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb">puppet_master_ssl_client_key.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--from-puppet-master-timeout STRING</code></pre>
+    </td>
+    <td valign=top>
+      Puppet Master catalog retrieval timeout in seconds for the from branch
+    </td>
+    <td valign=top>
+      Specify a timeout for retrieving a catalog from a Puppet master / Puppet server.
+This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_timeout.rb">puppet_master_timeout.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--from-puppetdb
@@ -507,6 +747,18 @@ These files must exist and be in Puppet catalog format. (<a href="../lib/octocat
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--from-save-catalog STRING</code></pre>
+    </td>
+    <td valign=top>
+      Save intermediate catalogs into files for the from branch
+    </td>
+    <td valign=top>
+      Allow catalogs to be saved to a file before they are diff'd. (<a href="../lib/octocatalog-diff/cli/options/save_catalog.rb">save_catalog.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--header STRING</code></pre>
@@ -908,6 +1160,97 @@ to work correctly. (<a href="../lib/octocatalog-diff/cli/options/preserve_enviro
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-binary STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to puppet binary globally
+    </td>
+    <td valign=top>
+      Set --puppet-binary, --to-puppet-binary, --from-puppet-binary (<a href="../lib/octocatalog-diff/cli/options/puppet_binary.rb">puppet_binary.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master STRING</code></pre>
+    </td>
+    <td valign=top>
+      Hostname or Hostname:PortNumber for Puppet Master globally
+    </td>
+    <td valign=top>
+      Specify the hostname, or hostname:port, for the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master.rb">puppet_master.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-api-version STRING</code></pre>
+    </td>
+    <td valign=top>
+      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
+    </td>
+    <td valign=top>
+      Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
+version 3.x PuppetMaster by specifying the API version as 2, or for a version 4.x PuppetMaster by
+specifying API version as 3. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_api_version.rb">puppet_master_api_version.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-ssl-ca STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to CA certificate that signed the Puppet Master certificate globally
+    </td>
+    <td valign=top>
+      Specify the CA certificate for Puppet Master. If specified, this will enable SSL verification
+that the certificate being presented has been signed by this CA, and that the common name
+matches the name you are using to connecting. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_ca.rb">puppet_master_ssl_ca.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-ssl-client-cert STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to certificate file for SSL client auth to Puppet Master globally
+    </td>
+    <td valign=top>
+      Specify the SSL client certificate for Puppet Master. This makes it possible to authenticate with a
+client certificate keypair to the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb">puppet_master_ssl_client_cert.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-ssl-client-key STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to key file for SSL client auth to Puppet Master globally
+    </td>
+    <td valign=top>
+      Specify the SSL client key for Puppet Master. This makes it possible to authenticate with a
+client certificate keypair to the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb">puppet_master_ssl_client_key.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--puppet-master-timeout STRING</code></pre>
+    </td>
+    <td valign=top>
+      Puppet Master catalog retrieval timeout in seconds globally
+    </td>
+    <td valign=top>
+      Specify a timeout for retrieving a catalog from a Puppet master / Puppet server.
+This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_timeout.rb">puppet_master_timeout.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--puppetdb-api-version N</code></pre>
@@ -1040,6 +1383,18 @@ cached directory). (<a href="../lib/octocatalog-diff/cli/options/safe_to_delete_
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--save-catalog STRING</code></pre>
+    </td>
+    <td valign=top>
+      Save intermediate catalogs into files globally
+    </td>
+    <td valign=top>
+      Allow catalogs to be saved to a file before they are diff'd. (<a href="../lib/octocatalog-diff/cli/options/save_catalog.rb">save_catalog.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--storeconfigs
@@ -1096,6 +1451,31 @@ These files must exist and be in Puppet catalog format. (<a href="../lib/octocat
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--to-command-line STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Command line arguments for the to branch
+    </td>
+    <td valign=top>
+      Provide additional command line flags to set when running Puppet to compile catalogs. (<a href="../lib/octocatalog-diff/cli/options/command_line.rb">command_line.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-create-symlinks STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Symlinks to create for the to branch
+    </td>
+    <td valign=top>
+      Specify which directories from the base should be symlinked into the temporary compilation
+environment. This is useful only in conjunction with `--preserve-environments`. (<a href="../lib/octocatalog-diff/cli/options/create_symlinks.rb">create_symlinks.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--to-enc PATH</code></pre>
@@ -1108,6 +1488,162 @@ These files must exist and be in Puppet catalog format. (<a href="../lib/octocat
     </td>
   </tr>
 
+  <tr>
+    <td valign=top>
+      <pre><code>--to-enc-override STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Override parameter from ENC for the to branch
+    </td>
+    <td valign=top>
+      Allow override of ENC parameters on the command line. ENC parameter overrides can be supplied for the 'to' or 'from' catalog,
+or for both. There is some attempt to handle data types here (since all items on the command line are strings)
+by permitting a data type specification as well. For parameters nested in hashes, use `::` as the delimiter. (<a href="../lib/octocatalog-diff/cli/options/enc_override.rb">enc_override.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-environment STRING</code></pre>
+    </td>
+    <td valign=top>
+      Environment for catalog compilation for the to branch
+    </td>
+    <td valign=top>
+      Specify the environment to use when compiling the catalog. This is useful only in conjunction
+with `--preserve-environments`. (<a href="../lib/octocatalog-diff/cli/options/environment.rb">environment.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-fact-file STRING</code></pre>
+    </td>
+    <td valign=top>
+      Override fact for the to branch
+    </td>
+    <td valign=top>
+      Allow an existing fact file to be provided, to avoid pulling facts from PuppetDB. (<a href="../lib/octocatalog-diff/cli/options/fact_file.rb">fact_file.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-fact-override STRING1[,STRING2[,...]]</code></pre>
+    </td>
+    <td valign=top>
+      Override fact for the to branch
+    </td>
+    <td valign=top>
+      Allow override of facts on the command line. Fact overrides can be supplied for the 'to' or 'from' catalog,
+or for both. There is some attempt to handle data types here (since all items on the command line are strings)
+by permitting a data type specification as well. (<a href="../lib/octocatalog-diff/cli/options/fact_override.rb">fact_override.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-binary STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to puppet binary for the to branch
+    </td>
+    <td valign=top>
+      Set --puppet-binary, --to-puppet-binary, --from-puppet-binary (<a href="../lib/octocatalog-diff/cli/options/puppet_binary.rb">puppet_binary.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master STRING</code></pre>
+    </td>
+    <td valign=top>
+      Hostname or Hostname:PortNumber for Puppet Master for the to branch
+    </td>
+    <td valign=top>
+      Specify the hostname, or hostname:port, for the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master.rb">puppet_master.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-api-version STRING</code></pre>
+    </td>
+    <td valign=top>
+      Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
+    </td>
+    <td valign=top>
+      Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
+version 3.x PuppetMaster by specifying the API version as 2, or for a version 4.x PuppetMaster by
+specifying API version as 3. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_api_version.rb">puppet_master_api_version.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-ssl-ca STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to CA certificate that signed the Puppet Master certificate for the to branch
+    </td>
+    <td valign=top>
+      Specify the CA certificate for Puppet Master. If specified, this will enable SSL verification
+that the certificate being presented has been signed by this CA, and that the common name
+matches the name you are using to connecting. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_ca.rb">puppet_master_ssl_ca.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-ssl-client-cert STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to certificate file for SSL client auth to Puppet Master for the to branch
+    </td>
+    <td valign=top>
+      Specify the SSL client certificate for Puppet Master. This makes it possible to authenticate with a
+client certificate keypair to the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb">puppet_master_ssl_client_cert.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-ssl-client-key STRING</code></pre>
+    </td>
+    <td valign=top>
+      Full path to key file for SSL client auth to Puppet Master for the to branch
+    </td>
+    <td valign=top>
+      Specify the SSL client key for Puppet Master. This makes it possible to authenticate with a
+client certificate keypair to the Puppet Master. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb">puppet_master_ssl_client_key.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-puppet-master-timeout STRING</code></pre>
+    </td>
+    <td valign=top>
+      Puppet Master catalog retrieval timeout in seconds for the to branch
+    </td>
+    <td valign=top>
+      Specify a timeout for retrieving a catalog from a Puppet master / Puppet server.
+This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_timeout.rb">puppet_master_timeout.rb</a>)
+    </td>
+  </tr>
+
+  <tr>
+    <td valign=top>
+      <pre><code>--to-save-catalog STRING</code></pre>
+    </td>
+    <td valign=top>
+      Save intermediate catalogs into files for the to branch
+    </td>
+    <td valign=top>
+      Allow catalogs to be saved to a file before they are diff'd. (<a href="../lib/octocatalog-diff/cli/options/save_catalog.rb">save_catalog.rb</a>)
+    </td>
+  </tr>
+
   <tr>
     <td valign=top>
       <pre><code>--truncate-details

data/lib/octocatalog-diff/catalog-diff/differ.rb

@@ -8,6 +8,7 @@ require 'stringio'
 
 require_relative '../catalog'
 require_relative '../errors'
+require_relative '../util/util'
 require_relative 'filter'
 
 module OctocatalogDiff
@@ -530,7 +531,8 @@ module OctocatalogDiff
 
           # Added a new key that points to some kind of data structure that we know how
           # to handle.
-          if obj[1] =~ /^(.+)\f([^\f]+)$/ && [String, Integer, Float, TrueClass, FalseClass, Array, Hash].include?(obj[2].class)
+          classes = [String, Integer, Float, TrueClass, FalseClass, Array, Hash]
+          if obj[1] =~ /^(.+)\f([^\f]+)$/ && OctocatalogDiff::Util::Util.object_is_any_of?(obj[2], classes)
             hashdiff_add_remove.add(obj[1])
             next
           end

data/lib/octocatalog-diff/catalog-diff/display/text.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative '../display'
-require_relative '../../util/colored.rb'
+require_relative '../../util/colored'
+require_relative '../../util/util'
 
 require 'diffy'
 require 'json'
@@ -447,16 +448,6 @@ module OctocatalogDiff
           class_name
         end
 
-        # Utility Method!
-        # `is_a?(class)` only allows one method, but this uses an array
-        # @param object [?] Object to consider
-        # @param classes [Array] Classes to determine if object is a member of
-        # @return [Boolean] True if object is_a any of the classes, false otherwise
-        def self.object_is_any_of?(object, classes)
-          classes.each { |clazz| return true if object.is_a? clazz }
-          false
-        end
-
         # Utility Method!
         # Given an arbitrary object, convert it into a string for use by 'diffy'.
         # This basically exists so we can do something prettier than just calling .inspect or .to_s
@@ -464,9 +455,9 @@ module OctocatalogDiff
         # @param obj [?] Object to be stringified
         # @return [String] String representation of object for diffy
         def self.stringify_for_diffy(obj)
-          return JSON.pretty_generate(obj) if object_is_any_of?(obj, [Hash, Array])
+          return JSON.pretty_generate(obj) if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [Hash, Array])
           return '""' if obj.is_a?(String) && obj == ''
-          return obj if object_is_any_of?(obj, [String, Fixnum, Integer, Float])
+          return obj if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [String, Fixnum, Integer, Float])
           "#{class_name_for_diffy(obj.class)}: #{obj.inspect}"
         end
 

data/lib/octocatalog-diff/catalog-util/fileresources.rb

@@ -122,6 +122,7 @@ module OctocatalogDiff
       # @return [Boolean] True of resource is convertible, false if not
       def self.resource_convertible?(resource)
         return true if resource['type'] == 'File' && \
+                       !resource['parameters'].nil? && \
                        resource['parameters'].key?('source') && \
                        !resource['parameters'].key?('content') && \
                        resource['parameters']['source'] =~ %r{^puppet:///modules/([^/]+)/(.+)}

data/lib/octocatalog-diff/cli/options.rb

@@ -13,6 +13,9 @@ module OctocatalogDiff
       # The usage banner.
       BANNER = 'Usage: catalog-diff -n <hostname> [-f <from environment>] [-t <to environment>]'.freeze
 
+      # An error class specifically for passing information to the document build task.
+      class DocBuildError < RuntimeError; end
+
       # List of classes
       def self.classes
         @classes ||= []
@@ -85,6 +88,7 @@ module OctocatalogDiff
       # option will populate any of the 'to' and 'from' variants that are missing.
       # @param :datatype [?] Expected data type
       def self.option_globally_or_per_branch(opts = {})
+        opts[:filename] = caller[0].split(':').first
         datatype = opts.fetch(:datatype, '')
         return option_globally_or_per_branch_string(opts) if datatype.is_a?(String)
         return option_globally_or_per_branch_array(opts) if datatype.is_a?(Array)
@@ -108,18 +112,21 @@ module OctocatalogDiff
         from_option = "from_#{option_name}".to_sym
         to_option = "to_#{option_name}".to_sym
         parser.on("--#{flag}", "#{desc} globally") do |x|
-          validate_option(opts[:validator], x) if opts[:validator]
+          validate_option(opts, x)
           translated = translate_option(opts[:translator], x)
           options[to_option] ||= translated
           options[from_option] ||= translated
+          post_process(opts[:post_process], options)
         end
         parser.on("--to-#{flag}", "#{desc} for the to branch") do |x|
-          validate_option(opts[:validator], x) if opts[:validator]
+          validate_option(opts, x)
           options[to_option] = translate_option(opts[:translator], x)
+          post_process(opts[:post_process], options)
         end
         parser.on("--from-#{flag}", "#{desc} for the from branch") do |x|
-          validate_option(opts[:validator], x) if opts[:validator]
+          validate_option(opts, x)
           options[from_option] = translate_option(opts[:translator], x)
+          post_process(opts[:post_process], options)
         end
       end
 
@@ -140,7 +147,7 @@ module OctocatalogDiff
         from_option = "from_#{option_name}".to_sym
         to_option = "to_#{option_name}".to_sym
         parser.on("--#{flag}", Array, "#{desc} globally") do |x|
-          validate_option(opts[:validator], x) if opts[:validator]
+          validate_option(opts, x)
           translated = translate_option(opts[:translator], x)
           options[to_option] ||= []
           options[to_option].concat translated
@@ -148,12 +155,12 @@ module OctocatalogDiff
           options[from_option].concat translated
         end
         parser.on("--to-#{flag}", Array, "#{desc} for the to branch") do |x|
-          validate_option(opts[:validator], x) if opts[:validator]
+          validate_option(opts, x)
           options[to_option] ||= []
           options[to_option].concat translate_option(opts[:translator], x)
         end
         parser.on("--from-#{flag}", Array, "#{desc} for the from branch") do |x|
-          validate_option(opts[:validator], x) if opts[:validator]
+          validate_option(opts, x)
           options[from_option] ||= []
           options[from_option].concat translate_option(opts[:translator], x)
         end
@@ -162,9 +169,15 @@ module OctocatalogDiff
       # If a validator was provided, run the validator on the supplied value. The validator is expected to
       # throw an error if there is a problem. Note that the validator runs *before* the translator if both
       # a validator and translator are supplied.
-      # @param validator [Code] Validation function
+      # @param opts [Hash] Options hash
       # @param value [?] Value to validate (typically a String but can really be anything)
-      def self.validate_option(validator, value)
+      def self.validate_option(opts, value)
+        # Special value to help build documentation automatically, since the source file location
+        # for `option_globally_or_per_branch` is always this file.
+        raise DocBuildError, opts[:filename] if value == :DOC_BUILD_FILENAME
+
+        validator = opts[:validator]
+        return true unless validator
         validator.call(value)
       end
 
@@ -178,6 +191,15 @@ module OctocatalogDiff
         return value if translator.nil?
         translator.call(value)
       end
+
+      # Code that can run after a translation and operate upon all options. This returns nothing but may
+      # modify options that were input.
+      # @param processor [Code] Processor function
+      # @param options [Hash] Options hash
+      def self.post_process(processor, options)
+        return if processor.nil?
+        processor.call(options)
+      end
     end
   end
 end

data/lib/octocatalog-diff/cli/options/fact_file.rb

@@ -7,19 +7,36 @@ OctocatalogDiff::Cli::Options::Option.newoption(:fact_file) do
   has_weight 150
 
   def parse(parser, options)
-    parser.on('--fact-file FILENAME', 'Fact file to use instead of node lookup') do |fact_file|
-      raise Errno::ENOENT, 'Invalid fact file provided' unless File.file?(fact_file)
-      facts = nil
-      local_opts = { fact_file_string: File.read(fact_file) }
-      if fact_file =~ /\.ya?ml$/
-        facts = OctocatalogDiff::Facts.new(local_opts.merge(backend: :yaml))
-      elsif fact_file =~ /\.json$/
-        facts = OctocatalogDiff::Facts.new(local_opts.merge(backend: :json))
-      else
-        raise ArgumentError, 'I do not know how to parse the provided fact file. Needs .yaml or .json extension.'
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
+      parser: parser,
+      options: options,
+      cli_name: 'fact-file',
+      option_name: 'facts',
+      desc: 'Override fact',
+      datatype: '',
+      validator: ->(fact_file) { File.file?(fact_file) && (fact_file =~ /\.ya?ml$/ || fact_file =~ /\.json$/) },
+      translator: lambda do |fact_file|
+        local_opts = { fact_file_string: File.read(fact_file) }
+        if fact_file =~ /\.ya?ml$/
+          OctocatalogDiff::Facts.new(local_opts.merge(backend: :yaml))
+        elsif fact_file =~ /\.json$/
+          OctocatalogDiff::Facts.new(local_opts.merge(backend: :json))
+        else
+          # :nocov:
+          # Believed to be a bug condition since the validator should kick this out before it ever gets here.
+          raise ArgumentError, 'I do not know how to parse the provided fact file. Needs .yaml or .json extension.'
+          # :nocov:
+        end
+      end,
+      post_process: lambda do |opts|
+        unless options[:node]
+          %w[to_facts from_facts facts].each do |opt|
+            next unless opts[opt.to_sym] && opts[opt.to_sym].node
+            opts[:node] = opts[opt.to_sym].node
+            break
+          end
+        end
       end
-      options[:facts] = facts
-      options[:node] ||= facts.facts['name']
-    end
+    )
   end
 end

data/lib/octocatalog-diff/cli/options/save_catalog.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Allow catalogs to be saved to a file before they are diff'd.
+# @param parser [OptionParser object] The OptionParser argument
+# @param options [Hash] Options hash being constructed; this is modified in this method.
+OctocatalogDiff::Cli::Options::Option.newoption(:save_catalog) do
+  has_weight 155
+
+  def parse(parser, options)
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
+      parser: parser,
+      options: options,
+      cli_name: 'save-catalog',
+      option_name: 'save_catalog',
+      desc: 'Save intermediate catalogs into files',
+      datatype: '',
+      validator: lambda do |catalog_file|
+        target_dir = File.dirname(catalog_file)
+        unless File.directory?(target_dir)
+          raise Errno::ENOENT, "Cannot save catalog to #{catalog_file} because parent directory does not exist"
+        end
+        if File.exist?(catalog_file) && !File.file?(catalog_file)
+          raise ArgumentError, "Cannot overwrite #{catalog_file} which is not a file"
+        end
+        true
+      end,
+      post_process: lambda do |opts|
+        if opts[:to_save_catalog] && opts[:to_save_catalog] == opts[:from_save_catalog]
+          raise ArgumentError, 'Cannot use the same file for --to-save-catalog and --from-save-catalog'
+        end
+      end
+    )
+  end
+end

data/lib/octocatalog-diff/facts.rb

@@ -4,6 +4,7 @@ require_relative 'errors'
 require_relative 'facts/json'
 require_relative 'facts/yaml'
 require_relative 'facts/puppetdb'
+require_relative 'util/util'
 require_relative 'external/pson/pure'
 
 module OctocatalogDiff
@@ -19,8 +20,7 @@ module OctocatalogDiff
       @timestamp = false
       @options = options.dup
       if facts
-        @facts = {}
-        facts.each { |k, v| @facts[k] = v.dup }
+        @facts = OctocatalogDiff::Util::Util.deep_dup(facts)
       else
         case options[:backend]
         when :json
@@ -32,8 +32,7 @@ module OctocatalogDiff
         else
           raise ArgumentError, 'Invalid fact source backend'
         end
-        @facts = {}
-        @orig_facts.each { |k, v| @facts[k] = v.dup }
+        @facts = OctocatalogDiff::Util::Util.deep_dup(@orig_facts)
       end
     end
 
@@ -41,6 +40,15 @@ module OctocatalogDiff
       self.class.new(@options, @orig_facts)
     end
 
+    # Node - get the node name, either as set explicitly or as determined from the facts themselves.
+    # @return [String] Node name, explicit or guessed
+    def node
+      return @node unless @node.nil? || @node.empty?
+      return facts['name'] if facts.key?('name')
+      return facts['values']['fqdn'] if facts.key?('values') && facts['values'].key?('fqdn')
+      ''
+    end
+
     # Facts - returned the 'cleansed' facts.
     # Clean up facts by setting 'name' to the node if given, and deleting _timestamp and expiration
     # which may cause Puppet catalog compilation to fail if the facts are old.

data/lib/octocatalog-diff/facts/yaml.rb

@@ -21,8 +21,18 @@ module OctocatalogDiff
         fact_file_data = fact_file_string.split(/\n/)
         fact_file_data[0] = '---' if fact_file_data[0] =~ /^---/
 
-        # Load and return the parsed fact file.
-        result = YAML.load(fact_file_data.join("\n"))
+        # Load the parsed fact file.
+        parsed = YAML.load(fact_file_data.join("\n"))
+
+        # This is a handler for a YAML file that has just the facts and none of the
+        # structure. For example if you saved the output of `facter -y` to a file and
+        # are passing that in, this will work.
+        result = if parsed.key?('name') && parsed.key?('values')
+          parsed
+        else
+          { 'name' => node || parsed['fqdn'] || '', 'values' => parsed }
+        end
+
         result['name'] = node unless node == ''
         result
       end

data/lib/octocatalog-diff/util/catalogs.rb

@@ -197,6 +197,11 @@ module OctocatalogDiff
           if catalog.valid?
             # The catalog was successfully compiled.
             result[key] = parallel_catalog_obj.output
+
+            if task.args[:save_catalog]
+              File.open(task.args[:save_catalog], 'w') { |f| f.write(catalog.catalog_json) }
+              @logger.debug "Saved catalog to #{task.args[:save_catalog]}"
+            end
           else
             # The catalog failed, but a catalog object was returned so that better error reporting
             # can take place. In this error reporting, we will replace 'Error:' with '[Puppet Error]'

data/lib/octocatalog-diff/util/util.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# Handy methods that are not tied to one particular class
+
+module OctocatalogDiff
+  module Util
+    # Helper class to construct catalogs, performing all necessary steps such as
+    # bootstrapping directories, installing facts, and running puppet.
+    class Util
+      # Utility Method!
+      # `is_a?(class)` only allows one method, but this uses an array
+      # @param object [?] Object to consider
+      # @param classes [Array] Classes to determine if object is a member of
+      # @return [Boolean] True if object is_a any of the classes, false otherwise
+      def self.object_is_any_of?(object, classes)
+        classes.each { |clazz| return true if object.is_a? clazz }
+        false
+      end
+
+      # Utility Method!
+      # `.dup` can't be called on certain objects (Fixnum for example). This
+      # method returns the original object if it can't be duplicated.
+      # @param object [?] Object to consider
+      # @return [?] Duplicated object if possible, otherwise the original object
+      def self.safe_dup(object)
+        object.dup
+      rescue TypeError
+        object
+      end
+
+      # Utility Method!
+      # This does a "deep" duplication via recursion. Handles hashes and arrays.
+      # @param object [?] Object to consider
+      # @return [?] Duplicated object
+      def self.deep_dup(object)
+        if object.is_a?(Hash)
+          result = {}
+          object.each { |k, v| result[k] = deep_dup(v) }
+          result
+        elsif object.is_a?(Array)
+          object.map { |ele| deep_dup(ele) }
+        else
+          safe_dup(object)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - GitHub, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -366,6 +366,7 @@ files:
 - lib/octocatalog-diff/cli/options/quiet.rb
 - lib/octocatalog-diff/cli/options/retry_failed_catalog.rb
 - lib/octocatalog-diff/cli/options/safe_to_delete_cached_master_dir.rb
+- lib/octocatalog-diff/cli/options/save_catalog.rb
 - lib/octocatalog-diff/cli/options/storeconfigs.rb
 - lib/octocatalog-diff/cli/options/suppress_absent_file_details.rb
 - lib/octocatalog-diff/cli/options/to_from_branch.rb
@@ -391,6 +392,7 @@ files:
 - lib/octocatalog-diff/util/parallel.rb
 - lib/octocatalog-diff/util/puppetversion.rb
 - lib/octocatalog-diff/util/scriptrunner.rb
+- lib/octocatalog-diff/util/util.rb
 - lib/octocatalog-diff/version.rb
 - scripts/env/env.sh
 - scripts/git-extract/git-extract.sh