puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/application/apply.rb

@@ -19,12 +19,7 @@ class Puppet::Application::Apply < Puppet::Application
   end
 
   option("--logdest LOGDEST", "-l") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:logset] = true
-    rescue => detail
-      $stderr.puts detail.to_s
-    end
+    handle_logdest_arg(arg)
   end
 
   option("--parseonly") do |args|
@@ -168,7 +163,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet[:code] = options[:code] || STDIN.read
     else
       manifest = command_line.args.shift
-      raise "Could not find file #{manifest}" unless ::File.exist?(manifest)
+      raise "Could not find file #{manifest}" unless Puppet::FileSystem::File.exist?(manifest)
       Puppet.warning("Only one file can be applied per run.  Skipping #{command_line.args.join(', ')}") if command_line.args.size > 0
       Puppet[:manifest] = manifest
     end
@@ -194,7 +189,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # Allow users to load the classes that puppet agent creates.
     if options[:loadclasses]
       file = Puppet[:classfile]
-      if FileTest.exists?(file)
+      if Puppet::FileSystem::File.exist?(file)
         unless FileTest.readable?(file)
           $stderr.puts "#{file} is not readable"
           exit(63)
@@ -238,7 +233,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def setup
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
-    Puppet::Util::Log.newdestination(:console) unless options[:logset]
+    Puppet::Util::Log.newdestination(:console) unless options[:setdest]
 
     Signal.trap(:INT) do
       $stderr.puts "Exiting"
@@ -248,10 +243,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
 
-    if options[:debug]
-      Puppet::Util::Log.level = :debug
-    elsif options[:verbose]
-      Puppet::Util::Log.level = :info
+    set_log_level
+
+    if Puppet[:profile]
+      Puppet::Util::Profiler.current = Puppet::Util::Profiler::WallClock.new(Puppet.method(:debug), "apply")
     end
   end
 

data/lib/puppet/application/cert.rb

@@ -1,4 +1,5 @@
 require 'puppet/application'
+require 'puppet/ssl/certificate_authority/interface'
 
 class Puppet::Application::Cert < Puppet::Application
 
@@ -36,11 +37,36 @@ class Puppet::Application::Cert < Puppet::Application
     Puppet::Util::Log.level = :debug
   end
 
-  require 'puppet/ssl/certificate_authority/interface'
-  Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject {|m| m == :destroy }.each do |method|
-    option("--#{method.to_s.gsub('_','-')}", "-#{method.to_s[0,1]}") do |arg|
-      self.subcommand = method
-    end
+  option("--list", "-l") do |arg|
+    self.subcommand = :list
+  end
+
+  option("--revoke", "-r") do |arg|
+    self.subcommand = :revoke
+  end
+
+  option("--generate", "-g") do |arg|
+    self.subcommand = :generate
+  end
+
+  option("--sign", "-s") do |arg|
+    self.subcommand = :sign
+  end
+
+  option("--print", "-p") do |arg|
+    self.subcommand = :print
+  end
+
+  option("--verify", "-v") do |arg|
+    self.subcommand = :verify
+  end
+
+  option("--fingerprint", "-f") do |arg|
+    self.subcommand = :fingerprint
+  end
+
+  option("--reinventory") do |arg|
+    self.subcommand = :reinventory
   end
 
   option("--[no-]allow-dns-alt-names") do |value|
@@ -120,6 +146,11 @@ unless the '--all' option is set.
 * verify:
   Verify the named certificate against the local CA certificate.
 
+* reinventory:
+  Build an inventory of the issued certificates. This will destroy the current
+  inventory file specified by 'cert_inventory' and recreate it from the
+  certificates found in the 'certdir'. Ensure the puppet master is stopped
+  before running this action.
 
 OPTIONS
 -------
@@ -184,8 +215,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       hosts = command_line.args.collect { |h| h.downcase }
     end
     begin
-      @ca.apply(:revoke, options.merge(:to => hosts)) if subcommand == :destroy
-      @ca.apply(subcommand, options.merge(:to => hosts, :digest => @digest))
+      apply(@ca, :revoke, options.merge(:to => hosts)) if subcommand == :destroy
+      apply(@ca, subcommand, options.merge(:to => hosts, :digest => @digest))
     rescue => detail
       Puppet.log_exception(detail)
       exit(24)
@@ -234,4 +265,13 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     end
     result
   end
+
+  # Create and run an applicator.  I wanted to build an interface where you could do
+  # something like 'ca.apply(:generate).to(:all) but I don't think it's really possible.
+  def apply(ca, method, options)
+    raise ArgumentError, "You must specify the hosts to apply to; valid values are an array or the symbol :all" unless options[:to]
+    applier = Puppet::SSL::CertificateAuthority::Interface.new(method, options)
+    applier.apply(ca)
+  end
+
 end

