Merge remote-tracking branch 'origin/kpaulisse-bootstrap-debug' into kpaulisse-octocatalog-diff-0-5-4

Author: Kevin Paulisse

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

@@ -0,0 +1,13 @@
+# Option to bootstrap the current directory (by default, the bootstrap script is NOT
+# run when the catalog builds in the current directory).
+# @param parser [OptionParser object] The OptionParser argument
+# @param options [Hash] Options hash being constructed; this is modified in this method.
+OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:bootstrap_current) do
+  has_weight 48
+
+  def parse(parser, options)
+    parser.on('--bootstrap-current', 'Run bootstrap script for the current directory too') do
+      options[:bootstrap_current] = true
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# Option to print debugging output for the bootstrap script in addition to the normal
+# debugging output. Note that `--debug` must also be enabled for this option to have
+# any effect.
+# @param parser [OptionParser object] The OptionParser argument
+# @param options [Hash] Options hash being constructed; this is modified in this method.
+OctocatalogDiff::CatalogDiff::Cli::Options::Option.newoption(:debug_bootstrap) do
+  has_weight 49
+
+  def parse(parser, options)
+    parser.on('--debug-bootstrap', 'Print debugging output for bootstrap script') do
+      options[:debug_bootstrap] = true
+    end
+  end
+end

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

@@ -136,6 +136,10 @@ def self.install_bootstrap_script(logger, opts)
       def self.run_bootstrap(logger, opts)
         logger.debug("Begin bootstrap with '#{opts[:bootstrap_script]}' in #{opts[:path]}")
         result = OctocatalogDiff::Bootstrap.bootstrap(opts)
+        if opts[:debug_bootstrap] || result[:status_code] > 0
+          output = result[:output].split(/[\r\n]+/)
+          output.each { |x| logger.debug("Bootstrap: #{x}") }
+        end
         raise BootstrapError, "bootstrap failed for #{opts[:path]}: #{result[:output]}" unless (result[:status_code]).zero?
         logger.debug("Success bootstrap in #{opts[:path]}")
         result[:output]

lib/octocatalog-diff/catalog/computed.rb

@@ -97,7 +97,17 @@ def bootstrap(logger)
           raise Errno::ENOENT, "Invalid dir #{@opts[:bootstrapped_dir]}" unless File.directory?(@opts[:bootstrapped_dir])
           tmphash[:basedir] = @opts[:bootstrapped_dir]
         elsif @opts[:branch] == '.'
-          tmphash[:basedir] = @opts[:basedir]
+          if @opts[:bootstrap_current]
+            tmphash[:basedir] = Dir.mktmpdir
+            at_exit { cleanup_checkout_dir(tmphash[:basedir], logger) }
+
+            FileUtils.cp_r File.join(@opts[:basedir], '.'), tmphash[:basedir]
+
+            o = @opts.reject { |k, _v| k == :branch }.merge(path: tmphash[:basedir])
+            OctocatalogDiff::CatalogUtil::Bootstrap.bootstrap_directory(o, logger)
+          else
+            tmphash[:basedir] = @opts[:basedir]
+          end
         else
           checkout_dir = Dir.mktmpdir
           at_exit { cleanup_checkout_dir(checkout_dir, logger) }

spec/octocatalog-diff/fixtures/repos/bootstrap/config/bootstrap.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+ls -lR > /tmp/foo.$$
+echo "Hello, stdout"
+echo "Hello, stderr" 1>&2
+cp -r external-modules/test modules
+exit 0

spec/octocatalog-diff/fixtures/repos/bootstrap/config/broken-bootstrap.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Fail, stdout"
+echo "Fail, stderr" 1>&2
+exit 1

spec/octocatalog-diff/fixtures/repos/bootstrap/external-modules/test/manifests/init.pp

@@ -0,0 +1,5 @@
+class test {
+  file { '/tmp/foo':
+    content => template('test/foo.erb'),
+  }
+}

spec/octocatalog-diff/fixtures/repos/bootstrap/external-modules/test/templates/foo.erb

@@ -0,0 +1 @@
+Test 123

spec/octocatalog-diff/fixtures/repos/bootstrap/manifests/site.pp

@@ -0,0 +1 @@
+include test