bolt 0.7.0 → 0.8.0

data/lib/bolt/node/winrm.rb

@@ -69,38 +69,76 @@ function Invoke-Interpreter
     $StdinInput = $Null
   )
 
-  $startInfo = New-Object System.Diagnostics.ProcessStartInfo($Path, $Arguments)
-  $startInfo.UseShellExecute = $false
-  $startInfo.WorkingDirectory = Split-Path -Parent (Get-Command $Path).Path
-  if ($StdinInput) { $startInfo.RedirectStandardInput = $true }
-  $startInfo.RedirectStandardOutput = $true
-  $startInfo.RedirectStandardError = $true
-
   try
   {
-    $process = [System.Diagnostics.Process]::Start($startInfo)
+    if (-not (Get-Command $Path -ErrorAction SilentlyContinue))
+    {
+      throw "Could not find executable '$Path' in ${ENV:PATH} on target node"
+    }
+
+    $startInfo = New-Object System.Diagnostics.ProcessStartInfo($Path, $Arguments)
+    $startInfo.UseShellExecute = $false
+    $startInfo.WorkingDirectory = Split-Path -Parent (Get-Command $Path).Path
+    $startInfo.CreateNoWindow = $true
+    if ($StdinInput) { $startInfo.RedirectStandardInput = $true }
+    $startInfo.RedirectStandardOutput = $true
+    $startInfo.RedirectStandardError = $true
+
+    $stdoutHandler = { if (-not ([String]::IsNullOrEmpty($EventArgs.Data))) { $Host.UI.WriteLine($EventArgs.Data) } }
+    $stderrHandler = { if (-not ([String]::IsNullOrEmpty($EventArgs.Data))) { $Host.UI.WriteErrorLine($EventArgs.Data) } }
+    $invocationId = [Guid]::NewGuid().ToString()
+
+    $process = New-Object System.Diagnostics.Process
+    $process.StartInfo = $startInfo
+    $process.EnableRaisingEvents = $true
+
+    # https://msdn.microsoft.com/en-us/library/system.diagnostics.process.standarderror(v=vs.110).aspx#Anchor_2
+    $stdoutEvent = Register-ObjectEvent -InputObject $process -EventName 'OutputDataReceived' -Action $stdoutHandler
+    $stderrEvent = Register-ObjectEvent -InputObject $process -EventName 'ErrorDataReceived' -Action $stderrHandler
+    $exitedEvent = Register-ObjectEvent -InputObject $process -EventName 'Exited' -SourceIdentifier $invocationId
+
+    $process.Start() | Out-Null
+
+    $process.BeginOutputReadLine()
+    $process.BeginErrorReadLine()
+
+    if ($StdinInput)
+    {
+      $process.StandardInput.WriteLine($StdinInput)
+      $process.StandardInput.Close()
+    }
+
+    # park current thread until the PS event is signaled upon process exit
+    # OR the timeout has elapsed
+    $waitResult = Wait-Event -SourceIdentifier $invocationId -Timeout $Timeout
+    if (! $process.HasExited)
+    {
+      $Host.UI.WriteErrorLine("Process $Path did not complete in $Timeout seconds")
+      return 1
+    }
+
+    return $process.ExitCode
   }
   catch
   {
-    Write-Error $_
+    $Host.UI.WriteErrorLine($_)
     return 1
   }
-
-  if ($StdinInput)
+  finally
   {
-    $process.StandardInput.WriteLine($StdinInput)
-    $process.StandardInput.Close()
+    @($stdoutEvent, $stderrEvent, $exitedEvent) |
+      ? { $_ -ne $Null } |
+      % { Unregister-Event -SourceIdentifier $_.Name }
+
+    if ($process -ne $Null)
+    {
+      if (($process.Handle -ne $Null) -and (! $process.HasExited))
+      {
+        try { $process.Kill() } catch { $Host.UI.WriteErrorLine("Failed To Kill Process $Path") }
+      }
+      $process.Dispose()
+    }
   }