data/lib/puppet/application/device.rb

@@ -47,12 +47,7 @@ class Puppet::Application::Device < Puppet::Application
   end
 
   option("--logdest DEST", "-l DEST") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:setdest] = true
-    rescue => detail
-      Puppet.log_exception(detail)
-    end
+    handle_logdest_arg(arg)
   end
 
   option("--waitforcert WAITFORCERT", "-w") do |arg|

data/lib/puppet/application/face_base.rb

@@ -240,7 +240,7 @@ class Puppet::Application::FaceBase < Puppet::Application
   rescue SystemExit => detail
     status = detail.status
 
-  rescue Exception => detail
+  rescue => detail
     Puppet.log_exception(detail)
     Puppet.err "Try 'puppet help #{@face.name} #{@action.name}' for usage"
 

data/lib/puppet/application/filebucket.rb

@@ -129,7 +129,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     raise "You must specify a file to back up" unless args.length > 0
 
     args.each do |file|
-      unless FileTest.exists?(file)
+      unless Puppet::FileSystem::File.exist?(file)
         $stderr.puts "#{file}: no such file"
         next
       end

data/lib/puppet/application/inspect.rb

@@ -8,12 +8,7 @@ class Puppet::Application::Inspect < Puppet::Application
   option("--verbose","-v")
 
   option("--logdest LOGDEST", "-l") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:logset] = true
-    rescue => detail
-      $stderr.puts detail.to_s
-    end
+    handle_logdest_arg(arg)
   end
 
   def help
@@ -86,18 +81,14 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     @report = Puppet::Transaction::Report.new("inspect")
 
     Puppet::Util::Log.newdestination(@report)
-    Puppet::Util::Log.newdestination(:console) unless options[:logset]
+    Puppet::Util::Log.newdestination(:console) unless options[:setdest]
 
     Signal.trap(:INT) do
       $stderr.puts "Exiting"
       exit(1)
     end
 
-    if options[:debug]
-      Puppet::Util::Log.level = :debug
-    elsif options[:verbose]
-      Puppet::Util::Log.level = :info
-    end
+    set_log_level
 
     Puppet::Transaction::Report.indirection.terminus_class = :rest
     Puppet::Resource::Catalog.indirection.terminus_class = :yaml

data/lib/puppet/application/master.rb

@@ -17,12 +17,7 @@ class Puppet::Application::Master < Puppet::Application
   end
 
   option("--logdest DEST",  "-l DEST") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:setdest] = true
-    rescue => detail
-      Puppet.log_exception(detail)
-    end
+    handle_logdest_arg(arg)
   end
 
   option("--parseonly") do |args|

data/lib/puppet/application/queue.rb

@@ -112,12 +112,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   option("--logdest DEST", "-l DEST") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:setdest] = true
-    rescue => detail
-      Puppet.log_exception(detail)
-    end
+    handle_logdest_arg(arg)
   end
 
   def main

data/lib/puppet/application/resource.rb

@@ -14,6 +14,7 @@ class Puppet::Application::Resource < Puppet::Application
   option("--edit","-e")
 
   option("--host HOST","-H") do |arg|
+    Puppet.warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
     @host = arg
   end
 
@@ -151,12 +152,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   def setup
     Puppet::Util::Log.newdestination(:console)
-
-    if options[:debug]
-      Puppet::Util::Log.level = :debug
-    elsif options[:verbose]
-      Puppet::Util::Log.level = :info
-    end
+    set_log_level
   end
 
   private

data/lib/puppet/coercion.rb

@@ -26,4 +26,15 @@ module Puppet::Coercion
       fail('expected a boolean value')
     end
   end
+
+  # Return the list of acceptable boolean values.
+  #
+  # This is limited to lower-case, even though boolean() is case-insensitive.
+  #
+  # @return [Array]
+  # @raise
+  # @api private
+  def self.boolean_values
+    ['true', 'false', 'yes', 'no']
+  end
 end

data/lib/puppet/configurer.rb

@@ -44,7 +44,7 @@ class Puppet::Configurer
   rescue => detail
     Puppet.log_exception(detail, "Removing corrupt state file #{Puppet[:statefile]}: #{detail}")
     begin
-      ::File.unlink(Puppet[:statefile])
+      Puppet::FileSystem::File.unlink(Puppet[:statefile])
       retry
     rescue => detail
       raise Puppet::Error.new("Cannot remove #{Puppet[:statefile]}: #{detail}")
@@ -157,7 +157,9 @@ class Puppet::Configurer
             query_options = nil
           end
         end
-      rescue Puppet::Error, Net::HTTPError => detail
+      rescue SystemExit,NoMemoryError
+        raise
+      rescue Exception => detail
         Puppet.warning("Unable to fetch my node definition, but the agent run will continue:")
         Puppet.warning(detail)
       end
