puppet 2.6.18 → 2.7.1

data/spec/unit/indirector/node/plain_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/indirector/node/plain'
 

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

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/indirector/node/rest'
 

data/spec/unit/indirector/node/yaml_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/node'
 require 'puppet/indirector/node/yaml'

data/spec/unit/indirector/plain_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/indirector/plain'
 
 describe Puppet::Indirector::Plain do
@@ -10,10 +9,9 @@ describe Puppet::Indirector::Plain do
     @indirection = stub 'indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model
     Puppet::Indirector::Indirection.stubs(:instance).returns(@indirection)
 
-    @plain_class = Class.new(Puppet::Indirector::Plain) do
-      def self.to_s
-        "Mystuff::Testing"
-      end
+    module Testing; end
+    @plain_class = class Testing::MyPlain < Puppet::Indirector::Plain
+      self
     end
 
     @searcher = @plain_class.new

data/spec/unit/indirector/queue_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/indirector/queue'
 
 class Puppet::Indirector::Queue::TestClient
@@ -31,10 +30,9 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
     @model = mock 'model'
     @indirection = stub 'indirection', :name => :my_queue, :register_terminus_type => nil, :model => @model
     Puppet::Indirector::Indirection.stubs(:instance).with(:my_queue).returns(@indirection)
-    @store_class = Class.new(Puppet::Indirector::Queue) do
-      def self.to_s
-        'MyQueue::MyType'
-      end
+    module MyQueue; end
+    @store_class = class MyQueue::MyType < Puppet::Indirector::Queue
+      self
     end
     @store = @store_class.new
 
@@ -42,8 +40,7 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
     @subject = @subject_class.new
     @subject.name = :me
 
-    Puppet.settings.stubs(:value).returns("bogus setting data")
-    Puppet.settings.stubs(:value).with(:queue_type).returns(:test_client)
+    Puppet[:queue_type] = :test_client
     Puppet::Util::Queue.stubs(:queue_type_to_class).with(:test_client).returns(Puppet::Indirector::Queue::TestClient)
 
     @request = stub 'request', :key => :me, :instance => @subject
@@ -112,12 +109,12 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
 
     it "should log but not propagate errors" do
       @store_class.client.expects(:subscribe).yields("foo")
-      @store_class.expects(:intern).raises ArgumentError
-      Puppet.expects(:err)
+      @store_class.expects(:intern).raises(ArgumentError)
+      expect { @store_class.subscribe {|o| o } }.should_not raise_error
 
-      @store_class.expects(:puts)
-
-      @store_class.subscribe {|o| o }
+      @logs.length.should == 1
+      @logs.first.message.should =~ /Error occured with subscription to queue my_queue for indirection my_queue: ArgumentError/
+      @logs.first.level.should == :err
     end
   end
 end

data/spec/unit/indirector/report/processor_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2007-9-23.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/indirector/report/processor'
 
@@ -25,11 +25,9 @@ describe Puppet::Transaction::Report::Processor, " when saving a report" do
 
   it "should not process the report if reports are set to 'none'" do
     Puppet::Reports.expects(:report).never
-    Puppet[:reports] = 'none'
+    Puppet.settings.expects(:value).with(:reports).returns("none")
 
-    request = Puppet::Indirector::Request.new(:indirection_name, :head, "key")
-    report = Puppet::Transaction::Report.new('apply')
-    request.instance = report
+    request = stub 'request', :instance => mock("report")
 
     @reporter.save(request)
   end
@@ -42,14 +40,14 @@ end
 
 describe Puppet::Transaction::Report::Processor, " when processing a report" do
   before do
-    Puppet[:reports] = "one"
+    Puppet.settings.stubs(:value).with(:reports).returns("one")
     Puppet.settings.stubs(:use)
     @reporter = Puppet::Transaction::Report::Processor.new
 
     @report_type = mock 'one'
     @dup_report = mock 'dupe report'
     @dup_report.stubs(:process)
