puppet 2.6.1 → 2.6.2

data/spec/unit/rails_spec.rb

@@ -47,14 +47,20 @@ describe Puppet::Rails, "when initializing any connection" do
     Puppet::Rails.connect
   end
 
-  describe "on ActiveRecord 2.1.x" do
-    confine("ActiveRecord 2.1.x") { ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1 }
-
-    it "should set ActiveRecord::Base.allow_concurrency" do
+  describe "ActiveRecord Version" do
+    it "should set ActiveRecord::Base.allow_concurrency if ActiveRecord is 2.1" do
+      Puppet::Util.stubs(:activerecord_version).returns(2.1)
       ActiveRecord::Base.expects(:allow_concurrency=).with(true)
 
       Puppet::Rails.connect
     end
+
+    it "should not set ActiveRecord::Base.allow_concurrency if ActiveRecord is >= 2.2" do
+      Puppet::Util.stubs(:activerecord_version).returns(2.2)
+      ActiveRecord::Base.expects(:allow_concurrency=).never
+
+      Puppet::Rails.connect
+    end
   end
 
   it "should call ActiveRecord::Base.verify_active_connections!" do

data/spec/unit/reports/rrdgraph_spec.rb

@@ -0,0 +1,31 @@
+#!/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") }
+
+require 'puppet/reports'
+
+processor = Puppet::Reports.report(:rrdgraph)
+
+describe processor do
+  include PuppetSpec::Files
+  before do
+    Puppet[:rrddir] = tmpdir('rrdgraph')
+    Puppet.settings.use :master
+  end
+
+  after do
+    FileUtils.rm_rf(Puppet[:rrddir])
+  end
+
+  it "should not error on 0.25.x report format" do
+    report = YAML.load_file(File.join(PuppetSpec::FIXTURE_DIR, 'yaml/report0.25.x.yaml')).extend processor
+    report.expects(:mkhtml)
+    lambda{ report.process }.should_not raise_error
+  end
+
+  it "should not error on 2.6.x report format" do
+    report = YAML.load_file(File.join(PuppetSpec::FIXTURE_DIR, 'yaml/report2.6.x.yaml')).extend processor
+    report.expects(:mkhtml)
+    lambda{ report.process }.should_not raise_error
+  end
+end

data/spec/unit/reports/tagmail_spec.rb

