puppet 5.5.14-universal-darwin → 5.5.16-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e689361a810ec55b61402a19eaf0a3262cc4ff5608c305308780437610ff3a1
-  data.tar.gz: 7c2026cc95a307dff1e4e7109482cb877e9e2268db90d74416616c2a3c6f0dd5
+  metadata.gz: 53cbc148eb43edb744a2750a884b748514038b84c5245622a84dba14c1b12c33
+  data.tar.gz: 652ad891715edda33fc101b0d0bd8d2605a3bc601b8672e10a9ef4216dd03092
 SHA512:
-  metadata.gz: 35c95f3540301d97ccdf4363320bd38cf586eb43b12fac82cc6610fe270547c7a868db893d43b90372ef04786c06c03919f03222f9be3f1b3b5788feababd7fe
-  data.tar.gz: aced659c6f764b21d768e3632ecf52c9077b28f592d9455d73e9208647b10e860d2c07e686009a2efd67db4b3586fe24446dc3adf2c3d3d0295104fd77c98f4f
+  metadata.gz: c5af9bdc9bf37665cfc51ada652552f77454f44fda12050b04b04514033a66e37fa4333fa669abddc4f5e88e42b8b4981aa9e92cb78bbef784f8b9a5f5f716f6
+  data.tar.gz: c9df2ba4c230c292d21bdc02d65489347b294aded44485220e577f81985e59fd6bea5d6fdc3cdea426cb33beeaa321e8f67a38ac5fc13e2c0a6ab3cfbb901c73

data/Gemfile

@@ -70,6 +70,8 @@ group(:development, :test) do
   # webmock requires addressable as as of 2.5.0 addressable started
   # requiring the public_suffix gem which requires Ruby 2
   gem 'addressable', '< 2.5.0'
+  # webmock requires hashdiff which requires ruby 2 as of 0.3.9
+  gem 'hashdiff', '0.3.8'
   gem 'webmock', '~> 1.24'
   gem 'vcr', '~> 2.9'
   gem "hiera-eyaml", :require => false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (5.5.14)
+    puppet (5.5.16)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -32,7 +32,7 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
       locale
-    hashdiff (0.3.9)
+    hashdiff (0.3.8)
     hiera (3.5.0)
     hiera-eyaml (3.0.0)
       highline (~> 1.6.19)
@@ -43,21 +43,21 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.2)
-    memory_profiler (0.9.13)
+    memory_profiler (0.9.14)
     metaclass (0.0.4)
     method_source (0.9.2)
-    mocha (1.8.0)
+    mocha (1.9.0)
       metaclass (~> 0.0.1)
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     mustache (1.1.0)
     net-ssh (4.2.0)
     optimist (3.0.0)
-    packaging (0.99.30)
+    packaging (0.99.36)
       artifactory (~> 2)
       rake (~> 12.3)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pathspec (0.2.1)
     powerpack (0.1.2)
@@ -65,7 +65,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     puppet-lint (2.3.6)
-    puppet-syntax (2.4.3)
+    puppet-syntax (2.5.0)
       rake
     puppetlabs_spec_helper (2.14.1)
       mocha (~> 1.0)
