PATCH/puppet] Improve safety of the file type against disasters.

Move type-name resolution out of Puppet::Resource into the AST resources.
Move find_resource_type out of Puppet::Resource into Scope
Thus, never pass unqualified type names to Puppet::Resource objects.
Thus, Puppet::Resource objects don't need the namespace property,
and Puppet::Resource objects never consult the harddrive to look for
.pp files that might contain their type definitions,
Thus, performance is improved.

Also removes the temporary fix for #4257 that caused #4397
(The code was too eager to look for a class in the topscope)

Paired-With: Paul Berry <pa### @puppetlabs.com>
Signed-off-by: Jesse Wolfe <jes### @gmail.com>
---
 lib/puppet/parser/ast/resource.rb               |    6 +-
 lib/puppet/parser/ast/resource_reference.rb     |   25 ++++-
 lib/puppet/parser/resource.rb                   |    6 +-
 lib/puppet/parser/scope.rb                      |   14 +++
 lib/puppet/resource.rb                          |  128 +++

Moved type-name resolution out of Puppet::Parser::TypeLoader, and into
its primary client, Puppet::Resource::TypeCollection.  TypeCollection
now always passes fully qualified type names to TypeLoader.

This avoids duplicate type-name resolution logic between TypeLoader
and TypeCollection.  That in turn fixes bug 4472, which resulted
from flaws in the type-name resolution logic in TypeLoader.

In addition, it fixes bug 4483, which resulted from improper
interleaving between looking up names using the TypeCollection and the
TypeLoader.

Signed-off-by: Paul Berry <pa### @puppetlabs.com>
---
 lib/puppet/parser/parser_support.rb        |    4 +-
 lib/puppet/parser/type_loader.rb           |   66 ++++++++

+1 (as a partial pairing partner)

On Thu, Aug 12, 2010 at 2:10 PM, Paul Berry <pa### @puppetlabs.com>
wrote:

 Moved type-name resolution out of Puppet::Parser::TypeLoader, and
into
 its primary client, Puppet::Resource::TypeCollection.  TypeCollection
 now always passes fully qualified type names to TypeLoader.

 This avoids duplicate type-name resolution logic between TypeLoader
 and TypeCollection.  That in turn fixes bug 4472, which resulted
 from flaws in the type-name resolution logic in TypeLoader.

 In addition, it fixes bug 4483, which resulted from improper
 interleaving between looking up names using the TypeCollection and
the
 TypeLoader.

 Signed-off-by: Paul Berry <pa### @puppetlabs.com>
 ---
  lib/puppet/parser/parser_support.rb        |    4 +-
  lib/puppet/parser/type_loader.rb           |   66 ++++++++

---
 lib/puppet/provider/sysctl/linux.rb |   69
+++++++++++++++++++++++++++++++++++
 lib/puppet/type/sysctl.rb           |   36 ++++++++++++++++++
 spec/unit/provider/sysctl/linux.rb  |   25 +++++++++++++
 spec/unit/type/sysctl.rb            |   23 ++++++++++++
 4 files changed, 153 insertions(+), 0 deletions(-)
 create mode 100644 lib/puppet/provider/sysctl/linux.rb
 create mode 100644 lib/puppet/type/sysctl.rb
 create mode 100644 spec/unit/provider/sysctl/linux.rb
 create mode 100644 spec/unit/type/sysctl.rb