@@ -199,7 +201,7 @@ class Puppet::Configurer
     # Between Puppet runs we need to forget the cached values.  This lets us
     # pick up on new functions installed by gems or new modules being added
     # without the daemon being restarted.
-    Thread.current[:env_module_directories] = nil
+    $env_module_directories = nil
 
     Puppet::Util::Log.close(report)
     send_report(report)

data/lib/puppet/configurer/downloader.rb

@@ -58,7 +58,9 @@ class Puppet::Configurer::Downloader
       :backup => false,
       :noop => false
     }.merge(
-      Puppet.features.microsoft_windows? ? {} :
+      Puppet.features.microsoft_windows? ? {
+        :source_permissions => :ignore
+      } :
       {
         :owner => Process.uid,
         :group => Process.gid

data/lib/puppet/configurer/plugin_handler.rb

@@ -11,6 +11,16 @@ module Puppet::Configurer::PluginHandler
       Puppet[:pluginsignore],
       @environment
     )
+    if Puppet.features.external_facts?
+       plugin_fact_downloader = Puppet::Configurer::Downloader.new(
+          "pluginfacts",
+          Puppet[:pluginfactdest],
+          Puppet[:pluginfactsource],
+          Puppet[:pluginsignore],
+          @environment
+       )
+       plugin_fact_downloader.evaluate
+    end
 
     plugin_downloader.evaluate
     Puppet::Util::Autoload.reload_changed

data/lib/puppet/confine.rb

@@ -0,0 +1,80 @@
+# The class that handles testing whether our providers
+# actually work or not.
+require 'puppet/util'
+
+class Puppet::Confine
+  include Puppet::Util
+
+  @tests = {}
+
+  class << self
+    attr_accessor :name
+  end
+
+  def self.inherited(klass)
+    name = klass.to_s.split("::").pop.downcase.to_sym
+    raise "Test #{name} is already defined" if @tests.include?(name)
+
+    klass.name = name
+
+    @tests[name] = klass
+  end
+
+  def self.test(name)
+    unless @tests[name]
+      begin
+        require "puppet/confine/#{name}"
+      rescue LoadError => detail
+        unless detail.to_s =~ /No such file|cannot load such file/i
+          warn "Could not load confine test '#{name}': #{detail}"
+        end
+        # Could not find file
+      end
+    end
+    @tests[name]
+  end
+
+  attr_reader :values
+
+  # Mark that this confine is used for testing binary existence.
+  attr_accessor :for_binary
+  def for_binary?
+    for_binary
+  end
+
+  # Used for logging.
+  attr_accessor :label
+
+  def initialize(values)
+    values = [values] unless values.is_a?(Array)
+    @values = values
+  end
+
+  # Provide a hook for the message when there's a failure.
+  def message(value)
+    ""
+  end
+
+  # Collect the results of all of them.
+  def result
+    values.collect { |value| pass?(value) }
+  end
+
+  # Test whether our confine matches.
+  def valid?
+    values.each do |value|
+      unless pass?(value)
+        Puppet.debug(label + ": " + message(value))
+        return false
+      end
+    end
+
+    return true
+  ensure
+    reset
+  end
+
+  # Provide a hook for subclasses.
+  def reset
+  end
+end

data/lib/puppet/{provider/confine → confine}/exists.rb

@@ -1,12 +1,12 @@
-require 'puppet/provider/confine'
+require 'puppet/confine'
 
-class Puppet::Provider::Confine::Exists < Puppet::Provider::Confine
+class Puppet::Confine::Exists < Puppet::Confine
   def self.summarize(confines)
     confines.inject([]) { |total, confine| total + confine.summary }
   end
 
   def pass?(value)
-    value && (for_binary? ? which(value) : FileTest.exist?(value))
+    value && (for_binary? ? which(value) : Puppet::FileSystem::File.exist?(value))
   end
 
   def message(value)

data/lib/puppet/{provider/confine → confine}/false.rb

@@ -1,6 +1,6 @@
-require 'puppet/provider/confine'
+require 'puppet/confine'
 
-class Puppet::Provider::Confine::False < Puppet::Provider::Confine
+class Puppet::Confine::False < Puppet::Confine
   def self.summarize(confines)
     confines.inject(0) { |count, confine| count + confine.summary }
   end

data/lib/puppet/{provider/confine → confine}/feature.rb

@@ -1,6 +1,6 @@
-require 'puppet/provider/confine'
+require 'puppet/confine'
 
-class Puppet::Provider::Confine::Feature < Puppet::Provider::Confine
+class Puppet::Confine::Feature < Puppet::Confine
   def self.summarize(confines)
     confines.collect { |c| c.values }.flatten.uniq.find_all { |value| ! confines[0].pass?(value) }
   end