puppet 2.7.26 → 3.0.0.rc4

data/spec/unit/face/node_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 
@@ -88,7 +88,7 @@ describe Puppet::Face[:node, '0.0.1'] do
 
         it "should run in master mode" do
           subject.clean('hostname')
-          $puppet_application_mode.name.should == :master
+          Puppet[:run_mode].should == :master
         end
 
         it "should set node cache as yaml" do
@@ -162,7 +162,7 @@ describe Puppet::Face[:node, '0.0.1'] do
           # Stub this so we don't need access to the DB
           require 'puppet/rails/host'
 
-          Puppet.stubs(:[]).with(:storeconfigs).returns(true)
+          Puppet[:storeconfigs] = true
 
           Puppet::Rails.stubs(:connect)
           @rails_node = stub_everything 'rails_node'

data/spec/unit/face/plugin_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/unit/face/report_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/unit/face/resource_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/unit/face/resource_type_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/unit/face/secret_agent_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 require 'puppet/indirector/catalog/rest'

data/spec/unit/file_bucket/dipper_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'pathname'

data/spec/unit/file_bucket/file_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_bucket/file'

data/spec/unit/file_serving/base_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/base'

data/spec/unit/file_serving/configuration/parser_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/configuration/parser'

data/spec/unit/file_serving/configuration_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/configuration'
@@ -8,8 +8,8 @@ describe Puppet::FileServing::Configuration do
 
   before :each do
     @path = make_absolute("/path/to/configuration/file.conf")
-    Puppet.settings.stubs(:value).with(:trace).returns(false)
-    Puppet.settings.stubs(:value).with(:fileserverconfig).returns(@path)
+    Puppet[:trace] = false
+    Puppet[:fileserverconfig] = @path
   end
 
   after :each do
@@ -17,7 +17,7 @@ describe Puppet::FileServing::Configuration do
   end
 
   it "should make :new a private method" do
-    proc { Puppet::FileServing::Configuration.new }.should raise_error
+    expect { Puppet::FileServing::Configuration.new }.to raise_error
   end
 
   it "should return the same configuration each time 'configuration' is called" do
@@ -28,7 +28,7 @@ describe Puppet::FileServing::Configuration do
 
     it "should work without a configuration file" do
       FileTest.stubs(:exists?).with(@path).returns(false)
-      proc { Puppet::FileServing::Configuration.configuration }.should_not raise_error
+      expect { Puppet::FileServing::Configuration.configuration }.to_not raise_error
     end
 
     it "should parse the configuration file if present" do
@@ -60,7 +60,7 @@ describe Puppet::FileServing::Configuration do
 
     it "should not raise exceptions" do
       @parser.expects(:parse).raises(ArgumentError)
-      proc { Puppet::FileServing::Configuration.configuration }.should_not raise_error
+      expect { Puppet::FileServing::Configuration.configuration }.to_not raise_error
     end
 
     it "should replace the existing mount list with the results of reparsing" do
@@ -133,27 +133,13 @@ describe Puppet::FileServing::Configuration do
       config.find_mount("one", mock('env')).should == "foo"
     end
 
-    it "should use the provided environment to find a matching module if the named module cannot be found" do
+    it "should return nil if there is no such named mount" do
       config = Puppet::FileServing::Configuration.configuration
 
-      mod = mock 'module'
       env = mock 'environment'
-      env.expects(:module).with("foo").returns mod
       mount = mock 'mount'
-
       config.stubs(:mounts).returns("modules" => mount)
-      Puppet::Util::Warnings.expects(:notice_once)
-      config.find_mount("foo", env).should equal(mount)
-    end
-
-    it "should return nil if there is no such named mount and no module with the same name exists" do
-      config = Puppet::FileServing::Configuration.configuration
 
-      env = mock 'environment'
-      env.expects(:module).with("foo").returns nil
-
-      mount = mock 'mount'
-      config.stubs(:mounts).returns("modules" => mount)
       config.find_mount("foo", env).should be_nil
     end
   end

data/spec/unit/file_serving/content_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/content'

data/spec/unit/file_serving/fileset_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/fileset'
@@ -6,6 +6,8 @@ require 'puppet/file_serving/fileset'
 describe Puppet::FileServing::Fileset, " when initializing" do
   include PuppetSpec::Files
 
