puppet 2.6.6 → 2.6.7

data/spec/unit/type/user_spec.rb

@@ -43,6 +43,10 @@ describe user do
     user.provider_feature(:manages_password_age).should_not be_nil
   end
 
+  it "should have a system_users feature" do
+    user.provider_feature(:system_users).should_not be_nil
+  end
+
   describe "instances" do
     it "should have a valid provider" do
       user.new(:name => "foo").provider.class.ancestors.should be_include(Puppet::Provider)

data/spec/unit/type_spec.rb

@@ -434,7 +434,7 @@ describe Puppet::Type do
         patterns.length.should == 1
         patterns[0].length.should == 2
       end
-      
+
       it "should have a regexp that captures the entire string" do
         patterns = @type_class.title_patterns
         string = "abc\n\tdef"
@@ -570,4 +570,15 @@ describe Puppet::Type.metaparamclass(:audit) do
     @resource[:audit] = :noop
     @resource.parameter(:noop).should be_nil
   end
+
+  describe "when generating the uniqueness key" do
+    it "should include all of the key_attributes in alphabetical order by attribute name" do
+      Puppet::Type.type(:file).stubs(:key_attributes).returns [:path, :mode, :owner]
+      Puppet::Type.type(:file).stubs(:title_patterns).returns(
+        [ [ /(.*)/, [ [:path, lambda{|x| x} ] ] ] ]
+      )
+      res = Puppet::Type.type(:file).new( :title => '/my/file', :path => '/my/file', :owner => 'root', :content => 'hello' )
+      res.uniqueness_key.should == [ nil, 'root', '/my/file']
+    end
+  end
 end

data/spec/unit/util/execution_spec.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Puppet::Util::Execution do
+  include Puppet::Util::Execution
+  describe "#withenv" do
+    before :each do
+      @original_path = ENV["PATH"]
+      @new_env = {:PATH => "/some/bogus/path"}
+    end
+
+    it "should change environment variables within the block then reset environment variables to their original values" do
+      withenv @new_env do
+        ENV["PATH"].should == "/some/bogus/path"
+      end
+      ENV["PATH"].should == @original_path
+    end
+
+    it "should reset environment variables to their original values even if the block fails" do
+      begin
+        withenv @new_env do
+          ENV["PATH"].should == "/some/bogus/path"
+          raise "This is a failure"
+        end
+      rescue
+      end
+      ENV["PATH"].should == @original_path
+    end
+
+    it "should reset environment variables even when they are set twice" do
+      # Setting Path & Environment parameters in Exec type can cause weirdness
+      @new_env["PATH"] = "/someother/bogus/path"
+      withenv @new_env do
+        # When assigning duplicate keys, can't guarantee order of evaluation
+        ENV["PATH"].should =~ /\/some.*\/bogus\/path/
+      end
+      ENV["PATH"].should == @original_path
+    end
+
+    it "should remove any new environment variables after the block ends" do
+      @new_env[:FOO] = "bar"
+      withenv @new_env do
+        ENV["FOO"].should == "bar"
+      end
+      ENV["FOO"].should == nil
+    end
+  end
+end

data/spec/unit/util/execution_stub_spec.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Puppet::Util::ExecutionStub do
+  it "should use the provided stub code when 'set' is called" do
+    Puppet::Util::ExecutionStub.set do |command, options|
+      command.should == ['/bin/foo', 'bar']
+      "stub output"
+    end
+    Puppet::Util::ExecutionStub.current_value.should_not == nil
+    Puppet::Util.execute(['/bin/foo', 'bar']).should == "stub output"
+  end
+
+  it "should automatically restore normal execution at the conclusion of each spec test" do
+    # Note: this test relies on the previous test creating a stub.
+    Puppet::Util::ExecutionStub.current_value.should == nil
+  end
+
+  it "should restore normal execution after 'reset' is called" do
+    true_command = Puppet::Util.which('true') # Note: "true" exists at different paths in different OSes
+    stub_call_count = 0
+    Puppet::Util::ExecutionStub.set do |command, options|
+      command.should == [true_command]
+      stub_call_count += 1
+      'stub called'
+    end
+    Puppet::Util.execute([true_command]).should == 'stub called'
+    stub_call_count.should == 1
+    Puppet::Util::ExecutionStub.reset
+    Puppet::Util::ExecutionStub.current_value.should == nil
+    Puppet::Util.execute([true_command]).should == ''
+    stub_call_count.should == 1
+  end
+end

data/spec/unit/util/rdoc/parser_spec.rb