diff --git a/lib/puppet/provider/sysctl/linux.rb
b/lib/puppet/provider/sysctl/linux.rb
new file mode 100644
index 0000000..ca9de35
--- /dev/null
+++ b/lib/puppet/provider/sysctl/linux.rb
@@ -0,0 +1,69 @@
+# Manage the linux kernel stack, should work for most sysctl unixes
+require 'pathname'
+
+Puppet::Type.type(:sysctl).provide(:linux) do
+
+    desc "Support for managing the linux kernel stack
+    Manages the /etc/sysctl.conf file and uses the sysctl command to
apply changes
+    "
+
+    defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos,
:sles, :debian, :ubuntu, :gentoo]
+
+    commands :sysctl_cmd => "sysctl"
+
+    #Verify that the setting is available and add the setting to the file
+    def create
+        # First, apply the setting, if the setting is invalid the
commands
+        # interface will throw and prevent the value from being applied.
+        sysctl_cmd "-w", "#{@resource[:name]}=#{@resource[:value]}"
+        lines = File.new('/etc/sysctl.conf', 'r').readlines
+        done = false
+        lines.each_index do |i|
+            if lines[i].split('=')[0].strip == @resource[:name]
+                lines[i] = "#{@resource[:name]} = #{@resource[:value]}\n"
+                done = true
+            end
+        end
+        unless done
+            lines << "#{@resource[:name]} = #{@resource[:value]}\n"
+        end
+            sysfile = File.new('/etc/sysctl.conf', 'w')
+        for line in lines
+            sysfile.write(line)
+        end
+        sysfile.close
+        sysctl_cmd "-p"
+    end
+
+    # Remove the setting from the file - Will not return the setting to
the kernel default!!
+    def destroy
+        lines = File.new('/etc/sysctl.conf', 'r').readlines
+        lines.each_index do |i|
+            if lines[i].split('=')[0].strip == @resource[:name]
+                lines[i] = ""
+            end
+            sysfile = File.new('/etc/sysctl.conf', 'w')
+            for line in lines
+                sysfile.write(line)
+            end
+            sysfile.close
+        end
+    end
+    
+    # Checks for the setting in the sysctl.conf file, if the rule is set
to be absent
+    # then it can exist with any value.
+    def exists?
+        lines = File.new('/etc/sysctl.conf', 'r').readlines
+        lines.each do |line|
+            if line.split('=')[0].strip == @resource[:name]
+                if line.split('=')[1].strip == @resource[:value]
+                return true
+                elsif @resource[:ensure] == :absent
+                    return true
+                end
+            end
+        end
+        return false
+    end
+end
+
diff --git a/lib/puppet/type/sysctl.rb b/lib/puppet/type/sysctl.rb
new file mode 100644
index 0000000..2633e2e
--- /dev/null
+++ b/lib/puppet/type/sysctl.rb
@@ -0,0 +1,36 @@
+module Puppet
+    newtype(:sysctl) do
+        @doc = "Manages the sysctl interface for unix-like systems.
+        The sysctl module works primarily by managing the
/etc/sysctl.conf
+        file, and then by calling the 'sysctl -p' command to apply the
state
+        of the /etc/sysctl.conf file.
+    
+        This is a very simple type and only makes use of a few
paramaters.
+        The type only supports three paramaters, the namevar paramater,
name,
+        is the dot notation reference to the desired sysctl setting, aka
+        'vm.swappiness'.  The value paramater is always a string and is
the
+        value to pass to the gives sysctl setting.  The sysctl trype is
also
+        ensurable, so all rules need to have the regular ensure =>
present
+        option set.
+    
+        A typical rule will look like this:
+    
+            sysctl {'vm.swappiness':
+                ensure => present,
+                value => '20',
+            }
+        
+        This rule would ensure that the kernel swappiness setting be set
to '20'"
+
+        ensurable
+
+        newparam(:name, :namevar => true) do
+            desc "The name of the variable in the sysctl tree, given in
dot notation, eg vm.swappiness"
+        end
+
+        newparam(:value) do
+            desc "The value to enforce for the sysctl variable."
+        end
+    end
+end
+
diff --git a/spec/unit/provider/sysctl/linux.rb
b/spec/unit/provider/sysctl/linux.rb
new file mode 100644
index 0000000..95b5203
--- /dev/null
+++ b/spec/unit/provider/sysctl/linux.rb
@@ -0,0 +1,25 @@
+#/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+provider_class = Puppet::Type.type(:sysctl).provider(:linux)
+
+describe provider_class do
+    before do
+        @resource = stub("resource", :name => "vm.swappiness")
+        @resource.stubs(:[]).with(:name).returns "vm.swappiness"
+        @provider = provider_class.new(@resource)
+    end
+    it "should have a create method" do
+        @provider.should respond_to(:create)
+    end
+
+    it "should have a destroy method" do
+        @provider.should respond_to(:destroy)
+    end
+
+    it "should have an exists? method" do
+        @provider.should respond_to(:exists?)
+    end
+
+end
diff --git a/spec/unit/type/sysctl.rb b/spec/unit/type/sysctl.rb
new file mode 100644
index 0000000..185d7ab
--- /dev/null
+++ b/spec/unit/type/sysctl.rb
@@ -0,0 +1,23 @@
+#/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ?
require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+sysctl = Puppet::Type.type(:sysctl)
+
+describe sysctl do
+    properties = [:ensure]
+
+    properties.each do |property|
+        it "should have a %s property" % property do
+            sysctl.attrclass(property).ancestors.should
be_include(Puppet::Property)
+        end
+    end 
+    parameters = [:name, :value]
+
+    parameters.each do |parameter|
+        it "should have a %s parameter" % parameter do
+            sysctl.attrclass(parameter).ancestors.should
be_include(Puppet::Parameter)
+        end
+    end
+end
+

Signed-off-by: James Turnbull <ja### @lovedthanlost.net>
---
 lib/puppet/type/yumrepo.rb |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb
index e0ed3ad..d2b9b7e 100644
--- a/lib/puppet/type/yumrepo.rb
+++ b/lib/puppet/type/yumrepo.rb
@@ -324,6 +324,12 @@ module Puppet
       newvalue(%r{[1-9][0-9]?}) { }
     end
 
+    newproperty(:cost, :parent => Puppet::IniProperty) do
+      desc "Cost of this repository.\n#{ABSENT_DOC}"
+      newvalue(:absent) { self.should = :absent }
+      newvalue(%r{\d+}) { }
+    end
+
     newproperty(:proxy, :parent => Puppet::IniProperty) do
       desc "URL to the proxy server for this repository.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }

Signed-off-by: James Turnbull <ja### @lovedthanlost.net>
---
 lib/puppet/type/yumrepo.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb
index e0ed3ad..5d86b1c 100644
--- a/lib/puppet/type/yumrepo.rb
+++ b/lib/puppet/type/yumrepo.rb
@@ -85,7 +85,7 @@ module Puppet
       clear
       inifile.each_section do |s|
         next if s.name == "main"
