bolt 0.10.0 → 0.11.0

data/vendored/require_vendored.rb

@@ -3,9 +3,3 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'facter/lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'hiera/lib'))
 
 require 'puppet_pal'
-
-# This can be removed when BOLT-66 is implemented, so that puppet_pal
-# is the only entry point
-require 'puppet'
-require 'puppet/node/environment'
-require 'puppet/info_service'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -230,16 +230,16 @@ dependencies:
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -513,7 +513,6 @@ files:
 - vendored/puppet/lib/puppet/application/script.rb
 - vendored/puppet/lib/puppet/application/status.rb
 - vendored/puppet/lib/puppet/application_support.rb
-- vendored/puppet/lib/puppet/bindings.rb
 - vendored/puppet/lib/puppet/coercion.rb
 - vendored/puppet/lib/puppet/compilable_resource_type.rb
 - vendored/puppet/lib/puppet/configurer.rb
@@ -632,6 +631,7 @@ files:
 - vendored/puppet/lib/puppet/functions/break.rb
 - vendored/puppet/lib/puppet/functions/call.rb
 - vendored/puppet/lib/puppet/functions/contain.rb
+- vendored/puppet/lib/puppet/functions/convert_to.rb
 - vendored/puppet/lib/puppet/functions/crit.rb
 - vendored/puppet/lib/puppet/functions/debug.rb
 - vendored/puppet/lib/puppet/functions/defined.rb
@@ -683,6 +683,7 @@ files:
 - vendored/puppet/lib/puppet/generate/models/type/type.rb
 - vendored/puppet/lib/puppet/generate/type.rb
 - vendored/puppet/lib/puppet/gettext/config.rb
+- vendored/puppet/lib/puppet/gettext/module_translations.rb
 - vendored/puppet/lib/puppet/gettext/stubs.rb
 - vendored/puppet/lib/puppet/graph.rb
 - vendored/puppet/lib/puppet/graph/key.rb
@@ -1100,7 +1101,6 @@ files:
 - vendored/puppet/lib/puppet/pops/types/ruby_generator.rb
 - vendored/puppet/lib/puppet/pops/types/ruby_method.rb
 - vendored/puppet/lib/puppet/pops/types/string_converter.rb
-- vendored/puppet/lib/puppet/pops/types/task.rb
 - vendored/puppet/lib/puppet/pops/types/tree_iterators.rb
 - vendored/puppet/lib/puppet/pops/types/type_acceptor.rb
 - vendored/puppet/lib/puppet/pops/types/type_asserter.rb

data/vendored/puppet/lib/puppet/bindings.rb

