bolt 0.11.0 → 0.12.0

data/vendored/puppet/lib/puppet/util/windows/sid.rb

@@ -71,7 +71,6 @@ module Puppet::Util::Windows
       raw_sid_bytes = nil
       begin
         string_to_sid_ptr(name) do |sid_ptr|
-          valid = ! sid_ptr.nil? && ! sid_ptr.null?
           raw_sid_bytes = sid_ptr.read_array_of_uchar(get_length_sid(sid_ptr))
         end
       rescue
@@ -105,7 +104,6 @@ module Puppet::Util::Windows
       sid_bytes = []
       begin
         string_to_sid_ptr(value) do |ptr|
-          valid = ! ptr.nil? && ! ptr.null?
           sid_bytes = ptr.read_array_of_uchar(get_length_sid(ptr))
         end
       rescue Puppet::Util::Windows::Error => e

data/vendored/puppet/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '5.3.3'
+  PUPPETVERSION = '5.3.4'
 
   ##
   # version is a public API method intended to always provide a fast and

data/vendored/puppet/lib/puppet_pal.rb

@@ -530,18 +530,10 @@ module Pal
     Puppet[:tasks] = true
     # After the assertions, if code_string is non nil - it has the highest precedence
     Puppet[:code] = code_string unless code_string.nil?
-    overrides = {}
-    unless facts.nil?
-      overrides[:pal_facts] = Puppet.lookup(:pal_facts).merge(facts)
-    end
-    unless variables.nil?
-      overrides[:pal_variables] = Puppet.lookup(:pal_variables).merge(variables)
-    end
-    Puppet.override(overrides, "PAL::with_script_compiler") do # TRANSLATORS: Do not translate, symbolic name
-      # If manifest_file is nil, the #main method will use the env configured manifest
-      # do things in block while a Script Compiler is in effect
-      main(manifest_file, &block)
-    end
+
+    # If manifest_file is nil, the #main method will use the env configured manifest
+    # to do things in the block while a Script Compiler is in effect
+    main(manifest_file, facts, variables, &block)
   end
 
   # Evaluates a Puppet Language script string.
@@ -749,7 +741,7 @@ module Pal
   # Picks up information from the puppet context and configures a script compiler which is given to
   # the provided block
   #
-  def self.main(manifest = nil, &block)
+  def self.main(manifest, facts, variables)
     # Configure the load path
     env = Puppet.lookup(:pal_env)
     env.each_plugin_directory do |dir|
@@ -761,7 +753,20 @@ module Pal
     Facter.reset
 
     node = Puppet.lookup(:pal_current_node)
-    prepare_node_facts(node, Puppet.lookup(:pal_facts))
+    pal_facts = Puppet.lookup(:pal_facts)
+    pal_variables = Puppet.lookup(:pal_variables)
+
+    overrides = {}
+    unless facts.nil? || facts.empty?
+      pal_facts = pal_facts.merge(facts)
+      overrides[:pal_facts] = pal_facts
+    end
+    unless variables.nil? || variables.empty?
+      pal_variables = pal_variables.merge(variables)
+      overrides[:pal_variables] = pal_variables
+    end
+
+    prepare_node_facts(node, pal_facts)
 
     configured_environment = node.environment || Puppet.lookup(:current_environment)
 
@@ -805,15 +810,23 @@ module Pal
           # create the $settings:: variables
           topscope.merge_settings(node.environment.name, false)
 
-          add_variables(topscope, Puppet.lookup(:pal_variables))
+          add_variables(topscope, pal_variables)
 
           # compiler.compile(&block)
           compiler.compile do | internal_compiler |
             # wrap the internal compiler to prevent it from leaking in the PAL API
-            block.call(ScriptCompiler.new(internal_compiler)) unless !block_given?
+            if block_given?
+              script_compiler = ScriptCompiler.new(internal_compiler)
+
+              # Make compiler available to Puppet#lookup
+              overrides[:pal_script_compiler] = script_compiler
+              Puppet.override(overrides, "PAL::with_script_compiler") do # TRANSLATORS: Do not translate, symbolic name
+                yield(script_compiler)
+              end
+            end
           end
 