-        obj = create(:name => s.name, :audit => check)
+        obj = new(:name => s.name, :audit => check)
         current_values = obj.retrieve
         obj.eachproperty do |property|
           if current_values[property].nil?

Signed-off-by: James Turnbull <ja### @lovedthanlost.net>
---
 lib/puppet/type/yumrepo.rb |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb
index e0ed3ad..cc2cc41 100644
--- a/lib/puppet/type/yumrepo.rb
+++ b/lib/puppet/type/yumrepo.rb
@@ -294,6 +294,12 @@ module Puppet
       newvalue(%r{(0|1)}) { }
     end
 
+     newproperty(:http_caching, :parent => Puppet::IniProperty) do
+       desc "Either 'packages' or 'all' or 'none'.\n#{ABSENT_DOC}" 
+       newvalue(:absent) { self.should = :absent }
+       newvalue(%r(packages|all|none)) { }
+     end
+
     newproperty(:timeout, :parent => Puppet::IniProperty) do
       desc "Number of seconds to wait for a connection before timing
         out.\n#{ABSENT_DOC}"

This patch introduces Type#retrieve_resource as a wrapper for
Type#resource, to coerce the return value from legacy types from Hash to
Resource.

Signed-off-by: Jesse Wolfe <jes### @gmail.com>
---
 lib/puppet/transaction/resource_harness.rb |    2 +-
 lib/puppet/type.rb                         |   12 +++++++++---
 lib/puppet/type/mount.rb                   |    2 +-
 lib/puppet/type/resources.rb               |    2 +-
 spec/unit/type_spec.rb                     |   12 ++++++------
 test/ral/type/mailalias.rb                 |    2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/puppet/transaction/resource_harness.rb
b/lib/puppet/transaction/resource_harness.rb
index ae38bcb..848ba7b 100644
--- a/lib/puppet/transaction/resource_harness.rb
+++ b/lib/puppet/transaction/resource_harness.rb
@@ -38,7 +38,7 @@ class Puppet::Transaction::ResourceHarness
     end
 
     def changes_to_perform(status, resource)
-        current = resource.retrieve
+        current = resource.retrieve_resource
 
         cache resource, :checked, Time.now
 
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 6e553d4..57caf1d 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -743,6 +743,14 @@ class Type
         result
     end
 
+    def retrieve_resource
+        resource = retrieve
+        if resource.is_a? Hash
+            resource = Resource.new(type, title, :parameters =>
resource)
+        end
+        resource
+    end
+
     # Get a hash of the current properties.  Returns a hash with
     # the actual property instance as the key and the current value
     # as the, um, value.
@@ -1924,10 +1932,8 @@ class Type
     def to_trans(ret = true)
         trans = TransObject.new(self.title, self.class.name)
 
-        values = retrieve()
+        values = retrieve_resource
         values.each do |name, value|
-            # sometimes we get symbols and sometimes we get Properties
-            # I think it's a bug, but I can't find it. ~JW
             name = name.name if name.respond_to? :name
             trans[name] = value
         end
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index e79bc0a..b2185b6 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -67,7 +67,7 @@ module Puppet
 
             def syncothers
                 # We have to flush any changes to disk.
-                currentvalues = @resource.retrieve
+                currentvalues = @resource.retrieve_resource
 
                 # Determine if there are any out-of-sync properties.
                 oos = @resource.send(:properties).find_all do |prop|
diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb
index 136b691..0080846 100644
--- a/lib/puppet/type/resources.rb
+++ b/lib/puppet/type/resources.rb
@@ -131,7 +131,7 @@ Puppet::Type.newtype(:resources) do
         return true unless self[:unless_system_user]
 
         resource[:audit] = :uid
-        current_values = resource.retrieve
+        current_values = resource.retrieve_resource
 
         if system_users().include?(resource[:name])
             return false
diff --git a/spec/unit/type_spec.rb b/spec/unit/type_spec.rb
index 54fb297..70597f7 100755
--- a/spec/unit/type_spec.rb
+++ b/spec/unit/type_spec.rb
@@ -368,11 +368,11 @@ describe Puppet::Type do
         it "should fail if its provider is unsuitable" do
             @resource = Puppet::Type.type(:mount).new(:name => "foo",
:fstype => "bar", :pass => 1, :ensure => :present)
             @resource.provider.class.expects(:suitable?).returns false
-            lambda { @resource.retrieve }.should
raise_error(Puppet::Error)
+            lambda { @resource.retrieve_resource }.should
raise_error(Puppet::Error)
         end
 
         it "should return a Puppet::Resource instance with its type and
title set appropriately" do
-            result = @resource.retrieve
+            result = @resource.retrieve_resource
             result.should be_instance_of(Puppet::Resource)
             result.type.should == "Mount"
             result.title.should == "foo"
@@ -381,11 +381,11 @@ describe Puppet::Type do
         it "should set the name of the returned resource if its own name
and title differ" do
             @resource[:name] = "my name"
             @resource.title = "other name"
-            @resource.retrieve[:name].should == "my name"
+            @resource.retrieve_resource[:name].should == "my name"
         end
 
         it "should provide a value for all set properties" do
-            values = @resource.retrieve
+            values = @resource.retrieve_resource
             [:ensure, :fstype, :pass].each { |property|
values[property].should_not be_nil }
         end
 
