puppet 3.0.0.rc5 → 3.0.0.rc7

data/lib/puppet/external/pson/pure.rb

@@ -3,68 +3,6 @@ require 'puppet/external/pson/pure/parser'
 require 'puppet/external/pson/pure/generator'
 
 module PSON
-  begin
-    require 'iconv'
-    # An iconv instance to convert from UTF8 to UTF16 Big Endian.
-    UTF16toUTF8 = Iconv.new('utf-8', 'utf-16be') # :nodoc:
-    # An iconv instance to convert from UTF16 Big Endian to UTF8.
-    UTF8toUTF16 = Iconv.new('utf-16be', 'utf-8') # :nodoc:
-    UTF8toUTF16.iconv('no bom')
-  rescue LoadError
-    # We actually don't care
-    Puppet.warning "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions"
-  rescue Errno::EINVAL, Iconv::InvalidEncoding
-    # Iconv doesn't support big endian utf-16. Let's try to hack this manually
-    # into the converters.
-    begin
-      old_verbose, $VERBSOSE = $VERBOSE, nil
-      # An iconv instance to convert from UTF8 to UTF16 Big Endian.
-      UTF16toUTF8 = Iconv.new('utf-8', 'utf-16') # :nodoc:
-      # An iconv instance to convert from UTF16 Big Endian to UTF8.
-      UTF8toUTF16 = Iconv.new('utf-16', 'utf-8') # :nodoc:
-      UTF8toUTF16.iconv('no bom')
-      if UTF8toUTF16.iconv("\xe2\x82\xac") == "\xac\x20"
-        swapper = Class.new do
-          def initialize(iconv) # :nodoc:
-            @iconv = iconv
-          end
-
-          def iconv(string) # :nodoc:
-            result = @iconv.iconv(string)
-            PSON.swap!(result)
-          end
-        end
-        UTF8toUTF16 = swapper.new(UTF8toUTF16) # :nodoc:
-      end
-      if UTF16toUTF8.iconv("\xac\x20") == "\xe2\x82\xac"
-        swapper = Class.new do
-          def initialize(iconv) # :nodoc:
-            @iconv = iconv
-          end
-
-          def iconv(string) # :nodoc:
-            string = PSON.swap!(string.dup)
-            @iconv.iconv(string)
-          end
-        end
-        UTF16toUTF8 = swapper.new(UTF16toUTF8) # :nodoc:
-      end
-    rescue Errno::EINVAL, Iconv::InvalidEncoding
-      Puppet.warning "iconv doesn't seem to support UTF-8/UTF-16 conversions"
-    ensure
-      $VERBOSE = old_verbose
-    end
-  end
-
-  # Swap consecutive bytes of _string_ in place.
-  def self.swap!(string) # :nodoc:
-    0.upto(string.size / 2) do |i|
-      break unless string[2 * i + 1]
-      string[2 * i], string[2 * i + 1] = string[2 * i + 1], string[2 * i]
-    end
-    string
-  end
-
   # This module holds all the modules/classes that implement PSON's
   # functionality in pure ruby.
   module Pure

data/lib/puppet/external/pson/pure/generator.rb