-    @report = Puppet::Transaction::Report.new('apply')
+    @report = mock 'report'
     @report.expects(:dup).returns(@dup_report)
 
     @request = stub 'request', :instance => @report
@@ -76,7 +74,7 @@ describe Puppet::Transaction::Report::Processor, " when processing a report" do
   end
 
   it "should not raise exceptions" do
-    Puppet[:trace] = false
+    Puppet.settings.stubs(:value).with(:trace).returns(false)
     @dup_report.expects(:process).raises(ArgumentError)
     proc { @reporter.save(@request) }.should_not raise_error
   end

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

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/indirector/report/rest'
 

data/spec/unit/indirector/report/yaml_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/transaction/report'
 require 'puppet/indirector/report/yaml'
@@ -23,7 +22,7 @@ describe Puppet::Transaction::Report::Yaml do
     Puppet::Transaction::Report::Yaml.name.should == :yaml
   end
 
-  it "should inconditionnally save/load from the --lastrunreport setting" do
+  it "should inconditionnally save/load from the --lastrunreport setting", :'fails_on_ruby_1.9.2' => true do
     indirection = stub 'indirection', :name => :my_yaml, :register_terminus_type => nil
     Puppet::Indirector::Indirection.stubs(:instance).with(:my_yaml).returns(indirection)
     store_class = Class.new(Puppet::Transaction::Report::Yaml) do

data/spec/unit/indirector/request_spec.rb

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'matchers/json'
 require 'puppet/indirector/request'
 
 describe Puppet::Indirector::Request do
@@ -301,26 +301,4 @@ describe Puppet::Indirector::Request do
       lambda { @request.query_string }.should raise_error(ArgumentError)
     end
   end
-
-  describe "#remote?" do
-    def request(options = {})
-      Puppet::Indirector::Request.new('node', 'find', 'localhost', options)
-    end
-
-    it "should not be unless node or ip is set" do
-      request.should_not be_remote
-    end
-
-    it "should be remote if node is set" do
-      request(:node => 'example.com').should be_remote
-    end
-
-    it "should be remote if ip is set" do
-      request(:ip => '127.0.0.1').should be_remote
-    end
-
-    it "should be remote if node and ip are set" do
-      request(:node => 'example.com', :ip => '127.0.0.1').should be_remote
-    end
-  end
 end

data/spec/unit/indirector/resource/ral_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe "Puppet::Resource::Ral" do
   describe "find" do
@@ -19,7 +18,7 @@ describe "Puppet::Resource::Ral" do
       Puppet::Resource::Ral.new.find(@request).should == my_resource
     end
 
-    it "if there is no instance, it should create one" do
+    it "if there is no instance, it should create one", :'fails_on_ruby_1.9.2' => true do
       wrong_instance = stub "wrong user", :name => "bob"
 
       require 'puppet/type/user'

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

@@ -1,6 +1,5 @@
-#!/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") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/indirector/resource/rest'
 

data/spec/unit/indirector/resource_type/parser_spec.rb

@@ -1,15 +1,16 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/indirector/resource_type/parser'
+require 'puppet_spec/files'
 
 describe Puppet::Indirector::ResourceType::Parser do
+  include PuppetSpec::Files
+
   before do
     @terminus = Puppet::Indirector::ResourceType::Parser.new
     @request = Puppet::Indirector::Request.new(:resource_type, :find, "foo")
-    @krt = Puppet::Resource::TypeCollection.new(@request.environment)
-    @request.environment.stubs(:known_resource_types).returns @krt
+    @krt = @request.environment.known_resource_types
   end
 
   it "should be registered with the resource_type indirection" do
@@ -17,16 +18,29 @@ describe Puppet::Indirector::ResourceType::Parser do
   end
 
   describe "when finding" do
-    it "should use the request's environment's list of known resource types" do
-      @request.environment.known_resource_types.expects(:hostclass).returns nil
+    it "should return any found type from the request's environment" do
+      type = Puppet::Resource::Type.new(:hostclass, "foo")
+      @request.environment.known_resource_types.add(type)
 
