puppet 3.2.2 → 3.2.3.rc1

data/spec/unit/util/adsi_spec.rb

@@ -17,7 +17,7 @@ describe Puppet::Util::ADSI do
   end
 
   it "should generate the correct URI for a resource" do
-    Puppet::Util::ADSI.uri('test', 'user').should == "WinNT://testcomputername/test,user"
+    Puppet::Util::ADSI.uri('test', 'user').should == "WinNT://./test,user"
   end
 
   it "should be able to get the name of the computer" do
@@ -25,7 +25,11 @@ describe Puppet::Util::ADSI do
   end
 
   it "should be able to provide the correct WinNT base URI for the computer" do
-    Puppet::Util::ADSI.computer_uri.should == "WinNT://testcomputername"
+    Puppet::Util::ADSI.computer_uri.should == "WinNT://."
+  end
+
+  it "should generate a fully qualified WinNT URI" do
+    Puppet::Util::ADSI.computer_uri('testcomputername').should == "WinNT://testcomputername"
   end
 
   describe ".sid_for_account", :if => Puppet.features.microsoft_windows? do
@@ -52,7 +56,7 @@ describe Puppet::Util::ADSI do
     let(:username)  { 'testuser' }
 
     it "should generate the correct URI" do
-      Puppet::Util::ADSI::User.uri(username).should == "WinNT://testcomputername/#{username},user"
+      Puppet::Util::ADSI::User.uri(username).should == "WinNT://./#{username},user"
     end
 
     it "should be able to create a user" do
@@ -68,7 +72,7 @@ describe Puppet::Util::ADSI do
     end
 
     it "should be able to check the existence of a user" do
-      Puppet::Util::ADSI.expects(:connect).with("WinNT://testcomputername/#{username},user").returns connection
+      Puppet::Util::ADSI.expects(:connect).with("WinNT://./#{username},user").returns connection
       Puppet::Util::ADSI::User.exists?(username).should be_true
     end
 
@@ -78,6 +82,22 @@ describe Puppet::Util::ADSI do
       Puppet::Util::ADSI::User.delete(username)
     end
 
+    it "should return an enumeration of IADsUser wrapped objects" do
+      name = 'Administrator'
+      wmi_users = [stub('WMI', :name => name)]
+      Puppet::Util::ADSI.expects(:execquery).with("select name from win32_useraccount").returns(wmi_users)
+
+      native_user = stub('IADsUser')
+      homedir = "C:\\Users\\#{name}"
+      native_user.expects(:Get).with('HomeDirectory').returns(homedir)
+      Puppet::Util::ADSI.expects(:connect).with("WinNT://./#{name},user").returns(native_user)
+
+      users = Puppet::Util::ADSI::User.to_a
+      users.length.should == 1
+      users[0].name.should == name
+      users[0]['HomeDirectory'].should == homedir
+    end
+
     describe "an instance" do
       let(:adsi_user) { stub 'user' }
       let(:user)      { Puppet::Util::ADSI::User.new(username, adsi_user) }
@@ -114,7 +134,7 @@ describe Puppet::Util::ADSI do
       end
 
       it "should generate the correct URI" do
-        user.uri.should == "WinNT://testcomputername/#{username},user"
+        user.uri.should == "WinNT://./#{username},user"
       end
 
       describe "when given a set of groups to which to add the user" do
@@ -132,8 +152,8 @@ describe Puppet::Util::ADSI do
             group3 = stub 'group1'
             group3.expects(:Remove).with("WinNT://testcomputername/#{username},user")
 
-            Puppet::Util::ADSI.expects(:connect).with('WinNT://testcomputername/group1,group').returns group1
-            Puppet::Util::ADSI.expects(:connect).with('WinNT://testcomputername/group3,group').returns group3
+            Puppet::Util::ADSI.expects(:connect).with('WinNT://./group1,group').returns group1
+            Puppet::Util::ADSI.expects(:connect).with('WinNT://./group3,group').returns group3
 
             user.set_groups(groups_to_set, false)
           end