@@ -31,6 +31,7 @@ describe tagmail do
 
   {
     "tag: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, []],
+    "tag.localhost: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag.localhost}, []],
     "tag, other: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag other}, []],
     "tag-other: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag-other}, []],
     "tag, !other: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, %w{other}],

data/spec/unit/sslcertificates/ca_spec.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet'
+require 'puppet/sslcertificates'
+require 'puppet/sslcertificates/ca'
+
+describe Puppet::SSLCertificates::CA do
+  before :all do
+    @hosts = %w{host.domain.com Other.Testing.Com}
+  end
+
+  before :each do
+    Puppet::Util::SUIDManager.stubs(:asuser).yields
+    file = Tempfile.new("ca_testing")
+    @dir = file.path
+    file.delete
+
+    Puppet.settings[:confdir] = @dir
+    Puppet.settings[:vardir]  = @dir
+
+    @ca = Puppet::SSLCertificates::CA.new
+  end
+
+  after :each do
+    system("rm -rf #{@dir}")
+  end
+
+  describe 'when cleaning' do
+    it 'should remove associated files' do
+      dirs = [:csrdir, :signeddir, :publickeydir, :privatekeydir, :certdir]
+
+      @hosts.each do |host|
+        files = []
+        dirs.each do |dir|
+          dir = Puppet[dir]
+
+          # Case insensitivity is handled through downcasing
+          file = File.join(dir, host.downcase + '.pem')
+
+          File.open(file, "w") do |f|
+            f.puts "testing"
+          end
+
+          files << file
+        end
+
+        lambda { @ca.clean(host) }.should_not raise_error
+
+        files.reject {|f| ! File.exists?(f)}.should be_empty
+      end
+    end
+  end
+
+  describe 'when mapping hosts to files' do
+    it 'should correctly return the certfile' do
+      @hosts.each do |host|
+        value = nil
+        lambda { value = @ca.host2certfile host }.should_not raise_error
+
+        File.join(Puppet[:signeddir], host.downcase + '.pem').should == value
+      end
+    end
+
+    it 'should correctly return the csrfile' do
+      @hosts.each do |host|
+        value = nil
+        lambda { value = @ca.host2csrfile host }.should_not raise_error
+
+        File.join(Puppet[:csrdir], host.downcase + '.pem').should == value
+      end
+    end
+  end
+
+  describe 'when listing' do
+    it 'should find all csr' do
+      list = []
+
+      # Make some fake CSRs
+      @hosts.each do |host|
+        file = File.join(Puppet[:csrdir], host.downcase + '.pem')
+        File.open(file, 'w') { |f| f.puts "yay" }
+        list << host.downcase
+      end
+
+      @ca.list.sort.should == list.sort
+    end
+  end
+
+  describe 'when creating a root certificate' do
+    before :each do
+      lambda { @ca.mkrootcert }.should_not raise_exception
+    end
+
+    it 'should store the public key' do
+      File.exists?(Puppet[:capub]).should be_true
+    end
+
+    it 'should prepend "Puppet CA: " to the fqdn as the ca_name by default' do
+      host_mock_fact = mock()
+      host_mock_fact.expects(:value).returns('myhost')
+      domain_mock_fact = mock()
+      domain_mock_fact.expects(:value).returns('puppetlabs.lan')
+      Facter.stubs(:[]).with('hostname').returns(host_mock_fact)
+      Facter.stubs(:[]).with('domain').returns(domain_mock_fact)
+
+      @ca.mkrootcert.name.should == 'Puppet CA: myhost.puppetlabs.lan'
+    end
+  end
+end

data/spec/unit/type/user_spec.rb

@@ -35,6 +35,14 @@ describe user do
     user.provider_feature(:manages_solaris_rbac).should_not be_nil
   end
 
+  it "should have a manages_expiry feature" do
+    user.provider_feature(:manages_expiry).should_not be_nil
+  end
+
+  it "should have a manages_password_age feature" do
+    user.provider_feature(:manages_password_age).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)
@@ -47,7 +55,7 @@ describe user do
     end
   end
 
-  properties = [:ensure, :uid, :gid, :home, :comment, :shell, :password, :groups, :roles, :auths, :profiles, :project, :keys]
+  properties = [:ensure, :uid, :gid, :home, :comment, :shell, :password, :password_min_age, :password_max_age, :groups, :roles, :auths, :profiles, :project, :keys, :expiry]
 
   properties.each do |property|
     it "should have a #{property} property" do
@@ -227,6 +235,16 @@ describe user do
     end
   end
 
+  describe "when managing expiry" do
+    before do
+      @expiry = user.attrclass(:expiry).new(:resource => @resource)
+    end
+
+    it "should fail if given an invalid date" do
+      lambda { @expiry.should = "200-20-20" }.should raise_error(Puppet::Error)
+    end
+  end
+
   describe "when managing passwords" do
     before do
       @password = user.attrclass(:password).new(:resource => @resource, :should => "mypass")

data/spec/unit/type/whit_spec.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+whit = Puppet::Type.type(:whit).new(:name => "Foo::Bar")
+
+describe whit do
+  it "should stringify as though it were the class it represents" do
+    whit.to_s.should == "Class[Foo::Bar]"
+  end
+end

data/spec/unit/type_spec.rb

@@ -545,6 +545,13 @@ describe Puppet::Type.metaparamclass(:audit) do
     @resource[:audit].should == list
   end
 
+  it "should accept the string 'all' to specify auditing all possible properties" do
+    @resource[:audit] = 'all'
+
+    list = @resource.class.properties.collect { |p| p.name }
+    @resource[:audit].should == list
+  end
+
   it "should fail if asked to audit an invalid property" do
     lambda { @resource[:audit] = :foobar }.should raise_error(Puppet::Error)
   end

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

@@ -19,7 +19,7 @@ describe RDoc::Parser do
     it "should parse puppet files with the puppet parser" do
       @parser.stubs(:scan_top_level)
       parser = stub 'parser'
-      Puppet::Parser::Parser.expects(:new).returns(parser)
+      Puppet::Parser::Parser.stubs(:new).returns(parser)
       parser.expects(:parse)
       parser.expects(:file=).with("module/manifests/init.pp")
 
@@ -340,10 +340,12 @@ describe RDoc::Parser do
 
     def create_stmt(name)
       stmt_value = stub "#{name}_value", :value => "myclass"