@@ -1,147 +0,0 @@
-# This class allows registration of named bindings that are later contributed to a layer via
-# a binding scheme.
-#
-# The intended use is for a .rb file to be placed in confdir's or module's `lib/bindings` directory structure, with a
-# name corresponding to the symbolic bindings name.
-#
-# Here are two equivalent examples, the first using chained methods (which is compact for simple cases), and the
-# second which uses a block.
-#
-# @example MyModule's lib/bindings/mymodule/default.rb
-#   Puppet::Bindings.newbindings('mymodule::default') do
-#     bind.integer.named('meaning of life').to(42)
-#   end
-#
-# @example Using blocks
-#   Puppet::Bindings.newbindings('mymodule::default') do
-#     bind do
-#       integer
-#       name 'meaning of life'
-#       to 42
-#     end
-#   end
-#
-# If access is needed to the scope, this can be declared as a block parameter.
-# @example MyModule's lib/bindings/mymodule/default.rb with scope
-#   Puppet::Bindings.newbindings('mymodule::default') do |scope|
-#     bind.integer.named('meaning of life').to("#{scope['::fqdn']} also think it is 42")
-#   end
-#
-# If late evaluation is wanted, this can be achieved by binding a puppet expression.
-# @example binding a puppet expression
-#   Puppet::Bindings.newbindings('mymodule::default') do |scope|
-#     bind.integer.named('meaning of life').to(puppet_string("${::fqdn} also think it is 42")
-#   end
-#
-# It is allowed to define methods in the block given to `newbindings`, these can be used when
-# producing bindings. (Care should naturally be taken to not override any of the already defined methods).
-# @example defining method to be used while creating bindings
-#   Puppet::Bindings.newbindings('mymodule::default') do
-#     def square(x)
-#       x * x
-#     end
-#     bind.integer.named('meaning of life squared').to(square(42))
-#   end
-#
-# For all details see {Puppet::Pops::Binder::BindingsFactory}, which is used behind the scenes.
-# @api public
-#
-class Puppet::Bindings
-  extend Enumerable
-
-  Environment = Puppet::Node::Environment
-
-  # Constructs and registers a {Puppet::Pops::Binder::Bindings::NamedBindings NamedBindings} that later can be contributed
-  # to a bindings layer in a bindings configuration via a URI. The name is symbolic, fully qualified with module name, and at least one
-  # more qualifying name (where the name `default` is used in the default bindings configuration.
-  #
-  # The given block is called with a `self` bound to an instance of {Puppet::Pops::Binder::BindingsFactory::BindingsContainerBuilder}
-  # which most notably has a `#bind` method which it turn calls a block bound to an instance of
-  # {Puppet::Pops::Binder::BindingsFactory::BindingsBuilder}.
-  # Depending on the use-case a direct chaining method calls or nested blocks may be used.
-  #
-  # @example simple bindings
-  #   Puppet::Bindings.newbindings('mymodule::default') do
-  #     bind.name('meaning of life').to(42)
-  #     bind.integer.named('port').to(8080)
-  #     bind.integer.named('apache::port').to(8080)
-  #   end
-  #
-  # The block form is more suitable for longer, more complex forms of bindings.
-  #
-  def self.newbindings(name, &block)
-    register_proc(name, block)
-  end
-
-  def self.register_proc(name, block)
-    adapter = NamedBindingsAdapter.adapt(Puppet.lookup(:current_environment))
-    adapter[name] = block
-  end
-
-  # Registers a named_binding under its name
-  # @param named_bindings [Puppet::Pops::Binder::Bindings::NamedBindings] The named bindings to register.
-  # @api public
-  #
-  def self.register(named_bindings)
-    adapter = NamedBindingsAdapter.adapt(Puppet.lookup(:current_environment))
-    adapter[named_bindings.name] = named_bindings
-  end
-
-  def self.resolve(scope, name)
-    entry = get(name)
-    return entry unless entry.is_a?(Proc)
-    named_bindings = Puppet::Pops::Binder::BindingsFactory.safe_named_bindings(name, scope, &entry).model
-    adapter = NamedBindingsAdapter.adapt(Puppet.lookup(:current_environment))
-    adapter[named_bindings.name] = named_bindings
-    named_bindings
-  end
-
-  # Returns the named bindings with the given name, or nil if no such bindings have been registered.
-  # @param name [String] The fully qualified name of a binding to get
-  # @return [Proc, Puppet::Pops::Binder::Bindings::NamedBindings] a Proc producing named bindings, or a named bindings directly
-  # @api public
-  #
-  def self.get(name)
-    adapter = NamedBindingsAdapter.adapt(Puppet.lookup(:current_environment))
-    adapter[name]
-  end
-
-  def self.[](name)
-    get(name)
-  end
-
-  # Supports Enumerable iteration (k,v) over the named bindings hash.
-  def self.each
-    adapter = NamedBindingsAdapter.adapt(Puppet.lookup(:current_environment))
-    adapter.each_pair {|k,v| yield k,v }
-  end
-
-  # A NamedBindingsAdapter holds a map of name to Puppet::Pops::Binder::Bindings::NamedBindings.
-  # It is intended to be used as an association between an Environment and named bindings.
-  #
-  class NamedBindingsAdapter < Puppet::Pops::Adaptable::Adapter
-    def initialize()
-      @named_bindings = {}
-    end
-
-    def [](name)
-      @named_bindings[name]
-    end
-
-    def has_name?(name)
-      @named_bindings.has_key?
-    end
-
-    def []=(name, value)
-      unless value.is_a?(Puppet::Pops::Binder::Bindings::NamedBindings) || value.is_a?(Proc)
-        raise ArgumentError, "Given value must be a NamedBindings, or a Proc producing one, got: #{value.class}."
-      end
-      @named_bindings[name] = value
-    end
-
-    def each_pair(&block)
-      @named_bindings.each_pair(&block)
-    end
-  end
-
-end

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

