puppet 0.25.0 → 0.25.1

data/spec/unit/ssl/certificate_revocation_list.rb

@@ -46,18 +46,6 @@ describe Puppet::SSL::CertificateRevocationList do
         end
     end
 
-    describe "when initializing" do
-        it "should fail if :cacrl is set to false" do
-            Puppet.settings.expects(:value).with(:cacrl).returns false
-            lambda { @class.new("crl") }.should raise_error(Puppet::Error)
-        end
-
-        it "should fail if :cacrl is set to the string 'false'" do
-            Puppet.settings.expects(:value).with(:cacrl).returns "false"
-            lambda { @class.new("crl") }.should raise_error(Puppet::Error)
-        end
-    end
-
     describe "when generating the crl" do
         before do
             @real_crl = mock 'crl'

data/spec/unit/type/cron.rb

@@ -0,0 +1,33 @@
+#!/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") }
+
+describe Puppet::Type.type(:cron) do
+    before do
+        @cron = Puppet::Type.type(:cron).new( :name => "foo" )
+    end
+
+    it "it should accept an :environment that looks like a path" do
+        lambda do
+            @cron[:environment] = 'PATH=/bin:/usr/bin:/usr/sbin'
+        end.should_not raise_error
+    end
+
+    it "should not accept environment variables that do not contain '='" do
+        lambda do
+            @cron[:environment] = "INVALID"
+        end.should raise_error(Puppet::Error)
+    end
+
+    it "should accept empty environment variables that do not contain '='" do
+        lambda do
+            @cron[:environment] = "MAILTO="
+        end.should_not raise_error(Puppet::Error)
+    end
+
+    it "should accept 'absent'" do
+        lambda do
+            @cron[:environment] = 'absent'
+        end.should_not raise_error(Puppet::Error)
+    end
+end

data/spec/unit/type/file/owner.rb

@@ -55,11 +55,13 @@ describe property do
 
     describe "when determining if the file is in sync" do
         describe "and not running as root" do
-            it "should warn and return true" do
-                @owner.should = 10
+            it "should warn once and return true" do
                 Puppet::Util::SUIDManager.expects(:uid).returns 1
-                @owner.expects(:warning)
-                @owner.must be_insync("whatever")
+
+                @owner.expects(:warnonce)
+
+                @owner.should = [10]
+                @owner.must be_insync(20)
             end
         end
 
@@ -67,6 +69,10 @@ describe property do
             Puppet::Util::SUIDManager.stubs(:uid).returns 0
         end
 
+        it "should be in sync if 'should' is not provided" do
+            @owner.must be_insync(10)
+        end
+
         it "should directly compare the owner values if the desired owner is an integer" do
             @owner.should = [10]
             @owner.must be_insync(10)

data/spec/unit/util/json.rb

@@ -2,20 +2,20 @@
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
-require 'puppet/util/json'
+require 'puppet/util/pson'
 
-class JsonUtil
-    include Puppet::Util::Json
+class PsonUtil
+    include Puppet::Util::Pson
 end
 
-describe Puppet::Util::Json do
+describe Puppet::Util::Pson do
     it "should fail if no data is provided" do
-        lambda { JsonUtil.new.json_create("json_class" => "foo") }.should raise_error(ArgumentError)
+        lambda { PsonUtil.new.pson_create("type" => "foo") }.should raise_error(ArgumentError)
     end
 
-    it "should call 'from_json' with the provided data" do
-        json = JsonUtil.new
-        json.expects(:from_json).with("mydata")
-        json.json_create("json_class" => "foo", "data" => "mydata")
+    it "should call 'from_pson' with the provided data" do
+        pson = PsonUtil.new
+        pson.expects(:from_pson).with("mydata")
+        pson.pson_create("type" => "foo", "data" => "mydata")
     end
 end

data/spec/unit/util/log.rb

@@ -13,6 +13,42 @@ describe Puppet::Util::Log do
         Puppet::Util::Log.close_all
     end
 
+    describe Puppet::Util::Log::DestConsole do
+        before do
+            @console = Puppet::Util::Log::DestConsole.new 
+        end
+
+        it "should colorize if Puppet[:color] is :ansi" do
+            Puppet[:color] = :ansi
+
+            @console.colorize(:alert, "abc").should == "\e[0;31mabc\e[0m"
+        end
+
+        it "should colorize if Puppet[:color] is 'yes'" do
+            Puppet[:color] = "yes"
+
+            @console.colorize(:alert, "abc").should == "\e[0;31mabc\e[0m"
+        end
+
+        it "should htmlize if Puppet[:color] is :html" do
+            Puppet[:color] = :html
+
+            @console.colorize(:alert, "abc").should == "<span style=\"color: FFA0A0\">abc</span>"
+        end
+
+        it "should do nothing if Puppet[:color] is false" do
+            Puppet[:color] = false
+
+            @console.colorize(:alert, "abc").should == "abc"
+        end
+
+        it "should do nothing if Puppet[:color] is invalid" do
+            Puppet[:color] = "invalid option"
+
+            @console.colorize(:alert, "abc").should == "abc"
+        end
+    end
+
     describe "instances" do
         before do
             Puppet::Util::Log.stubs(:newmessage)

data/spec/unit/util/settings.rb

@@ -200,6 +200,12 @@ describe Puppet::Util::Settings do
             @settings[:four].should == "ONE TWO ONE ONE TWO THREE FOUR"
         end
 