@@ -43,6 +43,18 @@ describe RDoc::Parser do
 
       @parser.scan.should be_a(RDoc::PuppetTopLevel)
     end
+
+    it "should scan the top level even if the file has already parsed" do
+      known_type = stub 'known_types'
+      env = stub 'env'
+      Puppet::Node::Environment.stubs(:new).returns(env)
+      env.stubs(:known_resource_types).returns(known_type)
+      known_type.expects(:watching_file?).with("module/manifests/init.pp").returns(true)
+
+      @parser.expects(:scan_top_level)
+
+      @parser.scan
+    end
   end
 
   describe "when scanning top level entities" do
@@ -339,7 +351,7 @@ describe RDoc::Parser do
   describe "when scanning for includes and requires" do
 
     def create_stmt(name)
-      stmt_value = stub "#{name}_value", :value => "myclass"
+      stmt_value = stub "#{name}_value", :to_s => "myclass"
 
       Puppet::Parser::AST::Function.new(
         :name      => name,
@@ -357,13 +369,13 @@ describe RDoc::Parser do
     it "should also scan mono-instruction code" do
       @class.expects(:add_include).with { |i| i.is_a?(RDoc::Include) and i.name == "myclass" and i.comment == "mydoc" }
 
-      @parser.scan_for_include_or_require(@class,create_stmt("include"))
+      @parser.scan_for_include_or_require(@class, create_stmt("include"))
     end
 
     it "should register recursively includes to the current container" do
       @code.stubs(:children).returns([ create_stmt("include") ])
 
-      @class.expects(:add_include).with { |i| i.is_a?(RDoc::Include) and i.name == "myclass" and i.comment == "mydoc" }
+      @class.expects(:add_include)#.with { |i| i.is_a?(RDoc::Include) and i.name == "myclass" and i.comment == "mydoc" }
       @parser.scan_for_include_or_require(@class, [@code])
     end
 

data/spec/unit/util/settings_spec.rb

@@ -284,7 +284,8 @@ describe Puppet::Util::Settings do
       @settings = Puppet::Util::Settings.new
       @settings.setdefaults :section,
         :config => ["/my/file", "a"],
-        :one => ["ONE", "a"]
+        :one => ["ONE", "a"],
+        :two => ["TWO", "b"]
       FileTest.stubs(:exist?).returns true
       Puppet.stubs(:run_mode).returns stub('run_mode', :name => :mymode)
     end
@@ -331,12 +332,20 @@ describe Puppet::Util::Settings do
       @settings.value(:one, "env").should == "envval"
     end
 
-    it "should interpolate found values using the current environment" do
+    it 'should use the current environment for $environment' do
       @settings.setdefaults :main, :myval => ["$environment/foo", "mydocs"]
 
       @settings.value(:myval, "myenv").should == "myenv/foo"
     end
 
+    it "should interpolate found values using the current environment" do
+      text = "[main]\none = mainval\n[myname]\none = nameval\ntwo = $one/two\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.parse
+
+      @settings.value(:two, "myname").should == "nameval/two"
+    end
+
     it "should return values in a specified environment before values in the main or name sections" do
       text = "[env]\none = envval\n[main]\none = mainval\n[myname]\none = nameval\n"
       @settings.stubs(:read_file).returns(text)

data/tasks/rake/git_workflow.rake

@@ -1,5 +1,5 @@
 # This set of tasks helps automate the workflow as described on
-# http://reductivelabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
+# http://projects.puppetlabs.com/projects/puppet/wiki/Development_Lifecycle
 
 
 def find_start(start)

data/test/Rakefile

@@ -94,5 +94,3 @@ filemap.each do |dir, files|
     # And alias it with a slash on the end
     task(dir + "/" => dir)
 end
-
-# $Id$

data/test/data/providers/mount/parsed/aix.mount

@@ -0,0 +1,7 @@
+node   mounted          mounted over  vfs    date              options   
+----   -------          ------------ ---  ------------   -------------------
+       /dev/hd0         /            jfs   Dec 17 08:04   rw, log  =/dev/hd8
+       /dev/hd3         /tmp         jfs   Dec 17 08:04   rw, log  =/dev/hd8
+       /dev/hd1         /home        jfs   Dec 17 08:06   rw, log  =/dev/hd8
+       /dev/hd2         /usr         jfs   Dec 17 08:06   rw, log  =/dev/hd8
+sue    /home/local/src  /usr/code    nfs   Dec 17 08:06   ro, log  =/dev/hd8

data/test/data/providers/mount/parsed/darwin.mount

@@ -0,0 +1,6 @@
+/dev/disk0s2 on / (hfs, local, journaled)
+devfs on /dev (devfs, local, nobrowse)
+map -hosts on /net (autofs, nosuid, automounted, nobrowse)
+map auto_home on /home (autofs, automounted, nobrowse)
+/dev/disk0s3 on /usr (hfs, local, journaled)
+/dev/fake on /ghost (hfs, local, journaled)

data/test/data/providers/mount/parsed/hpux.mount

@@ -0,0 +1,17 @@
+/ on rpool/ROOT/opensolaris read/write/setuid/devices/dev=2d90002 on Wed Dec 31 16:00:00 1969
+/devices on /devices read/write/setuid/devices/dev=4a00000 on Thu Feb 17 14:34:02 2011
+/dev on /dev read/write/setuid/devices/dev=4a40000 on Thu Feb 17 14:34:02 2011
+/system/contract on ctfs read/write/setuid/devices/dev=4ac0001 on Thu Feb 17 14:34:02 2011
+/proc on proc read/write/setuid/devices/dev=4b00000 on Thu Feb 17 14:34:02 2011
+/etc/mnttab on mnttab read/write/setuid/devices/dev=4b40001 on Thu Feb 17 14:34:02 2011
+/etc/svc/volatile on swap read/write/setuid/devices/xattr/dev=4b80001 on Thu Feb 17 14:34:02 2011
+/system/object on objfs read/write/setuid/devices/dev=4bc0001 on Thu Feb 17 14:34:02 2011
+/etc/dfs/sharetab on sharefs read/write/setuid/devices/dev=4c00001 on Thu Feb 17 14:34:02 2011
+/lib/libc.so.1 on /usr/lib/libc/libc_hwcap1.so.1 read/write/setuid/devices/dev=2d90002 on Thu Feb 17 14:34:14 2011
+/dev/fd on fd read/write/setuid/devices/dev=4d00001 on Thu Feb 17 14:34:18 2011
+/tmp on swap read/write/setuid/devices/xattr/dev=4b80002 on Thu Feb 17 14:34:19 2011
+/var/run on swap read/write/setuid/devices/xattr/dev=4b80003 on Thu Feb 17 14:34:19 2011
+/export on rpool/export read/write/setuid/devices/nonbmand/exec/xattr/atime/dev=2d90006 on Thu Feb 17 14:37:48 2011
+/export/home on rpool/export/home read/write/setuid/devices/nonbmand/exec/xattr/atime/dev=2d90007 on Thu Feb 17 14:37:48 2011
+/rpool on rpool read/write/setuid/devices/nonbmand/exec/xattr/atime/dev=2d90009 on Thu Feb 17 14:37:48 2011
+/ghost on /dev/fake read/write/setuid/devices/nonbmand/exec/xattr/atime/dev=2d90009 on Thu Feb 17 14:37:48 2011

data/test/data/providers/mount/parsed/linux.mount

@@ -0,0 +1,5 @@
+/dev/root on / type jfs (rw,noatime)
+rc-svcdir on /lib64/rc/init.d type tmpfs (rw,nosuid,nodev,noexec,relatime,size=1024k,mode=755)
+sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime)
+/dev/sda9 on /usr/portage type jfs (rw)
+/dev/fake on /ghost type jfs (rw)

