Split hiera-path and hiera-path-strip to be per-branch too

Author: kpaulisse

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

@@ -8,31 +8,42 @@
   has_weight 181
 
   def parse(parser, options)
-    parser.on('--hiera-path PATH', 'Path to hiera data directory, relative to top directory of repository') do |path_in|
-      if options.key?(:hiera_path_strip) && options[:hiera_path_strip] != :none
-        raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
+      parser: parser,
+      options: options,
+      cli_name: 'hiera-path',
+      option_name: 'hiera_path',
+      desc: 'Path to hiera data directory, relative to top directory of repository',
+      validator: lambda do |path|
+        if path.start_with?('/')
+          raise ArgumentError, '--hiera-path PATH must be a relative path not an absolute path'
+        end
+      end,
+      translator: lambda do |path|
+        result = path.sub(%r{/+$}, '')
+        raise ArgumentError, '--hiera-path must not be empty' if result.empty?
+        result
+      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'
+        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'
+        end
+        if opts[:to_hiera_path] == :none || opts[:from_hiera_path] == :none
+          raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
+        end
       end
-
-      if options[:hiera_path] == :none
-        raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
-      end
-
-      options[:hiera_path] = path_in
-
-      if options[:hiera_path].start_with?('/')
-        raise ArgumentError, '--hiera-path PATH must be a relative path not an absolute path'
-      end
-
-      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)
+      if options[:to_hiera_path].is_a?(String) || options[:from_hiera_path].is_a?(String)
         raise ArgumentError, '--hiera-path and --no-hiera-path are mutually exclusive'
       end
 
-      options[:hiera_path] = :none
+      options[:from_hiera_path] = :none
+      options[:to_hiera_path] = :none
     end
   end
 end

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

@@ -7,23 +7,31 @@
   has_weight 182
 
   def parse(parser, options)
-    parser.on('--hiera-path-strip PATH', 'Path prefix to strip when munging hiera.yaml') do |path_in|
-      if options.key?(:hiera_path) && options[:hiera_path] != :none
-        raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
+      parser: parser,
+      options: options,
+      cli_name: 'hiera-path-strip',
+      option_name: 'hiera_path_strip',
+      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'
+        end
+        if opts.key?(:from_hiera_path) && opts[:from_hiera_path] != :none
+          raise ArgumentError, '--hiera-path and --hiera-path-strip are mutually exclusive'
+        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'
+        end
       end
-
-      if options[:hiera_path_strip] == :none
-        raise ArgumentError, '--hiera-path-strip and --no-hiera-path-strip 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)
+      if options[:to_hiera_path_strip].is_a?(String) || options[:from_hiera_path_strip].is_a?(String)
         raise ArgumentError, '--hiera-path-strip and --no-hiera-path-strip are mutually exclusive'
       end
-      options[:hiera_path_strip] = :none
+      options[:to_hiera_path_strip] = :none
+      options[:from_hiera_path_strip] = :none
     end
   end
 end

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

@@ -6,7 +6,8 @@
   describe '#opt_hiera_path' do
     it 'should set options[:hiera_path] when relative path is specified' do
       result = run_optparse(['--hiera-path', 'foo/bar/baz'])
-      expect(result.fetch(:hiera_path, 'key-not-defined')).to eq('foo/bar/baz')
+      expect(result.fetch(:to_hiera_path, 'key-not-defined')).to eq('foo/bar/baz')
+      expect(result.fetch(:from_hiera_path, 'key-not-defined')).to eq('foo/bar/baz')
     end
 
     it 'should error if an absolute path is specified' do
@@ -15,7 +16,8 @@
 
     it 'should strip trailing slashes' do
       result = run_optparse(['--hiera-path', 'foo/bar/baz///'])
-      expect(result.fetch(:hiera_path, 'key-not-defined')).to eq('foo/bar/baz')
+      expect(result.fetch(:from_hiera_path, 'key-not-defined')).to eq('foo/bar/baz')
+      expect(result.fetch(:to_hiera_path, 'key-not-defined')).to eq('foo/bar/baz')
     end
 
     it 'should error if empty' do
@@ -30,7 +32,8 @@
 
     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)
+      expect(result.fetch(:to_hiera_path, 'key-not-defined')).to eq(:none)
+      expect(result.fetch(:from_hiera_path, 'key-not-defined')).to eq(:none)
     end
 
     it 'should error if --hiera-path and --no-hiera-path are used together (1)' do

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

@@ -4,14 +4,16 @@
 
 describe OctocatalogDiff::Cli::Options do
   describe '#opt_hiera_path_strip' do
-    it 'should set options[:hiera_path_strip] when path is specified' do
+    it 'should set options[:to_hiera_path_strip] when path is specified' do
       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')
+      expect(result.fetch(:to_hiera_path_strip, 'key-not-defined')).to eq('/var/tmp/foo/bar/baz')
+      expect(result.fetch(:from_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('')
+      expect(result.fetch(:to_hiera_path_strip, 'key-not-defined')).to eq('')
+      expect(result.fetch(:from_hiera_path_strip, 'key-not-defined')).to eq('')
     end
 
     it 'should error if --hiera-path and --hiera-path-strip are both specified' do
@@ -22,7 +24,8 @@
 
     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)
+      expect(result.fetch(:to_hiera_path_strip, 'key-not-defined')).to eq(:none)
+      expect(result.fetch(:from_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