Add negative options for --hiera-path and --hiera-path-strip

Author: Kevin Paulisse

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

@@ -7,7 +7,13 @@
 
   def parse(parser, options)
     parser.on('--hiera-path PATH', 'Path to hiera data directory, relative to top directory of repository') do |path_in|
-      raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive' if options.key?(:hiera_path_strip)
+      if options.key?(:hiera_path_strip) && options[:hiera_path_strip] != :none
+        raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+      end
+
+      if options[:hiera_path] == :none
+        raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
+      end
 
       options[:hiera_path] = path_in
 
@@ -18,5 +24,13 @@ def parse(parser, options)
       options[:hiera_path].sub!(%r{/+$}, '')
       raise ArgumentError, '--hiera-path must not be empty' if options[:hiera_path].empty?
     end
+
+    parser.on('--no-hiera-path', 'Do not use any default hiera path settings') do
+      if options[:hiera_path].is_a?(String)
+        raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
+      end
+
+      options[:hiera_path] = :none
+    end
   end
 end

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

@@ -6,9 +6,22 @@
 
   def parse(parser, options)
     parser.on('--hiera-path-strip PATH', 'Path prefix to strip when munging hiera.yaml') do |path_in|
-      raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive' if options.key?(:hiera_path)
+      if options.key?(:hiera_path) && options[:hiera_path] != :none
+        raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+      end
+
+      if options[:hiera_path_strip] == :none
+        raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
+      end
 
       options[:hiera_path_strip] = path_in
     end
+
+    parser.on('--no-hiera-path-strip', 'Do not use any default hiera path strip settings') do
+      if options[:hiera_path_strip].is_a?(String)
+        raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
+      end
+      options[:hiera_path_strip] = :none
+    end
   end
 end

spec/octocatalog-diff/tests/catalog-diff/cli/options/hiera_path_spec.rb

@@ -25,5 +25,22 @@
         run_optparse(['--hiera-path', 'foo', '--hiera-path-strip', 'bar'])
       end.to raise_error(ArgumentError, /mutually exclusive/)
     end
+
+    it 'should recognize --no-hiera-path option' do
+      result = run_optparse(['--no-hiera-path'])
+      expect(result.fetch(:hiera_path, 'key-not-defined')).to eq(:none)
+    end
+
+    it 'should error if --hiera-path and --no-hiera-path are used together (1)' do
+      expect do
+        run_optparse(['--hiera-path', 'foo/bar/baz', '--no-hiera-path'])
+      end.to raise_error(ArgumentError, /mutually exclusive/)
+    end
+
+    it 'should error if --hiera-path and --no-hiera-path are used together (2)' do
+      expect do
+        run_optparse(['--no-hiera-path', '--hiera-path', 'foo/bar/baz'])
+      end.to raise_error(ArgumentError, /mutually exclusive/)
+    end
   end
 end

spec/octocatalog-diff/tests/catalog-diff/cli/options/hiera_path_strip_spec.rb

@@ -6,5 +6,33 @@
       result = run_optparse(['--hiera-path-strip', '/var/tmp/foo/bar/baz'])
       expect(result.fetch(:hiera_path_strip, 'key-not-defined')).to eq('/var/tmp/foo/bar/baz')
     end
+
+    it 'should allow empty' do
+      result = run_optparse(['--hiera-path-strip', ''])
+      expect(result.fetch(:hiera_path_strip, 'key-not-defined')).to eq('')
+    end
+
+    it 'should error if --hiera-path and --hiera-path-strip are both specified' do
+      expect do
+        run_optparse(['--hiera-path-strip', 'foo', '--hiera-path', 'bar'])
+      end.to raise_error(ArgumentError, /mutually exclusive/)
+    end
+
+    it 'should recognize --no-hiera-path-strip option' do
+      result = run_optparse(['--no-hiera-path-strip'])
+      expect(result.fetch(:hiera_path_strip, 'key-not-defined')).to eq(:none)
+    end
+
+    it 'should error if --hiera-path-strip and --no-hiera-path-strip are used together (1)' do
+      expect do
+        run_optparse(['--hiera-path-strip', 'foo/bar/baz', '--no-hiera-path-strip'])
+      end.to raise_error(ArgumentError, /mutually exclusive/)
+    end
+
+    it 'should error if --hiera-path-strip and --no-hiera-path-strip are used together (2)' do
+      expect do
+        run_optparse(['--no-hiera-path-strip', '--hiera-path-strip', 'foo/bar/baz'])
+      end.to raise_error(ArgumentError, /mutually exclusive/)
+    end
   end
 end