puppet 0.24.9 → 0.25.0

data/spec/unit/indirector/catalog/queue.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/catalog/queue'
+
+describe Puppet::Resource::Catalog::Queue do
+    it 'should be a subclass of the Queue terminus' do
+        Puppet::Resource::Catalog::Queue.superclass.should equal(Puppet::Indirector::Queue)
+    end
+
+    it 'should be registered with the catalog store indirection' do
+        indirection = Puppet::Indirector::Indirection.instance(:catalog)
+        Puppet::Resource::Catalog::Queue.indirection.should equal(indirection)
+    end
+
+    it 'shall be dubbed ":queue"' do
+        Puppet::Resource::Catalog::Queue.name.should == :queue
+    end
+end

data/spec/unit/indirector/catalog/rest.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/catalog/rest'
+
+describe Puppet::Resource::Catalog::Rest do
+    it "should be a sublcass of Puppet::Indirector::REST" do
+        Puppet::Resource::Catalog::Rest.superclass.should equal(Puppet::Indirector::REST)
+    end
+end

data/spec/unit/indirector/catalog/yaml.rb

@@ -2,24 +2,24 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 require 'puppet/indirector/catalog/yaml'
 
-describe Puppet::Node::Catalog::Yaml do
+describe Puppet::Resource::Catalog::Yaml do
     it "should be a subclass of the Yaml terminus" do
-        Puppet::Node::Catalog::Yaml.superclass.should equal(Puppet::Indirector::Yaml)
+        Puppet::Resource::Catalog::Yaml.superclass.should equal(Puppet::Indirector::Yaml)
     end
 
     it "should have documentation" do
-        Puppet::Node::Catalog::Yaml.doc.should_not be_nil
+        Puppet::Resource::Catalog::Yaml.doc.should_not be_nil
     end
 
     it "should be registered with the catalog store indirection" do
         indirection = Puppet::Indirector::Indirection.instance(:catalog)
-        Puppet::Node::Catalog::Yaml.indirection.should equal(indirection)
+        Puppet::Resource::Catalog::Yaml.indirection.should equal(indirection)
     end
 
     it "should have its name set to :yaml" do
-        Puppet::Node::Catalog::Yaml.name.should == :yaml
+        Puppet::Resource::Catalog::Yaml.name.should == :yaml
     end
 end

data/spec/unit/indirector/certificate/ca.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2008-3-7.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate/ca'
+
+describe Puppet::SSL::Certificate::Ca do
+    it "should have documentation" do
+        Puppet::SSL::Certificate::Ca.doc.should be_instance_of(String)
+    end
+
+    it "should use the :signeddir as the collection directory" do
+        Puppet.settings.expects(:value).with(:signeddir).returns "/cert/dir"
+        Puppet::SSL::Certificate::Ca.collection_directory.should == "/cert/dir"
+    end
+
+    it "should store the ca certificate at the :cacert location" do
+        Puppet.settings.stubs(:use)
+        Puppet.settings.stubs(:value).returns "whatever"
+        Puppet.settings.stubs(:value).with(:cacert).returns "/ca/cert"
+        file = Puppet::SSL::Certificate::Ca.new
+        file.stubs(:ca?).returns true
+        file.path("whatever").should == "/ca/cert"
+    end
+end

data/spec/unit/indirector/certificate/file.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2008-3-7.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate/file'
+
+describe Puppet::SSL::Certificate::File do
+    it "should have documentation" do
+        Puppet::SSL::Certificate::File.doc.should be_instance_of(String)
+    end
+
+    it "should use the :certdir as the collection directory" do
+        Puppet.settings.expects(:value).with(:certdir).returns "/cert/dir"
+        Puppet::SSL::Certificate::File.collection_directory.should == "/cert/dir"
+    end
+
+    it "should store the ca certificate at the :localcacert location" do
+        Puppet.settings.stubs(:use)
+        Puppet.settings.stubs(:value).returns "whatever"
+        Puppet.settings.stubs(:value).with(:localcacert).returns "/ca/cert"
+        file = Puppet::SSL::Certificate::File.new
+        file.stubs(:ca?).returns true
+        file.path("whatever").should == "/ca/cert"
+    end
+end

data/spec/unit/indirector/certificate/rest.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate/rest'
+
+describe Puppet::SSL::Certificate::Rest do
+    before do
+        @searcher = Puppet::SSL::Certificate::Rest.new
+    end
+
+    it "should be a sublcass of Puppet::Indirector::REST" do
+        Puppet::SSL::Certificate::Rest.superclass.should equal(Puppet::Indirector::REST)
+    end
+
+    it "should set server_setting to :ca_server" do
+        Puppet::SSL::Certificate::Rest.server_setting.should == :ca_server
+    end
+
+    it "should set port_setting to :ca_port" do
+        Puppet::SSL::Certificate::Rest.port_setting.should == :ca_port
+    end
+end