@@ -144,7 +164,7 @@ describe Puppet::Util::ADSI do
             group1 = stub 'group1'
             group1.expects(:Add).with("WinNT://testcomputername/#{username},user")
 
-            Puppet::Util::ADSI.expects(:connect).with('WinNT://testcomputername/group1,group').returns group1
+            Puppet::Util::ADSI.expects(:connect).with('WinNT://./group1,group').returns group1
 
             user.set_groups(groups_to_set, true)
           end
@@ -193,12 +213,12 @@ describe Puppet::Util::ADSI do
       end
 
       it "should generate the correct URI" do
-        group.uri.should == "WinNT://testcomputername/#{groupname},group"
+        group.uri.should == "WinNT://./#{groupname},group"
       end
     end
 
     it "should generate the correct URI" do
-      Puppet::Util::ADSI::Group.uri("people").should == "WinNT://testcomputername/people,group"
+      Puppet::Util::ADSI::Group.uri("people").should == "WinNT://./people,group"
     end
 
     it "should be able to create a group" do
@@ -214,7 +234,7 @@ describe Puppet::Util::ADSI do
     end
 
     it "should be able to confirm the existence of a group" do
-      Puppet::Util::ADSI.expects(:connect).with("WinNT://testcomputername/#{groupname},group").returns connection
+      Puppet::Util::ADSI.expects(:connect).with("WinNT://./#{groupname},group").returns connection
 
       Puppet::Util::ADSI::Group.exists?(groupname).should be_true
     end
@@ -224,6 +244,21 @@ describe Puppet::Util::ADSI do
 
       Puppet::Util::ADSI::Group.delete(groupname)
     end
+
+    it "should return an enumeration of IADsGroup wrapped objects" do
+      name = 'Administrators'
+      wmi_groups = [stub('WMI', :name => name)]
+      Puppet::Util::ADSI.expects(:execquery).with("select name from win32_group").returns(wmi_groups)
+
+      native_group = stub('IADsGroup')
+      native_group.expects(:Members).returns([stub(:Name => 'Administrator')])
+      Puppet::Util::ADSI.expects(:connect).with("WinNT://./#{name},group").returns(native_group)
+
+      groups = Puppet::Util::ADSI::Group.to_a
+      groups.length.should == 1
+      groups[0].name.should == name
+      groups[0].members.should == ['Administrator']
+    end
   end
 
   describe Puppet::Util::ADSI::UserProfile do

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

@@ -176,7 +176,7 @@ describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
       @parser.split_module("/path/to/manifests/init.pp").should == RDoc::Parser::SITE
     end
 
-    it "should handle windows paths with drive letters", :if => Puppet.features.microsoft_windows? do
+    it "should handle windows paths with drive letters", :if => Puppet.features.microsoft_windows? && Puppet.features.rdoc1? do
       @parser.split_module("C:/temp/init.pp").should == RDoc::Parser::SITE
     end
   end

data/spec/unit/util/run_mode_spec.rb

@@ -10,7 +10,7 @@ describe Puppet::Util::RunMode do
     @run_mode.run_dir.should == '$vardir/run'
   end
 
-  describe Puppet::Util::UnixRunMode do
+  describe Puppet::Util::UnixRunMode, :unless => Puppet.features.microsoft_windows? do
     before do
       @run_mode = Puppet::Util::UnixRunMode.new('fake')
     end
@@ -59,17 +59,9 @@ describe Puppet::Util::RunMode do
         end
       end
     end
-
-    def without_home
-      saved_home = ENV["HOME"]
-      ENV.delete "HOME"
-      yield
-    ensure
-      ENV["HOME"] = saved_home
-    end
   end
 
-  describe Puppet::Util::WindowsRunMode do
+  describe Puppet::Util::WindowsRunMode, :if => Puppet.features.microsoft_windows? do
     before do
       if not Dir.const_defined? :COMMON_APPDATA
         Dir.const_set :COMMON_APPDATA, "/CommonFakeBase"
@@ -92,6 +84,18 @@ describe Puppet::Util::RunMode do
       it "has confdir in ~/.puppet when run as non-root" do
         as_non_root { @run_mode.conf_dir.should == File.expand_path("~/.puppet") }
       end