+        it "should provide a method for returning uninterpolated values" do
+            @settings[:two] = "$one tw0"
+            @settings.uninterpolated_value(:two).should  == "$one tw0"
+            @settings.uninterpolated_value(:four).should == "$two $three FOUR"
+        end
+
         it "should interpolate set values for other parameters into returned parameter values" do
             @settings[:one] = "on3"
             @settings[:two] = "$one tw0"

data/test/data/providers/ssh_authorized_key/parsed/authorized_keys2

@@ -0,0 +1 @@
+false ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz

data/test/lib/puppettest/support/utils.rb

@@ -91,22 +91,6 @@ module PuppetTest::Support::Utils
         return trans
     end
 
-    # If there are any fake data files, retrieve them
-    def fakedata(dir)
-        ary = [basedir, "test"]
-        ary += dir.split("/")
-        dir = File.join(ary)
-
-        unless FileTest.exists?(dir)
-            raise Puppet::DevError, "No fakedata dir %s" % dir
-        end
-        files = Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f|
-            File.join(dir, f)
-        }
-
-        return files
-    end
-
     def fakefile(name)
         ary = [PuppetTest.basedir, "test"]
         ary += name.split("/")
@@ -169,4 +153,12 @@ end
 
 module PuppetTest
     include PuppetTest::Support::Utils
+
+    def self.fakedata(dir,pat='*')
+        glob = "#{basedir}/test/#{dir}/#{pat}"
+        files = Dir.glob(glob,File::FNM_PATHNAME)
+        raise Puppet::DevError, "No fakedata matching #{glob}" if files.empty?
+        files
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors: 
 - Reductive Labs
@@ -9,14 +9,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 +10:00
+date: 2009-10-27 00:00:00 +11:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: facter
+  type: !ruby/sym runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.1
+    version: 
 description: 
 email: puppet@reductivelabs.com
-executables: []
-
+executables: 
+- puppetca
+- puppetd
+- puppetmasterd
+- puppetqd
+- puppetrun
+- filebucket
+- pi
+- puppet
+- puppetdoc
+- ralsh
 extensions: []
 
 extra_rdoc_files: []
@@ -36,11 +54,6 @@ files:
 - bin/puppet
 - bin/puppetdoc
 - bin/pi
-- sbin/puppetca
-- sbin/puppetrun
-- sbin/puppetd
-- sbin/puppetmasterd
-- sbin/puppetqd
 - lib/puppet
 - lib/puppet/module.rb
 - lib/puppet/checksum.rb
@@ -177,6 +190,7 @@ files:
 - lib/puppet/util/posix.rb
 - lib/puppet/util/settings.rb
 - lib/puppet/util/monkey_patches.rb
+- lib/puppet/util/pson.rb
 - lib/puppet/util/tagging.rb
 - lib/puppet/util/fileparsing.rb
 - lib/puppet/util/provider_features.rb
@@ -189,7 +203,6 @@ files:
 - lib/puppet/util/autoload
 - lib/puppet/util/autoload/file_cache.rb
 - lib/puppet/util/queue.rb
-- lib/puppet/util/json.rb
 - lib/puppet/util/resource_template.rb
 - lib/puppet/util/docs.rb
 - lib/puppet/util/suidmanager.rb
@@ -347,9 +360,9 @@ files:
 - lib/puppet/sslcertificates/inventory.rb
 - lib/puppet/reports.rb
 - lib/puppet/feature
+- lib/puppet/feature/pson.rb
 - lib/puppet/feature/rails.rb
 - lib/puppet/feature/stomp.rb
-- lib/puppet/feature/json.rb
 - lib/puppet/feature/rubygems.rb
 - lib/puppet/feature/rack.rb
 - lib/puppet/feature/base.rb
@@ -572,6 +585,13 @@ files:
 - lib/puppet/external/event-loop/signal-system.rb
 - lib/puppet/external/event-loop/better-definers.rb
 - lib/puppet/external/nagios.rb
+- lib/puppet/external/pson
+- lib/puppet/external/pson/pure.rb
+- lib/puppet/external/pson/version.rb
+- lib/puppet/external/pson/common.rb
+- lib/puppet/external/pson/pure
+- lib/puppet/external/pson/pure/generator.rb
+- lib/puppet/external/pson/pure/parser.rb
 - lib/puppet/external/base64.rb
 - lib/puppet/ssl.rb
 - lib/puppet/resource
@@ -902,6 +922,7 @@ files:
 - test/data/providers/ssh_authorized_key
 - test/data/providers/ssh_authorized_key/parsed
 - test/data/providers/ssh_authorized_key/parsed/authorized_keys
+- test/data/providers/ssh_authorized_key/parsed/authorized_keys2
 - test/data/providers/ssh_authorized_key/parsed/authorized_keys1
 - test/data/providers/package
 - test/data/providers/package/testpackages.yaml
@@ -1289,6 +1310,7 @@ files:
 - spec/unit/parser/functions/realize.rb
 - spec/unit/parser/functions/require.rb
 - spec/unit/parser/functions/split.rb
+- spec/unit/parser/functions/fqdn_rand.rb
 - spec/unit/parser/functions/versioncmp.rb
 - spec/unit/parser/functions/template.rb
 - spec/unit/parser/ast.rb
@@ -1360,6 +1382,7 @@ files:
 - spec/unit/type/group.rb
 - spec/unit/type/tidy.rb
 - spec/unit/type/zfs.rb
+- spec/unit/type/cron.rb
 - spec/unit/parameter.rb
 - spec/unit/indirector
 - spec/unit/indirector/code.rb

data/lib/puppet/feature/json.rb

@@ -1,2 +0,0 @@
-# This is here so it autoloads correctly.
-Puppet.features.rails?