-
-  # streams must have .ReadToEnd() called prior to process .WaitForExit()
-  # to prevent deadlocks per MSDN
-  # https://msdn.microsoft.com/en-us/library/system.diagnostics.process.standarderror(v=vs.110).aspx#Anchor_2
-  $process.StandardOutput.ReadToEnd() | Out-Host
-  $stderr = $process.StandardError.ReadToEnd()
-  if ($stderr) { Write-Error $stderr }
-  $process.WaitForExit($Timeout) | Out-Null
-
-  return $process.ExitCode
 }
 PS
       @shell_initialized = true
@@ -128,11 +166,11 @@ PS
       end
     end
 
-    # 10 minutes in milliseconds
-    DEFAULT_EXECUTION_TIMEOUT = 10 * 60 * 1000
+    # 10 minutes in seconds
+    DEFAULT_EXECUTION_TIMEOUT = 10 * 60
 
     def execute_process(path = '', arguments = [], stdin = nil,
-                        timeout_ms = DEFAULT_EXECUTION_TIMEOUT)
+                        timeout = DEFAULT_EXECUTION_TIMEOUT)
       quoted_args = arguments.map do |arg|
         "'" + arg.gsub("'", "''") + "'"
       end.join(',')
@@ -145,12 +183,13 @@ $quoted_array = @(
 $invokeArgs = @{
   Path = "#{path}"
   Arguments = $quoted_array -Join ' '
-  Timeout = #{timeout_ms}
+  Timeout = #{timeout}
   #{stdin.nil? ? '' : "StdinInput = @'\n" + stdin + "\n'@"}
 }
 
-# winrm gem relies on $LASTEXITCODE
-$LASTEXITCODE = Invoke-Interpreter @invokeArgs
+# winrm gem checks $? prior to using $LASTEXITCODE
+# making it necessary to exit with the desired code to propagate status properly
+exit $(Invoke-Interpreter @invokeArgs)
 PS
     end
 
@@ -233,9 +272,9 @@ PS
     def _run_script(script, arguments)
       @logger.info { "Running script '#{script}'" }
       with_remote_file(script) do |remote_path|
-        args = [*PS_ARGS, '-File', "\"#{remote_path}\""]
+        path, args = *process_from_extension(remote_path)
         args += escape_arguments(arguments)
-        execute_process('powershell.exe', args)
+        execute_process(path, args)
       end
     end
 

data/lib/bolt/notifier.rb

@@ -0,0 +1,20 @@
+require 'concurrent'
+
+module Bolt
+  class Notifier
+    def initialize(executor = Concurrent::SingleThreadExecutor.new)
+      @executor = executor
+    end
+
+    def notify(callback, node, result)
+      @executor.post do
+        callback.call(node, result)
+      end
+    end
+
+    def shutdown
+      @executor.shutdown
+      @executor.wait_for_termination
+    end
+  end
+end

data/lib/bolt/outputter.rb

@@ -0,0 +1,21 @@
+module Bolt
+  class Outputter
+    def self.for_format(format)
+      case format
+      when 'human'
+        Bolt::Outputter::Human.new
+      when 'json'
+        Bolt::Outputter::JSON.new
+      when nil
+        raise "Cannot use outputter before parsing."
+      end
+    end
+
+    def initialize(stream = $stdout)
+      @stream = stream
+    end
+  end
+end
+
+require 'bolt/outputter/human'
+require 'bolt/outputter/json'

data/lib/bolt/outputter/human.rb

@@ -0,0 +1,30 @@
+module Bolt
+  class Outputter
+    class Human < Bolt::Outputter
+      def print_head; end
+
+      def print_result(node, result)
+        color = result.success? ? "\033[32m" : "\033[31m"
+        @stream.print color if @stream.isatty
+        @stream.puts "#{node.host}:"
+        @stream.print "\033[0m" if @stream.isatty
+        @stream.puts
+        @stream.puts result.message
+        @stream.puts
+      end
+
+      def print_summary(results, elapsed_time)
+        @stream.puts format("Ran on %d node%s in %.2f seconds",
+                            results.size,
+                            results.size > 1 ? 's' : '',
+                            elapsed_time)
+      end
+
+      def print_plan(result)
+        @stream.puts result
+      end
+
+      def fatal_error(e); end
+    end
+  end
+end

data/lib/bolt/outputter/json.rb

@@ -0,0 +1,51 @@
+module Bolt
+  class Outputter
+    class JSON < Bolt::Outputter
+      def initialize(stream = $stdout)
+        @items_open = false
+        @object_open = false
+        @preceding_item = false
+        super(stream)
+      end
+
+      def print_head
+        @stream.puts '{ "items": ['
+        @preceding_item = false
+        @items_open = true
+        @object_open = true
+      end
+
+      def print_result(node, result)
+        item = {
+          name: node.uri,
+          status: result.is_a?(Bolt::ErrorResult) ? 'failure' : 'success',
+          result: result.to_result
+        }
+
+        @stream.puts ',' if @preceding_item
+        @stream.puts item.to_json
+        @preceding_item = true
+      end
+
+      def print_summary(results, elapsed_time)
+        @stream.puts "],\n"
+        @preceding_item = false
+        @items_open = false
+        @stream.puts format('"node_count": %d, "elapsed_time": %d }',
+                            results.size,
+                            elapsed_time)
+      end
+
+      def print_plan(result)
+        @stream.puts result.to_json
+      end
+
+      def fatal_error(e)
+        @stream.puts "],\n" if @items_open
+        @stream.puts '"_error": ' if @object_open
+        @stream.puts e.to_json
+        @stream.puts '}' if @object_open
+      end
+    end
+  end
+end

data/lib/bolt/result.rb

@@ -20,6 +20,10 @@ module Bolt
       { 'value' => value }
     end
 
+    def to_result
+      value
+    end
+
     def success?
       true
     end
@@ -42,6 +46,16 @@ module Bolt
       }
     end
 
