puppet 2.6.18 → 2.7.1

data/spec/unit/face/resource_type_spec.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'puppet/face'
+
+describe Puppet::Face[:resource_type, '0.0.1'] do
+  it "should actually have some tests..."
+end

data/spec/unit/face/secret_agent_spec.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'puppet/face'
+require 'puppet/indirector/catalog/rest'
+require 'tempfile'
+
+describe Puppet::Face[:secret_agent, '0.0.1'] do
+  describe "#synchronize" do
+    it "should retrieve and apply a catalog and return a report" do
+      pending "This test doesn't work, but the code actually does - tested by LAK"
+      dirname = Dir.mktmpdir("puppetdir")
+      Puppet[:vardir] = dirname
+      Puppet[:confdir] = dirname
+      @catalog = Puppet::Resource::Catalog.new
+      @file = Puppet::Resource.new(:file, File.join(dirname, "tmp_dir_resource"), :parameters => {:ensure => :present})
+      @catalog.add_resource(@file)
+      Puppet::Resource::Catalog::Rest.any_instance.stubs(:find).returns(@catalog)
+
+      report = subject.synchronize
+
+      report.kind.should   == "apply"
+      report.status.should == "changed"
+    end
+  end
+end

data/spec/unit/face_spec.rb

@@ -0,0 +1 @@
+# You should look at interface_spec.rb

data/spec/unit/file_bucket/dipper_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'pathname'
 
@@ -20,7 +19,7 @@ describe Puppet::FileBucket::Dipper do
     @dipper = Puppet::FileBucket::Dipper.new(:Path => "/my/bucket")
 
     file = make_tmp_file('contents')
-    Puppet::FileBucket::File.expects(:head).raises ArgumentError
+    Puppet::FileBucket::File.indirection.expects(:head).raises ArgumentError
 
     lambda { @dipper.backup(file) }.should raise_error(Puppet::Error)
   end
@@ -29,8 +28,8 @@ describe Puppet::FileBucket::Dipper do
     @dipper = Puppet::FileBucket::Dipper.new(:Path => "/my/bucket")
 
     file = make_tmp_file('contents')
-    Puppet::FileBucket::File.expects(:head).returns false
-    Puppet::FileBucket::File.any_instance.expects(:save).raises ArgumentError
+    Puppet::FileBucket::File.indirection.expects(:head).returns false
+    Puppet::FileBucket::File.indirection.expects(:save).raises ArgumentError
 
     lambda { @dipper.backup(file) }.should raise_error(Puppet::Error)
   end
@@ -55,8 +54,8 @@ describe Puppet::FileBucket::Dipper do
     file = make_tmp_file('my contents')
     checksum = Digest::MD5.hexdigest('my contents')
 
-    Puppet::FileBucket::File.expects(:head).returns true
-    Puppet::FileBucket::File.any_instance.expects(:save).never
+    Puppet::FileBucket::File.indirection.expects(:head).returns true
+    Puppet::FileBucket::File.indirection.expects(:save).never
     @dipper.backup(file).should == checksum
   end
 

data/spec/unit/file_bucket/file_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/file_bucket/file'
 require 'digest/md5'
@@ -52,15 +51,7 @@ describe Puppet::FileBucket::File do
     end
 
     it "should have a :save instance method" do
-      Puppet::FileBucket::File.new("mysum").should respond_to(:save)
-    end
-
-    it "should respond to :find" do
-      Puppet::FileBucket::File.should respond_to(:find)
-    end
-
-    it "should respond to :destroy" do
-      Puppet::FileBucket::File.should respond_to(:destroy)
+      Puppet::FileBucket::File.indirection.should respond_to(:save)
     end
   end
 
@@ -88,25 +79,25 @@ describe Puppet::FileBucket::File do
 
   describe "using the indirector's find method" do
     it "should return nil if a file doesn't exist" do
-      bucketfile = Puppet::FileBucket::File.find("md5/#{@digest}")
+      bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
       bucketfile.should == nil
     end
 
     it "should find a filebucket if the file exists" do
       make_bucketed_file
-      bucketfile = Puppet::FileBucket::File.find("md5/#{@digest}")
+      bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
       bucketfile.should_not == nil
     end
 
     describe "using RESTish digest notation" do
       it "should return nil if a file doesn't exist" do
-        bucketfile = Puppet::FileBucket::File.find("md5/#{@digest}")
+        bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
         bucketfile.should == nil
       end
 
       it "should find a filebucket if the file exists" do
         make_bucketed_file
-        bucketfile = Puppet::FileBucket::File.find("md5/#{@digest}")
+        bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
         bucketfile.should_not == nil
       end
 

data/spec/unit/file_collection/lookup_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/file_collection/lookup'
 
 class LookupTester

data/spec/unit/file_collection_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/file_collection'
 