data/spec/unit/indirector/certificate_request/ca.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2008-3-7.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate_request/ca'
+
+describe Puppet::SSL::CertificateRequest::Ca do
+    it "should have documentation" do
+        Puppet::SSL::CertificateRequest::Ca.doc.should be_instance_of(String)
+    end
+
+    it "should use the :csrdir as the collection directory" do
+        Puppet.settings.expects(:value).with(:csrdir).returns "/request/dir"
+        Puppet::SSL::CertificateRequest::Ca.collection_directory.should == "/request/dir"
+    end
+end

data/spec/unit/indirector/certificate_request/file.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2008-3-7.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate_request/file'
+
+describe Puppet::SSL::CertificateRequest::File do
+    it "should have documentation" do
+        Puppet::SSL::CertificateRequest::File.doc.should be_instance_of(String)
+    end
+
+    it "should use the :requestdir as the collection directory" do
+        Puppet.settings.expects(:value).with(:requestdir).returns "/request/dir"
+        Puppet::SSL::CertificateRequest::File.collection_directory.should == "/request/dir"
+    end
+end

data/spec/unit/indirector/certificate_request/rest.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate_request/rest'
+
+describe Puppet::SSL::CertificateRequest::Rest do
+    before do
+        @searcher = Puppet::SSL::CertificateRequest::Rest.new
+    end
+
+    it "should be a sublcass of Puppet::Indirector::REST" do
+        Puppet::SSL::CertificateRequest::Rest.superclass.should equal(Puppet::Indirector::REST)
+    end
+
+    it "should set server_setting to :ca_server" do
+        Puppet::SSL::CertificateRequest::Rest.server_setting.should == :ca_server
+    end
+
+    it "should set port_setting to :ca_port" do
+        Puppet::SSL::CertificateRequest::Rest.port_setting.should == :ca_port
+    end
+end

data/spec/unit/indirector/certificate_revocation_list/ca.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2008-3-7.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate_revocation_list/ca'
+
+describe Puppet::SSL::CertificateRevocationList::Ca do
+    it "should have documentation" do
+        Puppet::SSL::CertificateRevocationList::Ca.doc.should be_instance_of(String)
+    end
+
+    it "should use the :cacrl setting as the crl location" do
+        Puppet.settings.stubs(:value).returns "whatever"
+        Puppet.settings.stubs(:use)
+        Puppet.settings.stubs(:value).with(:cacrl).returns "/request/dir"
+        Puppet::SSL::CertificateRevocationList::Ca.new.path("whatever").should == "/request/dir"
+    end
+end

data/spec/unit/indirector/certificate_revocation_list/file.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2008-3-7.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate_revocation_list/file'
+
+describe Puppet::SSL::CertificateRevocationList::File do
+    it "should have documentation" do
+        Puppet::SSL::CertificateRevocationList::File.doc.should be_instance_of(String)
+    end
+
+    it "should always store the file to :hostcrl location" do
+        Puppet.settings.expects(:value).with(:hostcrl).returns "/host/crl"
+        Puppet.settings.stubs(:use)
+        Puppet::SSL::CertificateRevocationList::File.file_location.should == "/host/crl"
+    end
+end

data/spec/unit/indirector/certificate_revocation_list/rest.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/certificate_revocation_list/rest'
+
+describe Puppet::SSL::CertificateRevocationList::Rest do
+    before do
+        @searcher = Puppet::SSL::CertificateRevocationList::Rest.new
+    end
+
+    it "should be a sublcass of Puppet::Indirector::REST" do
+        Puppet::SSL::CertificateRevocationList::Rest.superclass.should equal(Puppet::Indirector::REST)
+    end
+
+    it "should set server_setting to :ca_server" do
+        Puppet::SSL::CertificateRevocationList::Rest.server_setting.should == :ca_server
+    end
+
+    it "should set port_setting to :ca_port" do
+        Puppet::SSL::CertificateRevocationList::Rest.port_setting.should == :ca_port
+    end
+end

data/spec/unit/indirector/direct_file_server.rb

@@ -24,7 +24,7 @@ describe Puppet::Indirector::DirectFileServer do
 
         @uri = "file:///my/local"
 
-        @request = stub 'request', :key => @uri, :options => {}
+        @request = Puppet::Indirector::Request.new(:mytype, :find, @uri)
     end
 
     describe Puppet::Indirector::DirectFileServer, "when finding a single file" do
@@ -45,17 +45,12 @@ describe Puppet::Indirector::DirectFileServer do
 
         before do
             @data = mock 'content'