-      @terminus.find(@request)
+      @terminus.find(@request).should == type
     end
 
-    it "should return any found type" do
-      type = @krt.add(Puppet::Resource::Type.new(:hostclass, "foo"))
+    it "should attempt to load the type if none is found in memory" do
+      dir = tmpdir("find_a_type")
+      FileUtils.mkdir_p(dir)
+      Puppet[:modulepath] = dir
 
-      @terminus.find(@request).should == type
+      # Make a new request, since we've reset the env
+      @request = Puppet::Indirector::Request.new(:resource_type, :find, "foo::bar")
+
+      manifest_path = File.join(dir, "foo", "manifests")
+      FileUtils.mkdir_p(manifest_path)
+
+      File.open(File.join(manifest_path, "bar.pp"), "w") { |f| f.puts "class foo::bar {}" }
+
+      result = @terminus.find(@request)
+      result.should be_instance_of(Puppet::Resource::Type)
+      result.name.should == "foo::bar"
     end
 
     it "should return nil if no type can be found" do
@@ -52,8 +66,35 @@ describe Puppet::Indirector::ResourceType::Parser do
       @terminus.search(@request)
     end
 
-    it "should fail if anyther other than '*' was provided as the search key" do
-      @request.key = "foo*"
+    it "should return all results if '*' is provided as the search string" do
+      @request.key = "*"
+      type = @krt.add(Puppet::Resource::Type.new(:hostclass, "foo"))
+      node = @krt.add(Puppet::Resource::Type.new(:node, "bar"))
+      define = @krt.add(Puppet::Resource::Type.new(:definition, "baz"))
+
+      result = @terminus.search(@request)
+      result.should be_include(type)
+      result.should be_include(node)
+      result.should be_include(define)
+    end
+
+    it "should treat any search string not '*' as a regex" do
+      @request.key = "a"
+      foo = @krt.add(Puppet::Resource::Type.new(:hostclass, "foo"))
+      bar = @krt.add(Puppet::Resource::Type.new(:hostclass, "bar"))
+      baz = @krt.add(Puppet::Resource::Type.new(:hostclass, "baz"))
+
+      result = @terminus.search(@request)
+      result.should be_include(bar)
+      result.should be_include(baz)
+      result.should_not be_include(foo)
+    end
+
+    it "should fail if a provided search string is not '*' and is not a valid regex" do
+      @request.key = "*foo*"
+
+      # Add one instance so we don't just get an empty array"
+      @krt.add(Puppet::Resource::Type.new(:hostclass, "foo"))
       lambda { @terminus.search(@request) }.should raise_error(ArgumentError)
     end
 
@@ -68,8 +109,41 @@ describe Puppet::Indirector::ResourceType::Parser do
       result.should be_include(define)
     end
 
+    it "should not return the 'main' class" do
+      main = @krt.add(Puppet::Resource::Type.new(:hostclass, ""))
+
+      # So there is a return value
+      foo = @krt.add(Puppet::Resource::Type.new(:hostclass, "foo"))
+
+      @terminus.search(@request).should_not be_include(main)
+    end
+
     it "should return nil if no types can be found" do
       @terminus.search(@request).should be_nil
     end
+
+    it "should load all resource types from all search paths" do
+      dir = tmpdir("searching_in_all")
+      first = File.join(dir, "first")
+      second = File.join(dir, "second")
+      FileUtils.mkdir_p(first)
+      FileUtils.mkdir_p(second)
+      Puppet[:modulepath] = "#{first}:#{second}"
+
+      # Make a new request, since we've reset the env
+      @request = Puppet::Indirector::Request.new(:resource_type, :search, "*")
+
+      onepath = File.join(first, "one", "manifests")
+      FileUtils.mkdir_p(onepath)
+      twopath = File.join(first, "two", "manifests")
+      FileUtils.mkdir_p(twopath)
+
+      File.open(File.join(onepath, "oneklass.pp"), "w") { |f| f.puts "class one::oneklass {}" }
+      File.open(File.join(twopath, "twoklass.pp"), "w") { |f| f.puts "class two::twoklass {}" }
+
+      result = @terminus.search(@request)
+      result.find { |t| t.name == "one::oneklass" }.should be_instance_of(Puppet::Resource::Type)
+      result.find { |t| t.name == "two::twoklass" }.should be_instance_of(Puppet::Resource::Type)
+    end
   end
 end

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

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/indirector/resource_type/rest'
 

