Only per-branch settings are mutually exclusive

Author: kpaulisse

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

@@ -26,10 +26,14 @@ def parse(parser, options)
       end,
       post_process: lambda do |opts|
         if opts.key?(:to_hiera_path_strip) && opts[:to_hiera_path_strip] != :none
-          raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          if opts.key?(:to_hiera_path) && opts[:to_hiera_path] != :none
+            raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          end
         end
         if opts.key?(:from_hiera_path_strip) && opts[:from_hiera_path_strip] != :none
-          raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          if opts.key?(:from_hiera_path) && opts[:from_hiera_path] != :none
+            raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          end
         end
         if opts[:to_hiera_path] == :none || opts[:from_hiera_path] == :none
           raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'

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

@@ -15,10 +15,14 @@ def parse(parser, options)
       desc: 'Path prefix to strip when munging hiera.yaml',
       post_process: lambda do |opts|
         if opts.key?(:to_hiera_path) && opts[:to_hiera_path] != :none
-          raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          if opts.key?(:to_hiera_path_strip) && opts[:to_hiera_path_strip] != :none
+            raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          end
         end
         if opts.key?(:from_hiera_path) && opts[:from_hiera_path] != :none
-          raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          if opts.key?(:from_hiera_path_strip) && opts[:from_hiera_path_strip] != :none
+            raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+          end
         end
         if opts[:to_hiera_path_strip] == :none || opts[:from_hiera_path_strip] == :none
           raise ArgumentError, '--hiera-path-strip and --no-hiera-path-strip are mutually exclusive'