@@ -45,7 +45,7 @@ module PSON
       string.force_encoding(Encoding::ASCII_8BIT)
       string.gsub!(/["\\\x0-\x1f]/) { MAP[$MATCH] }
       string
-    rescue Iconv::Failure => e
+    rescue => e
       raise GeneratorError, "Caught #{e.class}: #{e}"
     end
   else

data/lib/puppet/external/pson/pure/parser.rb

@@ -141,7 +141,7 @@ module PSON
                 bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
                 i += 1
               end
-              PSON::UTF16toUTF8.iconv(bytes)
+              PSON.encode('utf-8', 'utf-16be', bytes)
             end
           end
           string.force_encoding(Encoding::UTF_8) if string.respond_to?(:force_encoding)
@@ -149,7 +149,7 @@ module PSON
         else
           UNPARSED
         end
-      rescue Iconv::Failure => e
+      rescue => e
         raise GeneratorError, "Caught #{e.class}: #{e}"
       end
 

data/lib/puppet/face/ca.rb

@@ -34,6 +34,10 @@ Puppet::Face.define(:ca, '0.1.0') do
       summary "Include signed certificates."
     end
 
+    option "--digest ALGORITHM" do
+      summary "The hash algorithm to use when displaying the fingerprint"
+    end
+
     option "--subject PATTERN" do
       summary "Only list if the subject matches PATTERN."
 
@@ -50,6 +54,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :only
 
       pattern = options[:subject].nil? ? nil :
         Regexp.new(options[:subject], Regexp::IGNORECASE)
@@ -70,7 +75,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       hosts.sort.map {|host| Puppet::SSL::Host.new(host) }
     end
 
-    when_rendering :console do |hosts|
+    when_rendering :console do |hosts, options|
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
@@ -80,13 +85,13 @@ Puppet::Face.define(:ca, '0.1.0') do
       hosts.map do |host|
         name = host.name.ljust(length)
         if host.certificate_request then
-          "  #{name} (#{host.certificate_request.fingerprint})"
+          "  #{name} #{host.certificate_request.digest(options[:digest])}"
         else
           begin
             ca.verify(host.name)
-            "+ #{name} (#{host.certificate.fingerprint})"
+            "+ #{name} #{host.certificate.digest(options[:digest])}"
           rescue Puppet::SSL::CertificateAuthority::CertificateVerificationError => e
-            "- #{name} (#{host.certificate.fingerprint}) (#{e.to_s})"
+            "- #{name} #{host.certificate.digest(options[:digest])} (#{e.to_s})"
           end
         end
       end.join("\n")
@@ -99,6 +104,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :local
 
       ca.destroy host
     end
@@ -110,6 +116,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :only
 
       begin
         ca.revoke host
@@ -134,6 +141,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :local
 
       begin
         ca.generate(host, :dns_alt_names => options[:dns_alt_names])
@@ -163,6 +171,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :only
 
       begin
         ca.sign(host, options[:allow_dns_alt_names])
@@ -182,6 +191,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :only
 
       ca.print host
     end
@@ -197,17 +207,11 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :only
 
-      begin
-        # I want the default from the CA, not to duplicate it, but passing
-        # 'nil' explicitly means that we don't get that.  This works...
-        if options.has_key? :digest
-          ca.fingerprint host, options[:digest]
-        else
-          ca.fingerprint host
-        end
-      rescue ArgumentError => e
-        raise unless e.to_s =~ /Could not find a certificate or csr for/
+      if cert = (Puppet::SSL::Certificate.indirection.find(host) || Puppet::SSL::CertificateRequest.indirection.find(host))
+        cert.digest(options[:digest]).to_s
+      else
         nil
       end
     end
@@ -219,6 +223,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       unless ca = Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
+      Puppet::SSL::Host.ca_location = :only
 
       begin
         ca.verify host

data/lib/puppet/face/config.rb

@@ -22,7 +22,7 @@ Puppet::Face.define(:config, '0.0.1') do
     EOT
     notes <<-'EOT'
       By default, this action reads the configuration in agent mode.
-      Use the '--mode' and '--environment' flags to examine other
+      Use the '--run_mode' and '--environment' flags to examine other
       configuration domains.
     EOT
     examples <<-'EOT'
@@ -32,7 +32,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
       Get a list of important directories from the master's config:
 
-      $ puppet config print all --mode master | grep -E "(path|dir)"
+      $ puppet config print all --run_mode master | grep -E "(path|dir)"
     EOT
 
     when_invoked do |*args|

data/lib/puppet/face/facts.rb

@@ -42,7 +42,7 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
 
     Query a DB-backed inventory directly (bypassing the REST API):
 
-    $ puppet facts find somenode.puppetlabs.lan --terminus inventory_active_record --mode master
+    $ puppet facts find somenode.puppetlabs.lan --terminus inventory_active_record --run_mode master
   EOT
 
   get_action(:destroy).summary "Invalid for this subcommand."

data/lib/puppet/face/help/action.erb

@@ -10,7 +10,6 @@ RETURNS: <%= action.returns.strip %>
 <% end -%>
 OPTIONS:
 <%# Remove these options once we can introspect them normally. -%>
-  --mode MODE                    - The run mode to use (user, agent, or master).
   --render-as FORMAT             - The rendering format to use.
   --verbose                      - Whether to log verbosely.
   --debug                        - Whether to log debug information.

data/lib/puppet/face/help/face.erb

@@ -6,7 +6,6 @@ USAGE: <%= face.synopsis %>
 
 OPTIONS:
 <%# Remove these options once we can introspect them normally. -%>
-  --mode MODE                    - The run mode to use (user, agent, or master).
   --render-as FORMAT             - The rendering format to use.
   --verbose                      - Whether to log verbosely.
   --debug                        - Whether to log debug information.

data/lib/puppet/face/help/man.erb

@@ -17,9 +17,9 @@ OPTIONS
 -------
 Note that any configuration parameter that's valid in the configuration
 file is also a valid long argument, although it may or may not be
-relevant to the present action. For example, `server` is a valid
-configuration parameter, so you can specify `--server <servername>` as
-an argument.
+relevant to the present action. For example, `server` and `run_mode` are valid
+configuration parameters, so you can specify `--server <servername>`, or
+`--run_mode <runmode>` as an argument.
 
 See the configuration file documentation at
 <http://docs.puppetlabs.com/references/stable/configuration.html> for the
@@ -27,9 +27,6 @@ full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 `--genconfig`.
 
-* --mode MODE:
-  The run mode to use for the current action. Valid modes are `user`, `agent`,
-  and `master`.
 * --render-as FORMAT:
   The format in which to render output. The most common formats are `json`,
   `s` (string), `yaml`, and `console`, but other options such as `dot` are

data/lib/puppet/face/module/install.rb

@@ -16,7 +16,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     returns "Pathname object representing the path to the installed module."
 
-    examples <<-EOT
+    examples <<-'EOT'
       Install a module:
 
       $ puppet module install puppetlabs-vcsrepo

data/lib/puppet/face/module/list.rb

@@ -17,7 +17,7 @@ Puppet::Face.define(:module, '1.0.0') do
       summary "Whether to show dependencies as a tree view"
     end
 
-    examples <<-EOT
+    examples <<-'EOT'
       List installed modules:
 
       $ puppet module list

data/lib/puppet/face/module/uninstall.rb

@@ -8,7 +8,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     returns "Hash of module objects representing uninstalled modules and related errors."
 
-    examples <<-EOT
+    examples <<-'EOT'
       Uninstall a module:
 
       $ puppet module uninstall puppetlabs-ssh

data/lib/puppet/face/node.rb

@@ -34,7 +34,7 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
 
     Retrieve a node using the puppet master's configured ENC:
 
-    $ puppet node find somenode.puppetlabs.lan --terminus exec --mode master --render-as yaml
+    $ puppet node find somenode.puppetlabs.lan --terminus exec --run_mode master --render-as yaml
 
     Retrieve the same node from the puppet master:
 

data/lib/puppet/face/node/clean.rb

@@ -1,27 +1,32 @@
 Puppet::Face.define(:node, '0.0.1') do
   action(:clean) do
     option "--[no-]unexport" do
-      summary "Unexport exported resources"
+      summary "Whether to remove this node's exported resources from other nodes"
     end
 
-    summary "Clean up everything a puppetmaster knows about a node"
+    summary "Clean up everything a puppetmaster knows about a node."
     arguments "<host1> [<host2> ...]"
-    description <<-EOT
-      This includes
-
-       * Signed certificates ($vardir/ssl/ca/signed/node.domain.pem)
-       * Cached facts ($vardir/yaml/facts/node.domain.yaml)
-       * Cached node stuff ($vardir/yaml/node/node.domain.yaml)
-       * Reports ($vardir/reports/node.domain)
-       * Stored configs: it can either remove all data from an host in your
-       storedconfig database, or with --unexport turn every exported resource
-       supporting ensure to absent so that any other host checking out their
-       config can remove those exported configurations.
-
-      This will unexport exported resources of a
-      host, so that consumers of these resources can remove the exported
-      resources and we will safely remove the node from our
-      infrastructure.
+    description <<-'EOT'
+      Clean up everything a puppet master knows about a node, including certificates
+      and storeconfigs data.
+      
+      The full list of info cleaned by this action is:
+
+      <Signed certificates> - ($vardir/ssl/ca/signed/node.domain.pem)
+      
+      <Cached facts> - ($vardir/yaml/facts/node.domain.yaml)
+      
+      <Cached node objects> - ($vardir/yaml/node/node.domain.yaml)
+      
+      <Reports> - ($vardir/reports/node.domain)
+      
+      <Stored configs> - (in database) The clean action can either remove all
+      data from a host in your storeconfigs database, or, with the
+      <--unexport> option, turn every exported resource supporting ensure to
+      absent so that any other host that collected those resources can remove
+      them. Without unexporting, a removed node's exported resources become
+      unmanaged by Puppet, and may linger as cruft unless you are purging
+      that resource type.
     EOT
 
     when_invoked do |*args|
@@ -29,13 +34,13 @@ Puppet::Face.define(:node, '0.0.1') do
       options = args.last
       raise "At least one node should be passed" if nodes.empty? || nodes == options
 
-
-
-      # This seems really bad; run_mode should be set as part of a class definition, and should
-      #  not be modifiable beyond that.  This is one of the only places left in the code that
-      #  tries to manipulate it.  I would like to get rid of it but I'm not entirely familiar
-      #  with what we are trying to do here, so I'm postponing for now... --cprice 2012-03-16
-      Puppet.settings.set_value(:run_mode, :master, :application_defaults)
+      # This seems really bad; run_mode should be set as part of a class
+      # definition, and should not be modifiable beyond that.  This is one of
+      # the only places left in the code that tries to manipulate it. Other
+      # parts of code that handle certificates behave differently if the the
+      # run_mode is master. Those other behaviors are needed for cleaning the
+      # certificates correctly.
+      Puppet.settings.preferred_run_mode = "master"
 
       if Puppet::SSL::CertificateAuthority.ca?
         Puppet::SSL::Host.ca_location = :local

data/lib/puppet/feature/base.rb

@@ -47,9 +47,6 @@ Puppet.features.add(:libshadow, :libs => ["shadow"])
 # We're running as root.
 Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SUIDManager.root? }
 
-# We've got mongrel available
-Puppet.features.add(:mongrel, :libs => %w{rubygems mongrel puppet/network/http/mongrel})
-
 # We have lcs diff
 Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}
 