-            @data.stubs(:collect_attributes)
+            @data.stubs(:collect)
             FileTest.expects(:exists?).with("/my/local").returns true
         end
 
-        it "should create the Content instance with the original key as the key" do
-            @model.expects(:new).with { |key, options| key == @uri }.returns(@data)
-            @server.find(@request)
-        end
-
         it "should pass the full path to the instance" do
-            @model.expects(:new).with { |key, options| options[:path] == "/my/local" }.returns(@data)
+            @model.expects(:new).with { |key, options| key == "/my/local" }.returns(@data)
             @server.find(@request)
         end
 

data/spec/unit/indirector/exec.rb

@@ -47,5 +47,10 @@ describe Puppet::Indirector::Exec do
         @searcher.find(@request).should be_nil
     end
 
-    it "should be able to execute commands with multiple arguments"
+    it "should return nil and log an error if there's an execution failure" do
+        @searcher.expects(:execute).with(%w{/echo foo}).raises(Puppet::ExecutionFailure.new("message"))
+
+        Puppet.expects(:err)
+        @searcher.find(@request).should be_nil
+    end
 end

data/spec/unit/indirector/facts/active_record.rb

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/node/facts'
+
+describe "Puppet::Node::Facts::ActiveRecord" do
+    confine "Missing Rails" => Puppet.features.rails?
+
+    before do
+        require 'puppet/indirector/facts/active_record'
+        Puppet.features.stubs(:rails?).returns true
+        Puppet::Rails.stubs(:init)
+        @terminus = Puppet::Node::Facts::ActiveRecord.new
+    end
+
+    it "should be a subclass of the ActiveRecord terminus class" do
+        Puppet::Node::Facts::ActiveRecord.ancestors.should be_include(Puppet::Indirector::ActiveRecord)
+    end
+
+    it "should use Puppet::Rails::Host as its ActiveRecord model" do
+        Puppet::Node::Facts::ActiveRecord.ar_model.should equal(Puppet::Rails::Host)
+    end
+
+    describe "when finding an instance" do
+        before do
+            @request = stub 'request', :key => "foo"
+        end
+
+        it "should use the Hosts ActiveRecord class to find the host" do
+            Puppet::Rails::Host.expects(:find_by_name).with { |key, args| key == "foo" }
+            @terminus.find(@request)
+        end
+
+        it "should include the fact names and values when finding the host" do
+            Puppet::Rails::Host.expects(:find_by_name).with { |key, args| args[:include] == {:fact_values => :fact_name} }
+            @terminus.find(@request)
+        end
+
+        it "should return nil if no host instance can be found" do
+            Puppet::Rails::Host.expects(:find_by_name).returns nil
+
+            @terminus.find(@request).should be_nil
+        end
+
+        it "should convert the node's parameters into a Facts instance if a host instance is found" do
+            host = stub 'host', :name => "foo"
+            host.expects(:get_facts_hash).returns("one" => [mock("two_value", :value => "two")], "three" => [mock("three_value", :value => "four")])
+
+            Puppet::Rails::Host.expects(:find_by_name).returns host
+
+            result = @terminus.find(@request)
+
+            result.should be_instance_of(Puppet::Node::Facts)
+            result.name.should == "foo"
+            result.values.should == {"one" => "two", "three" => "four"}
+        end
+
+        it "should convert all single-member arrays into non-arrays" do
+            host = stub 'host', :name => "foo"
+            host.expects(:get_facts_hash).returns("one" => [mock("two_value", :value => "two")])
+
+            Puppet::Rails::Host.expects(:find_by_name).returns host
+
+            @terminus.find(@request).values["one"].should == "two"
+        end
+    end
+
+    describe "when saving an instance" do
+        before do
+            @host = stub 'host', :name => "foo", :save => nil, :merge_facts => nil
+            Puppet::Rails::Host.stubs(:find_by_name).returns @host
+            @facts = Puppet::Node::Facts.new("foo", "one" => "two", "three" => "four")
+            @request = stub 'request', :key => "foo", :instance => @facts
+        end
+
+        it "should find the Rails host with the same name" do
+            Puppet::Rails::Host.expects(:find_by_name).with("foo").returns @host
+
+            @terminus.save(@request)
+        end
+
+        it "should create a new Rails host if none can be found" do
+            Puppet::Rails::Host.expects(:find_by_name).with("foo").returns nil
+
+            Puppet::Rails::Host.expects(:create).with(:name => "foo").returns @host
+
+            @terminus.save(@request)
+        end
+
+        it "should set the facts as facts on the Rails host instance" do
+            # There is other stuff added to the hash.
+            @host.expects(:merge_facts).with { |args| args["one"] == "two" and args["three"] == "four" }
+
+            @terminus.save(@request)
+        end
+
+        it "should save the Rails host instance" do
+            @host.expects(:save)
+
+            @terminus.save(@request)
+        end
+    end
+end