-      stmt = stub_everything 'stmt', :name => name, :arguments => [stmt_value], :doc => "mydoc"
-      stmt.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(false)
-      stmt.stubs(:is_a?).with(Puppet::Parser::AST::Function).returns(true)
-      stmt
+
+      Puppet::Parser::AST::Function.new(
+        :name      => name,
+        :arguments => [stmt_value],
+        :doc       => 'mydoc'
+      )
     end
 
     before(:each) do
@@ -377,10 +379,11 @@ describe RDoc::Parser do
 
     def create_stmt
       stmt_value = stub "resource_ref", :to_s => "File[\"/tmp/a\"]"
-      stmt = stub_everything 'stmt', :name => "realize", :arguments => [stmt_value], :doc => "mydoc"
-      stmt.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(false)
-      stmt.stubs(:is_a?).with(Puppet::Parser::AST::Function).returns(true)
-      stmt
+      Puppet::Parser::AST::Function.new(
+        :name      => 'realize',
+        :arguments => [stmt_value],
+        :doc       => 'mydoc'
+      )
     end
 
     before(:each) do
@@ -432,11 +435,12 @@ describe RDoc::Parser do
   describe "when scanning for resources" do
     before :each do
       @class = stub_everything 'class'
-
-      param = stub 'params', :children => []
-      @stmt = stub_everything 'stmt', :type => "File", :title => "myfile", :doc => "mydoc", :params => param
-      @stmt.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(false)
-      @stmt.stubs(:is_a?).with(Puppet::Parser::AST::Resource).returns(true)
+      @stmt = Puppet::Parser::AST::Resource.new(
+        :type       => "File",
+        :title      => "myfile",
+        :doc        => 'mydoc',
+        :parameters => Puppet::Parser::AST::ASTArray.new(:children => [])
+      )
 
       @code = stub_everything 'code'
       @code.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(true)

data/spec/unit/util/zaml_spec.rb

@@ -11,7 +11,8 @@ describe "Pure ruby yaml implementation" do
   'test'       => "--- test",
   []           => "--- []",
   :symbol      => "--- !ruby/sym symbol",