+    def to_result
+      {
+        '_error' => {
+          'issue_code' => @issue_code,
+          'kind' => @kind,
+          'msg' => @message
+        }
+      }
+    end
+
     def success?
       false
     end
@@ -64,6 +78,10 @@ module Bolt
       }
     end
 
+    def to_result
+      value
+    end
+
     def success?
       @exit_code.zero?
     end
@@ -86,6 +104,12 @@ module Bolt
       @object || @stdout
     end
 
+    def to_result
+      result = @object
+      result['_error'] = @error if @error
+      result
+    end
+
     def to_h
       hash = super
       hash['error'] = error if error
@@ -95,12 +119,15 @@ module Bolt
     private
 
     def output_to_json_hash(output)
-      obj = JSON.parse(output)
-      if obj.is_a? Hash
-        obj
+      begin
+        obj = JSON.parse(output)
+        unless obj.is_a? Hash
+          obj = nil
+        end
+      rescue JSON::ParserError
+        nil
       end
-    rescue JSON::ParserError
-      nil
+      obj || { '_output' => output }
     end
   end
 

data/lib/bolt/version.rb

@@ -1,3 +1,3 @@
 module Bolt
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/vendored/puppet/lib/puppet.rb

@@ -42,11 +42,10 @@ module Puppet
   require 'puppet/environments'
 
   class << self
-    gettext_config_file = Puppet::GettextConfig.puppet_locale_path
-    unless Puppet::GettextConfig.initialize(gettext_config_file, Puppet::GettextConfig.translation_mode(gettext_config_file))
-      # Stub out gettext's `_` and `n_()` methods, which attempt to load translations,
-      # with versions that do nothing
-      require 'puppet/gettext/stubs'
+    Puppet::GettextConfig.create_text_domain('production')
+    locale_dir = Puppet::GettextConfig.puppet_locale_path
+    if Puppet::GettextConfig.load_translations('puppet', locale_dir, Puppet::GettextConfig.translation_mode(locale_dir))
+      Puppet::GettextConfig.set_locale(Locale.current.language)
     end
 
     include Puppet::Util