data/lib/puppet/feature/rails.rb

@@ -13,9 +13,10 @@ Puppet.features.add(:rails) do
     # that it offers. --daniel 2012-07-16
     require 'active_support'
     begin
+      require 'active_support/dependencies'
       ActiveSupport::Dependencies.unhook!
       ActiveSupport::Dependencies.mechanism = :require
-    rescue ScriptError, StandardError => e
+    rescue LoadError, ScriptError, StandardError => e
       # ignore any failure - worst case we run without disabling the CPU
       # sucking features, so are slower but ... not actually failed, just
       # because some random future version of ActiveRecord changes.

data/lib/puppet/file_serving/terminus_selector.rb

@@ -19,7 +19,7 @@ module Puppet::FileServing::TerminusSelector
       if request.server
         :rest
       else
-        Puppet[:default_file_terminus].to_sym
+        Puppet[:default_file_terminus]
       end
     when nil
       :file_server

data/lib/puppet/indirector/catalog/active_record.rb

@@ -5,6 +5,11 @@ require 'puppet/resource/catalog'
 class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord
   use_ar_model Puppet::Rails::Host
 
+  def initialize
+    Puppet.deprecation_warning "ActiveRecord-based storeconfigs and inventory are deprecated. See http://links.puppetlabs.com/activerecord-deprecation"
+    super
+  end
+
   # We don't retrieve catalogs from storeconfigs
   def find(request)
     nil

data/lib/puppet/indirector/catalog/static_compiler.rb

@@ -113,9 +113,7 @@ class Puppet::Resource::Catalog::StaticCompiler < Puppet::Indirector::Code
 
   def remove_existing_resources(children, catalog)
     existing_names = catalog.resources.collect { |r| r.to_s }
-
     both = (existing_names & children.keys).inject({}) { |hash, name| hash[name] = true; hash }
-
     both.each { |name| children.delete(name) }
   end
 
@@ -131,7 +129,8 @@ class Puppet::Resource::Catalog::StaticCompiler < Puppet::Indirector::Code
     else
       Puppet.info "Storing content for source '#{resource[:source]}'"
       content = Puppet::FileServing::Content.indirection.find(resource[:source])
-      Puppet::FileBucket::File.indirection.save(Puppet::FileBucket::File.new(content.content))
+      file = Puppet::FileBucket::File.new(content.content)
+      Puppet::FileBucket::File.indirection.save(file)
     end
   end
 end