data/test/data/providers/mount/parsed/solaris.mount

@@ -0,0 +1,6 @@
+/ on /dev/dsk/c0t0d0s0 read/write/setuid/intr/largefiles/xattr/onerror=panic/dev=2200000 on Mon Mar 18 08:48:45 2002
+/proc on /proc read/write/setuid/dev=4300000 on Mon Mar 18 08:48:44 2002
+/etc/mnttab on mnttab read/write/setuid/dev=43c0000 on Mon Mar 18 08:48:44 2002
+/tmp on swap read/write/setuid/xattr/dev=2 on Mon Mar 18 08:48:52 2002
+/export/home on /dev/dsk/c0t0d0s7 read/write/setuid/intr/largefiles/xattr/onerror=panic/dev=2200007 on Mon Mar 18
+/ghost on /dev/dsk/c0t1d0s7 read/write/setuid/intr/largefiles/xattr/onerror=panic/dev=2200007 on Mon Mar 18

data/test/data/types/mount/linux.fstab

@@ -9,3 +9,4 @@ proc                    /proc                   proc    defaults        0 0
 /dev/vg00/lv01          /spare                  ext3    defaults        1 2
 sysfs                   /sys                    sysfs   defaults        0 0
 LABEL=SWAP-hda6         swap                    swap    defaults        0 0