data/vendored/puppet/lib/puppet/agent.rb

@@ -2,6 +2,8 @@ require 'puppet/application'
 require 'puppet/error'
 require 'puppet/util/at_fork'
 
+require 'timeout'
+
 # A general class for triggering a run of another
 # class.
 class Puppet::Agent
@@ -14,6 +16,10 @@ class Puppet::Agent
   require 'puppet/util/splayer'
   include Puppet::Util::Splayer
 
+  # Special exception class used to signal an agent run has timed out.
+  class RunTimeoutError < Exception
+  end
+
   attr_reader :client_class, :client, :should_fork
 
   def initialize(client_class, should_fork=true)
@@ -41,12 +47,26 @@ class Puppet::Agent
       splay client_options.fetch :splay, Puppet[:splay]
       result = run_in_fork(should_fork) do
         with_client(client_options[:transaction_uuid], client_options[:job_id]) do |client|
+          client_args = client_options.merge(:pluginsync => Puppet::Configurer.should_pluginsync?)
           begin
-            client_args = client_options.merge(:pluginsync => Puppet::Configurer.should_pluginsync?)
-            lock { client.run(client_args) }
+            lock do
+              # NOTE: Timeout is pretty heinous as the location in which it
+              # throws an error is entirely unpredictable, which means that
+              # it can interrupt code blocks that perform cleanup or enforce
+              # sanity. The only thing a Puppet agent should do after this
+              # error is thrown is die with as much dignity as possible.
+              Timeout.timeout(Puppet[:runtimeout], RunTimeoutError) do
+                client.run(client_args)
+              end
+            end
           rescue Puppet::LockError
             Puppet.notice _("Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)") % { client_class: client_class, lockfile_path: lockfile_path }
             return
+          rescue RunTimeoutError => detail
+            Puppet.log_exception(detail, _("Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated.") %
+              {client_class: client_class,
+              runtimeout: Puppet[:runtimeout]})
+            return 1
           rescue StandardError => detail
             Puppet.log_exception(detail, _("Could not run %{client_class}: %{detail}") % { client_class: client_class, detail: detail })
             1

data/vendored/puppet/lib/puppet/application/agent.rb

@@ -98,7 +98,7 @@ USAGE
 -----
 puppet agent [--certname <NAME>] [-D|--daemonize|--no-daemonize]
   [-d|--debug] [--detailed-exitcodes] [--digest <DIGEST>] [--disable [MESSAGE]] [--enable]
-  [--fingerprint] [-h|--help] [-l|--logdest syslog|eventlog|<FILE>|console]
+  [--fingerprint] [-h|--help] [-l|--logdest syslog|eventlog|<ABS FILEPATH>|console]
   [--masterport <PORT>] [--noop] [-o|--onetime] [-t|--test]
   [-v|--verbose] [-V|--version] [-w|--waitforcert <SECONDS>]
 

data/vendored/puppet/lib/puppet/application/apply.rb

@@ -50,7 +50,7 @@ USAGE
 -----
 puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
   [-e|--execute] [--detailed-exitcodes] [-L|--loadclasses]
-  [-l|--logdest syslog|eventlog|<FILE>|console] [--noop]
+  [-l|--logdest syslog|eventlog|<ABS FILEPATH>|console] [--noop]
   [--catalog <catalog>] [--write-catalog-summary] <file>
 
 

data/vendored/puppet/lib/puppet/configurer/downloader_factory.rb

@@ -31,4 +31,14 @@ class Puppet::Configurer::DownloaderFactory
       source_permissions
     )
   end
+
+  def create_locales_downloader(environment)
+    locales_downloader = Puppet::Configurer::Downloader.new(
+      "locales",
+      Puppet[:localedest],
+      Puppet[:localesource],
+      Puppet[:pluginsignore] + " config.yaml",
+      environment
+    )
+  end
 end