puppet 3.1.0.rc1 → 3.1.0.rc2

data/spec/unit/ssl/certificate_request_spec.rb

@@ -211,6 +211,24 @@ describe Puppet::SSL::CertificateRequest do
       generated.should be_a(OpenSSL::X509::Request)
       generated.should be(request.content)
     end
+
+    it "should use SHA1 to sign the csr when SHA256 isn't available" do
+      csr = OpenSSL::X509::Request.new
+      OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(true)
+      signer = Puppet::SSL::CertificateSigner.new
+      signer.sign(csr, key.content)
+      csr.verify(key.content).should be_true
+    end
+
+    it "should raise an error if neither SHA256 nor SHA1 are available" do
+      csr = OpenSSL::X509::Request.new
+      OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
+      expect {
+        signer = Puppet::SSL::CertificateSigner.new
+      }.to raise_error(Puppet::Error)
+    end
   end
 
   describe "when a CSR is saved" do

data/spec/unit/util/rubygems_spec.rb

@@ -37,7 +37,7 @@ describe Puppet::Util::RubyGems::Source do
     before(:each) { described_class.stubs(:source).returns(Puppet::Util::RubyGems::Gems18Source) }
 
     it "#directories returns the lib subdirs of Gem::Specification.latest_specs" do
-      Gem::Specification.expects(:latest_specs).returns([fake_gem])
+      Gem::Specification.expects(:latest_specs).with(true).returns([fake_gem])
 
       described_class.new.directories.should == [gem_lib]
     end

data/spec/unit/util/selinux_spec.rb

@@ -135,7 +135,6 @@ describe Puppet::Util::SELinux do
       Selinux.stubs(:matchpathcon).with("/root/chuj", 0).returns(-1)
       self.stubs(:file_lstat).with("/root/chuj").raises(Errno::EACCES, "/root/chuj")
 
-      self.expects(:warning).with("Could not stat; Permission denied - /root/chuj")
       get_selinux_default_context("/root/chuj").should be_nil
     end
 
@@ -145,7 +144,6 @@ describe Puppet::Util::SELinux do
       Selinux.stubs(:matchpathcon).with("/root/chuj", 0).returns(-1)
       self.stubs(:file_lstat).with("/root/chuj").raises(Errno::ENOENT, "/root/chuj")
 
-      self.expects(:warning).with("Could not stat; No such file or directory - /root/chuj")
       get_selinux_default_context("/root/chuj").should be_nil
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: -3924182244
+  hash: 2371461667
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 1
-  version: 3.1.0.rc1
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - Puppet Labs
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-09 00:00:00 Z
+date: 2013-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hiera
@@ -58,6 +58,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- COMMITTERS.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -117,13 +118,8 @@ files:
 - lib/puppet/daemon.rb
 - lib/puppet/data_binding.rb
 - lib/puppet/defaults.rb
-- lib/puppet/dsl/actions.rb
-- lib/puppet/dsl/blank_slate.rb
-- lib/puppet/dsl/context.rb
-- lib/puppet/dsl/parser.rb
-- lib/puppet/dsl/resource_decorator.rb
-- lib/puppet/dsl/resource_reference.rb
-- lib/puppet/dsl/type_reference.rb
+- lib/puppet/dsl/resource_api.rb
+- lib/puppet/dsl/resource_type_api.rb
 - lib/puppet/dsl.rb
 - lib/puppet/error.rb
 - lib/puppet/external/base64.rb
@@ -653,6 +649,7 @@ files:
 - lib/puppet/ssl/certificate_factory.rb
 - lib/puppet/ssl/certificate_request.rb
 - lib/puppet/ssl/certificate_revocation_list.rb
+- lib/puppet/ssl/certificate_signer.rb
 - lib/puppet/ssl/configuration.rb
 - lib/puppet/ssl/digest.rb
 - lib/puppet/ssl/host.rb
@@ -773,7 +770,6 @@ files:
 - lib/puppet/util/log.rb
 - lib/puppet/util/log_paths.rb
 - lib/puppet/util/logging.rb
-- lib/puppet/util/manifest_filetype_helper.rb
 - lib/puppet/util/metaid.rb
 - lib/puppet/util/methodhelper.rb
 - lib/puppet/util/metric.rb
@@ -840,6 +836,7 @@ files:
 - conf/fileserver.conf
 - conf/tagmail.conf
 - man/man5/puppet.conf.5
