Get rid of dir_opts, just use options

Author: Kevin Paulisse

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

@@ -82,8 +82,8 @@ def self.bootstrap_directory_parallelizer(options, logger)
 
       # Performs the actual bootstrap of a directory. Intended to be called by bootstrap_directory_parallelizer
       # above, or as part of the parallelized catalog build process from util/catalogs.
+      # @param options [Hash] Directory options: branch, path, tag
       # @param logger [Logger] Logger object
-      # @param dir_opts [Hash] Directory options: branch, path, tag
       def self.bootstrap_directory(options, logger)
         raise ArgumentError, ':path must be supplied' unless options[:path]
         FileUtils.mkdir_p(options[:path]) unless Dir.exist?(options[:path])
@@ -96,11 +96,11 @@ def self.bootstrap_directory(options, logger)
 
       # Perform git checkout
       # @param logger [Logger] Logger object
-      # @param dir_opts [Hash] Directory options: branch, path, tag
-      def self.git_checkout(logger, dir_opts)
-        logger.debug("Begin git checkout #{dir_opts[:basedir]}:#{dir_opts[:branch]} -> #{dir_opts[:path]}")
-        OctocatalogDiff::CatalogUtil::Git.check_out_git_archive(dir_opts.merge(logger: logger))
-        logger.debug("Success git checkout #{dir_opts[:basedir]}:#{dir_opts[:branch]} -> #{dir_opts[:path]}")
+      # @param options [Hash] Options (need to contain: basedir, branch, path)
+      def self.git_checkout(logger, options)
+        logger.debug("Begin git checkout #{options[:basedir]}:#{options[:branch]} -> #{options[:path]}")
+        OctocatalogDiff::CatalogUtil::Git.check_out_git_archive(options.merge(logger: logger))
+        logger.debug("Success git checkout #{options[:basedir]}:#{options[:branch]} -> #{options[:path]}")
       rescue OctocatalogDiff::Errors::GitCheckoutError => exc
         logger.error("Git checkout error: #{exc}")
         raise OctocatalogDiff::Errors::BootstrapError, exc