-        rescue Puppet::ParseErrorWithIssue, Puppet::Error => detail
+        rescue Puppet::ParseErrorWithIssue, Puppet::Error
           # already logged and handled by the compiler for these two cases
           raise
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +244,16 @@ dependencies:
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -295,6 +309,7 @@ files:
 - lib/bolt/cli.rb
 - lib/bolt/config.rb
 - lib/bolt/error.rb
+- lib/bolt/execution_result.rb
 - lib/bolt/executor.rb
 - lib/bolt/formatter.rb
 - lib/bolt/node.rb
@@ -309,7 +324,10 @@ files:
 - lib/bolt/outputter/human.rb
 - lib/bolt/outputter/json.rb
 - lib/bolt/result.rb
+- lib/bolt/target.rb
 - lib/bolt/version.rb
+- modules/boltlib/lib/puppet/datatypes/executionresult.rb
+- modules/boltlib/lib/puppet/datatypes/target.rb
 - modules/boltlib/lib/puppet/functions/file_upload.rb
 - modules/boltlib/lib/puppet/functions/run_command.rb
 - modules/boltlib/lib/puppet/functions/run_plan.rb
@@ -532,6 +550,9 @@ files:
 - vendored/puppet/lib/puppet/context/trusted_information.rb
 - vendored/puppet/lib/puppet/daemon.rb
 - vendored/puppet/lib/puppet/data_binding.rb
+- vendored/puppet/lib/puppet/datatypes.rb
+- vendored/puppet/lib/puppet/datatypes/error.rb
+- vendored/puppet/lib/puppet/datatypes/impl/error.rb
 - vendored/puppet/lib/puppet/defaults.rb
 - vendored/puppet/lib/puppet/environments.rb
 - vendored/puppet/lib/puppet/error.rb
@@ -1004,6 +1025,7 @@ files:
 - vendored/puppet/lib/puppet/pops/loader/puppet_function_instantiator.rb
 - vendored/puppet/lib/puppet/pops/loader/puppet_plan_instantiator.rb
 - vendored/puppet/lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb
+- vendored/puppet/lib/puppet/pops/loader/ruby_data_type_instantiator.rb
 - vendored/puppet/lib/puppet/pops/loader/ruby_function_instantiator.rb
 - vendored/puppet/lib/puppet/pops/loader/runtime3_type_loader.rb
 - vendored/puppet/lib/puppet/pops/loader/simple_environment_loader.rb
@@ -1080,7 +1102,6 @@ files:
 - vendored/puppet/lib/puppet/pops/types/annotation.rb
 - vendored/puppet/lib/puppet/pops/types/class_loader.rb
 - vendored/puppet/lib/puppet/pops/types/enumeration.rb
-- vendored/puppet/lib/puppet/pops/types/execution_result.rb
 - vendored/puppet/lib/puppet/pops/types/implementation_registry.rb
 - vendored/puppet/lib/puppet/pops/types/iterable.rb
 - vendored/puppet/lib/puppet/pops/types/p_binary_type.rb

data/vendored/puppet/lib/puppet/pops/types/execution_result.rb

