puppet 3.0.2 → 3.1.0.rc1

data/spec/unit/face/help_spec.rb

@@ -72,7 +72,7 @@ describe Puppet::Face[:help, '0.0.1'] do
       #  that can't be run from the command line, so, rather than iterating
       #  over all available faces, we need to iterate over the subcommands
       #  that are available from the command line.
-      Puppet::Util::CommandLine.available_subcommands.each do |name|
+      Puppet::Application.available_application_names.each do |name|
         next unless help_face.is_face_app?(name)
         next if help_face.exclude_from_docs?(name)
         face = Puppet::Face[name, :current]
@@ -84,12 +84,10 @@ describe Puppet::Face[:help, '0.0.1'] do
     end
 
     context "face summaries" do
-      # we need to set a bunk module path here, because without doing so,
-      #  the autoloader will try to use it before it is initialized.
-      Puppet[:modulepath] = "/dev/null"
-
-      Puppet::Face.faces.each do |name|
-        it "has a summary for #{name}" do
+      it "can generate face summaries" do
+        faces = Puppet::Face.faces
+        faces.length.should > 0
+        faces.each do |name|
           Puppet::Face[name, :current].should have_a_summary
         end
       end

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

@@ -19,4 +19,8 @@ describe Puppet::SSL::CertificateRequest::Rest do
   it "should set port_setting to :ca_port" do
     Puppet::SSL::CertificateRequest::Rest.port_setting.should == :ca_port
   end
+
+  it "should use the :ca SRV service" do
+    Puppet::SSL::CertificateRequest::Rest.srv_service.should == :ca
+  end
 end

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

@@ -19,4 +19,8 @@ describe Puppet::SSL::CertificateRevocationList::Rest do
   it "should set port_setting to :ca_port" do
     Puppet::SSL::CertificateRevocationList::Rest.port_setting.should == :ca_port
   end
+
+  it "should use the :ca SRV service" do
+    Puppet::SSL::CertificateRevocationList::Rest.srv_service.should == :ca
+  end
 end

data/spec/unit/indirector/certificate_status/rest_spec.rb

@@ -11,4 +11,8 @@ describe "Puppet::CertificateStatus::Rest" do
   it "should be a terminus on Puppet::SSL::Host" do
     @terminus.should be_instance_of(Puppet::Indirector::CertificateStatus::Rest)
   end
+
+  it "should use the :ca SRV service" do
+    Puppet::Indirector::CertificateStatus::Rest.srv_service.should == :ca
+  end
 end

data/spec/unit/indirector/file_metadata/rest_spec.rb

@@ -2,7 +2,12 @@
 require 'spec_helper'
 
 require 'puppet/indirector/file_metadata'
+require 'puppet/indirector/file_metadata/rest'
 
 describe "Puppet::Indirector::Metadata::Rest" do
   it "should add the node's cert name to the arguments"
+
+  it "should use the :fileserver SRV service" do
+    Puppet::Indirector::FileMetadata::Rest.srv_service.should == :fileserver
+  end
 end

data/spec/unit/indirector/hiera_spec.rb

@@ -96,7 +96,9 @@ describe Puppet::Indirector::Hiera do
 
     it "should return a hiera configuration hash" do
       results = @hiera_class.hiera_config
-      results.should == default_hiera_config
+      default_hiera_config.each do |key,value|
+        results[key].should == value
+      end
       results.should be_a_kind_of Hash
     end
 

data/spec/unit/indirector/queue_spec.rb

@@ -25,7 +25,7 @@ class FooExampleData
   end
 end
 
-describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
+describe Puppet::Indirector::Queue do
   before :each do
     @model = mock 'model'
     @indirection = stub 'indirection', :name => :my_queue, :register_terminus_type => nil, :model => @model
@@ -46,12 +46,6 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
     @request = stub 'request', :key => :me, :instance => @subject
   end
 
-  it "should require PSON" do
-    Puppet.features.expects(:pson?).returns false
-
-    expect { @store_class.new }.to raise_error(ArgumentError)
-  end
-
   it 'should use the correct client type and queue' do
     @store.queue.should == :my_queue
     @store.client.should be_an_instance_of(Puppet::Indirector::Queue::TestClient)

data/spec/unit/indirector/ssl_file_spec.rb

@@ -27,6 +27,12 @@ describe Puppet::Indirector::SslFile do
     Puppet[:trace] = false
   end
 
+  after :each do
+    @file_class.store_in nil
+    @file_class.store_at nil
+    @file_class.store_ca_at nil
+  end
+
   it "should use :main and :ssl upon initialization" do
     Puppet.settings.expects(:use).with(:main, :ssl)
     @file_class.new