@@ -90,9 +90,9 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-collection_matchers (1.1.3)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-its (1.3.0)
@@ -100,12 +100,12 @@ GEM
       rspec-expectations (>= 3.0.0)
     rspec-legacy_formatters (1.0.1)
       rspec (~> 3.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-puppet (2.7.3)
+    rspec-puppet (2.7.5)
       rspec
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -115,17 +115,17 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (0.17.0)
-    ruby-progressbar (1.10.0)
+    ruby-prof (0.18.0)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     text (1.3.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     vcr (2.9.3)
     webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.19)
+    yard (0.9.20)
     yarjuf (2.0.0)
       builder
       rspec (~> 3)
@@ -136,6 +136,7 @@ PLATFORMS
 DEPENDENCIES
   addressable (< 2.5.0)
   gettext-setup (~> 0.28)
+  hashdiff (= 0.3.8)
   hiera-eyaml
   json-schema (~> 2.0)
   memory_profiler

data/ext/solaris/smf/puppet.xml

@@ -28,6 +28,8 @@
 
     <exec_method type="method" name="stop" exec="/lib/svc/method/puppet stop" timeout_seconds="60"/>
 
+    <exec_method type="method" name="refresh" exec=":kill" timeout_seconds="60"/>
+
   <stability value="Evolving"/>
 
     <template>

data/lib/hiera/scope.rb

@@ -1,5 +1,8 @@
+require 'forwardable'
 class Hiera
   class Scope
+    extend Forwardable
+
     CALLING_CLASS = 'calling_class'.freeze
     CALLING_CLASS_PATH = 'calling_class_path'.freeze
     CALLING_MODULE = 'calling_module'.freeze
@@ -79,5 +82,9 @@ class Hiera
       end
     end
     private :find_hostclass
+
+    # This is needed for type conversion to work
+    def_delegators :@real, :call_function
+
   end
 end

data/lib/puppet.rb

@@ -1,7 +1,7 @@
 require 'puppet/version'
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("1.9.3")
-  raise LoadError, _("Puppet %{version} requires ruby 1.9.3 or greater.") % { version: Puppet.version }
+  raise LoadError, "Puppet #{Puppet.version} requires Ruby 1.9.3 or greater, found Ruby #{RUBY_VERSION.dup}."
 end
 
 Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.3.0'

data/lib/puppet/application/device.rb

@@ -266,10 +266,29 @@ Licensed under the Apache 2.0 License
           Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
           Puppet[:certname] = device.name
 
-          unless options[:resource] || options[:facts] || options[:apply] || options[:libdir]
-            Puppet::Configurer::PluginHandler.new.download_plugins(env)
+          unless options[:resource] || options[:facts] || options[:apply]
+            # this will reload and recompute default settings and create the devices sub vardir
+            Puppet.settings.use :main, :agent, :ssl
+
+            # Since it's too complicated to fix properly in the default settings, we workaround for PUP-9642 here.
+            # See https://github.com/puppetlabs/puppet/pull/7483#issuecomment-483455997 for details.
+            # This has to happen after `settings.use` above, so the directory is created and before `setup_host` below, where the SSL
+            # routines would fail with access errors
+            if Puppet.features.root? && !Puppet::Util::Platform.windows?
+              user = Puppet::Type.type(:user).new(name: Puppet[:user]).exists? ? Puppet[:user] : nil
+              group = Puppet::Type.type(:group).new(name: Puppet[:group]).exists? ? Puppet[:group] : nil
+              Puppet.debug("Fixing perms for #{user}:#{group} on #{Puppet[:confdir]}")
+              FileUtils.chown(user, group, Puppet[:confdir]) if user || group
+            end
+
+            # ask for a ssl cert if needed, and setup the ssl system for this device.
+            setup_host
+
+            # only pluginsync if we do not have a libdir specified on the command line
+            Puppet::Configurer::PluginHandler.new.download_plugins(env) unless options[:libdir]
           end
-          # this init the device singleton, so that the facts terminus
+
+          # this inits the device singleton, so that the facts terminus
           # and the various network_device provider can use it
           Puppet::Util::NetworkDevice.init(device)
 
@@ -316,13 +335,6 @@ Licensed under the Apache 2.0 License
             end
           else
             Puppet.info _("starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
-            # this will reload and recompute default settings and create the devices sub vardir
-            Puppet.settings.use :main, :agent, :ssl
-            # ask for a ssl cert if needed, but at least
-            # setup the ssl system for this device.
-            setup_host
-
-            require 'puppet/configurer'
             configurer = Puppet::Configurer.new
             configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_pluginsync? && !options[:libdir])
           end

data/lib/puppet/configurer.rb

@@ -212,24 +212,23 @@ class Puppet::Configurer
 
         # Skip failover logic if the server_list setting is empty
         if Puppet.settings[:server_list].nil? || Puppet.settings[:server_list].empty?
-          do_failover = false;
+          do_failover = false
         else
           do_failover = true
         end
         # When we are passed a catalog, that means we're in apply
         # mode. We shouldn't try to do any failover in that case.
         if options[:catalog].nil? && do_failover
-          found = find_functional_server()
-          server = found[:server]
+          server, port = find_functional_server
           if server.nil?
-            raise Puppet::Error, _("Could not select a functional puppet master from server_list: '%{server_list}'") % { server_list: Puppet[:server_list] }
+            raise Puppet::Error, _("Could not select a functional puppet master from server_list: '%{server_list}'") % { server_list: Puppet.settings.value(:server_list, Puppet[:environment].to_sym, true) }
           else
             #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-            Puppet.debug _("Selected server from the `server_list` setting: %{server}:%{port}") % {server: server[0], port: server[1]}
-            report.master_used = "#{server[0]}:#{server[1]}"
+            Puppet.debug _("Selected puppet server from the `server_list` setting: %{server}:%{port}") % { server: server, port: port }
+            report.master_used = "#{server}:#{port}"
           end
-          Puppet.override(:server => server[0], :serverport => server[1]) do
-            completed = run_internal(options.merge(:node => found[:node]))
+          Puppet.override(server: server, serverport: port) do
+            completed = run_internal(options)
           end
         else
           completed = run_internal(options)
@@ -283,7 +282,7 @@ class Puppet::Configurer
         begin
           node = nil
           node_retr_time = thinmark do
-            node = options[:node] || Puppet::Node.indirection.find(Puppet[:node_name_value],
+            node = Puppet::Node.indirection.find(Puppet[:node_name_value],
               :environment => Puppet::Node::Environment.remote(@environment),
               :configured_environment => configured_environment,
               :ignore_cache => true,
@@ -382,37 +381,23 @@ class Puppet::Configurer
   end
   private :run_internal
 
-  def find_functional_server()
-    configured_environment = Puppet[:environment] if Puppet.settings.set_by_config?(:environment)
-
-    node = nil
-    selected_server = Puppet.settings[:server_list].find do |server|
-      # Puppet.override doesn't return the result of its block, so we
-      # need to handle this manually
-      found = false
-      server[1] ||= Puppet[:masterport]
-      Puppet.override(:server => server[0], :serverport => server[1]) do
-        begin
-          node = Puppet::Node.indirection.find(Puppet[:node_name_value],
-              :environment => Puppet::Node::Environment.remote(@environment),
-              :configured_environment => configured_environment,
-              :ignore_cache => true,
-              :transaction_uuid => @transaction_uuid,
-              :fail_on_404 => false)
-          found = true
-        rescue  => detail
-          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail}
-        end
+  def find_functional_server
+    Puppet.settings[:server_list].each do |server|
+      host = server[0]
+      port = server[1] || Puppet[:masterport]
+      begin
+        http = Puppet::Network::HttpPool.http_ssl_instance(host, port)
+        response = http.get('/status/v1/simple/master')
+        return [host, port] if response.is_a?(Net::HTTPOK) || response.is_a?(Net::HTTPForbidden)
+
+        Puppet.debug(_("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %
+                     { host: host, port: port, code: response.code, reason: response.message })
+      rescue => detail
+        #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+        Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail}
       end
-      found
-    end
-    unless selected_server.nil?
-      #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-      Puppet.debug _("Selected functional server from the `server_list` setting: %{server}") % {server: selected_server}
     end
-    { :node => node,
-      :server => selected_server }
+    [nil, nil]
   end
   private :find_functional_server
 

data/lib/puppet/network/http/connection.rb

@@ -333,6 +333,8 @@ module Puppet::Network::HTTP
       end
       response
     rescue OpenSSL::SSL::SSLError => error
+      raise @verify.last_error if @verify.last_error
+
       # can be nil
       peer_cert = @verify.peer_certs.last
 

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

@@ -843,14 +843,16 @@ INTEGER_HEX = '(?:0[xX][0-9A-Fa-f]+)'
 INTEGER_OCT = '(?:0[0-7]+)'
 INTEGER_BIN = '(?:0[bB][01]+)'
 INTEGER_DEC = '(?:0|[1-9]\d*)'
+INTEGER_DEC_OR_OCT = '(?:\d+)'
 SIGN_PREFIX = '[+-]?\s*'
 
 OPTIONAL_FRACTION = '(?:\.\d+)?'
 OPTIONAL_EXPONENT = '(?:[eE]-?\d+)?'
 FLOAT_DEC = '(?:' + INTEGER_DEC + OPTIONAL_FRACTION + OPTIONAL_EXPONENT + ')'
 
-INTEGER_PATTERN = '\A' + SIGN_PREFIX + '(?:' + INTEGER_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
-FLOAT_PATTERN = '\A' + SIGN_PREFIX + '(?:' + FLOAT_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
+INTEGER_PATTERN          = '\A' + SIGN_PREFIX + '(?:' + INTEGER_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
+INTEGER_PATTERN_LENIENT = '\A' + SIGN_PREFIX + '(?:' + INTEGER_DEC_OR_OCT + '|' + INTEGER_HEX + '|' + INTEGER_BIN + ')\z'
+FLOAT_PATTERN            = '\A' + SIGN_PREFIX + '(?:' + FLOAT_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
 
 # @api public
 #
@@ -1089,7 +1091,7 @@ class PIntegerType < PNumericType
     @@new_function ||= Puppet::Functions.create_loaded_function(:new, loader) do
       local_types do
         type 'Radix       = Variant[Default, Integer[2,2], Integer[8,8], Integer[10,10], Integer[16,16]]'
-        type "Convertible = Variant[Numeric, Boolean, Pattern[/#{INTEGER_PATTERN}/], Timespan, Timestamp]"
+        type "Convertible = Variant[Numeric, Boolean, Pattern[/#{INTEGER_PATTERN_LENIENT}/], Timespan, Timestamp]"
         type 'NamedArgs   = Struct[{from => Convertible, Optional[radix] => Radix, Optional[abs] => Boolean}]'
       end
 

data/lib/puppet/provider.rb

@@ -384,7 +384,7 @@ class Puppet::Provider
   # @raise [Puppet::DevError] Error indicating that the method should have been implemented by subclass.
   # @see prefetch
   def self.instances
-    raise Puppet::DevError, _("Provider %{provider} has not defined the 'instances' class method") % { provider: self.name }
+    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: self.name }
   end
 
   # Creates getter- and setter- methods for each property supported by the resource type.
@@ -610,4 +610,3 @@ class Puppet::Provider
   # @return [void]
   # @api public
 end
-

data/lib/puppet/provider/cron/crontab.rb

@@ -258,7 +258,7 @@ Puppet::Type.type(:cron).provide(:crontab, :parent => Puppet::Provider::ParsedFi
   end
 
   CRONTAB_DIR = case Facter.value("osfamily")
-  when "Debian", "HP-UX"
+  when "Debian", "HP-UX", "Solaris"
     "/var/spool/cron/crontabs"
   when /BSD/
     "/var/cron/tabs"

data/lib/puppet/provider/package.rb

@@ -1,3 +1,5 @@
+require 'puppet/provider'
+
 class Puppet::Provider::Package < Puppet::Provider
   # Prefetch our package list, yo.
   def self.prefetch(packages)

data/lib/puppet/provider/package/dpkg.rb

@@ -81,7 +81,6 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     unless file = @resource[:source]
       raise ArgumentError, _("You cannot install dpkg packages without a source")
     end
-
     args = []
 
     # We always unhold when installing to remove any prior hold.
@@ -146,7 +145,9 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   end
 
   def hold
-    self.install
+    if package_not_installed?(@resource[:name])
+      self.install
+    end
     Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
       tmpfile.write("#{@resource[:name]} hold\n")
       tmpfile.flush
@@ -162,4 +163,16 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
   end
 
+  def package_not_installed?(name)
+    if !name.nil? && !name.empty?
+      begin
+       dpkgquery("-W", "--showformat", self.class::DPKG_QUERY_FORMAT_STRING, name)
+      rescue Puppet::ExecutionFailure
+        # return true if exception is generated because package is not found
+        return true
+      end
+      return false
+    end
+    raise ArgumentError.new("Package name is nil or empty")
+  end
 end

data/lib/puppet/provider/package/gem.rb

@@ -1,8 +1,8 @@
-require 'puppet/provider/package'
+require 'puppet/provider/package_targetable'
 require 'uri'
 
 # Ruby gems support.
-Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package do
+Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::Targetable do
   desc "Ruby Gem support. If a URL is passed via `source`, then that URL is
     appended to the list of remote gem repositories; to ensure that only the
     specified source is used, also pass `--clear-sources` via `install_options`.
@@ -15,9 +15,31 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
     or an array where each element is either a string or a hash."
 
-  has_feature :versionable, :install_options, :uninstall_options
+  has_feature :versionable, :install_options, :uninstall_options, :targetable
 
-  commands :gemcmd => "gem"
+  # Override the specificity method to return 1 if gem is not set as default provider
+  def self.specificity
+    match = default_match
+    length = match ? match.length : 0
+
+    return 1 if length == 0
+
+    super
+  end
+
+  # Define the default provider package command name when the provider is targetable.
+  # Required by Puppet::Provider::Package::Targetable::resource_or_provider_command
+
+  def self.provider_command
+    command(:gemcmd)
+  end
+
+  # Define the default provider package command as optional when the provider is targetable.
+  # Doing do defers the evaluation of provider suitability until all commands are evaluated.
+
+  has_command(:gemcmd, 'gem') do
+    is_optional
+  end
 
   # CommandDefiner in provider.rb creates convenience execution methods that set failonfail, combine, and optionally, environment.
   # And when a child provider defines its own command via commands() or has_command(), the provider-specific path is always returned by command().
@@ -26,12 +48,29 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   #
   # In this case, causing the puppet_gem provider to inherit the parent gem provider's convenience gemcmd() methods, with the wrong path.
 
-  def self.execute_gem_command(command_options)
-    cmd = [command(:gemcmd)] << command_options
+  def self.execute_gem_command(command, command_options)
+    validate_command(command)
+    cmd = [command] << command_options
 
     execute(cmd, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
   end
 
+  def self.instances(target_command = nil)
+    if target_command
+      command = target_command
+    else
+      command = provider_command
+      # The default provider package command is optional.
+      return [] unless command
+    end
+
+    gemlist(:command => command, :local => true).collect do |pkg|
+      # Track the command when the provider is targetable.
+      pkg[:command] = command
+      new(pkg)
+    end
+  end
+
   def self.gemlist(options)
     command_options = ["list"]
 
@@ -48,7 +87,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
 
     begin
-      list = execute_gem_command(command_options).lines.
+      list = execute_gem_command(options[:command], command_options).lines.
         map {|set| gemsplit(set) }.
         reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
@@ -83,12 +122,6 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
   end
 
-  def self.instances(justme = false)
-    gemlist(:local => true).collect do |hash|
-      new(hash)
-    end
-  end
-
   def insync?(is)
     return false unless is && is != :absent
 
@@ -105,13 +138,13 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     is.any? { |version| dependency.match?('', version) }
   end
 
-  def rubygem_version
+  def rubygem_version(command)
     command_options = ["--version"]
-
-    self.class.execute_gem_command(command_options)
+    self.class.execute_gem_command(command, command_options)
   end
 
   def install(useversion = true)
+    command = resource_or_provider_command
     command_options = ["install"]
     command_options += install_options if resource[:install_options]
 
@@ -122,7 +155,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       command_options << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
     end
 
-    if Puppet::Util::Package.versioncmp(rubygem_version, '2.0.0') == -1
+    if Puppet::Util::Package.versioncmp(rubygem_version(command), '2.0.0') == -1
       command_options << "--no-rdoc" << "--no-ri"
     else
       command_options << "--no-document"
@@ -157,31 +190,34 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       command_options << resource[:name]
     end
 
-    output = self.class.execute_gem_command(command_options)
-    # Apparently some gem versions don't exit non-0 on failure
+    output = self.class.execute_gem_command(command, command_options)
+    # Apparently some gem versions don't exit non-0 on failure.
     self.fail _("Could not install: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
 
   def latest
-    # This always gets the latest version available.
-    options = {:justme => resource[:name]}
-    options.merge!({:source => resource[:source]}) unless resource[:source].nil?
-    hash = self.class.gemlist(options)
-
-    hash[:ensure][0]
+    command = resource_or_provider_command
+    options = { :command => command, :justme => resource[:name] }
+    options[:source] = resource[:source] unless resource[:source].nil?
+    pkg = self.class.gemlist(options)
+    pkg[:ensure][0]
   end
 
   def query
-    self.class.gemlist(:justme => resource[:name], :local => true)
+    command = resource_or_provider_command
+    options = { :command => command, :justme => resource[:name], :local => true }
+    pkg = self.class.gemlist(options)
+    pkg[:command] = command unless pkg.nil?
+    pkg
   end
 
   def uninstall
+    command = resource_or_provider_command
     command_options = ["uninstall"]
     command_options << "--executables" << "--all" << resource[:name]
     command_options += uninstall_options if resource[:uninstall_options]
-
-    output = self.class.execute_gem_command(command_options)
-    # Apparently some gem versions don't exit non-0 on failure
+    output = self.class.execute_gem_command(command, command_options)
+    # Apparently some gem versions don't exit non-0 on failure.
     self.fail _("Could not uninstall: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end