puppet 7.6.1-universal-darwin → 7.10.0-universal-darwin

data/lib/puppet/agent.rb

@@ -1,19 +1,19 @@
-require 'puppet/application'
-require 'puppet/error'
-require 'puppet/util/at_fork'
+require_relative '../puppet/application'
+require_relative '../puppet/error'
+require_relative '../puppet/util/at_fork'
 
 require 'timeout'
 
 # A general class for triggering a run of another
 # class.
 class Puppet::Agent
-  require 'puppet/agent/locker'
+  require_relative 'agent/locker'
   include Puppet::Agent::Locker
 
-  require 'puppet/agent/disabler'
+  require_relative 'agent/disabler'
   include Puppet::Agent::Disabler
 
-  require 'puppet/util/splayer'
+  require_relative '../puppet/util/splayer'
   include Puppet::Util::Splayer
 
   # Special exception class used to signal an agent run has timed out.

data/lib/puppet/agent/disabler.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/json_lockfile'
+require_relative '../../puppet/util/json_lockfile'
 
 # This module is responsible for encapsulating the logic for
 #  "disabling" the puppet agent during a run; in other words,

data/lib/puppet/agent/locker.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/pidlock'
-require 'puppet/error'
+require_relative '../../puppet/util/pidlock'
+require_relative '../../puppet/error'
 
 # This module is responsible for encapsulating the logic for "locking" the
 # puppet agent during a catalog run; in other words, keeping track of enough

data/lib/puppet/application.rb

@@ -1,8 +1,8 @@
 require 'optparse'
-require 'puppet/util/command_line'
-require 'puppet/util/constant_inflector'
-require 'puppet/error'
-require 'puppet/application_support'
+require_relative '../puppet/util/command_line'
+require_relative '../puppet/util/constant_inflector'
+require_relative '../puppet/error'
+require_relative '../puppet/application_support'
 
 module Puppet
 
@@ -105,7 +105,7 @@ module Puppet
 # @abstract
 # @api public
 class Application
-  require 'puppet/util'
+  require_relative '../puppet/util'
   include Puppet::Util
 
   DOCPATTERN = ::File.expand_path(::File.dirname(__FILE__) + "/util/command_line/*" )
@@ -284,7 +284,7 @@ class Application
 
       return @run_mode if @run_mode and not mode_name
 
-      require 'puppet/util/run_mode'
+      require_relative '../puppet/util/run_mode'
       @run_mode = Puppet::Util::RunMode[ mode_name || Puppet.settings.preferred_run_mode ]
     end
 

data/lib/puppet/application/agent.rb

@@ -1,9 +1,9 @@
-require 'puppet/application'
-require 'puppet/daemon'
-require 'puppet/util/pidlock'
-require 'puppet/agent'
-require 'puppet/configurer'
-require 'puppet/ssl/oids'
+require_relative '../../puppet/application'
+require_relative '../../puppet/daemon'
+require_relative '../../puppet/util/pidlock'
+require_relative '../../puppet/agent'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/ssl/oids'
 
 class Puppet::Application::Agent < Puppet::Application
 
@@ -133,9 +133,12 @@ Some flags are meant specifically for interactive use --- in particular,
 'test', 'tags' and 'fingerprint' are useful.
 
 '--test' runs once in the foreground with verbose logging, then exits.
-It also exits if it can't get a valid catalog. `--test` includes the '--detailed-exitcodes' option by default and exits with one of the following exit codes:
+It also exits if it can't get a valid catalog. `--test` includes the 
+'--detailed-exitcodes' option by default and exits with one of the following 
+exit codes:
 
-* 0: The run succeeded with no changes or failures; the system was already in the desired state.
+* 0: The run succeeded with no changes or failures; the system was already in 
+     the desired state.
 * 1: The run failed, or wasn't attempted due to another run already in progress.
 * 2: The run succeeded, and some resources were changed.
 * 4: The run succeeded, and some resources failed.
