Add support for arbitrary commands

Author: Kevin Paulisse

lib/octocatalog-diff/catalog-util/command.rb

@@ -95,9 +95,51 @@ def puppet_command
         cmdline << "--ssldir=#{Shellwords.escape(File.join(@compilation_dir, 'var', 'ssl'))}"
         cmdline << "--confdir=#{Shellwords.escape(@compilation_dir)}"
 
+        # Other parameters provided by the user
+        override_and_append_commandline_with_user_supplied_arguments(cmdline)
+
         # Return full command
         cmdline.join(' ')
       end
+
+      private
+
+      # Private: Mutate the command line with arguments that were passed directly from the
+      # user. This appends new arguments and overwrites existing arguments.
+      # @param cmdline [Array] Existing command line - mutated by this method
+      def override_and_append_commandline_with_user_supplied_arguments(cmdline)
+        return unless @options[:command_line].is_a?(Array)
+
+        @options[:command_line].each do |opt|
+          # Validate format: Accept '--key=value' or '--key' only.
+          unless opt =~ /\A--([^=\s]+)(=.+)?\z/
+            raise ArgumentError, "Command line option '#{opt}' does not match format '--SOME_OPTION=SOME_VALUE'"
+          end
+          key = Shellwords.escape(Regexp.last_match(1))
+          val = Regexp.last_match(2)
+          val.sub!(/\A=/, '') if val.is_a?(String)
+
+          # Determine if command line already contains this setting. If yes, the setting provided
+          # here should override. If no, then append to the commandline.
+          new_setting = val.nil? ? "--#{key}" : "--#{key}=#{Shellwords.escape(val)}"
+          ind = key_position(cmdline, key)
+          if ind.nil?
+            cmdline << new_setting
+          else
+            cmdline[ind] = new_setting
+          end
+        end
+      end
+
+      # Private: Determine if the key (given by --key) is already defined in the
+      # command line. Returns nil if it is not already defined, otherwise returns
+      # the index.
+      # @param cmdline [Array] Existing command line
+      # @param key [String] Key to look up
+      # @return [Fixnum] Index of where key is defined (nil if undefined)
+      def key_position(cmdline, key)
+        cmdline.index { |x| x == "--#{key}" || x =~ /\A--#{key}=/ }
+      end
     end
   end
 end