+  let(:request) { Puppet::Indirector::Request.new(:file_serving, :find, "foo", nil) }
+
   before :each do
     @somefile = make_absolute("/some/file")
   end
@@ -93,7 +95,6 @@ describe Puppet::FileServing::Fileset, " when initializing" do
 
   it "should support using an Indirector Request for its options" do
     File.expects(:lstat).with(@somefile).returns stub("stat")
-    request = Puppet::Indirector::Request.new(:file_serving, :find, "foo")
     lambda { Puppet::FileServing::Fileset.new(@somefile, request) }.should_not raise_error
   end
 
@@ -101,35 +102,34 @@ describe Puppet::FileServing::Fileset, " when initializing" do
     before do
       File.stubs(:lstat).returns stub("stat")
       @values = {:links => :manage, :ignore => %w{a b}, :recurse => true, :recurselimit => 1234}
-      @request = Puppet::Indirector::Request.new(:file_serving, :find, "foo")
       @myfile = make_absolute("/my/file")
     end
 
     [:recurse, :recurselimit, :ignore, :links].each do |option|
       it "should pass :recurse, :recurselimit, :ignore, and :links settings on to the fileset if present" do
-        @request.stubs(:options).returns(option => @values[option])
-        Puppet::FileServing::Fileset.new(@myfile, @request).send(option).should == @values[option]
+        request.stubs(:options).returns(option => @values[option])
+        Puppet::FileServing::Fileset.new(@myfile, request).send(option).should == @values[option]
       end
 
       it "should pass :recurse, :recurselimit, :ignore, and :links settings on to the fileset if present with the keys stored as strings" do
-        @request.stubs(:options).returns(option.to_s => @values[option])
-        Puppet::FileServing::Fileset.new(@myfile, @request).send(option).should == @values[option]
+        request.stubs(:options).returns(option.to_s => @values[option])
+        Puppet::FileServing::Fileset.new(@myfile, request).send(option).should == @values[option]
       end
     end
 
     it "should convert the integer as a string to their integer counterpart when setting options" do
-      @request.stubs(:options).returns(:recurselimit => "1234")
-      Puppet::FileServing::Fileset.new(@myfile, @request).recurselimit.should == 1234
+      request.stubs(:options).returns(:recurselimit => "1234")
+      Puppet::FileServing::Fileset.new(@myfile, request).recurselimit.should == 1234
     end
 
     it "should convert the string 'true' to the boolean true when setting options" do
-      @request.stubs(:options).returns(:recurse => "true")
-      Puppet::FileServing::Fileset.new(@myfile, @request).recurse.should == true
+      request.stubs(:options).returns(:recurse => "true")
+      Puppet::FileServing::Fileset.new(@myfile, request).recurse.should == true
     end
 
     it "should convert the string 'false' to the boolean false when setting options" do
-      @request.stubs(:options).returns(:recurse => "false")
-      Puppet::FileServing::Fileset.new(@myfile, @request).recurse.should == false
+      request.stubs(:options).returns(:recurse => "false")
+      Puppet::FileServing::Fileset.new(@myfile, request).recurse.should == false
     end
   end
 end

data/spec/unit/file_serving/metadata_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/metadata'
@@ -33,6 +33,14 @@ describe Puppet::FileServing::Metadata do
   describe "when serializing" do
     let(:metadata) { Puppet::FileServing::Metadata.new(foobar) }
 
+    it "should perform pson serialization by calling to_pson on it's pson_data_hash" do
+      pdh = mock "data hash"
+      pdh_as_pson = mock "data as pson"
+      metadata.expects(:to_pson_data_hash).returns pdh
+      pdh.expects(:to_pson).returns pdh_as_pson
+      metadata.to_pson.should == pdh_as_pson
+    end
+
     it "should serialize as FileMetadata" do
       metadata.to_pson_data_hash['document_type'].should == "FileMetadata"
     end
@@ -41,48 +49,48 @@ describe Puppet::FileServing::Metadata do
       metadata.to_pson_data_hash['data'].keys.sort.should == %w{ path relative_path links owner group mode checksum type destination }.sort
     end
 
