puppet 0.24.9 → 0.25.0

data/test/ral/providers/port/parsed.rb

@@ -9,12 +9,12 @@ require 'puppettest'
 #require 'facter'
 #
 #class TestParsedPort < Test::Unit::TestCase
-#	include PuppetTest
-#	include PuppetTest::FileParsing
+#    include PuppetTest
+#    include PuppetTest::FileParsing
 #
 #    def setup
 #        super
-#        @provider = Puppet.type(:port).provider(:parsed)
+#        @provider = Puppet::Type.type(:port).provider(:parsed)
 #        @oldfiletype = @provider.filetype
 #    end
 #
@@ -24,7 +24,7 @@ require 'puppettest'
 #        @provider.clear
 #        super
 #    end
-#    
+#
 #    # Generate a line from a hash.  The line might include '\n'.
 #    def genline(hash)
 #        line = [hash[:name], "#{hash[:number]}/%s"].join("\t\t")
@@ -60,7 +60,7 @@ require 'puppettest'
 #            assert_equal("53", dns[:number], "dns number is wrong")
 #
 #            text = nil
-#            assert_nothing_raised("failed to generate %s" % file) do 
+#            assert_nothing_raised("failed to generate %s" % file) do
 #                text = @provider.to_file(@provider.target_records(file))
 #            end
 #
@@ -68,7 +68,7 @@ require 'puppettest'
 #            newlines = text.chomp.split "\n"
 #            regex = /^(\S+)\s+(\d+)\/(\w+)/
 #            oldlines.zip(newlines).each do |old, new|
-#                if omatch = regex.match(old) 
+#                if omatch = regex.match(old)
 #                    assert(newmatch = regex.match(new),
 #                        "Lines were not equivalent: %s vs %s" %
 #                        [old.inspect, new.inspect]

data/test/ral/providers/provider.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'facter'
 
 class TestProvider < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def echo
         echo = Puppet::Util.binary("echo")
@@ -319,7 +319,7 @@ class TestProvider < Test::Unit::TestCase
     def test_initialize
         test = @type.provide(:test)
 
-        inst = @type.create :name => "boo"
+        inst = @type.new :name => "boo"
         prov = nil
         assert_nothing_raised("Could not init with a resource") do
             prov = test.new(inst)
@@ -345,7 +345,7 @@ class TestProvider < Test::Unit::TestCase
 end
 
 class TestProviderFeatures < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def setup
         super
@@ -381,7 +381,7 @@ class TestProviderFeatures < Test::Unit::TestCase
             end
         end
 
-        resource = @type.create(:name => "foo")
+        resource = @type.new(:name => "foo")
         {:numbers => [:numeric], :letters => [:alpha], :both => [:numeric, :alpha],
             :mixed => [], :neither => []}.each do |name, should|
                 should.sort! { |a,b| a.to_s <=> b.to_s }
@@ -453,7 +453,7 @@ class TestProviderFeatures < Test::Unit::TestCase
             define_method(:one) {}
             define_method(:two) {}
         end
-        
+
         # Another with the numbers and a declaration
         @type.provide(:both) do
             define_method(:one) {}
@@ -461,7 +461,7 @@ class TestProviderFeatures < Test::Unit::TestCase
 
             has_feature :alpha
         end
-        
+
         # And just the declaration
         @type.provide(:letters) do
             has_feature :alpha
@@ -484,7 +484,7 @@ class TestProviderFeatures < Test::Unit::TestCase
             features.sort! { |a,b| a.to_s <=> b.to_s }
             assert_equal(features, provider.features, "Got incorrect feature list for provider instance %s" % name)
             assert_equal(features, provider_class.features, "Got incorrect feature list for provider class %s" % name)
-            features.each do |feat| 
+            features.each do |feat|
                 assert(provider.feature?(feat), "Provider instance %s did not have feature %s" % [name, feat])
                 assert(provider_class.feature?(feat), "Provider class %s did not have feature %s" % [name, feat])
             end
@@ -506,13 +506,13 @@ class TestProviderFeatures < Test::Unit::TestCase
         [nope, maybe, yep].each do |prov|
             assert(prov.respond_to?(:supports_parameter?), "%s does not respond to :supports_parameter?" % prov.name)
             case prov.name
-            when :nope:
+            when :nope
                 supported = [:neither]
                 un = [:some, :both]
-            when :maybe:
+            when :maybe
                 supported = [:neither, :some]
                 un = [:both]
-            when :yep:
+            when :yep
                 supported = [:neither, :some, :both]
                 un = []
             end

