octocatalog-diff 0.6.1 → 1.0.0

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/filters.rb

@@ -2,16 +2,19 @@
 
 # Specify one or more filters to apply to the results of the catalog difference.
 # For a list of available filters and further explanation, please refer to
-# [Filtering results](/doc/advanced-filter.md).
+# <a href="advanced-filter.md">Filtering results</a>.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:filters) do
+OctocatalogDiff::Cli::Options::Option.newoption(:filters) do
   has_weight 199
 
   def parse(parser, options)
     parser.on('--filters FILTER1[,FILTER2[,...]]', Array, 'Filters to apply') do |x|
       options[:filters] ||= []
       options[:filters].concat x
+
+      require_relative '../../catalog-diff/filter'
+      options[:filters].each { |filter| OctocatalogDiff::CatalogDiff::Filter.assert_that_filter_exists(filter) }
     end
   end
 end

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/from_puppetdb.rb

@@ -3,7 +3,7 @@
 # Set --from-puppetdb to pull most recent catalog from PuppetDB instead of compiling
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:from_puppetdb) do
+OctocatalogDiff::Cli::Options::Option.newoption(:from_puppetdb) do
   has_weight 300
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/header.rb

@@ -3,7 +3,7 @@
 # Provide ability to set custom header or to display no header at all
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:header) do
+OctocatalogDiff::Cli::Options::Option.newoption(:header) do
   has_weight 260
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/hiera_config.rb

@@ -3,7 +3,7 @@
 # Specify a relative path to the Hiera yaml file
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:hiera_config) do
+OctocatalogDiff::Cli::Options::Option.newoption(:hiera_config) do
   has_weight 180
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/hiera_path.rb

@@ -4,7 +4,7 @@
 # Puppet control repo template, the value of this should be 'hieradata', which is the default.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:hiera_path) do
+OctocatalogDiff::Cli::Options::Option.newoption(:hiera_path) do
   has_weight 181
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/hiera_path_strip.rb

@@ -3,7 +3,7 @@
 # Specify the path to strip off the datadir to munge hiera.yaml file
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:hiera_path_strip) do
+OctocatalogDiff::Cli::Options::Option.newoption(:hiera_path_strip) do
   has_weight 182
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/hostname.rb

@@ -4,7 +4,7 @@
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
 
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:hostname) do
+OctocatalogDiff::Cli::Options::Option.newoption(:hostname) do
   has_weight 1
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/ignore.rb

@@ -3,7 +3,7 @@
 # Options used when comparing catalogs - set ignored changes.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:ignore) do
+OctocatalogDiff::Cli::Options::Option.newoption(:ignore) do
   has_weight 130
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/ignore_attr.rb

@@ -3,7 +3,7 @@
 # Specify attributes to ignore
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:ignore_attr) do
+OctocatalogDiff::Cli::Options::Option.newoption(:ignore_attr) do
   has_weight 190
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/ignore_tags.rb

@@ -4,7 +4,7 @@
 # to ignore any changes for any defined type where this tag is set.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:ignore_tags) do
+OctocatalogDiff::Cli::Options::Option.newoption(:ignore_tags) do
   has_weight 400
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/include_tags.rb

@@ -3,7 +3,7 @@
 # Options used when comparing catalogs - tags are generally ignored; you can un-ignore them.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:include_tags) do
+OctocatalogDiff::Cli::Options::Option.newoption(:include_tags) do
   has_weight 140
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/master_cache_branch.rb

@@ -3,7 +3,7 @@
 # Allow override of the branch that is cached. This defaults to 'origin/master'.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:master_cache_branch) do
+OctocatalogDiff::Cli::Options::Option.newoption(:master_cache_branch) do
   has_weight 160
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/output_file.rb