+/dev/sda1               /usr                    xfs     noatime         0 0

data/test/data/types/mount/solaris.fstab

@@ -9,3 +9,4 @@ fd      -       /dev/fd fd      -       no      -
 ctfs    -       /system/contract        ctfs    -       no      -
 objfs   -       /system/object  objfs   -       no      -
 #swap   -       /tmp    tmpfs   -       yes     -
+/dev/dsk/c0d0s2 /dev/rdsk/c0d0s2        /usr       ufs     1       no      -

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 6
-  - 6
-  version: 2.6.6
+  - 7
+  version: 2.6.7
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -08:00
+date: 2011-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -214,10 +214,12 @@ files:
 - lib/puppet/provider/nameservice/objectadd.rb
 - lib/puppet/provider/mailalias/aliases.rb
 - lib/puppet/error.rb
+- lib/puppet/rails/inventory_fact.rb
 - lib/puppet/rails/host.rb
 - lib/puppet/rails/fact_value.rb
 - lib/puppet/rails/resource_tag.rb
 - lib/puppet/rails/fact_name.rb
+- lib/puppet/rails/inventory_node.rb
 - lib/puppet/rails/param_value.rb
 - lib/puppet/rails/benchmark.rb
 - lib/puppet/rails/puppet_tag.rb
@@ -225,6 +227,7 @@ files:
 - lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
 - lib/puppet/rails/database/schema.rb
 - lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
+- lib/puppet/rails/database/004_add_inventory_service_tables.rb
 - lib/puppet/rails/param_name.rb
 - lib/puppet/rails/source_file.rb
 - lib/puppet/rails/resource.rb
@@ -396,6 +399,7 @@ files:
 - lib/puppet/indirector/certificate_revocation_list/file.rb
 - lib/puppet/indirector/envelope.rb
 - lib/puppet/indirector/facts/rest.rb
+- lib/puppet/indirector/facts/inventory_active_record.rb
 - lib/puppet/indirector/facts/facter.rb
 - lib/puppet/indirector/facts/couch.rb
 - lib/puppet/indirector/facts/yaml.rb
@@ -531,6 +535,7 @@ files:
 - lib/puppet/util/rails/cache_accumulator.rb
 - lib/puppet/util/rails/reference_serializer.rb
 - lib/puppet/util/rails/collection_merger.rb
+- lib/puppet/util/execution_stub.rb
 - lib/puppet/util/provider_features.rb
 - lib/puppet/util/queue/stomp.rb
 - lib/puppet/util/run_mode.rb
@@ -757,6 +762,11 @@ files:
 - test/data/types/ssh_authorized_key/1
 - test/data/types/sshkey/1
 - test/data/types/mailalias/file1
+- test/data/providers/mount/parsed/solaris.mount
+- test/data/providers/mount/parsed/hpux.mount
+- test/data/providers/mount/parsed/aix.mount
+- test/data/providers/mount/parsed/darwin.mount
+- test/data/providers/mount/parsed/linux.mount
 - test/data/providers/cron/crontab.envNname
 - test/data/providers/cron/crontab_sample_records.yaml
 - test/data/providers/cron/crontab_multiple_with_env.yaml
@@ -1146,6 +1156,7 @@ files:
 - spec/unit/indirector/certificate_revocation_list/rest_spec.rb
 - spec/unit/indirector/certificate_revocation_list/file_spec.rb
 - spec/unit/indirector/facts/yaml_spec.rb
+- spec/unit/indirector/facts/inventory_active_record_spec.rb
 - spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
 - spec/unit/indirector/facts/couch_spec.rb
@@ -1245,6 +1256,8 @@ files:
 - spec/unit/util/queue/stomp_spec.rb
 - spec/unit/util/queue_spec.rb
 - spec/unit/util/settings/file_setting_spec.rb
+- spec/unit/util/execution_spec.rb
+- spec/unit/util/execution_stub_spec.rb
 - spec/unit/util/filetype_spec.rb
 - spec/unit/util/posix_spec.rb
 - spec/unit/util/cacher_spec.rb
@@ -1307,6 +1320,7 @@ files:
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/file_spec.rb
+- spec/integration/provider/mount_spec.rb
 - spec/integration/provider/package_spec.rb
 - spec/integration/provider/service/init_spec.rb
 - spec/integration/provider/mailalias/aliases_spec.rb