data/test/ral/providers/service/base.rb

@@ -8,32 +8,32 @@ require File.dirname(__FILE__) + '/../../../lib/puppettest'
 require 'puppettest'
 
 class TestBaseServiceProvider < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
-	def test_base
-	    running = tempfile()
-	    
-	    commands = {}
-	    %w{touch rm test}.each do |c|
-    	    path = %x{which #{c}}.chomp
-    	    if path == ""
-    	        $stderr.puts "Cannot find '#{c}'; cannot test base service provider"
-    	        return
+    def test_base
+        running = tempfile()
+
+        commands = {}
+        %w{touch rm test}.each do |c|
+            path = %x{which #{c}}.chomp
+            if path == ""
+                $stderr.puts "Cannot find '#{c}'; cannot test base service provider"
+                return
             end
             commands[c.to_sym] = path
         end
-	    service = Puppet::Type.type(:service).create(
-	        :name => "yaytest", :provider => :base,
-	        :start => "%s %s" % [commands[:touch], running],
-	        :status => "%s -f %s" % [commands[:test], running],
-	        :stop => "%s %s" % [commands[:rm], running]
-	    )
-	    
-	    provider = service.provider
-	    assert(provider, "did not get base provider")
-	    
-	    assert_nothing_raised do
-	        provider.start
+        service = Puppet::Type.type(:service).new(
+            :name => "yaytest", :provider => :base,
+            :start => "%s %s" % [commands[:touch], running],
+            :status => "%s -f %s" % [commands[:test], running],
+            :stop => "%s %s" % [commands[:rm], running]
+        )
+
+        provider = service.provider
+        assert(provider, "did not get base provider")
+
+        assert_nothing_raised do
+            provider.start
         end
         assert(FileTest.exists?(running), "start was not called correctly")
         assert_nothing_raised do
@@ -47,20 +47,20 @@ class TestBaseServiceProvider < Test::Unit::TestCase
             assert_equal(:stopped, provider.status, "status was not returned correctly")
         end
     end
-    
+
     # Testing #454
     def test_that_failures_propagate
         nope = "/no/such/command"
-	    service = Puppet::Type.type(:service).create(
-	        :name => "yaytest", :provider => :base,
-	        :start => nope,
-	        :status => nope,
-	        :stop => nope,
-	        :restart => nope
-	    )
+        service = Puppet::Type.type(:service).new(
+            :name => "yaytest", :provider => :base,
+            :start => nope,
+            :status => nope,
+            :stop => nope,
+            :restart => nope
+        )
 
-	    provider = service.provider
-	    assert(provider, "did not get base provider")
+        provider = service.provider
+        assert(provider, "did not get base provider")
 
         # We can't fail well when status is messed up, because we depend on the return code
         # of the command for data.

data/test/ral/providers/sshkey/parsed.rb

@@ -6,12 +6,12 @@ require 'puppettest'
 require 'puppettest/fileparsing'
 
 class TestParsedSSHKey < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
     def setup
         super
-        @provider = Puppet.type(:sshkey).provider(:parsed)
+        @provider = Puppet::Type.type(:sshkey).provider(:parsed)
 
         @oldfiletype = @provider.filetype
     end
@@ -22,7 +22,7 @@ class TestParsedSSHKey < Test::Unit::TestCase
         @provider.clear
         super
     end
-    
+
     def mkkey(name = "host.domain.com")
         if defined? @pcount
             @pcount += 1
@@ -52,39 +52,39 @@ class TestParsedSSHKey < Test::Unit::TestCase
             fakedataparse(file)
         }
     end
-    
+
     def test_simplekey
         @provider.filetype = :ram
         file = @provider.default_target
-        
+
         key = nil
         assert_nothing_raised do
             key = mkkey
         end
-        
+
         assert(key, "did not create key")
-        
+
         assert_nothing_raised do
             key.flush
         end
-        
+
         assert(key.alias, "No alias set for key")
-        
+
         hash = key.property_hash.dup
         text = @provider.target_object(file).read
         names = [key.name, key.alias].flatten.join(",")
-        
+
         assert_equal("#{names} #{key.type} #{key.key}\n", text)
-        
+
         assert_nothing_raised do
             @provider.prefetch
         end
-        
+
         hash.each do |p, v|
             next unless key.respond_to?(p)
             assert_equal(v, key.send(p), "%s did not match" % p)
         end
-        
+
         assert(key.name !~ /,/, "Aliases were not split out during parsing")
     end
 

data/test/ral/providers/user.rb

@@ -32,7 +32,7 @@ class TestUserProvider < Test::Unit::TestCase
     end
 
     case Facter["operatingsystem"].value
-    when "Darwin":
+    when "Darwin"
         def missing?(user)
             output = %x{nidump -r /users/#{user} / 2>/dev/null}.chomp
 
@@ -46,13 +46,12 @@ class TestUserProvider < Test::Unit::TestCase
         end
 
         def current?(param, user)
-            property = Puppet.type(:user).properties.find { |st|
+            property = Puppet::Type.type(:user).properties.find { |st|
                 st.name == param
             }
 
             prov = Puppet::Type.type(:user).defaultprovider
             output = prov.report(param)
-            # output = %x{nireport / /users name #{prov.netinfokey(param)}}
             output.each { |hash|
                 if hash[:name] == user.name
                     val = hash[param]
@@ -81,7 +80,7 @@ class TestUserProvider < Test::Unit::TestCase
         end
 
         def current?(param, user)
-            property = Puppet.type(:user).properties.find { |st|
+            property = Puppet::Type.type(:user).properties.find { |st|
                 st.name == param
             }
 
@@ -119,12 +118,12 @@ class TestUserProvider < Test::Unit::TestCase
 
     def fakedata(name, param)
         case param
-        when :name: name
-        when :ensure: :present
-        when :comment: "Puppet's Testing User %s" % name # use a single quote a la #375
-        when :gid: nonrootgroup.gid
-        when :shell: findshell()
-        when :home: "/home/%s" % name
+        when :name; name
+        when :ensure; :present
+        when :comment; "Puppet's Testing User %s" % name # use a single quote a la #375
+        when :gid; nonrootgroup.gid
+        when :shell; findshell()
+        when :home; "/home/%s" % name
         else
             return nil
         end
@@ -307,7 +306,7 @@ class TestUserProvider < Test::Unit::TestCase
             return
         end
 
-        # Stupid netinfo
+        # Stupid DirectoryServices
         if Facter.value(:operatingsystem) == "Darwin"
             assert_raise(ArgumentError, "gid allowed a non-integer value") do
                 user.gid = group.name
@@ -370,7 +369,7 @@ class TestUserProvider < Test::Unit::TestCase
         5.times do |i|
             i += 1
             name = "pptstgr%s" % i
-            tmpgroup = Puppet.type(:group).create(
+            tmpgroup = Puppet::Type.type(:group).new(
                 :name => name,
                 :gid => max + i
             )
@@ -535,16 +534,16 @@ class TestUserProvider < Test::Unit::TestCase
         assert_equal("-s", user.send(:flag, :shell),
                     "Incorrect shell flag")
     end
-    
+
     def test_autogen
         provider = nil
-        user = Puppet::Type.type(:user).create(:name => nonrootuser.name)
+        user = Puppet::Type.type(:user).new(:name => nonrootuser.name)
         provider = user.provider
         assert(provider, "did not get provider")
-        
+
         # Everyone should be able to autogenerate a uid
         assert_instance_of(Fixnum, provider.autogen(:uid))
-        
+
         # If we're Darwin, then we should get results, but everyone else should
         # get nil
         darwin = (Facter.value(:operatingsystem) == "Darwin")
@@ -554,7 +553,7 @@ class TestUserProvider < Test::Unit::TestCase
             :home => "/var/empty",
             :shell => "/usr/bin/false"
         }
-        
+
         should.each do |param, value|
             if darwin
                 assert_equal(value, provider.autogen(param), "did not autogen %s for darwin correctly" % param)

data/test/ral/providers/user/useradd.rb

@@ -8,12 +8,12 @@ class UserAddProviderTest < PuppetTest::TestCase
     confine "useradd user provider missing" =>
         Puppet::Type.type(:user).provider(:useradd).suitable?
 
-	def setup
+    def setup
         super
-		@type = Puppet::Type.type(:user)
-		@provider = Puppet::Type.type(:user).provider(:useradd)
+        @type = Puppet::Type.type(:user)
+        @provider = Puppet::Type.type(:user).provider(:useradd)
         @home = tempfile
-		@vals = {:name => 'faff',
+        @vals = {:name => 'faff',
             :provider => :useradd,
             :ensure => :present,
             :uid => 5000,
@@ -22,10 +22,10 @@ class UserAddProviderTest < PuppetTest::TestCase
             :comment => "yayness",
             :groups => %w{one two}
         }
-	end
+    end
 
     def setup_user
-		@user = @type.create(@vals)
+        @user = @type.new(@vals)
 
         @vals.each do |name, val|
             next unless @user.class.validproperty?(name)
@@ -39,9 +39,9 @@ class UserAddProviderTest < PuppetTest::TestCase
                 "useradd provider is missing %s" % feature)
         end
     end
-	
-	def test_create
-		user = setup_user
+
+    def test_create
+        user = setup_user
 
         @vals.each do |name, val|
             next unless user.class.validproperty?(name)
@@ -50,7 +50,7 @@ class UserAddProviderTest < PuppetTest::TestCase
         user.expects(:allowdupe?).returns(false)
         user.expects(:managehome?).returns(false)
 
-		user.provider.expects(:execute).with do |params|
+        user.provider.expects(:execute).with do |params|
             command = params.shift
             assert_equal(@provider.command(:add), command,
                 "Got incorrect command")
@@ -78,9 +78,9 @@ class UserAddProviderTest < PuppetTest::TestCase
 
             true
         end
-		
+
         user.provider.create
-	end
+    end
 
     # Make sure we add the right flags when managing home
     def test_managehome
@@ -95,7 +95,7 @@ class UserAddProviderTest < PuppetTest::TestCase
         # First run
         @user.expects(:managehome?).returns(true)
 
-		@user.provider.expects(:execute).with do |params|
+        @user.provider.expects(:execute).with do |params|
             assert_equal(params[0], @provider.command(:add),
                 "useradd was not called")
             assert(params.include?("-m"),
@@ -107,7 +107,6 @@ class UserAddProviderTest < PuppetTest::TestCase
         end
 
         @user.provider.create
-        @user.class.clear
 
         # Start again, this time with manages_home off
         @vals[:managehome] = false
@@ -116,7 +115,7 @@ class UserAddProviderTest < PuppetTest::TestCase
         # First run
         @user.expects(:managehome?).returns(false)
 
-		@user.provider.expects(:execute).with do |params|
+        @user.provider.expects(:execute).with do |params|
             assert_equal(params[0], @provider.command(:add),
                 "useradd was not called")
             if %w{Fedora RedHat}.include?(Facter.value(:operatingsystem))
@@ -144,7 +143,7 @@ class UserAddProviderTest < PuppetTest::TestCase
         # First run
         @user.expects(:allowdupe?).returns(true)
 
-		@user.provider.expects(:execute).with do |params|
+        @user.provider.expects(:execute).with do |params|
             assert_equal(params[0], @provider.command(:add),
                 "useradd was not called")
             assert(params.include?("-o"),
@@ -154,7 +153,6 @@ class UserAddProviderTest < PuppetTest::TestCase
         end
 
         @user.provider.create
-        @user.class.clear
 
         # Start again, this time with manages_home off
         @vals[:allowdupe] = false
@@ -163,7 +161,7 @@ class UserAddProviderTest < PuppetTest::TestCase
         # First run
         @user.expects(:allowdupe?).returns(false)
 
-		@user.provider.expects(:execute).with do |params|
+        @user.provider.expects(:execute).with do |params|
             assert_equal(params[0], @provider.command(:add),
                 "useradd was not called")
             assert(! params.include?("-o"),
@@ -182,7 +180,7 @@ class UserAddProviderTest < PuppetTest::TestCase
         @vals[:password] = "somethingorother"
         setup_user
 
-		@user.provider.expects(:execute).with do |params|
+        @user.provider.expects(:execute).with do |params|
             assert_equal(params[0], @provider.command(:add),
                 "useradd was not called")
             params.shift
@@ -198,13 +196,12 @@ class UserAddProviderTest < PuppetTest::TestCase
         end
 
         @user.provider.create
-        @user.class.clear
 
         # Now mark the user made, and make sure the right command is called
         setup_user
         @vals[:password] = "somethingelse"
 
-		@user.provider.expects(:execute).with do |params|
+        @user.provider.expects(:execute).with do |params|
             assert_equal(params[0], @provider.command(:modify),
                 "usermod was not called")
 
@@ -230,7 +227,7 @@ class UserRootAddProviderTest < PuppetTest::TestCase
     confine "not running as root" => (Process.uid == 0)
 
     def test_password
-        user = Puppet::Type.type(:user).create(:name => "root", :check => [:password], :provider => :useradd)
+        user = Puppet::Type.type(:user).new(:name => "root", :check => [:password], :provider => :useradd)
 
         provider = user.provider