data/spec/unit/indirector/facts/facter.rb

@@ -26,7 +26,7 @@ describe Puppet::Node::Facts::Facter do
     end
 
     it "should load facts on initialization" do
-        Puppet::Node::Facts::Facter.expects(:loadfacts)
+        Puppet::Node::Facts::Facter.expects(:load_fact_plugins)
         Puppet::Node::Facts::Facter.new
     end
 end
@@ -40,7 +40,6 @@ describe Puppet::Node::Facts::Facter do
     end
 
     describe Puppet::Node::Facts::Facter, " when finding facts" do
-
         it "should return a Facts instance" do
             @facter.find(@request).should be_instance_of(Puppet::Node::Facts)
         end
@@ -54,6 +53,30 @@ describe Puppet::Node::Facts::Facter do
             facts = @facter.find(@request)
             facts.values["one"].should == "two"
         end
+
+        it "should add local facts" do
+            facts = Puppet::Node::Facts.new("foo")
+            Puppet::Node::Facts.expects(:new).returns facts
+            facts.expects(:add_local_facts)
+
+            @facter.find(@request)
+        end
+
+        it "should convert all facts into strings" do
+            facts = Puppet::Node::Facts.new("foo")
+            Puppet::Node::Facts.expects(:new).returns facts
+            facts.expects(:stringify)
+
+            @facter.find(@request)
+        end
+
+        it "should call the downcase hook" do
+            facts = Puppet::Node::Facts.new("foo")
+            Puppet::Node::Facts.expects(:new).returns facts
+            facts.expects(:downcase_if_necessary)
+
+            @facter.find(@request)
+        end
     end
 
     describe Puppet::Node::Facts::Facter, " when saving facts" do
@@ -70,32 +93,50 @@ describe Puppet::Node::Facts::Facter do
         end
     end
 
-    describe Puppet::Node::Facts::Facter, "when loading facts from disk" do
+    it "should skip files when asked to load a directory" do
+        FileTest.expects(:directory?).with("myfile").returns false
+
+        Puppet::Node::Facts::Facter.load_facts_in_dir("myfile")
+    end
+
+    it "should load each ruby file when asked to load a directory" do
+        FileTest.expects(:directory?).with("mydir").returns true
+        Dir.expects(:chdir).with("mydir").yields
+
+        Dir.expects(:glob).with("*.rb").returns %w{a.rb b.rb}
+
+        Puppet::Node::Facts::Facter.expects(:load).with("a.rb")
+        Puppet::Node::Facts::Facter.expects(:load).with("b.rb")
+
+        Puppet::Node::Facts::Facter.load_facts_in_dir("mydir")
+    end
+
+    describe Puppet::Node::Facts::Facter, "when loading fact plugins from disk" do
         it "should load each directory in the Fact path" do
             Puppet.settings.stubs(:value).returns "foo"
             Puppet.settings.expects(:value).with(:factpath).returns("one%stwo" % File::PATH_SEPARATOR)
 
-            Puppet::Node::Facts::Facter.expects(:loaddir).with("one", "fact")
-            Puppet::Node::Facts::Facter.expects(:loaddir).with("two", "fact")
+            Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("one")
+            Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("two")
 
-            Puppet::Node::Facts::Facter.loadfacts
+            Puppet::Node::Facts::Facter.load_fact_plugins
         end
 
         it "should load all facts from the modules" do
             Puppet.settings.stubs(:value).returns "foo"
-            Puppet::Node::Facts::Facter.stubs(:loaddir)
+            Puppet::Node::Facts::Facter.stubs(:load_facts_in_dir)
 
             Puppet.settings.expects(:value).with(:modulepath).returns("one%stwo" % File::PATH_SEPARATOR)
 
             Dir.expects(:glob).with("one/*/plugins/facter").returns %w{oneA oneB}
             Dir.expects(:glob).with("two/*/plugins/facter").returns %w{twoA twoB}
 
-            Puppet::Node::Facts::Facter.expects(:loaddir).with("oneA", "fact")
-            Puppet::Node::Facts::Facter.expects(:loaddir).with("oneB", "fact")
-            Puppet::Node::Facts::Facter.expects(:loaddir).with("twoA", "fact")
-            Puppet::Node::Facts::Facter.expects(:loaddir).with("twoB", "fact")
+            Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("oneA")
+            Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("oneB")
+            Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("twoA")
+            Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("twoB")
 
-            Puppet::Node::Facts::Facter.loadfacts
+            Puppet::Node::Facts::Facter.load_fact_plugins
         end
     end
 end