+
+      it "fails when asking for the conf_dir as non-root and there is no %HOME%, %HOMEDRIVE%, and %USERPROFILE%" do
+        as_non_root do
+          without_env('HOME') do
+            without_env('HOMEDRIVE') do
+              without_env('USERPROFILE') do
+                expect { @run_mode.conf_dir }.to raise_error ArgumentError, /couldn't find HOME/
+              end
+            end
+          end
+        end
+      end
     end
 
     describe "#var_dir" do
@@ -102,6 +106,18 @@ describe Puppet::Util::RunMode do
       it "has vardir in ~/.puppet/var when run as non-root" do
         as_non_root { @run_mode.var_dir.should == File.expand_path("~/.puppet/var") }
       end
+
+      it "fails when asking for the conf_dir as non-root and there is no %HOME%, %HOMEDRIVE%, and %USERPROFILE%" do
+        as_non_root do
+          without_env('HOME') do
+            without_env('HOMEDRIVE') do
+              without_env('USERPROFILE') do
+                expect { @run_mode.var_dir }.to raise_error ArgumentError, /couldn't find HOME/
+              end
+            end
+          end
+        end
+      end
     end
   end
 
@@ -114,4 +130,16 @@ describe Puppet::Util::RunMode do
     Puppet.features.stubs(:root?).returns(false)
     yield
   end
+
+  def without_env(name, &block)
+    saved = ENV[name]
+    ENV.delete name
+    yield
+  ensure
+    ENV[name] = saved
+  end
+
+  def without_home(&block)
+    without_env('HOME', &block)
+  end
 end

data/spec/unit/util/zaml_spec.rb

@@ -69,7 +69,7 @@ describe "Pure ruby yaml implementation" do
     end
 
     it "serializes a time in UTC" do
-      pending("not supported on Windows", :if => Puppet.features.microsoft_windows?) do
+      pending("not supported on Windows", :if => Puppet.features.microsoft_windows? && RUBY_VERSION[0,3] == '1.8') do
         the_time_in("Europe/London").should be_equivalent_to(the_time_in_yaml_offset_by("+00:00"))
       end
     end

data/spec/unit/util_spec.rb

@@ -273,7 +273,10 @@ describe Puppet::Util do
     it "should warn if the user's HOME is not set but their PATH contains a ~" do
       env_path = %w[~/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
 
-      Puppet::Util.withenv({:HOME => nil, :PATH => env_path}) do
+      env = {:HOME => nil, :PATH => env_path}
+      env.merge!({:HOMEDRIVE => nil, :USERPROFILE => nil}) if Puppet.features.microsoft_windows?
+
+      Puppet::Util.withenv(env) do
         Puppet::Util::Warnings.expects(:warnonce).once
         Puppet::Util.which('foo')
       end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.2.2
-  prerelease: 
+  version: 3.2.3.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: facter
+  name: rgen
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
-  name: hiera
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rgen
+  name: hiera
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 description: Puppet, an automated configuration management tool
 email: info@puppetlabs.com
 executables:
@@ -1589,6 +1589,7 @@ files:
 - spec/unit/parser/ast/resource_defaults_spec.rb
 - spec/unit/parser/ast/astarray_spec.rb
 - spec/unit/parser/ast/resource_reference_spec.rb
+- spec/unit/parser/ast/block_expression_spec.rb
 - spec/unit/parser/ast/function_spec.rb
 - spec/unit/parser/ast/hostclass_spec.rb
 - spec/unit/parser/ast/vardef_spec.rb
@@ -2047,9 +2048,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: puppet
 rubygems_version: 1.8.23
@@ -2497,6 +2498,7 @@ test_files:
 - spec/unit/parser/ast/resource_defaults_spec.rb
 - spec/unit/parser/ast/astarray_spec.rb
 - spec/unit/parser/ast/resource_reference_spec.rb
+- spec/unit/parser/ast/block_expression_spec.rb
 - spec/unit/parser/ast/function_spec.rb
 - spec/unit/parser/ast/hostclass_spec.rb
 - spec/unit/parser/ast/vardef_spec.rb