@@ -43,11 +49,12 @@ describe Puppet::Indirector::SslFile do
   end
 
   it "should fail if no store directory or file location has been set" do
+    Puppet.settings.expects(:use).with(:main, :ssl)
     @file_class.store_in nil
     @file_class.store_at nil
-    FileTest.expects(:exists?).with(File.dirname(@path)).at_least(0).returns(true)
-    Dir.stubs(:mkdir).with(@path)
-    lambda { @file_class.new }.should raise_error(Puppet::DevError, /No file or directory setting provided/)
+    expect {
+      @file_class.new
+    }.to raise_error(Puppet::DevError, /No file or directory setting provided/)
   end
 
   describe "when managing ssl files" do
@@ -113,30 +120,45 @@ describe Puppet::Indirector::SslFile do
 
     describe "when finding certificates on disk" do
       describe "and no certificate is present" do
-        before do
-          # Stub things so the case management bits work.
-          FileTest.stubs(:exist?).with(File.dirname(@certpath)).returns false
-          FileTest.expects(:exist?).with(@certpath).returns false
-        end
-
         it "should return nil" do
+          FileTest.expects(:exist?).with(@path).returns(true)
+          Dir.expects(:entries).with(@path).returns([])
+          FileTest.expects(:exist?).with(@certpath).returns(false)
+
           @searcher.find(@request).should be_nil
         end
       end
 
       describe "and a certificate is present" do
-        before do
-          FileTest.expects(:exist?).with(@certpath).returns true
-        end
+        let(:cert) { mock 'cert' }
+        let(:model) { mock 'model' }
 
-        it "should return an instance of the model, which it should use to read the certificate" do
-          cert = mock 'cert'
-          model = mock 'model'
+        before(:each) do
           @file_class.stubs(:model).returns model
+        end
+
+        context "is readable" do
+          it "should return an instance of the model, which it should use to read the certificate" do
+            FileTest.expects(:exist?).with(@certpath).returns true
+
+            model.expects(:new).with("myname").returns cert
+            cert.expects(:read).with(@certpath)
+
+            @searcher.find(@request).should equal(cert)
+          end
+        end
 
-          model.expects(:new).with("myname").returns cert
-          cert.expects(:read).with(@certpath)
-          @searcher.find(@request).should equal(cert)
+        context "is unreadable" do
+          it "should raise an exception" do
+            FileTest.expects(:exist?).with(@certpath).returns(true)
+
+            model.expects(:new).with("myname").returns cert
+            cert.expects(:read).with(@certpath).raises(Errno::EACCES)
+
+            expect {
+              @searcher.find(@request)
+            }.to raise_error(Errno::EACCES)
+          end
         end
       end
 
@@ -262,41 +284,46 @@ describe Puppet::Indirector::SslFile do
     end
 
     describe "when searching for certificates" do
-      before do
-        @model = mock 'model'
-        @file_class.stubs(:model).returns @model
+      let(:one) { stub 'one' }
+      let(:two) { stub 'two' }
+      let(:one_path) { File.join(@path, 'one.pem') }
+      let(:two_path) { File.join(@path, 'two.pem') }
+      let(:model) { mock 'model' }
+
+      before :each do
+        @file_class.stubs(:model).returns model
       end
-      it "should return a certificate instance for all files that exist" do
-        Dir.expects(:entries).with(@path).returns %w{one.pem two.pem}
 
-        one = stub 'one', :read => nil
-        two = stub 'two', :read => nil
+      it "should return a certificate instance for all files that exist" do
+        Dir.expects(:entries).with(@path).returns(%w{. .. one.pem two.pem})
 
-        @model.expects(:new).with("one").returns one
-        @model.expects(:new).with("two").returns two
+        model.expects(:new).with("one").returns one
+        one.expects(:read).with(one_path)
+        model.expects(:new).with("two").returns two
+        two.expects(:read).with(two_path)
 
         @searcher.search(@request).should == [one, two]
       end
 
-      it "should read each certificate in using the model's :read method" do
-        Dir.expects(:entries).with(@path).returns %w{one.pem}
-
-        one = stub 'one'
-        one.expects(:read).with(File.join(@path, "one.pem"))
+      it "should raise an exception if any file is unreadable" do
+        Dir.expects(:entries).with(@path).returns(%w{. .. one.pem two.pem})
 
-        @model.expects(:new).with("one").returns one
+        model.expects(:new).with("one").returns(one)
+        one.expects(:read).with(one_path)
+        model.expects(:new).with("two").returns(two)
+        two.expects(:read).raises(Errno::EACCES)
 
-        @searcher.search(@request)
+        expect {
+          @searcher.search(@request)
+        }.to raise_error(Errno::EACCES)
       end
 
       it "should skip any files that do not match /\.pem$/" do