-    it "should pass the path in the hash verbatim" do
-      metadata.to_pson_data_hash['data']['path'].should == metadata.path
+    it "should pass the path in the hash verbatum" do
+      metadata.to_pson_data_hash['data']['path'] == metadata.path
     end
 
-    it "should pass the relative_path in the hash verbatim" do
-      metadata.to_pson_data_hash['data']['relative_path'].should == metadata.relative_path
+    it "should pass the relative_path in the hash verbatum" do
+      metadata.to_pson_data_hash['data']['relative_path'] == metadata.relative_path
     end
 
-    it "should pass the links in the hash verbatim" do
-      metadata.to_pson_data_hash['data']['links'].should == metadata.links
+    it "should pass the links in the hash verbatum" do
+      metadata.to_pson_data_hash['data']['links'] == metadata.links
     end
 
-    it "should pass the path owner in the hash verbatim" do
-      metadata.to_pson_data_hash['data']['owner'].should == metadata.owner
+    it "should pass the path owner in the hash verbatum" do
+      metadata.to_pson_data_hash['data']['owner'] == metadata.owner
     end
 
-    it "should pass the group in the hash verbatim" do
-      metadata.to_pson_data_hash['data']['group'].should == metadata.group
+    it "should pass the group in the hash verbatum" do
+      metadata.to_pson_data_hash['data']['group'] == metadata.group
     end
 
-    it "should pass the mode in the hash verbatim" do
-      metadata.to_pson_data_hash['data']['mode'].should == metadata.mode
+    it "should pass the mode in the hash verbatum" do
+      metadata.to_pson_data_hash['data']['mode'] == metadata.mode
     end
 
-    it "should pass the ftype in the hash verbatim as the 'type'" do
-      metadata.to_pson_data_hash['data']['type'].should == metadata.ftype
+    it "should pass the ftype in the hash verbatum as the 'type'" do
+      metadata.to_pson_data_hash['data']['type'] == metadata.ftype
     end
 
-    it "should pass the destination verbatim" do
-      metadata.to_pson_data_hash['data']['destination'].should == metadata.destination
+    it "should pass the destination verbatum" do
+      metadata.to_pson_data_hash['data']['destination'] == metadata.destination
     end
 
     it "should pass the checksum in the hash as a nested hash" do
       metadata.to_pson_data_hash['data']['checksum'].should be_is_a(Hash)
     end
 
-    it "should pass the checksum_type in the hash verbatim as the checksum's type" do
-      metadata.to_pson_data_hash['data']['checksum']['type'].should == metadata.checksum_type
+    it "should pass the checksum_type in the hash verbatum as the checksum's type" do
+      metadata.to_pson_data_hash['data']['checksum']['type'] == metadata.checksum_type
     end
 
-    it "should pass the checksum in the hash verbatim as the checksum's value" do
-      metadata.to_pson_data_hash['data']['checksum']['value'].should == metadata.checksum
+    it "should pass the checksum in the hash verbatum as the checksum's value" do
+      metadata.to_pson_data_hash['data']['checksum']['value'] == metadata.checksum
     end
 
   end
@@ -106,10 +114,6 @@ describe Puppet::FileServing::Metadata do
           FileUtils.touch(path)
         end
 
-        it "should be able to produce xmlrpc-style attribute information" do
-          metadata.should respond_to(:attributes_with_tabs)
-        end
-
         it "should set the owner to the file's current owner" do
           metadata.owner.should == owner
         end
@@ -142,12 +146,6 @@ describe Puppet::FileServing::Metadata do
             metadata.collect
             metadata.checksum.should == "{mtime}#{@time}"
           end
-
-          it "should produce tab-separated mode, type, owner, group, and checksum for xmlrpc" do
-            set_mode(0755, path)
-
-            metadata.attributes_with_tabs.should == "#{0755.to_s}\tfile\t#{owner}\t#{group}\t{md5}#{checksum}"
-          end
         end
       end
 
@@ -170,13 +168,6 @@ describe Puppet::FileServing::Metadata do
           metadata.collect
           metadata.checksum.should == "{ctime}#{time}"
         end