+- man/man8/extlookup2hiera.8
 - man/man8/puppet-agent.8
 - man/man8/puppet-apply.8
 - man/man8/puppet-ca.8
@@ -1164,15 +1161,6 @@ files:
 - spec/integration/application/doc_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/defaults_spec.rb
-- spec/integration/dsl/classes_spec.rb
-- spec/integration/dsl/defaults_spec.rb
-- spec/integration/dsl/definitions_spec.rb
-- spec/integration/dsl/functions_spec.rb
-- spec/integration/dsl/nodes_spec.rb
-- spec/integration/dsl/params_spec.rb
-- spec/integration/dsl/relationships_spec.rb
-- spec/integration/dsl/resources_spec.rb
-- spec/integration/dsl/type_loading_spec.rb
 - spec/integration/faces/ca_spec.rb
 - spec/integration/faces/documentation_spec.rb
 - spec/integration/file_bucket/file_spec.rb
@@ -1198,6 +1186,7 @@ files:
 - spec/integration/parser/functions/require_spec.rb
 - spec/integration/parser/functions_spec.rb
 - spec/integration/parser/parser_spec.rb
+- spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/undef_param_spec.rb
 - spec/integration/provider/mailalias/aliases_spec.rb
@@ -1227,7 +1216,6 @@ files:
 - spec/integration/util/windows/security_spec.rb
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
-- spec/lib/matchers/catalog.rb
 - spec/lib/matchers/json.rb
 - spec/lib/puppet/face/1.0.0/huzzah.rb
 - spec/lib/puppet/face/basetest.rb
@@ -1238,7 +1226,6 @@ files:
 - spec/lib/puppet/indirector_testing.rb
 - spec/lib/puppet_spec/compiler.rb
 - spec/lib/puppet_spec/database.rb
-- spec/lib/puppet_spec/dsl.rb
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/matchers.rb
@@ -1287,13 +1274,8 @@ files:
 - spec/unit/configurer_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/data_binding_spec.rb
-- spec/unit/dsl/actions_spec.rb
-- spec/unit/dsl/blank_slate_spec.rb
-- spec/unit/dsl/context_spec.rb
-- spec/unit/dsl/parser_spec.rb
-- spec/unit/dsl/resource_decorator_spec.rb
-- spec/unit/dsl/resource_reference_spec.rb
-- spec/unit/dsl/type_reference_spec.rb
+- spec/unit/dsl/resource_api_spec.rb
+- spec/unit/dsl/resource_type_api_spec.rb
 - spec/unit/face/catalog_spec.rb
 - spec/unit/face/certificate_request_spec.rb
 - spec/unit/face/certificate_revocation_list_spec.rb
@@ -1600,6 +1582,7 @@ files:
 - spec/unit/provider/package/pkgdmg_spec.rb
 - spec/unit/provider/package/pkgin_spec.rb
 - spec/unit/provider/package/pkgutil_spec.rb
+- spec/unit/provider/package/portage_spec.rb
 - spec/unit/provider/package/rpm_spec.rb
 - spec/unit/provider/package/sun_spec.rb
 - spec/unit/provider/package/up2date_spec.rb
@@ -1775,7 +1758,6 @@ files:
 - spec/unit/util/log/rate_limited_logger_spec.rb
 - spec/unit/util/log_spec.rb
 - spec/unit/util/logging_spec.rb
-- spec/unit/util/manifest_filetype_helper_spec.rb
 - spec/unit/util/metric_spec.rb
 - spec/unit/util/monkey_patches/lines_spec.rb
 - spec/unit/util/monkey_patches_spec.rb
@@ -1986,15 +1968,6 @@ test_files:
 - spec/integration/application/doc_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/defaults_spec.rb
-- spec/integration/dsl/classes_spec.rb
-- spec/integration/dsl/defaults_spec.rb
-- spec/integration/dsl/definitions_spec.rb
-- spec/integration/dsl/functions_spec.rb
-- spec/integration/dsl/nodes_spec.rb
-- spec/integration/dsl/params_spec.rb
-- spec/integration/dsl/relationships_spec.rb
-- spec/integration/dsl/resources_spec.rb
-- spec/integration/dsl/type_loading_spec.rb
 - spec/integration/faces/ca_spec.rb
 - spec/integration/faces/documentation_spec.rb
 - spec/integration/file_bucket/file_spec.rb