-        Dir.expects(:entries).with(@path).returns %w{. .. one.pem}
-
-        one = stub 'one', :read => nil
+        Dir.expects(:entries).with(@path).returns(%w{. .. one two.notpem})
 
-        @model.expects(:new).with("one").returns one
+        model.expects(:new).never
 
-        @searcher.search(@request)
+        @searcher.search(@request).should == []
       end
     end
   end

data/spec/unit/module_spec.rb

@@ -521,7 +521,7 @@ describe Puppet::Module do
     mod
   end
 
-  describe "when loading the metadata file", :if => Puppet.features.pson? do
+  describe "when loading the metadata file" do
     before do
       @data = {
         :license       => "GPL2",

data/spec/unit/network/authstore_spec.rb

@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
+require 'rbconfig'
 
 require 'puppet/network/authconfig'
 
@@ -214,7 +215,6 @@ describe Puppet::Network::AuthStore::Declaration do
     "1::2:3:4",
     "1::2:3",
     "1::8",
-    "::2:3:4:5:6:7:8",
     "::2:3:4:5:6:7",
     "::2:3:4:5:6",
     "::2:3:4:5",
@@ -291,6 +291,27 @@ describe Puppet::Network::AuthStore::Declaration do
     end unless ip =~ /:.*\./ # Hybrid IPs aren't supported by ruby's ipaddr
   }
 