-  {:a => "A"}  => "--- \n  !ruby/sym a: A"
+  {:a => "A"}  => "--- \n  !ruby/sym a: A",
+  {:a => "x\ny"} => "--- \n  !ruby/sym a: |-\n    x\n    y" 
   }.each { |o,y|
     it "should convert the #{o.class} #{o.inspect} to yaml" do
       o.to_yaml.should == y

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 2
   - 6
-  - 1
-  version: 2.6.1
+  - 2
+  version: 2.6.2
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +10:00
+date: 2010-10-08 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -633,7 +633,6 @@ files:
 - conf/epm.list
 - conf/suse/client.init
 - conf/suse/fileserver.conf
-- conf/suse/ruby-env.patch
 - conf/suse/puppet.spec
 - conf/suse/server.init
 - conf/suse/puppet.conf
@@ -850,7 +849,6 @@ files:
 - test/network/client/dipper.rb
 - test/certmgr/support.rb
 - test/certmgr/inventory.rb
-- test/certmgr/ca.rb
 - test/certmgr/certmgr.rb
 - test/Rakefile
 - test/ral/manager/manager.rb
@@ -935,6 +933,8 @@ files:
 - test/util/log.rb
 - test/util/fileparsing.rb
 - spec/fixtures/yaml/test.local.yaml
+- spec/fixtures/yaml/report2.6.x.yaml
+- spec/fixtures/yaml/report0.25.x.yaml
 - spec/monkey_patches/publicize_methods.rb
 - spec/monkey_patches/alias_should_to_must.rb
 - spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb
@@ -1072,6 +1072,7 @@ files:
 - spec/unit/parser/collector_spec.rb
 - spec/unit/parser/parser_spec.rb
 - spec/unit/reports/tagmail_spec.rb
+- spec/unit/reports/rrdgraph_spec.rb
 - spec/unit/reports/http_spec.rb
 - spec/unit/node/facts_spec.rb
 - spec/unit/node/environment_spec.rb
@@ -1127,6 +1128,7 @@ files:
 - spec/unit/module_spec.rb
 - spec/unit/puppet_spec.rb
 - spec/unit/rails_spec.rb
+- spec/unit/sslcertificates/ca_spec.rb
 - spec/unit/transaction/change_spec.rb
 - spec/unit/transaction/event_manager_spec.rb
 - spec/unit/transaction/resource_harness_spec.rb
@@ -1278,6 +1280,7 @@ files:
 - spec/unit/type/macauthorization_spec.rb
 - spec/unit/type/user_spec.rb
 - spec/unit/type/zone_spec.rb
+- spec/unit/type/whit_spec.rb
 - spec/unit/type/mcx_spec.rb
 - spec/unit/type/tidy_spec.rb
 - spec/unit/type/filebucket_spec.rb
@@ -1316,6 +1319,7 @@ files:
 - spec/integration/node_spec.rb
 - spec/integration/parser/compiler_spec.rb
 - spec/integration/parser/functions/require_spec.rb
+- spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/collector_spec.rb
 - spec/integration/parser/parser_spec.rb
 - spec/integration/node/facts_spec.rb
@@ -1325,6 +1329,7 @@ files:
 - spec/integration/provider/package_spec.rb
 - spec/integration/type_spec.rb
 - spec/integration/transaction/report_spec.rb
+- spec/integration/application/doc_spec.rb
 - spec/integration/application/apply_spec.rb
 - spec/integration/indirector/report/rest_spec.rb
 - spec/integration/indirector/certificate_request/rest_spec.rb

data/conf/suse/ruby-env.patch

@@ -1,17 +0,0 @@
---- sbin/puppetd	2010-07-18 14:17:38.000000000 -0700
-+++ sbin/puppetd	2010-07-21 17:31:57.057138615 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/ruby
- 
- require 'puppet/application/agent'
- Puppet::Application[:agent].run
-
---- sbin/puppetmasterd	2010-07-18 14:17:38.000000000 -0700
-+++ sbin/puppetmasterd	2010-07-21 17:32:10.178513969 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/ruby
- 
- require 'puppet/application/master'
- Puppet::Application[:master].run

data/test/certmgr/ca.rb

@@ -1,87 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../lib/puppettest'
-
-require 'puppet'
-require 'puppet/sslcertificates/ca.rb'
-require 'puppettest'
-require 'puppettest/certificates'
-require 'mocha'
-
-class TestCA < Test::Unit::TestCase
-  include PuppetTest
-
-  def setup
-    super
-    Puppet::Util::SUIDManager.stubs(:asuser).yields
-  end
-
-  def hosts
-    %w{host.domain.com Other.Testing.Com}
-  end
-  def mkca
-    Puppet::SSLCertificates::CA.new
-  end
-
-  def test_clean
-    dirs = [:csrdir, :signeddir, :publickeydir, :privatekeydir, :certdir]
-    ca = mkca
-
-    hosts.each do |host|
-      files = []
-      dirs.each do |dir|
-        dir = Puppet[dir]
-        # We handle case insensitivity through downcasing
-        file = File.join(dir, host.downcase + ".pem")
-        File.open(file, "w") do |f|
-          f.puts "testing"
-        end
-        files << file
-      end
-      assert_nothing_raised do
-        ca.clean(host)
-      end
-      files.each do |f|
-        assert(! FileTest.exists?(f), "File #{f} was not deleted")
-      end
-    end
-  end
-
-  def test_host2Xfile
-    ca = mkca
-    hosts.each do |host|
-      {:signeddir => :host2certfile, :csrdir => :host2csrfile}.each do |dir, method|
-        val = nil
-        assert_nothing_raised do
-          val = ca.send(method, host)
-        end
-        assert_equal(File.join(Puppet[dir], host.downcase + ".pem"), val,
-          "incorrect response from #{method}")
-      end
-    end
-  end
-
-  def test_list
-    ca = mkca
-    # Make a fake csr
-    dir = Puppet[:csrdir]
-    list = []
-    hosts.each do |host|
-      file = File.join(dir, host.downcase + ".pem")
-      File.open(file, "w") { |f| f.puts "yay" }
-      list << host.downcase
-    end
-
-    assert_equal(list.sort, ca.list.sort, "list was not correct")
-  end
-
-  # #142 - test storing the public key
-  def test_store_public_key
-    ca = mkca
-    assert_nothing_raised do
-      ca.mkrootcert
-    end
-    assert(FileTest.exists?(Puppet[:capub]), "did not store public key")
-  end
-end
-