data/spec/unit/indirector/rest_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/indirector/rest'
 
 shared_examples_for "a REST http call" do
@@ -26,19 +25,27 @@ shared_examples_for "a REST http call" do
 end
 
 describe Puppet::Indirector::REST do
-  before do
+  before :all do
     Puppet::Indirector::Terminus.stubs(:register_terminus_class)
     @model = stub('model', :supported_formats => %w{}, :convert_from => nil)
     @instance = stub('model instance', :name= => nil)
     @indirection = stub('indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model)
-    Puppet::Indirector::Indirection.stubs(:instance).returns(@indirection)
+    Puppet::Indirector::Indirection.expects(:instance).returns(@indirection)
 
-    @rest_class = Class.new(Puppet::Indirector::REST) do
-      def self.to_s
-        "This::Is::A::Test::Class"
+    module This
+      module Is
+        module A
+          module Test
+          end
+        end
       end
     end
+    @rest_class = class This::Is::A::Test::Class < Puppet::Indirector::REST
+      self
+    end
+  end
 
+  before :each do
     @response = stub('mock response', :body => 'result', :code => "200")
     @response.stubs(:[]).with('content-type').returns "text/plain"
     @response.stubs(:[]).with('content-encoding').returns nil
@@ -216,13 +223,37 @@ describe Puppet::Indirector::REST do
       @searcher.stubs(:network).returns(@connection)    # neuter the network connection
 
       # Use a key with spaces, so we can test escaping
-      @request = Puppet::Indirector::Request.new(:foo, :find, "foo bar")
+      @request = Puppet::Indirector::Request.new(:foo, :find, "foo bar", :environment => "myenv")
     end
 
-    it "should call the GET http method on a network connection" do
-      @searcher.expects(:network).returns @connection
-      @connection.expects(:get).returns @response
-      @searcher.find(@request)
+    describe "with a large body" do
+      it "should use the POST http method" do
+        params = {}
+        'aa'.upto('zz') do |s|
+          params[s] = 'foo'
+        end
+
+        # The request special-cases this parameter, and it
+        # won't be passed on to the server, so we remove it here
+        # to avoid a failure.
+        params.delete('ip')
+
+        @request = Puppet::Indirector::Request.new(:foo, :find, "foo bar", params.merge(:environment => "myenv"))
+
+        @connection.expects(:post).with do |uri, body|
+          uri == "/myenv/foo/foo%20bar" and body.split("&").sort == params.map {|key,value| "#{key}=#{value}"}.sort
+        end.returns(@response)
+
+        @searcher.find(@request)
+      end
+    end
+
+    describe "with a small body" do
+      it "should use the GET http method" do
+        @searcher.expects(:network).returns @connection
+        @connection.expects(:get).returns @response
+        @searcher.find(@request)
+      end
     end
 
     it "should deserialize and return the http response, setting name" do
@@ -244,10 +275,8 @@ describe Puppet::Indirector::REST do
       @searcher.find(@request).should == instance
     end
 
-
     it "should use the URI generated by the Handler module" do
-      @searcher.expects(:indirection2uri).with(@request).returns "/my/uri"
-      @connection.expects(:get).with { |path, args| path == "/my/uri" }.returns(@response)
+      @connection.expects(:get).with { |path, args| path == "/myenv/foo/foo%20bar?" }.returns(@response)
       @searcher.find(@request)
     end