+  [
+    "::2:3:4:5:6:7:8",
+  ].each { |ip|
+    describe "when the pattern is a valid IP such as #{ip}" do
+      let(:declaration) do
+        Puppet::Network::AuthStore::Declaration.new(:allow_ip,ip)
+      end
+
+      issue_7477 = !(IPAddr.new(ip) rescue false)
+
+      it "should match the specified IP" do
+        pending "resolution of ruby issue [7477](http://goo.gl/Bb1LU)", :if => issue_7477
+        declaration.should be_match('www.testsite.org',ip)
+      end
+      it "should not match other IPs" do
+        pending "resolution of ruby issue [7477](http://goo.gl/Bb1LU)", :if => issue_7477
+        declaration.should_not be_match('www.testsite.org','200.101.99.98')
+      end
+    end
+  }
+
   {
   'spirit.mars.nasa.gov' => 'a PQDN',
   'ratchet.2ndsiteinc.com' => 'a PQDN with digits',

data/spec/unit/network/formats_spec.rb

@@ -220,7 +220,7 @@ describe "Puppet Network Format" do
     Puppet::Network::FormatHandler.format(:pson).should_not be_nil
   end
 
-  describe "pson", :if => Puppet.features.pson? do
+  describe "pson" do
     before do
       @pson = Puppet::Network::FormatHandler.format(:pson)
     end

data/spec/unit/node/environment_spec.rb

@@ -441,6 +441,19 @@ describe Puppet::Node::Environment do
       env.instance_eval { perform_initial_import }
     end
 
+    it "should not do anything when using ruby dsl" do
+      Puppet[:manifest] = "test.rb"
+      @parser.expects(:parse).never
+      env.instance_eval { perform_initial_import }
+    end
+
+    it "returns empty hostclass when using Ruby DSL" do
+      Puppet[:manifest] = "test.rb"
+      env.instance_eval { perform_initial_import }.tap {|c|
+        c.should be_a Puppet::Parser::AST::Hostclass
+      }.code.should be nil
+    end
+
     it "should mark the type collection as needing a reparse when there is an error parsing" do
       @parser.expects(:parse).raises Puppet::ParseError.new("Syntax error at ...")
       env.stubs(:known_resource_types).returns Puppet::Resource::TypeCollection.new(env)

data/spec/unit/parser/collector_spec.rb

@@ -34,7 +34,7 @@ describe Puppet::Parser::Collector, "when initializing" do
     @collector.equery.should equal(@equery)
   end
 
-  it "should canonize the type name" do
+  it "should canonicalize the type name" do
     @collector = Puppet::Parser::Collector.new(@scope, "resource::type", @equery, @vquery, @form)
     @collector.type.should == "Resource::Type"
   end

data/spec/unit/parser/compiler_spec.rb

@@ -247,6 +247,32 @@ describe Puppet::Parser::Compiler do
       @compiler.compile
     end
 
+    it "should evaluate ruby code on main object when using ruby dsl" do
+      compile_stub(:evaluate_main)
+      Puppet::Util::ManifestFiletypeHelper.expects(:is_ruby_filename?).at_least_once.returns true
+      @compiler.expects :assign_ruby_code
+
+      @compiler.compile
+    end
+
+    it "should create a new Puppet::DSL::Parser when using ruby dsl" do
+      compile_stub(:evaluate_main)
+      File.stubs(:read).returns("test code")
+      Puppet[:manifest] = "test.rb"
+      Puppet::DSL::Parser.expects(:prepare_for_evaluation).with {|main, code, filename| code == "test code" and main.is_a? Puppet::Resource::Type}.returns stub(:evaluate)
+
+      @compiler.compile
+    end
+
+    it "should call evaluate on DSL Parser instance when using ruby dsl" do
+      compile_stub(:evaluate_main)
+      Puppet::Util::ManifestFiletypeHelper.expects(:is_ruby_filename?).at_least_once.returns true
+      File.stubs(:read).returns("")
+      Puppet::DSL::Parser.expects :prepare_for_evaluation
+
+      @compiler.compile
+    end
+
     it "should create a new, empty 'main' if no main class exists" do
       compile_stub(:evaluate_main)
       @compiler.compile

data/spec/unit/parser/functions/create_resources_spec.rb

@@ -19,7 +19,7 @@ describe 'function for dynamically creating resources' do
   end
 
   it 'should require two or three arguments' do
-    expect { @scope.function_create_resources(['foo']) }.to raise_error(ArgumentError, 'create_resources(): wrong number of arguments (1; must be 2 or 3)')
+    expect { @scope.function_create_resources(['foo']) }.to raise_error(ArgumentError, 'create_resources(): Wrong number of arguments given (1 for minimum 2)')
     expect { @scope.function_create_resources(['foo', 'bar', 'blah', 'baz']) }.to raise_error(ArgumentError, 'create_resources(): wrong number of arguments (4; must be 2 or 3)')
   end
 
@@ -50,6 +50,17 @@ describe 'function for dynamically creating resources' do
       catalog.resource(:file, "/etc/foo")['ensure'].should == 'present'
     end
 
+    it 'should be able to add virtual resources' do
+      catalog = compile_to_catalog("create_resources('@file', {'/etc/foo'=>{'ensure'=>'present'}})\nrealize(File['/etc/foo'])")
+      catalog.resource(:file, "/etc/foo")['ensure'].should == 'present'
+    end
+
+    it 'should be able to add exported resources' do
+      catalog = compile_to_catalog("create_resources('@@file', {'/etc/foo'=>{'ensure'=>'present'}})")
+      catalog.resource(:file, "/etc/foo")['ensure'].should == 'present'
+      catalog.resource(:file, "/etc/foo").exported.should == true
+    end
+
     it 'should accept multiple types' do
       catalog = compile_to_catalog("create_resources('notify', {'foo'=>{'message'=>'one'}, 'bar'=>{'message'=>'two'}})")
       catalog.resource(:notify, "foo")['message'].should == 'one'

data/spec/unit/parser/functions/extlookup_spec.rb

@@ -19,12 +19,12 @@ describe "the extlookup function" do
     Puppet::Parser::Functions.function("extlookup").should == "function_extlookup"
   end
 
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { @scope.function_extlookup([]) }.should( raise_error(Puppet::ParseError))
+  it "should raise a ArgumentError if there is less than 1 arguments" do
+    lambda { @scope.function_extlookup([]) }.should( raise_error(ArgumentError))
   end
 
-  it "should raise a ParseError if there is more than 3 arguments" do
-    lambda { @scope.function_extlookup(["foo", "bar", "baz", "gazonk"]) }.should( raise_error(Puppet::ParseError))
+  it "should raise a ArgumentError if there is more than 3 arguments" do
+    lambda { @scope.function_extlookup(["foo", "bar", "baz", "gazonk"]) }.should( raise_error(ArgumentError))
   end
 
   it "should return the default" do

data/spec/unit/parser/functions/hiera_array_spec.rb

@@ -8,7 +8,7 @@ describe 'Puppet::Parser::Functions#hiera_array' do
   let :scope do Puppet::Parser::Scope.new_for_test_harness('foo') end
 
   it 'should require a key argument' do
-    expect { scope.function_hiera_array([]) }.to raise_error(Puppet::ParseError)
+    expect { scope.function_hiera_array([]) }.to raise_error(ArgumentError)
   end
 
   it 'should raise a useful error when nil is returned' do

data/spec/unit/parser/functions/hiera_hash_spec.rb

@@ -4,7 +4,7 @@ describe 'Puppet::Parser::Functions#hiera_hash' do
   let :scope do Puppet::Parser::Scope.new_for_test_harness('foo') end
 
   it 'should require a key argument' do
-    expect { scope.function_hiera_hash([]) }.to raise_error(Puppet::ParseError)
+    expect { scope.function_hiera_hash([]) }.to raise_error(ArgumentError)
   end
 
   it 'should raise a useful error when nil is returned' do