@@ -396,13 +396,13 @@ describe Puppet::Type do
         it "should not call retrieve on non-ensure properties if the
resource is absent and should consider the property absent" do
             @resource.property(:ensure).expects(:retrieve).returns
:absent
             @resource.property(:fstype).expects(:retrieve).never
-            @resource.retrieve[:fstype].should == :absent
+            @resource.retrieve_resource[:fstype].should == :absent
         end
 
         it "should include the result of retrieving each property's
current value if the resource is present" do
             @resource.property(:ensure).expects(:retrieve).returns
:present
             @resource.property(:fstype).expects(:retrieve).returns 15
-            @resource.retrieve[:fstype] == 15
+            @resource.retrieve_resource[:fstype] == 15
         end
     end
 
diff --git a/test/ral/type/mailalias.rb b/test/ral/type/mailalias.rb
index 5d5023a..ff0e62e 100755
--- a/test/ral/type/mailalias.rb
+++ b/test/ral/type/mailalias.rb
@@ -34,7 +34,7 @@ class TestMailAlias < Test::Unit::TestCase
     # This isn't much of a test, but then, it's not much of a type.
     def test_recipient_arrays
         resource = @type.new(:name => "luke", :recipient => "yay",
:target => tempfile)
-        values = resource.retrieve
+        values = resource.retrieve_resource
         assert_equal(:absent, values[:recipient])
         resource.property(:recipient).expects(:set).with(%w{yay})
         assert_nothing_raised("Could not sync mailalias") do

Previously, type definitions were not represented directly in the AST.
Instead, the parser would instantiate types and insert them into
known_resource_types as soon as they were parsed.  This made it
difficult to distinguish which types had come from the file that was
just parsed and which types had been loaded previously, which led to
bug 4496.

A side-effect of this change is that the user is no longer allowed to
define types inside of conditional constructs (such as if/else).  This
was allowed before but had unexpected semantics (bugs 4521 and 4522).

It is still possible, however, to place an "include" statement inside
a conditional construct, and have that "include" statement trigger the
autoloading of a file that instantiates types.

Signed-off-by: Paul Berry <pa### @puppetlabs.com>
---
 lib/puppet/node/environment.rb               |   14 +-
 lib/puppet/parser/ast.rb                     |    7 +-
 lib/puppet/parser/ast/astarray.rb            |   19 +-
 lib/puppet/parser/ast/definition.rb          |   12 +
 lib/puppet/parser/ast/hostclass.rb           |   26 +
 lib/puppet/parser/ast/node.rb                |   15 +
 lib/puppet/parser/ast/top_level_construct.rb |    4 +
 lib/puppet/parser/grammar.ra                 |   63 +-
 lib/puppet/parser/parser.rb                  | 2858 +++++++++++++

Also warns you it's skipping files if you pass it more than one file to
apply.

Reviewed-by: Nick Lewis <nic### @puppetlabs.com>
Signed-off-by: Matt Robinson <ma### @puppetlabs.com>
---
 lib/puppet/application/apply.rb     |    5 ++++-
 spec/unit/application/apply_spec.rb |   24 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/puppet/application/apply.rb
b/lib/puppet/application/apply.rb
index bb4186d..152b754 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -78,7 +78,10 @@ class Puppet::Application::Apply <
Puppet::Application
     if options[:code] or command_line.args.length == 0
       Puppet[:code] = options[:code] || STDIN.read
     else
-      Puppet[:manifest] = command_line.args.shift
+      manifest = command_line.args.shift
+      raise "Could not find file #{manifest}" unless
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
 
     # Collect our facts.
diff --git a/spec/unit/application/apply_spec.rb
b/spec/unit/application/apply_spec.rb
index 0b00d1a..8c53136 100755
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@ -3,6 +3,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/application/apply'
+require 'puppet/file_bucket/dipper'
 
 describe Puppet::Application::Apply do
   before :each do
@@ -53,7 +54,6 @@ describe Puppet::Application::Apply do
       Puppet.stubs(:trap)
       Puppet::Log.stubs(:level=)
       Puppet.stubs(:parse_config)
-      require 'lib/puppet/file_bucket/dipper'
       Puppet::FileBucket::Dipper.stubs(:new)
       STDIN.stubs(:read)
 
@@ -212,7 +212,8 @@ describe Puppet::Application::Apply do
         @apply.main
       end
 
-      it "should set the manifest if some files are passed on command
line" do
+      it "should set the manifest if a file is passed on command line and
the file exists" do
+        File.stubs(:exist?).with('site.pp').returns true
         @apply.command_line.stubs(:args).returns(['site.pp'])
 
         Puppet.expects(:[]=).with(:manifest,"site.pp")
@@ -220,6 +221,23 @@ describe Puppet::Application::Apply do
         @apply.main
       end
 