data/spec/unit/file_serving/base_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/file_serving/base'
 

data/spec/unit/file_serving/configuration/parser_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/file_serving/configuration/parser'
 

data/spec/unit/file_serving/configuration_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/file_serving/configuration'
 
@@ -170,88 +169,80 @@ describe Puppet::FileServing::Configuration do
     end
   end
 
-  describe "#split_path" do
-    let(:config) { Puppet::FileServing::Configuration.create }
-    let(:request) { stub 'request', :key => "foo/bar/baz", :options => {}, :node => nil, :environment => mock("env") }
-
+  describe "when finding the mount name and relative path in a request key" do
     before do
-      config.stubs(:find_mount)
+      @config = Puppet::FileServing::Configuration.create
+      @config.stubs(:find_mount)
+
+      @request = stub 'request', :key => "foo/bar/baz", :options => {}, :node => nil, :environment => mock("env")
     end
 
     it "should reread the configuration" do
-      config.expects(:readconfig)
+      @config.expects(:readconfig)
 
-      config.split_path(request)
+      @config.split_path(@request)
     end
 
     it "should treat the first field of the URI path as the mount name" do
-      config.expects(:find_mount).with { |name, node| name == "foo" }
+      @config.expects(:find_mount).with { |name, node| name == "foo" }
 
-      config.split_path(request)
+      @config.split_path(@request)
     end
 
     it "should fail if the mount name is not alpha-numeric" do
-      request.expects(:key).returns "foo&bar/asdf"
+      @request.expects(:key).returns "foo&bar/asdf"
 
-      lambda { config.split_path(request) }.should raise_error(ArgumentError)
+      lambda { @config.split_path(@request) }.should raise_error(ArgumentError)
     end
 
     it "should support dashes in the mount name" do
-      request.expects(:key).returns "foo-bar/asdf"
+      @request.expects(:key).returns "foo-bar/asdf"
 
-      lambda { config.split_path(request) }.should_not raise_error(ArgumentError)
+      lambda { @config.split_path(@request) }.should_not raise_error(ArgumentError)
     end
 
     it "should use the mount name and environment to find the mount" do
-      config.expects(:find_mount).with { |name, env| name == "foo" and env == request.environment }
-      request.stubs(:node).returns("mynode")
+      @config.expects(:find_mount).with { |name, env| name == "foo" and env == @request.environment }
+      @request.stubs(:node).returns("mynode")
 
-      config.split_path(request)
+      @config.split_path(@request)
     end
 
     it "should return nil if the mount cannot be found" do
-      config.expects(:find_mount).returns nil
+      @config.expects(:find_mount).returns nil
 
-      config.split_path(request).should be_nil
+      @config.split_path(@request).should be_nil
     end
 
     it "should return the mount and the relative path if the mount is found" do
       mount = stub 'mount', :name => "foo"
-      config.expects(:find_mount).returns mount
+      @config.expects(:find_mount).returns mount
 
-      config.split_path(request).should == [mount, "bar/baz"]
+      @config.split_path(@request).should == [mount, "bar/baz"]
     end
 
     it "should remove any double slashes" do
-      request.stubs(:key).returns "foo/bar//baz"
+      @request.stubs(:key).returns "foo/bar//baz"
       mount = stub 'mount', :name => "foo"
-      config.expects(:find_mount).returns mount
-
-      config.split_path(request).should == [mount, "bar/baz"]
-    end
-
-    it "should fail if the path contains .." do
-      request.stubs(:key).returns 'module/foo/../../bar'
+      @config.expects(:find_mount).returns mount
 
-      expect do
-        config.split_path(request)
-      end.to raise_error(ArgumentError, /Invalid relative path/)
+      @config.split_path(@request).should == [mount, "bar/baz"]
     end
 
     it "should return the relative path as nil if it is an empty string" do
-      request.expects(:key).returns "foo"
+      @request.expects(:key).returns "foo"
       mount = stub 'mount', :name => "foo"
-      config.expects(:find_mount).returns mount
+      @config.expects(:find_mount).returns mount
 
-      config.split_path(request).should == [mount, nil]
+      @config.split_path(@request).should == [mount, nil]
     end
 
     it "should add 'modules/' to the relative path if the modules mount is used but not specified, for backward compatibility" do
-      request.expects(:key).returns "foo/bar"
+      @request.expects(:key).returns "foo/bar"
       mount = stub 'mount', :name => "modules"
-      config.expects(:find_mount).returns mount
+      @config.expects(:find_mount).returns mount
 
-      config.split_path(request).should == [mount, "foo/bar"]
+      @config.split_path(@request).should == [mount, "foo/bar"]
     end
   end
 end

data/spec/unit/file_serving/content_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/file_serving/content'
 
@@ -13,6 +12,10 @@ describe Puppet::FileServing::Content do
     Puppet::FileServing::Content.indirection.name.should == :file_content
   end
 