@@ -1,137 +0,0 @@
-module Puppet::Pops
-module Types
-  class ExecutionResult
-    include PuppetObject
-    include Iterable
-    include IteratorProducer
-
-    TYPE_RESULT_HASH = TypeFactory.hash_kv(PStringType::NON_EMPTY, TypeFactory.struct({
-      TypeFactory.optional('value') => TypeFactory.data,
-      TypeFactory.optional('error') => TypeFactory.struct({
-        'msg' => PStringType::NON_EMPTY,
-        TypeFactory.optional('kind') => PStringType::NON_EMPTY,
-        TypeFactory.optional('issue_code') => PStringType::NON_EMPTY,
-        TypeFactory.optional('details') => TypeFactory.hash_of_data,
-      })
-    }))
-
-    TYPE_RESULT_ERRORS = TypeFactory.hash_kv(PStringType::NON_EMPTY, TypeFactory.variant(TypeFactory.error, TypeFactory.data))
-
-    def self.register_ptype(loader, ir)
-      @type = Pcore::create_object_type(loader, ir, self, 'ExecutionResult', nil,
-        { 'result_hash' => TYPE_RESULT_HASH },
-        {
-          'count' => TypeFactory.callable([], TypeFactory.integer),
-          'empty' => TypeFactory.callable([], TypeFactory.boolean),
-          'error_nodes' => TypeFactory.callable([], TypeFactory.type_reference('ExecutionResult')),
-          'names' => TypeFactory.callable([], TypeFactory.array_of(PStringType::NON_EMPTY)),
-          'ok' => TypeFactory.callable([], TypeFactory.boolean),
-          'ok_nodes' => TypeFactory.callable([], TypeFactory.type_reference('ExecutionResult')),
-          'value' => TypeFactory.callable([PStringType::NON_EMPTY], TypeFactory.variant(TypeFactory.error, TypeFactory.data)),
-          'values' => TypeFactory.callable([], TypeFactory.array_of(TypeFactory.variant(TypeFactory.error, TypeFactory.data))),
-          '[]' => TypeFactory.callable([PStringType::NON_EMPTY], TypeFactory.variant(TypeFactory.error, TypeFactory.data)),
-        })
-    end
-
-    def self._pcore_type
-      @type
-    end
-
-    # Creates a pure Data hash from a result hash returned from the Bolt::Executor
-    # @return [Hash{String => Data}] The data hash
-    def self.from_bolt(result_hash)
-      data_result = {}
-      result_hash.each_pair { |k, v| data_result[k.uri] = v.to_h }
-      self.new(data_result)
-    end
-
-    attr_reader :result_hash
-
-    def initialize(result_hash)
-      @result_hash = convert_errors(result_hash)
-    end
-
-    def count
-      @result_hash.size
-    end
-
-    def empty
-      @result_hash.empty?
-    end
-    alias_method :empty?, :empty
-
-    def error_nodes
-      result = {}
-      t = TypeFactory.error
-      @result_hash.each_pair { |k, v| result[k] = v if t.instance?(v) }
-      self.class.new(result)
-    end
-
-    def iterator
-      Iterable.on(@result_hash)
-    end
-
-    def names
-      @result_hash.keys
-    end
-
-    def ok
-      t = TypeFactory.error
-      !@result_hash.values.any? { |v| t.instance?(v) }
-    end
-    alias_method :ok?, :ok
-
-    def ok_nodes
-      result = {}
-      t = TypeFactory.error
-      @result_hash.each_pair { |k, v| result[k] = v unless t.instance?(v) }
-      self.class.new(result)
-    end
-
-    def [](node_uri)
-      @result_hash[node_uri]
-    end
-
-    def value(node_uri)
-      self[node_uri]
-    end
-
-    def values
-      @result_hash.values
-    end
-
-    def _pcore_init_hash
-      @result_hash
-    end
-
-    def eql?(o)
-      self.class == o.class && self.result_hash == o.result_hash
-    end
-
-    def ==(o)
-      eql?(o)
-    end
-
-    private
-
-    def convert_errors(result_hash)
-      return result_hash unless TYPE_RESULT_HASH.instance?(result_hash)
-      converted = {}
-      result_hash.each_pair { |k, v| converted[k] = convert_error(v) }
-      converted
-    end
-
-    def convert_error(value_or_error)
-      error = value_or_error['error']
-      value = value_or_error['value']
-      if error.nil?
-        value
-      else
-        TypeFactory.error.create(error['msg'], error['kind'], error['issue_code'], value, error['details'])
-      end
-    end
-
-    EMPTY_RESULT = ExecutionResult.new(EMPTY_HASH)
-  end
-end
-end