@@ -2020,6 +1993,7 @@ test_files:
 - spec/integration/parser/functions/require_spec.rb
 - spec/integration/parser/functions_spec.rb
 - spec/integration/parser/parser_spec.rb
+- spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/undef_param_spec.rb
 - spec/integration/provider/mailalias/aliases_spec.rb
@@ -2049,7 +2023,6 @@ test_files:
 - spec/integration/util/windows/security_spec.rb
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
-- spec/lib/matchers/catalog.rb
 - spec/lib/matchers/json.rb
 - spec/lib/puppet/face/1.0.0/huzzah.rb
 - spec/lib/puppet/face/basetest.rb
@@ -2060,7 +2033,6 @@ test_files:
 - spec/lib/puppet/indirector_testing.rb
 - spec/lib/puppet_spec/compiler.rb
 - spec/lib/puppet_spec/database.rb
-- spec/lib/puppet_spec/dsl.rb
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/matchers.rb
@@ -2109,13 +2081,8 @@ test_files:
 - spec/unit/configurer_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/data_binding_spec.rb
-- spec/unit/dsl/actions_spec.rb
-- spec/unit/dsl/blank_slate_spec.rb
-- spec/unit/dsl/context_spec.rb
-- spec/unit/dsl/parser_spec.rb
-- spec/unit/dsl/resource_decorator_spec.rb
-- spec/unit/dsl/resource_reference_spec.rb
-- spec/unit/dsl/type_reference_spec.rb
+- spec/unit/dsl/resource_api_spec.rb
+- spec/unit/dsl/resource_type_api_spec.rb
 - spec/unit/face/catalog_spec.rb
 - spec/unit/face/certificate_request_spec.rb
 - spec/unit/face/certificate_revocation_list_spec.rb
@@ -2422,6 +2389,7 @@ test_files:
 - spec/unit/provider/package/pkgdmg_spec.rb
 - spec/unit/provider/package/pkgin_spec.rb
 - spec/unit/provider/package/pkgutil_spec.rb
+- spec/unit/provider/package/portage_spec.rb
 - spec/unit/provider/package/rpm_spec.rb
 - spec/unit/provider/package/sun_spec.rb
 - spec/unit/provider/package/up2date_spec.rb
@@ -2597,7 +2565,6 @@ test_files:
 - spec/unit/util/log/rate_limited_logger_spec.rb
 - spec/unit/util/log_spec.rb
 - spec/unit/util/logging_spec.rb
-- spec/unit/util/manifest_filetype_helper_spec.rb
 - spec/unit/util/metric_spec.rb
 - spec/unit/util/monkey_patches/lines_spec.rb
 - spec/unit/util/monkey_patches_spec.rb

data/lib/puppet/dsl/actions.rb