@@ -3,7 +3,7 @@
 # Output file option
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:output_file) do
+OctocatalogDiff::Cli::Options::Option.newoption(:output_file) do
   has_weight 90
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/output_format.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-# Output format option
+# Output format option. 'text' is human readable text, 'json' is an array of differences
+# identified by human readable keys (the preferred octocatalog-diff 1.x format), and 'legacy_json' is an
+# array of differences, where each difference is an array (the octocatalog-diff 0.x format).
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:output_format) do
+OctocatalogDiff::Cli::Options::Option.newoption(:output_format) do
   has_weight 100
 
   def parse(parser, options)
-    valid = %w(text json)
+    valid = %w(text json legacy_json)
     parser.on('--output-format FORMAT', "Output format: #{valid.join(',')}") do |fmt|
       raise ArgumentError, "Invalid format. Must be one of: #{valid.join(',')}" unless valid.include?(fmt)
       options[:format] = fmt.to_sym

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/parallel.rb

@@ -3,7 +3,7 @@
 # Disable or enable parallel processing of catalogs.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:parallel) do
+OctocatalogDiff::Cli::Options::Option.newoption(:parallel) do
   has_weight 300
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/parser.rb

@@ -3,7 +3,7 @@
 # Enable future parser for both branches or for just one
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:parser) do
+OctocatalogDiff::Cli::Options::Option.newoption(:parser) do
   has_weight 270
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pass_env_vars.rb

@@ -5,7 +5,7 @@
 # available. Setting these variables is your responsibility outside of octocatalog-diff.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pass_env_vars) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pass_env_vars) do
   has_weight 600
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pe_enc_ssl_ca.rb

@@ -5,7 +5,7 @@
 # matches the name you are using to connecting.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pe_enc_ssl_ca) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pe_enc_ssl_ca) do
   has_weight 352
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pe_enc_ssl_client_cert.rb

@@ -4,7 +4,7 @@
 # --pe-enc-ssl-client-key in order to work.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pe_enc_ssl_client_cert) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pe_enc_ssl_client_cert) do
   has_weight 353
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pe_enc_ssl_client_key.rb

@@ -4,7 +4,7 @@
 # --pe-enc-ssl-client-cert in order to work.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pe_enc_ssl_client_key) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pe_enc_ssl_client_key) do
   has_weight 354
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pe_enc_token.rb

@@ -6,7 +6,7 @@
 # of the token. (Use --pe-enc-token-file to read the content of the token from a file.)
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pe_enc_token) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pe_enc_token) do
   has_weight 351
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pe_enc_token_file.rb

@@ -6,7 +6,7 @@
 # in a file, to read the content of the token from the file.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pe_enc_token_file) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pe_enc_token_file) do
   has_weight 351
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/pe_enc_url.rb

@@ -8,7 +8,7 @@ require 'uri'
 # https://your-pe-console-server:4433/classifier-api
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:pe_enc_url) do
+OctocatalogDiff::Cli::Options::Option.newoption(:pe_enc_url) do
   has_weight 350
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/preserve_environments.rb

@@ -5,7 +5,7 @@
 # to work correctly.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:preserve_environments) do
+OctocatalogDiff::Cli::Options::Option.newoption(:preserve_environments) do
   has_weight 501
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppet_binary.rb

@@ -3,11 +3,11 @@
 # Set --puppet-binary, --to-puppet-binary, --from-puppet-binary
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppet_binary) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_binary) do
   has_weight 300
 
   def parse(parser, options)