@@ -246,7 +249,9 @@ generated by running puppet agent with '--genconfig'.
   'puppet agent' exits after executing this.
   
 *  --evaltrace:
-  Logs each resource as it is being evaluated. This allows you to interactively see exactly what is being done. (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
+  Logs each resource as it is being evaluated. This allows you to interactively
+  see exactly what is being done. (This is a Puppet setting, and can go in
+  puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
 
 * --fingerprint:
   Display the current certificate or certificate signing request
@@ -267,7 +272,8 @@ generated by running puppet agent with '--genconfig'.
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. If debugging or verbosity is enabled, this defaults to 'console'.
   Otherwise, it defaults to 'syslog' on POSIX systems and 'eventlog' on Windows.
-  Multiple destinations can be set using a comma separated list (eg: `/path/file1,console,/path/file2`)"
+  Multiple destinations can be set using a comma separated list 
+  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the
@@ -310,7 +316,8 @@ generated by running puppet agent with '--genconfig'.
   'no-splay', and 'show_diff'.
   
 * --trace
-  Prints stack traces on some errors. (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
+  Prints stack traces on some errors. (This is a Puppet setting, and can go in
+  puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
 
 * --verbose:
   Turn on verbose reporting.

data/lib/puppet/application/apply.rb

@@ -1,9 +1,9 @@
-require 'puppet/application'
-require 'puppet/configurer'
-require 'puppet/util/profiler/aggregate'
+require_relative '../../puppet/application'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/util/profiler/aggregate'
 
 class Puppet::Application::Apply < Puppet::Application
-  require 'puppet/util/splayer'
+  require_relative '../../puppet/util/splayer'
   include Puppet::Util::Splayer
 
   option("--debug","-d")
@@ -113,7 +113,8 @@ configuration options by running puppet with
   Where to send log messages. Choose between 'syslog' (the POSIX syslog
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. Defaults to 'console'.
-  Multiple destinations can be set using a comma separated list (eg: `/path/file1,console,/path/file2`)"
+  Multiple destinations can be set using a comma separated list
+  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the

data/lib/puppet/application/catalog.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/indirection_base'
+require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Catalog < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/config.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::Config < Puppet::Application::FaceBase
   environment_mode :not_required

data/lib/puppet/application/describe.rb

@@ -1,4 +1,4 @@
-require 'puppet/application'
+require_relative '../../puppet/application'
 
 class Formatter
 

data/lib/puppet/application/device.rb

@@ -1,7 +1,7 @@
-require 'puppet/application'
-require 'puppet/configurer'
-require 'puppet/util/network_device'
-require 'puppet/ssl/oids'
+require_relative '../../puppet/application'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/util/network_device'
+require_relative '../../puppet/ssl/oids'
 
 class Puppet::Application::Device < Puppet::Application
 
@@ -155,7 +155,8 @@ you can specify '--server <servername>' as an argument.
   Where to send log messages. Choose between 'syslog' (the POSIX syslog
   service), 'console', or the path to a log file. If debugging or verbosity is
   enabled, this defaults to 'console'. Otherwise, it defaults to 'syslog'.
-  Multiple destinations can be set using a comma separated list (eg: `/path/file1,console,/path/file2`)"
+  Multiple destinations can be set using a comma separated list
+  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the
@@ -246,7 +247,7 @@ Licensed under the Apache 2.0 License
     env = Puppet::Node::Environment.remote(Puppet[:environment])
     returns = Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
       # find device list
-      require 'puppet/util/network_device/config'
+      require_relative '../../puppet/util/network_device/config'
       devices = Puppet::Util::NetworkDevice::Config.devices.dup
       if options[:target]
         devices.select! { |key, value| key == options[:target] }
@@ -339,7 +340,7 @@ Licensed under the Apache 2.0 License
             Puppet::Transaction::Report.indirection.terminus_class = :yaml
             Puppet::Resource::Catalog.indirection.cache_class = nil
 
-            require 'puppet/application/apply'
+            require_relative '../../puppet/application/apply'
             begin
               Puppet[:node_terminus] = :plain
               Puppet[:catalog_terminus] = :compiler

data/lib/puppet/application/doc.rb

@@ -1,4 +1,4 @@
-require 'puppet/application'
+require_relative '../../puppet/application'
 
 class Puppet::Application::Doc < Puppet::Application
   run_mode :server
@@ -21,7 +21,7 @@ class Puppet::Application::Doc < Puppet::Application
 
   option("--format FORMAT", "-f") do |arg|
     method = "to_#{arg}"
-    require 'puppet/util/reference'
+    require_relative '../../puppet/util/reference'
     if Puppet::Util::Reference.method_defined?(method)
       options[:format] = method
     else
@@ -30,7 +30,7 @@ class Puppet::Application::Doc < Puppet::Application
   end
 
   option("--mode MODE", "-m") do |arg|
-    require 'puppet/util/reference'
+    require_relative '../../puppet/util/reference'
     if Puppet::Util::Reference.modes.include?(arg) or arg.intern==:rdoc
       options[:mode] = arg.intern
     else
@@ -39,7 +39,7 @@ class Puppet::Application::Doc < Puppet::Application
   end
 
   option("--list", "-l") do |arg|
-    require 'puppet/util/reference'
+    require_relative '../../puppet/util/reference'
     refs = Puppet::Util::Reference.references(Puppet.lookup(:current_environment))
     puts refs.collect { |r| Puppet::Util::Reference.reference(r).doc }.join("\n")
     exit(0)
@@ -136,7 +136,7 @@ HELP
 
     Puppet.settings[:document_all] = options[:all] || false
     begin
-      require 'puppet/util/rdoc'
+      require_relative '../../puppet/util/rdoc'
       if @manifest
         Puppet::Util::RDoc.manifestdoc(files)
       else
@@ -154,7 +154,7 @@ HELP
     text = ""
     with_contents = options[:references].length <= 1
     exit_code = 0
-    require 'puppet/util/reference'
+    require_relative '../../puppet/util/reference'
     options[:references].sort_by(&:to_s).each do |name|
       section = Puppet::Util::Reference.reference(name)
       raise _("Could not find reference %{name}") % { name: name } unless section
@@ -199,7 +199,7 @@ HELP
   def setup_reference
     if options[:all]
       # Don't add dynamic references to the "all" list.
-      require 'puppet/util/reference'
+      require_relative '../../puppet/util/reference'
       refs = Puppet::Util::Reference.references(Puppet.lookup(:current_environment))
       options[:references] = refs.reject do |ref|
         Puppet::Util::Reference.reference(ref).dynamic?

data/lib/puppet/application/epp.rb

@@ -1,5 +1,5 @@
-require 'puppet/application/face_base'
-require 'puppet/face'
+require_relative '../../puppet/application/face_base'
+require_relative '../../puppet/face'
 
 class Puppet::Application::Epp < Puppet::Application::FaceBase
 end

data/lib/puppet/application/face_base.rb

@@ -1,5 +1,5 @@
-require 'puppet/application'
-require 'puppet/face'
+require_relative '../../puppet/application'
+require_relative '../../puppet/face'
 require 'optparse'
 require 'pp'
 

data/lib/puppet/application/facts.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/indirection_base'
+require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Facts < Puppet::Application::IndirectionBase
   # Allows `puppet facts` actions to be run against environments that

data/lib/puppet/application/filebucket.rb

@@ -1,6 +1,7 @@
-require 'puppet/application'
+require_relative '../../puppet/application'
 
 class Puppet::Application::Filebucket < Puppet::Application
+  environment_mode :not_required
 
   option("--bucket BUCKET","-b")
   option("--debug","-d")
@@ -298,7 +299,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
-    require 'puppet/file_bucket/dipper'
+    require_relative '../../puppet/file_bucket/dipper'
     begin
       if options[:local] or options[:bucket]
         path = options[:bucket] || Puppet[:clientbucketdir]

data/lib/puppet/application/generate.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 
 # The Generate application. 
 class Puppet::Application::Generate < Puppet::Application::FaceBase

data/lib/puppet/application/help.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::Help < Puppet::Application::FaceBase
   environment_mode :not_required

data/lib/puppet/application/indirection_base.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::IndirectionBase < Puppet::Application::FaceBase
 end

data/lib/puppet/application/lookup.rb

@@ -1,7 +1,7 @@
-require 'puppet/application'
-require 'puppet/pops'
-require 'puppet/node'
-require 'puppet/parser/compiler'
+require_relative '../../puppet/application'
+require_relative '../../puppet/pops'
+require_relative '../../puppet/node'
+require_relative '../../puppet/parser/compiler'
 
 class Puppet::Application::Lookup < Puppet::Application
 
@@ -76,8 +76,8 @@ class Puppet::Application::Lookup < Puppet::Application
   end
 
   def setup_terminuses
-    require 'puppet/file_serving/content'
-    require 'puppet/file_serving/metadata'
+    require_relative '../../puppet/file_serving/content'
+    require_relative '../../puppet/file_serving/metadata'
 
     Puppet::FileServing::Content.indirection.terminus_class = :file_server
     Puppet::FileServing::Metadata.indirection.terminus_class = :file_server

data/lib/puppet/application/module.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::Module < Puppet::Application::FaceBase
 end

data/lib/puppet/application/node.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/indirection_base'
+require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Node < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/parser.rb

@@ -1,5 +1,5 @@
-require 'puppet/application/face_base'
-require 'puppet/face'
+require_relative '../../puppet/application/face_base'
+require_relative '../../puppet/face'
 
 class Puppet::Application::Parser < Puppet::Application::FaceBase
 end

data/lib/puppet/application/plugin.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 class Puppet::Application::Plugin < Puppet::Application::FaceBase
   environment_mode :not_required
 end

data/lib/puppet/application/report.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/indirection_base'
+require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Report < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/resource.rb

@@ -1,6 +1,7 @@
-require 'puppet/application'
+require_relative '../../puppet/application'
 
 class Puppet::Application::Resource < Puppet::Application
+  environment_mode :not_required
 
   attr_accessor :host, :extra_params
 
@@ -14,8 +15,9 @@ class Puppet::Application::Resource < Puppet::Application
   option("--to_yaml","-y")
 
   option("--types", "-t") do |arg|
+    env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
     types = []
-    Puppet::Type.loadall
+    Puppet::Type.typeloader.loadall(env)
     Puppet::Type.eachtype do |t|
       next if t.name == :component
       types << t.name.to_s
@@ -101,7 +103,8 @@ configuration options can also be generated by running puppet with
   Print extra information.
 
 * --to_yaml:
-  Output found resources in yaml format, suitable to use with Hiera and create_resources.
+  Output found resources in yaml format, suitable to use with Hiera and
+  create_resources.
 
 EXAMPLE
 -------
@@ -133,7 +136,9 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   end
 
   def main
-    env = Puppet.lookup(:environments).get(Puppet[:environment])
+    # If the specified environment does not exist locally, fall back to the default (production) environment
+    env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
+
     Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
       type, name, params = parse_args(command_line.args)
 
@@ -208,6 +213,15 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     [type, name, params]
   end
 
+  def create_default_environment
+    Puppet.debug("Specified environment '#{Puppet[:environment]}' does not exist on the filesystem, defaulting to 'production'")
+    Puppet[:environment] = :production
+    basemodulepath = Puppet::Node::Environment.split_path(Puppet[:basemodulepath])
+    modulepath = Puppet[:modulepath]
+    modulepath = (modulepath.nil? || modulepath.empty?) ? basemodulepath : Puppet::Node::Environment.split_path(modulepath)
+    Puppet::Node::Environment.create(Puppet[:environment], modulepath, Puppet::Node::Environment::NO_MANIFEST)
+  end
+
   def find_or_save_resources(type, name, params)
     key = local_key(type, name)