@@ -1,283 +0,0 @@
-require 'puppet/dsl/resource_decorator'
-require 'puppet/dsl/type_reference'
-require 'puppet/util/methodhelper'
-
-module Puppet
-  # @since 3.1 
-  # @status EXPERIMENTAL
-  module DSL
-
-    # {Puppet::DSL::Context} delegates most calls to this class since itself is based
-    # on {BlankSlate}. This simplifies the implementation and makes debugging easier.
-    ##
-    class Actions
-      include Puppet::Util::MethodHelper
-
-      # The filename argument is only used when creating new nodes, definitions
-      # or classes.
-      # @overload initialize()
-      # @overload initialize(filename)
-      #   @param filename [String] required when creating nodes, definitions and classes
-      #
-      def initialize(filename)
-        @filename     = filename
-        @exporting    = false
-        @virtualizing = false
-      end
-
-      # Returns type reference to the given type.
-      # @param name [String] a type name string
-      # @return [TypeReference] to the type of the given name
-      def type_reference(name)
-        TypeReference.new name
-      end
-
-      # Checks whether resource type exists
-      # @param name [String] the name of the type
-      #
-      def is_resource_type?(name)
-        type = Puppet::Resource.canonicalize_type(name)
-        !!(["Node", "Class"].include? type or
-           Puppet::Type.type type or
-           Parser.known_resource_types.find_definition '', type or
-           Parser.known_resource_types.find_hostclass  '', type)
-      end
-
-      # Checks whether Puppet function exists
-      # @param [String] the name of the function
-      def is_function?(name)
-        !!Puppet::Parser::Functions.function(name)
-      end
-
-      # Returns object for accessing params hash (an object that responds to #[]).
-      # All keys will be stringified
-      # @return [#[]] object for looking up parameters
-      #
-      def params
-        Parser.current_scope
-      end
-
-      # Creates a new Puppet node. All arguments have to be passed.
-      # Nesting is the number of nested blocks in Ruby DSL (this can be
-      # basically 0 or 1). Nodes can be only created in the top level scope
-      # 
-      # @param name [String, Regexp] the name match for hostname
-      # @option options [String] :inherits name of parent/super node
-      # @param nesting [Fixnum] 0 if topscope else > 0
-      # @param code [Proc] the body of the created node, evaluated later as Ruby DSL
-      # 
-      # @return [void]
-      # @raise [NoMethodError] if nesting > 0
-      # @raise [ArgumentError] if block is missing
-      #
-      def create_node(name, options, nesting, &code)
-        raise NoMethodError, "nodes can be only created in top level scope" if nesting > 0
-        raise ArgumentError, "no block supplied" if code.nil?
-
-        validate_options [:inherits], options
-
-        name   = name.to_s unless name.is_a? Regexp
-        parent = options[:inherits].to_s if options[:inherits]
-        node = Puppet::Resource::Type.new :node, name, :parent => parent
-        node.ruby_code << Context.new(code, :filename => @filename, :nesting => nesting + 1)
-
-        Parser.known_resource_types.add_node node
-      end
-
-      # Creates a new hostclass. All arguments are required.
-      # Nesting is the number of nested blocks in Ruby DSL (this can be
-      # basically 0 or 1). Classes can be only created in the top level scope.
-      # 
-      # @param name [String] the name of the class
-      # @option options [String] :inherits name of parent/super class
-      # @option options [Hash] :arguments map of parameter name to value
-      # @param nesting [Fixnum] 0 if topscope else > 0
-      # @param code [Proc] the body of the created hostclass, evaluated later as Ruby DSL
-      # 
-      # @return [void]
-      # @raise [NoMethodError] if nesting > 0
-      # @raise [ArgumentError] if block is missing
-      #
-      def create_hostclass(name, options, nesting, &code)
-        raise NoMethodError, "classes can be only created in top level scope" if nesting > 0
-        raise ArgumentError, "no block supplied" if code.nil?
-
-        validate_options [:inherits, :arguments], options
-
-        hostclass = Puppet::Resource::Type.new :hostclass, name.to_s, :arguments => options[:arguments], :parent => options[:inherits].to_s
-        hostclass.ruby_code << Context.new(code, :filename => @filename, :nesting => nesting + 1)
-
-        Parser.known_resource_types.add_hostclass hostclass
-      end
-
-      # Creates a new definition. All arguments are required.
-      # Nesting is the number of nested blocks in Ruby DSL (this can be
-      # basically 0 or 1). Definitions can be only created in the top level scope.
-      # 
-      # @param name [String] the name of the definition
-      # @option options [Hash] :arguments map of parameter name to value
-      # @param nesting [Fixnum] 0 if topscope else > 0
-      # @param code [Proc] the body of the created definition, evaluated later as Ruby DSL
-      # 
-      # @return [void]
-      # @raise [NoMethodError] if nesting > 0
-      # @raise [ArgumentError] if block is missing
-      #
-      def create_definition(name, options, nesting, &code)
-        raise NoMethodError, "definitions can be only created in top level scope" if nesting > 0
-        raise ArgumentError, "no block supplied" if code.nil?
-
-        validate_options [:arguments], options
-
-        definition = Puppet::Resource::Type.new :definition, name.to_s, options
-        definition.ruby_code << Context.new(code, :filename => @filename, :nesting => nesting + 1)
-
-        Parser.known_resource_types.add_definition definition
-      end
-
-      # Creates a resource, all arguments are required.
-      # Type is a Puppet Type of a resource,
-      # Code is a proc that will set additional parameters, can be nil.
-      #
-      # @overload create_resource(type, args, options, {|r| block})
-      # @param type [Symbol] name of resource type
-      # @param args [String, Array<String>] one or several instance names
-      # @param options [Hash] mapping from resource attribute name to value, including mapping of 
-      #   non attribute names :export and :virtual. The set of valid names is determined by the resource type.
-      # @yieldparam r [ResourceDecorator] allows manipulating the created resource
-      # @param block [ruby] evaluated immediately to allow further manipulation of parameters (can be nil)
-      # @return [Puppet::Parser::Resource] the created resource
-      # 
-      # @raise [NoMethodError] if attempt is made to create resource while manifest is imported
-      #
-      def create_resource(type, args, options, code)
-        # when performing type import the scope is nil
-        raise NoMethodError, "resources can't be created in top level scope when importing a manifest" if Parser.current_scope.nil?
-
-        ResourceDecorator.new(options, &code) if code
-
-        Array(args).flatten.map do |name|
-          # Implementation based on
-          # lib/puppet/parser/functions/create_resources.rb
-          #
-          name  = name.to_s
-          scope = Parser.current_scope
-
-          case type
-          when :class
-            klass = Parser.known_resource_types.find_hostclass '', name
-            resource = klass.ensure_in_catalog scope, options
-          else
-            resource = Puppet::Parser::Resource.new type, name,
-              :scope => scope,
-              :source => scope.source
-            options.each do |key, val|
-              resource[key] = get_resource(val)
-            end
-
-            resource.virtual  = true if virtualizing? or options[:virtual]
-            resource.exported = true if exporting?    or options[:export]
-
-            definition = Parser.known_resource_types.definition name
-            definition.instantiate_resource scope, resource if definition
-
-            scope.compiler.add_resource scope, resource
-          end
-          resource
-        end
-      end
-
-      # Calls a puppet function.
-      # It does not validate arguments to the function.
-      #
-      # @example
-      #   call_function :notice, "foo"
-      #
-      # @param name [Symbol] the name of the function
-      # @param *args arguments passed to the called function
-      # @return [Object, void] what the function returns, or void if function does not produce a r-value.
-      #
-      # @raise [NoMethodError] if function is not found
-      #
-      def call_function(name, *args)
-        # when performing type import the scope is nil
-        raise NoMethodError, "functions can't be called in top level scope when importing a manifest" if Parser.current_scope.nil?
-        Parser.current_scope.send name, *args
-      end
-
-
-      # @return [Boolean] flag indicating the _export_ state of a resource
-      attr_accessor :exporting
-      # @return [Boolean] flag indicating the _virtual_ state of a resource
-      attr_accessor :virtualizing
-
-      # Predicate accessor for :exporting
-      # @return [Boolean] true of resource is _export_ state, false otherwise
-      #
-      def exporting?
-        !!@exporting
-      end
-
-      # Predicate accessor for :virtualizing
-      # @return [Boolean] true of resource is _virtual_ state, false otherwise
-      def virtualizing?
-        !!@virtualizing
-      end
-
-      # Exports given resources. Resource references can be used.
-      # @see #get_resource #get_resource for what can be passed as a reference
-      # @param resources [Array<Object>] resources (via reference) to set in _export_ state.
-      # @return [void]
-      #
-      def export_resources(resources)
-        resources.flatten.each do |r|
-          get_resource(r).exported = true
-        end
-      end
-
-      # Virtualizes resources passed in as an array. Resource references can be used.
-      # @param resources [Array<Puppet::Parser::Resource] resources to set in _virtual_ state.
-      # @return [void]
-      #
-      def virtualize_resources(resources)
-        resources.flatten.each do |r|
-          get_resource(r).virtual = true
-        end
-      end
-
-      private
-
-      # Returns a resource for the passed reference
-      # @todo the return of o.to_s is somewhat mysterious and needs an explanation
-      #
-      # @overload get_resource(resource)
-      #   @param resource [Puppet::Resource] a resource
-      # @overload get_resource(reference)
-      #   @param reference [ResourceReference] a reference to a resource
-      # @overload get_resource(name)
-      #   @param name [String] a resource name
-      # @overload get_resource(o)
-      #   @param o [#to_s] ???
-      # @return [Puppet::Resource] the dereferenced resource
-      # @return [String] if reference can not be dereferenced, or not Resource, ResourceReference or String
-      #
-      def get_resource(reference)
-        case reference
-        when Puppet::Resource
-          reference
-        when ResourceReference
-          reference.resource
-        when String
-          # Try to look up a resource by String, if it fails (function returns
-          # nil) just return the string
-          resource = Puppet::DSL::Parser.current_scope.findresource(reference)
-          resource ||= reference
-        else
-          # All values have to be stringified before passing to Puppet Core
-          reference.to_s
-        end
-      end
-
-    end
-  end
-end