+      it "should raise an error if a file is passed on command line and
the file does not exist" do
+        File.stubs(:exist?).with('noexist.pp').returns false
+        @apply.command_line.stubs(:args).returns(['noexist.pp'])
+        lambda { @apply.main }.should raise_error(RuntimeError, 'Could
not find file noexist.pp')
+      end
+
+      it "should set the manifest to the first file and warn other files
will be skipped" do
+        File.stubs(:exist?).with('starwarsIV').returns true
+        File.expects(:exist?).with('starwarsI').never
+        @apply.command_line.stubs(:args).returns(['starwarsIV',
'starwarsI', 'starwarsII'])
+
+        Puppet.expects(:[]=).with(:manifest,"starwarsIV")
+        Puppet.expects(:warning).with('Only one file can be applied per
run.  Skipping starwarsI, starwarsII')
+
+        @apply.main
+      end
+
       it "should collect the node facts" do
         Puppet::Node::Facts.expects(:find).returns(@facts)
 
@@ -232,7 +250,7 @@ describe Puppet::Application::Apply do
         lambda { @apply.main }.should raise_error
       end
 
-      it "should find the node" do
+      it "should look for the node" do
         Puppet::Node.expects(:find).returns(@node)
 
         @apply.main

Hello,

With DBCollection, it's possible to see the class type for objects
returned.  This is a very nice feature.  However, when I have an
embedded object or embedded collection (using BasicDBList) I do not
have the ability to set the class type.

Now, I could have some higher level code that takes a DBObject and
populates my Object using a wrapper method or a copy constructor, but
it would be nice to simply set the class which extends DBObject.

I realize that by the time the document is loaded, the objects are
already constructed, which makes this problematic and is also why
there are libraries to help out here.  However, the performance with
the reflection based libraries is sub optimal.

I am willing to help implement something like this if it's a
possibility without changing a large amount of what is already
written.

Anything I should look at, or are you wondering why I don't just use
morphia?

Thanks,
Dan

---

This is available from:

    git://jet.mox.net/~tmz/puppet.git
feature/master/redhat-updates-for-2.6.0

 conf/redhat/puppet.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index 6791cea..e51af0a 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -5,14 +5,14 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.5
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppetlabs.com
 Source0:       
http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1:       
http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
-Patch0:         rundir-perms.patch
+
 Group:          System Environment/Base
 
 BuildRoot:     
%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,7 @@ The server can also function as a certificate authority
and file server.
 %setup -q
 patch -p1 < conf/redhat/rundir-perms.patch
 
+
 %build
 # Fix some rpmlint complaints
 for f in mac_dscl.pp mac_dscl_revert.pp \
@@ -91,6 +92,7 @@ rm -rf %{buildroot}
 ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
 
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
+install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
@@ -221,6 +223,10 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jul 20 2010 Todd Zullinger <tm### @pobox.com> - 2.6.0-1
+- Update to 2.6.0
+- Create and own /usr/share/puppet/modules (#615432)
+
 * Mon May 03 2010 Todd Zullinger <tm### @pobox.com> - 0.25.5-1
 - Update to 0.25.5
 - Adjust selinux conditional for EL-6

We were sending an incorrect (containing a //) url for sourced file
content since the file streaming patches.
Depending on the webserver in front of puppet it could fail (for instance
nginx+mongrel).

This patch fixes the offending // in each sourced file urls.

Signed-off-by: Brice Figureau <brice-pup### @daysofwonder.com>
---
 lib/puppet/type/file/content.rb     |    2 +-
 spec/unit/type/file/content_spec.rb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/type/file/content.rb
b/lib/puppet/type/file/content.rb
index 74b380f..0d0bb55 100755
--- a/lib/puppet/type/file/content.rb
+++ b/lib/puppet/type/file/content.rb
@@ -184,7 +184,7 @@ module Puppet
     end
 
     def chunk_file_from_source(source_or_content)
-      request = Puppet::Indirector::Request.new(:file_content, :find,
source_or_content.full_path)
+      request = Puppet::Indirector::Request.new(:file_content, :find,
source_or_content.full_path.sub(/^\//,''))
       connection =
Puppet::Network::HttpPool.http_instance(source_or_content.server,
source_or_content.port)
       connection.request_get(indirection2uri(request),
add_accept_encoding({"Accept" => "raw"})) do |response|
         case response.code
diff --git a/spec/unit/type/file/content_spec.rb
b/spec/unit/type/file/content_spec.rb
index e4b9f9b..a01a14a 100755
--- a/spec/unit/type/file/content_spec.rb
+++ b/spec/unit/type/file/content_spec.rb
@@ -362,7 +362,7 @@ describe content do
       end
 
       it "should send the correct indirection uri" do
-        @conn.expects(:request_get).with { |uri,headers| uri ==
"/production/file_content//path/to/source" }.yields(@response)
+        @conn.expects(:request_get).with { |uri,headers| uri ==
"/production/file_content/path/to/source" }.yields(@response)
         @content.write(@fh)
       end
 

When the name of a module matches the name of a file in the local
directory, puppet agent would sometimes try to read that file and
interpret it as puppet code.  This happened because files.rb was
unintentionally permitting puppet files without an extension.  Fixed
by changing the glob pattern to only permit ".pp" and ".rb"
extensions.

Signed-off-by: Paul Berry <pa### @puppetlabs.com>
---
 lib/puppet/parser/files.rb           |    2 +-
 spec/unit/parser/files_spec.rb       |    6 +++---
 spec/unit/parser/type_loader_spec.rb |    2 +-
 test/language/parser.rb              |   12 ++++++------
 test/lib/puppettest.rb               |    4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/puppet/parser/files.rb b/lib/puppet/parser/files.rb
index 9ef05e1..f346831 100644
--- a/lib/puppet/parser/files.rb
+++ b/lib/puppet/parser/files.rb
@@ -24,7 +24,7 @@ module Puppet::Parser::Files
       # Than that would be a "no."
     end
     abspat = File::expand_path(start, cwd)
-    [nil, Dir.glob(abspat + (File.extname(abspat).empty? ? '{,.pp,.rb}' :
'' )).uniq.reject { |f| FileTest.directory?(f) }]
+    [nil, Dir.glob(abspat + (File.extname(abspat).empty? ? '{.pp,.rb}' :
'' )).uniq.reject { |f| FileTest.directory?(f) }]
   end
 
   # Find the concrete file denoted by +file+. If +file+ is absolute,
diff --git a/spec/unit/parser/files_spec.rb
b/spec/unit/parser/files_spec.rb
index fcfbfa6..3eb0db0 100644
--- a/spec/unit/parser/files_spec.rb
+++ b/spec/unit/parser/files_spec.rb
@@ -154,7 +154,7 @@ describe Puppet::Parser::Files do
 
     it "should match against provided fully qualified patterns" do
       pattern = @basepath + "/fully/qualified/pattern/*"
-      Dir.expects(:glob).with(pattern+'{,.pp,.rb}').returns(%w{my file
list})
+      Dir.expects(:glob).with(pattern+'{.pp,.rb}').returns(%w{my file
list})
       Puppet::Parser::Files.find_manifests(pattern)[1].should == %w{my
file list}
     end
 
@@ -168,7 +168,7 @@ describe Puppet::Parser::Files do
       pattern = @basepath + "/fully/qualified/pattern/*"
       file = @basepath + "/my/file"
       dir = @basepath + "/my/directory"
-      Dir.expects(:glob).with(pattern+'{,.pp,.rb}').returns([file, dir])
+      Dir.expects(:glob).with(pattern+'{.pp,.rb}').returns([file, dir])
       FileTest.expects(:directory?).with(file).returns(false)
       FileTest.expects(:directory?).with(dir).returns(true)
       Puppet::Parser::Files.find_manifests(pattern)[1].should == [file]
@@ -176,7 +176,7 @@ describe Puppet::Parser::Files do
 
     it "should return files once only" do
       pattern = @basepath + "/fully/qualified/pattern/*"
-      Dir.expects(:glob).with(pattern+'{,.pp,.rb}').returns(%w{one two
one})
+      Dir.expects(:glob).with(pattern+'{.pp,.rb}').returns(%w{one two
one})
       Puppet::Parser::Files.find_manifests(pattern)[1].should == %w{one
two}
     end
   end
diff --git a/spec/unit/parser/type_loader_spec.rb
b/spec/unit/parser/type_loader_spec.rb
index 8f005d5..83006b3 100644
--- a/spec/unit/parser/type_loader_spec.rb
+++ b/spec/unit/parser/type_loader_spec.rb
@@ -192,7 +192,7 @@ describe Puppet::Parser::TypeLoader do
   end
 
   it "should be able to add classes to the current resource type
collection" do
-    file = tmpfile("simple_file")
+    file = tmpfile("simple_file.pp")
     File.open(file, "w") { |f| f.puts "class foo {}" }
     @loader.import(file)
 
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 5a433c7..8cda8ee 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -97,7 +97,7 @@ class TestParser < Test::Unit::TestCase
     }
 
     4.times { |i|
-      path = File.join(basedir, subdir, "subfile#{i}")
+      path = File.join(basedir, subdir, "subfile#{i}.pp")
       mkmanifest(path)
     }
 
@@ -137,8 +137,8 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_importedclasses
-    imported = tempfile
-    importer = tempfile
+    imported = tempfile '.pp'
+    importer = tempfile '.pp'
 
     made = tempfile
 
@@ -655,9 +655,9 @@ file { "/tmp/yayness":
   end
 
   def test_multiple_imports_on_one_line
-    one = tempfile
-    two = tempfile
-    base = tempfile
+    one = tempfile '.pp'
+    two = tempfile '.pp'
+    base = tempfile '.pp'
     File.open(one, "w") { |f| f.puts "$var = value" }
     File.open(two, "w") { |f| f.puts "$var = value" }
     File.open(base, "w") { |f| f.puts "import '#{one}', '#{two}'" }
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index e31a319..294d0ef 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -227,14 +227,14 @@ module PuppetTest
     #Facter.stubs(:to_hash).returns({})
   end
 
-  def tempfile
+  def tempfile(suffix = '')
     if defined?(@@tmpfilenum)
       @@tmpfilenum += 1
     else
       @@tmpfilenum = 1
     end
 
-    f = File.join(self.tmpdir, "tempfile_" + @@tmpfilenum.to_s)
+    f = File.join(self.tmpdir, "tempfile_" + @@tmpfilenum.to_s + suffix)
     @@tmpfiles ||= []
     @@tmpfiles << f
     f

    [
https://issues.apache.org/jira/browse...2#action_12890772
] 

Henri Yandell commented on BEANUTILS-377:

     [
https://issues.apache.org/jira/browse...nels:all-tabpanel
]

Henri Yandell moved COLLECTIONS-326 to BEANUTILS-377:

This change is part of an ongoing effort to remove functionality from
TypeCollection that is not related to keeping track of a collection of
types.  This reduces TypeCollection's linkage to the environment,
which is a step toward decoupling it from the type loading mechanism.

Also, added a spec test to verify that TypeCollection.version is
correctly recomputed when types are re-imported.

Signed-off-by: Paul Berry <pau### @puppetlabs.com>
---
 lib/puppet/node/environment.rb             |   22 ++++++++++-
 lib/puppet/resource/type_collection.rb     |   18 --------
 spec/integration/parser/compiler_spec.rb   |   11 +++++
 spec/unit/application/apply_spec.rb        |   11 ++---
 spec/unit/application/master_spec.rb       |    9 ++--
 spec/unit/node/environment_spec.rb         |   59
++++++++++++++++++++++++++--
 spec/unit/resource/type_collection_spec.rb |   52 

* Remove hard-coded facts terminus in master
* Change facts_terminus default to 'yaml' for master and 'facter' for
  everything else.

Paired-with: Matt Robinson <ma### @puppetlabs.com>
Signed-off-by: Rein Henrichs <re### @puppetlabs.com>
---
 lib/puppet/application/master.rb       |    3 ---
 lib/puppet/defaults.rb                 |    2 +-
 spec/unit/indirector/node/ldap_spec.rb |    4 ----
 spec/unit/node/facts_spec.rb           |   15 +++++++++++++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/puppet/application/master.rb
b/lib/puppet/application/master.rb
index 777a50e..fde4749 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -138,9 +138,6 @@ class Puppet::Application::Master <
Puppet::Application
 
     Puppet.settings.use :main, :master, :ssl
 
-    # A temporary solution, to at least make the master work for now.
-    Puppet::Node::Facts.terminus_class = :yaml
-
     # Cache our nodes in yaml.  Currently not configurable.
     Puppet::Node.cache_class = :yaml
 
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 84e2d93..3c79439 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -115,7 +115,7 @@ module Puppet
     :node_terminus => ["plain", "Where to find information about
nodes."],
     :catalog_terminus => ["compiler", "Where to get node catalogs. 
This is useful to change if, for instance,
       you'd like to pre-compile catalogs and store them in memcached or
some other easily-accessed store."],
-    :facts_terminus => ["facter", "Where to get node facts."],
+    :facts_terminus => [Puppet.application_name.to_s == "master" ?
'yaml' : 'facter', "The node facts terminus."],
     :httplog => { :default => "$logdir/http.log",
       :owner => "root",
       :mode => 0640,
diff --git a/spec/unit/indirector/node/ldap_spec.rb
b/spec/unit/indirector/node/ldap_spec.rb
index f9c5efa..a5f14fc 100755
--- a/spec/unit/indirector/node/ldap_spec.rb
+++ b/spec/unit/indirector/node/ldap_spec.rb
@@ -5,10 +5,6 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/indirector/node/ldap'
 
 describe Puppet::Node::Ldap do
-  before do
-    Puppet::Node::Facts.stubs(:terminus_class).returns :yaml
-  end
-
   describe "when searching for a single node" do
     before :each do
       @searcher = Puppet::Node::Ldap.new
diff --git a/spec/unit/node/facts_spec.rb b/spec/unit/node/facts_spec.rb
index a2f4ab9..394db79 100755
--- a/spec/unit/node/facts_spec.rb
+++ b/spec/unit/node/facts_spec.rb
@@ -88,9 +88,20 @@ describe Puppet::Node::Facts, "when indirecting" do
       @facts.save
     end
 
-    it "should default to the 'facter' terminus" do
-      Puppet::Node::Facts.indirection.terminus_class.should == :facter
+    describe "when the Puppet application is 'master'" do
+      it "should default to the 'yaml' terminus" do
+        pending "Cannot test the behavior of defaults in defaults.rb"
+        # Puppet::Node::Facts.indirection.terminus_class.should == :yaml
+      end
     end
+
+    describe "when the Puppet application is not 'master'" do
+      it "should default to the 'facter' terminus" do
+        pending "Cannot test the behavior of defaults in defaults.rb"
+        # Puppet::Node::Facts.indirection.terminus_class.should ==
:facter
+      end
+    end
+
   end
 
   describe "when storing and retrieving" do

These specs 'use' some settings which create directories belonging
to the 'service' user/group. If the default service group doesn't
exist, these fail. This patch explicitly sets the service group to
the gid of the process, which is known to be accessible by the user.

Signed-off-by: Nick Lewis <ni### @puppetlabs.com>
---
 .../indirector/bucket_file/rest_spec.rb            |    1 +
 .../indirector/certificate/rest_spec.rb            |    1 +
 .../indirector/certificate_request/rest_spec.rb    |    1 +
 .../certificate_revocation_list/rest_spec.rb       |    1 +
 spec/integration/indirector/report/rest_spec.rb    |    1 +
 spec/integration/indirector/rest_spec.rb           |    1 +
 spec/integration/network/server/webrick_spec.rb    |    1 +
 spec/integration/ssl/certificate_authority_spec.rb |    1 +
 spec/integration/ssl/certificate_request_spec.rb   |    1 +
 .../ssl/certificate_revocation_list_spec.rb        |    1 +
 spec/integration/ssl/host_spec.rb                  |    1 +
 11 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/spec/integration/indirector/bucket_file/rest_spec.rb
b/spec/integration/indirector/bucket_file/rest_spec.rb
index 4d90a8c..dc10faa 100644
--- a/spec/integration/indirector/bucket_file/rest_spec.rb
+++ b/spec/integration/indirector/bucket_file/rest_spec.rb
@@ -17,6 +17,7 @@ describe "Filebucket REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
diff --git a/spec/integration/indirector/certificate/rest_spec.rb
b/spec/integration/indirector/certificate/rest_spec.rb
index 356a7d3..58aa96c 100755
--- a/spec/integration/indirector/certificate/rest_spec.rb
+++ b/spec/integration/indirector/certificate/rest_spec.rb
@@ -17,6 +17,7 @@ describe "Certificate REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
diff --git a/spec/integration/indirector/certificate_request/rest_spec.rb
b/spec/integration/indirector/certificate_request/rest_spec.rb
index 2c98ef6..c718b78 100755
--- a/spec/integration/indirector/certificate_request/rest_spec.rb
+++ b/spec/integration/indirector/certificate_request/rest_spec.rb
@@ -19,6 +19,7 @@ describe "Certificate Request REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
diff --git
a/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
b/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
index 62a2f80..86f2b01 100755
--- a/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
+++ b/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
@@ -17,6 +17,7 @@ describe "Certificate REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
diff --git a/spec/integration/indirector/report/rest_spec.rb
b/spec/integration/indirector/report/rest_spec.rb
index 089f8fd..fdc2189 100644
--- a/spec/integration/indirector/report/rest_spec.rb
+++ b/spec/integration/indirector/report/rest_spec.rb
@@ -17,6 +17,7 @@ describe "Report REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
diff --git a/spec/integration/indirector/rest_spec.rb
b/spec/integration/indirector/rest_spec.rb
index e904839..14e9e95 100755
--- a/spec/integration/indirector/rest_spec.rb
+++ b/spec/integration/indirector/rest_spec.rb
@@ -39,6 +39,7 @@ describe Puppet::Indirector::REST do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
diff --git a/spec/integration/network/server/webrick_spec.rb
b/spec/integration/network/server/webrick_spec.rb
index 2809df7..2b14dfb 100755
--- a/spec/integration/network/server/webrick_spec.rb
+++ b/spec/integration/network/server/webrick_spec.rb
@@ -18,6 +18,7 @@ describe Puppet::Network::Server do
 
       Puppet.settings[:confdir] = @dir
       Puppet.settings[:vardir] = @dir
+      Puppet.settings[:group] = Process.gid
 
       Puppet::SSL::Host.ca_location = :local
 
diff --git a/spec/integration/ssl/certificate_authority_spec.rb
b/spec/integration/ssl/certificate_authority_spec.rb
index be82b5f..fca17b4 100755
--- a/spec/integration/ssl/certificate_authority_spec.rb
+++ b/spec/integration/ssl/certificate_authority_spec.rb
@@ -17,6 +17,7 @@ describe Puppet::SSL::CertificateAuthority do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
     @ca = Puppet::SSL::CertificateAuthority.new
diff --git a/spec/integration/ssl/certificate_request_spec.rb
b/spec/integration/ssl/certificate_request_spec.rb
index 365ecce..8426b9d 100755
--- a/spec/integration/ssl/certificate_request_spec.rb
+++ b/spec/integration/ssl/certificate_request_spec.rb
@@ -21,6 +21,7 @@ describe Puppet::SSL::CertificateRequest do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :none
 
diff --git a/spec/integration/ssl/certificate_revocation_list_spec.rb
b/spec/integration/ssl/certificate_revocation_list_spec.rb
index 127654c..44eee36 100755
--- a/spec/integration/ssl/certificate_revocation_list_spec.rb
+++ b/spec/integration/ssl/certificate_revocation_list_spec.rb
@@ -17,6 +17,7 @@ describe Puppet::SSL::CertificateRevocationList do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
   end
diff --git a/spec/integration/ssl/host_spec.rb
b/spec/integration/ssl/host_spec.rb
index 9b4152e..05862df 100755
--- a/spec/integration/ssl/host_spec.rb
+++ b/spec/integration/ssl/host_spec.rb
@@ -17,6 +17,7 @@ describe Puppet::SSL::Host do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
 

---
 install.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install.rb b/install.rb
index d35aaa0..b06ec09 100755
--- a/install.rb
+++ b/install.rb
@@ -84,7 +84,7 @@ bins  = glob(%w{bin/*})
 rdoc  = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG
TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
 ri    = glob(%w{bin/*.rb sbin/* lib/**/*.rb}).reject { |e| e=~
/\.(bat|cmd)$/ }
 man   = glob(%w{man/man[0-9]/*})
-libs  = glob(%w{lib/**/*.rb lib/**/*.py})
+libs  = glob(%w{lib/**/*.rb lib/**/*.py lib/puppet/util/command_line/*})
 tests = glob(%w{test/**/*.rb})
 
 def do_bins(bins, target, strip = 's?bin/')