+  it "should should include the IndirectionHooks module in its indirection" do
+    Puppet::FileServing::Content.indirection.singleton_class.included_modules.should include(Puppet::FileServing::IndirectionHooks)
+  end
+
   it "should only support the raw format" do
     Puppet::FileServing::Content.supported_formats.should == [:raw]
   end

data/spec/unit/file_serving/fileset_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/file_serving/fileset'
 

data/spec/unit/file_serving/{terminus_selector_spec.rb → indirection_hooks_spec.rb}

@@ -1,34 +1,34 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2007-10-18.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
-require 'puppet/file_serving/terminus_selector'
+require 'puppet/file_serving/indirection_hooks'
 
-describe Puppet::FileServing::TerminusSelector do
+describe Puppet::FileServing::IndirectionHooks do
   before do
     @object = Object.new
-    @object.extend(Puppet::FileServing::TerminusSelector)
+    @object.extend(Puppet::FileServing::IndirectionHooks)
 
     @request = stub 'request', :key => "mymod/myfile", :options => {:node => "whatever"}, :server => nil, :protocol => nil
   end
 
   describe "when being used to select termini" do
     it "should return :file if the request key is fully qualified" do
-      @request.expects(:key).returns File.expand_path('/foo')
-      @object.select(@request).should == :file
+      @request.expects(:key).returns "#{File::SEPARATOR}foo"
+      @object.select_terminus(@request).should == :file
     end
 
     it "should return :file if the URI protocol is set to 'file'" do
       @request.expects(:protocol).returns "file"
-      @object.select(@request).should == :file
+      @object.select_terminus(@request).should == :file
     end
 
     it "should fail when a protocol other than :puppet or :file is used" do
       @request.stubs(:protocol).returns "http"
-      proc { @object.select(@request) }.should raise_error(ArgumentError)
+      proc { @object.select_terminus(@request) }.should raise_error(ArgumentError)
     end
 
     describe "and the protocol is 'puppet'" do
@@ -39,15 +39,15 @@ describe Puppet::FileServing::TerminusSelector do
       it "should choose :rest when a server is specified" do
         @request.stubs(:protocol).returns "puppet"
         @request.expects(:server).returns "foo"
-        @object.select(@request).should == :rest
+        @object.select_terminus(@request).should == :rest
       end
 
       # This is so a given file location works when bootstrapping with no server.
       it "should choose :rest when the Settings name isn't 'puppet'" do
         @request.stubs(:protocol).returns "puppet"
-        # We have to stub this because we can't set name
+        @request.stubs(:server).returns "foo"
         Puppet.settings.stubs(:value).with(:name).returns "foo"
-        @object.select(@request).should == :rest
+        @object.select_terminus(@request).should == :rest
       end
 
       it "should choose :file_server when the settings name is 'puppet' and no server is specified" do
@@ -55,7 +55,8 @@ describe Puppet::FileServing::TerminusSelector do
 
         @request.expects(:protocol).returns "puppet"
         @request.expects(:server).returns nil
-        @object.select(@request).should == :file_server
+        Puppet.settings.expects(:value).with(:name).returns "puppet"
+        @object.select_terminus(@request).should == :file_server
       end
     end
   end

data/spec/unit/file_serving/metadata_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/file_serving/metadata'
 
@@ -13,6 +12,10 @@ describe Puppet::FileServing::Metadata do
     Puppet::FileServing::Metadata.indirection.name.should == :file_metadata
   end
 
+  it "should should include the IndirectionHooks module in its indirection" do
+    Puppet::FileServing::Metadata.indirection.singleton_class.included_modules.should include(Puppet::FileServing::IndirectionHooks)
+  end
+
   it "should have a method that triggers attribute collection" do
     Puppet::FileServing::Metadata.new("/foo/bar").should respond_to(:collect)
   end

data/spec/unit/file_serving/mount/file_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/file_serving/mount/file'
 
 module FileServingMountTesting

data/spec/unit/file_serving/mount/modules_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/file_serving/mount/modules'
 
 describe Puppet::FileServing::Mount::Modules do
@@ -12,10 +11,6 @@ describe Puppet::FileServing::Mount::Modules do
   end
 
   describe "when finding files" do
-    it "should fail if no module is specified" do
-      expect { @mount.find("", @request) }.to raise_error(/No module specified/)
-    end
-
     it "should use the provided environment to find the module" do
       @environment.expects(:module)
 
@@ -41,10 +36,6 @@ describe Puppet::FileServing::Mount::Modules do
   end
 
   describe "when searching for files" do
-    it "should fail if no module is specified" do
-      expect { @mount.find("", @request) }.to raise_error(/No module specified/)
-    end
-
     it "should use the node's environment to search the module" do
       @environment.expects(:module)