-    OctocatalogDiff::CatalogDiff::Cli::Options.option_globally_or_per_branch(
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
       parser: parser,
       options: options,
       cli_name: 'puppet-binary',

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppet_master.rb

@@ -3,11 +3,11 @@
 # Specify the hostname, or hostname:port, for the Puppet Master.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppet_master) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master) do
   has_weight 320
 
   def parse(parser, options)
-    OctocatalogDiff::CatalogDiff::Cli::Options.option_globally_or_per_branch(
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
       parser: parser,
       options: options,
       cli_name: 'puppet-master',

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppet_master_api_version.rb

@@ -5,11 +5,11 @@
 # specifying API version as 3.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppet_master_api_version) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_api_version) do
   has_weight 320
 
   def parse(parser, options)
-    OctocatalogDiff::CatalogDiff::Cli::Options.option_globally_or_per_branch(
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
       parser: parser,
       options: options,
       cli_name: 'puppet-master-api-version',

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppet_master_ssl_ca.rb

@@ -5,11 +5,11 @@
 # matches the name you are using to connecting.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_ca) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_ca) do
   has_weight 320
 
   def parse(parser, options)
-    OctocatalogDiff::CatalogDiff::Cli::Options.option_globally_or_per_branch(
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
       parser: parser,
       options: options,
       cli_name: 'puppet-master-ssl-ca',

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppet_master_ssl_client_cert.rb

@@ -4,11 +4,11 @@
 # client certificate keypair to the Puppet Master.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_client_cert) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_client_cert) do
   has_weight 320
 
   def parse(parser, options)
-    OctocatalogDiff::CatalogDiff::Cli::Options.option_globally_or_per_branch(
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
       parser: parser,
       options: options,
       cli_name: 'puppet-master-ssl-client-cert',

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppet_master_ssl_client_key.rb

@@ -4,11 +4,11 @@
 # client certificate keypair to the Puppet Master.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_client_key) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_client_key) do
   has_weight 320
 
   def parse(parser, options)
-    OctocatalogDiff::CatalogDiff::Cli::Options.option_globally_or_per_branch(
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
       parser: parser,
       options: options,
       cli_name: 'puppet-master-ssl-client-key',

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_api_version.rb

@@ -2,7 +2,7 @@
 # the default.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_api_version) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_api_version) do
   has_weight 319
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_ssl_ca.rb

@@ -5,7 +5,7 @@
 # matches the name you are using to connecting.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_ca) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_ca) do
   has_weight 310
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_ssl_client_cert.rb

@@ -4,7 +4,7 @@
 # --puppetdb-ssl-client-key in order to work.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_cert) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_cert) do
   has_weight 310
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_ssl_client_key.rb

@@ -4,7 +4,7 @@
 # --puppetdb-ssl-client-cert in order to work.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_key) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_key) do
   has_weight 310
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_ssl_client_password.rb

@@ -5,7 +5,7 @@
 # the text of the password won't appear in the process list.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_cert) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_cert) do
   has_weight 310
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_ssl_client_password_file.rb

@@ -3,7 +3,7 @@
 # Specify the password for a PEM or PKCS12 private key, by reading it from a file.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_password_file) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_password_file) do
   has_weight 310
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/puppetdb_url.rb

@@ -5,7 +5,7 @@ require 'uri'
 # Specify the base URL for PuppetDB. This will generally look like https://puppetdb.yourdomain.com:8081
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:puppetdb_url) do
+OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_url) do
   has_weight 310
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/quiet.rb

@@ -3,7 +3,7 @@
 # Quiet option
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:quiet) do
+OctocatalogDiff::Cli::Options::Option.newoption(:quiet) do
   has_weight 120
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/retry_failed_catalog.rb

@@ -4,7 +4,7 @@
 # a failed catalog multiple times before kicking out an error message.
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:retry_failed_catalog) do
+OctocatalogDiff::Cli::Options::Option.newoption(:retry_failed_catalog) do
   has_weight 230
 
   def parse(parser, options)

data/lib/octocatalog-diff/{catalog-diff/cli → cli}/options/safe_to_delete_cached_master_dir.rb

@@ -5,7 +5,7 @@
 # cached directory).
 # @param parser [OptionParser object] The OptionParser argument
 # @param options [Hash] Options hash being constructed; this is modified in this method.
-OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:safe_to_delete_cached_master_dir) do
+OctocatalogDiff::Cli::Options::Option.newoption(:safe_to_delete_cached_master_dir) do
   has_weight 160
 
   def parse(parser, options)