@@ -1,116 +0,0 @@
-require 'json'
-
-module Puppet::Pops
-module Types
-  # Ruby implementation of the Task Pcore type. It is the super type of a custom task that either has parameters
-  # or explicitly declared that it has zero parameters (by providing an empty parameters clause).
-  class Task
-    include PuppetObject
-
-    # Pattern used for task parameter names
-    PARAMETER_NAME_PATTERN = PPatternType.new([PRegexpType.new(/\A[a-z][a-z0-9_]*\z/)])
-
-    # Register the Task type with the Pcore loader and implementation registry
-    def self.register_ptype(loader, ir)
-      @type = Pcore::create_object_type(loader, ir, self, 'Task', nil, {
-        'supports_noop' => {
-          'type' => PBooleanType::DEFAULT,
-          'value' => false,
-          'kind' => 'constant'
-        },
-        'input_method' => {
-          'type' => PStringType::DEFAULT,
-          'value' => 'both',
-          'kind' => 'constant'
-        },
-        'executable' => {
-          'type' => PStringType::DEFAULT,
-          'kind' => 'constant',
-          'value' => ''
-        },
-        'task_json' => {
-          'type' => PStringType::DEFAULT,
-          'kind' => 'derived'
-        },
-      })
-    end
-
-    def self._pcore_type
-      @type
-    end
-
-    # Calculates the full path of the executable file. It is required that the type was loaded
-    # using a file based loader
-    # @return [String] The full path to the executable.
-    def executable_path
-      loader = _pcore_type.loader
-      unless loader.is_a?(Loader::ModuleLoaders::FileBased)
-        raise Puppet::Error,
-          _('Absolute path of executable %{file} for task %{task} cannot be determined. This type was not loaded by a file based loader') %
-          { :filename => executable, :task => _pcore_type.name }
-      end
-      File.join(loader.path, 'tasks', executable)
-    end
-
-    # Returns the parameters of this instance represented as a JSON string
-    # @return [String] the JSON string representation of all parameter values
-    def task_json
-      # Convert this instance into Data and strip off the __pcore_type__ key. It's not
-      # needed when executing the task
-      rich_json = Serialization::ToDataConverter.convert(self, :rich_data => true)
-      rich_json.delete('__pcore_type__')
-      rich_json.to_json
-    end
-
-    # Returns the parameters of this instance as a Hash
-    # @return [Hash] a map of attribute names to values as given when the instance of Task was created
-    #
-    def task_args()
-      _pcore_init_hash
-    end
-  end
-
-  # Ruby implementation of the GenericTask. It is a specialization of the Task Pcore type used as the super type
-  # of custom task that lacks a 'parameters' definition (or lacks metadata altogether). This task accepts any
-  # parameters and keeps them in an 'args' hash.
-  class GenericTask < Task
-    # Register the GenericTask type with the Pcore loader and implementation registry
-    def self.register_ptype(loader, ir)
-      @type = Pcore::create_object_type(loader, ir, self, 'GenericTask', 'Task', {
-        'args' => {
-          'type' => PHashType.new(PARAMETER_NAME_PATTERN, PTypeReferenceType.new('Data')),
-          'value' => EMPTY_HASH
-        }
-      })
-    end
-
-    def self._pcore_type
-      @type
-    end
-
-    attr_reader :args
-
-    def _pcore_init_hash
-      { 'args' => args }
-    end
-
-    def initialize(args = EMPTY_HASH)
-      @args = args
-    end
-
-    def task_json
-      @args.to_json
-    end
-
-    def task_args()
-      args
-    end
-
-    # Special to_s needed to cloak the 'attr' attribute and instead present
-    # the hash
-    def to_s
-      "#{_pcore_type.name}(#{TypeFormatter.string(@args)})"
-    end
-  end
-end
-end