-
-        it "should produce tab-separated mode, type, owner, group, and checksum for xmlrpc" do
-          set_mode(0755, path)
-          metadata.collect
-
-          metadata.attributes_with_tabs.should == "#{0755.to_s}\tdirectory\t#{owner}\t#{group}\t{ctime}#{time.to_s}"
-        end
       end
 
       describe "when managing links", :unless => Puppet.features.microsoft_windows? do
@@ -196,15 +187,6 @@ describe Puppet::FileServing::Metadata do
         it "should read links instead of returning their checksums" do
           metadata.destination.should == target
         end
-
-        pending "should produce tab-separated mode, type, owner, group, and destination for xmlrpc" do
-          # "We'd like this to be true, but we need to always collect the checksum because in the server/client/server round trip we lose the distintion between manage and follow."
-          metadata.attributes_with_tabs.should == "#{0755}\tlink\t#{owner}\t#{group}\t#{target}"
-        end
-
-        it "should produce tab-separated mode, type, owner, group, checksum, and destination for xmlrpc" do
-          metadata.attributes_with_tabs.should == "#{fmode}\tlink\t#{owner}\t#{group}\t{md5}eb9c2bf0eb63f3a7bc0ea37ef18aeba5\t#{target}"
-        end
       end
     end
 

data/spec/unit/file_serving/mount/file_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/file_serving/mount/file'
 

data/spec/unit/file_serving/mount/modules_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/file_serving/mount/modules'
 

data/spec/unit/file_serving/mount/plugins_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/file_serving/mount/plugins'
 
@@ -7,7 +7,8 @@ describe Puppet::FileServing::Mount::Plugins do
     @mount = Puppet::FileServing::Mount::Plugins.new("plugins")
 
     @environment = stub 'environment', :module => nil
-    @request = stub 'request', :environment => @environment
+    @options = { :recurse => true }
+    @request = stub 'request', :environment => @environment, :options => @options
   end
 
   describe  "when finding files" do
@@ -36,16 +37,28 @@ describe Puppet::FileServing::Mount::Plugins do
 
   describe "when searching for files" do
     it "should use the node's environment to find the modules" do
-      @environment.expects(:modules).returns []
+      @environment.expects(:modules).at_least_once.returns []
+      @environment.stubs(:modulepath).returns ["/tmp/modules"]
 
       @mount.search("foo", @request)
     end
 
-    it "should return nil if no modules can be found that have plugins" do
+    it "should return modulepath if no modules can be found that have plugins" do
+      mod = mock 'module'
+      mod.stubs(:plugins?).returns false
+
+      @environment.stubs(:modules).returns []
+      @environment.stubs(:modulepath).returns ["/"]
+      @options.expects(:[]=).with(:recurse, false)
+      @mount.search("foo/bar", @request).should == ["/"]
+    end
+
+    it "should return nil if no modules can be found that have plugins and modulepath is invalid" do
       mod = mock 'module'
       mod.stubs(:plugins?).returns false
 
       @environment.stubs(:modules).returns []
+      @environment.stubs(:modulepath).returns []
       @mount.search("foo/bar", @request).should be_nil
     end
 

data/spec/unit/file_serving/mount_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/file_serving/mount'
 

data/spec/unit/file_serving/terminus_helper_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/terminus_helper'

data/spec/unit/file_serving/terminus_selector_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/file_serving/terminus_selector'
@@ -39,18 +39,18 @@ describe Puppet::FileServing::TerminusSelector do
       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
+      it "should choose :rest when default_file_terminus is rest" do
         @request.stubs(:protocol).returns "puppet"
-        # We have to stub this because we can't set name
-        Puppet.settings.stubs(:value).with(:name).returns "foo"
+        Puppet[:server] = 'localhost'
         @object.select(@request).should == :rest
       end
 
-      it "should choose :file_server when the settings name is 'puppet' and no server is specified" do
+      it "should choose :file_server when default_file_terminus is file_server and no server is specified on the request" do
         modules = mock 'modules'
 
         @request.expects(:protocol).returns "puppet"
         @request.expects(:server).returns nil
+        Puppet[:default_file_terminus] = 'file_server'
         @object.select(@request).should == :file_server
       end
     end