puppet 2.7.26 → 3.0.0.rc4

data/spec/integration/type/package_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:package), "when choosing a default package provider" do
@@ -8,7 +8,11 @@ describe Puppet::Type.type(:package), "when choosing a default package provider"
   end
 
   def provider_name(os)
-    {"Ubuntu" => :apt, "Debian" => :apt, "Darwin" => :pkgdmg, "RedHat" => :up2date, "Fedora" => :yum, "FreeBSD" => :ports, "OpenBSD" => :openbsd, "Solaris" => :sun}[os]
+    if Facter.value(:operatingsystem) == 'Solaris' && Puppet::Util::Package.versioncmp(Facter.value(:kernelrelease), '5.11') >= 0
+      :pkg
+    else
+      {"Ubuntu" => :apt, "Debian" => :apt, "Darwin" => :pkgdmg, "RedHat" => :up2date, "Fedora" => :yum, "FreeBSD" => :ports, "OpenBSD" => :openbsd, "Solaris" => :sun}[os]
+    end
   end
 
   it "should have a default provider" do

data/spec/integration/type/tidy_spec.rb

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

data/spec/integration/type_spec.rb

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

data/spec/integration/util/autoload_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/autoload'
@@ -61,7 +61,7 @@ describe Puppet::Util::Autoload do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:mything, dir, "mything.rb") {
         loader.load(:mything).should be_true
-        loader.should be_loaded(:mything)
+        loader.class.should be_loaded("bar/mything")
         AutoloadIntegrator.should be_thing(:mything)
       }
     }
@@ -71,7 +71,7 @@ describe Puppet::Util::Autoload do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:noext, dir, "noext.rb") {
         loader.load(:noext)
-        loader.should be_loaded(:noext)
+        loader.class.should be_loaded("bar/noext")
       }
     }
   end
@@ -80,21 +80,15 @@ describe Puppet::Util::Autoload do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:noext, dir, "withext.rb") {
         loader.load(:withext)
-        loader.should be_loaded("withext.rb")
-      }
-    }
-  end
-
-  it "should register the fact that the instance is loaded with the Autoload base class" do
-    with_loader("foo", "bar") { |dir,loader|
-      with_file(:baseload, dir, "baseload.rb") {
-        loader.load(:baseload)
-        Puppet::Util::Autoload.should be_loaded("bar/withext.rb")
+        loader.class.should be_loaded("bar/withext.rb")
       }
     }
   end
 
   it "should be able to load files directly from modules" do
+    ## modulepath can't be used until after app settings are initialized, so we need to simulate that:
+    Puppet.settings.expects(:app_defaults_initialized?).returns(true).at_least_once
+
     modulepath = tmpfile("autoload_module_testing")
     libdir = File.join(modulepath, "mymod", "lib", "foo")
     FileUtils.mkdir_p(libdir)
@@ -106,7 +100,7 @@ describe Puppet::Util::Autoload do
     with_loader("foo", "foo") do |dir, loader|
       with_file(:plugin, file.split("/")) do
         loader.load(:plugin)
-        loader.should be_loaded("plugin.rb")
+        loader.class.should be_loaded("foo/plugin.rb")
       end
     end
   end

data/spec/integration/util/feature_spec.rb

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

data/spec/integration/util/rdoc/parser_spec.rb

@@ -1,17 +1,19 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-require 'puppet/resource/type_collection'
-require 'puppet/util/rdoc/parser'
-require 'puppet/util/rdoc'
-require 'puppet/util/rdoc/code_objects'
-require 'rdoc/options'
-require 'rdoc/rdoc'
-
-describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
+describe "RDoc::Parser", :if => Puppet.features.rdoc1? do
   require 'puppet_spec/files'
   include PuppetSpec::Files
 
+  before :all do
+    require 'puppet/resource/type_collection'
+    require 'puppet/util/rdoc/parser'
+    require 'puppet/util/rdoc'
+    require 'puppet/util/rdoc/code_objects'
+    require 'rdoc/options'
+    require 'rdoc/rdoc'
+  end
+
   before :each do
     tmpdir = tmpfile('rdoc_parser_tmp')
     Dir.mkdir(tmpdir)

data/spec/integration/util/settings_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet_spec/files'
 
-describe Puppet::Util::Settings do
+describe Puppet::Settings do
   include PuppetSpec::Files
 
   def minimal_default_settings
@@ -11,16 +11,29 @@ describe Puppet::Util::Settings do
   end
 
   it "should be able to make needed directories" do
-    settings = Puppet::Util::Settings.new
-    settings.setdefaults :main, minimal_default_settings.update( :maindir => [tmpfile("main"), "a"] )
+    settings = Puppet::Settings.new
+    settings.define_settings :main, minimal_default_settings.update(
+        :maindir => {
+            :default => tmpfile("main"),
+            :type => :directory,
+            :desc => "a",
+        }
+    )
     settings.use(:main)
 
     File.should be_directory(settings[:maindir])
   end
 
   it "should make its directories with the correct modes" do
-    settings = Puppet::Util::Settings.new
-    settings.setdefaults :main,  minimal_default_settings.update( :maindir => {:default => tmpfile("main"), :desc => "a", :mode => 0750} )
+    settings = Puppet::Settings.new
+    settings.define_settings :main,  minimal_default_settings.update(
+        :maindir => {
+            :default => tmpfile("main"),
+            :type => :directory,
+            :desc => "a",
+            :mode => 0750
+        }
+    )
 
     settings.use(:main)
 

data/spec/integration/util/windows/security_spec.rb

@@ -15,9 +15,9 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
 
   before :all do
     @sids = {
-      :current_user => Puppet::Util::Windows::Security.name_to_sid(Sys::Admin.get_login),
-      :admin => Puppet::Util::Windows::Security.name_to_sid("Administrator"),
-      :guest => Puppet::Util::Windows::Security.name_to_sid("Guest"),
+      :current_user => Puppet::Util::ADSI.sid_for_account(Sys::Admin.get_login),
+      :admin => Puppet::Util::ADSI.sid_for_account("Administrator"),
+      :guest => Puppet::Util::ADSI.sid_for_account("Guest"),
       :users => Win32::Security::SID::BuiltinUsers,
       :power_users => Win32::Security::SID::PowerUsers,
     }
@@ -371,6 +371,26 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
           # end
         end
 
+        describe "#string_to_sid_ptr" do
+          it "should raise an error if an invalid SID is specified" do
+            expect do
+              winsec.string_to_sid_ptr('foobar')
+            end.to raise_error(Puppet::Util::Windows::Error) { |error| error.code.should == 1337 }
+          end
+
+          it "should yield if a block is given" do
+            yielded = nil
+            winsec.string_to_sid_ptr('S-1-1-0') do |sid|
+              yielded = sid
+            end
+            yielded.should_not be_nil
+          end
+
+          it "should allow no block to be specified" do
+            winsec.string_to_sid_ptr('S-1-1-0').should be_true
+          end
+        end
+
         describe "when the parent directory" do
           before :each do
             winsec.set_owner(sids[:current_user], parent)

data/spec/integration/util_spec.rb

@@ -7,13 +7,13 @@ describe Puppet::Util do
     it "should properly allow stdout and stderr to share a file" do
       command = "ruby -e '(1..10).each {|i| (i%2==0) ? $stdout.puts(i) : $stderr.puts(i)}'"
 
-      Puppet::Util.execute(command, :combine => true).split.should =~ [*'1'..'10']
+      Puppet::Util::Execution.execute(command, :combine => true).split.should =~ [*'1'..'10']
     end
 
     it "should return output and set $CHILD_STATUS" do
       command = "ruby -e 'puts \"foo\"; exit 42'"
 
-      output = Puppet::Util.execute(command, {:failonfail => false})
+      output = Puppet::Util::Execution.execute(command, {:failonfail => false})
 
       output.should == "foo\n"
       $CHILD_STATUS.exitstatus.should == 42
@@ -22,7 +22,7 @@ describe Puppet::Util do
     it "should raise an error if non-zero exit status is returned" do
       command = "ruby -e 'exit 43'"
 
-      expect { Puppet::Util.execute(command) }.to raise_error(Puppet::ExecutionFailure, /Execution of '#{command}' returned 43: /)
+      expect { Puppet::Util::Execution.execute(command) }.to raise_error(Puppet::ExecutionFailure, /Execution of '#{command}' returned 43: /)
       $CHILD_STATUS.exitstatus.should == 43
     end
   end

data/spec/lib/puppet/indirector/indirector_testing/json.rb

@@ -0,0 +1,6 @@
+require 'puppet/indirector_testing'
+require 'puppet/indirector/json'
+
+class Puppet::IndirectorTesting::JSON < Puppet::Indirector::JSON
+  desc "Testing the JSON indirector"
+end

data/spec/lib/puppet/indirector_testing.rb

@@ -0,0 +1,27 @@
+require 'puppet/indirector'
+require 'puppet/util/pson'
+
+class Puppet::IndirectorTesting
+  extend Puppet::Indirector
+  indirects :indirector_testing
+
+  # We should have some way to identify if we got a valid object back with the
+  # current values, no?
+  attr_accessor :value
+  def initialize(value)
+    self.value = value
+  end
+
+  PSON.register_document_type('IndirectorTesting',self)
+  def self.from_pson(data)
+    new(data['value'])
+  end
+
+  def to_pson
+    {
+      'document_type' => 'IndirectorTesting',
+      'data'          => { 'value' => value },
+      'metadata'      => { 'api_version' => 1 }
+    }.to_pson
+  end
+end

data/spec/lib/puppet_spec/compiler.rb

@@ -1,6 +1,6 @@
 module PuppetSpec::Compiler
-  def compile_to_catalog(string)
+  def compile_to_catalog(string, node = Puppet::Node.new('foonode'))
     Puppet[:code] = string
-    Puppet::Parser::Compiler.compile(Puppet::Node.new('foonode'))
+    Puppet::Parser::Compiler.compile(node)
   end
 end

data/spec/lib/puppet_spec/database.rb

@@ -27,6 +27,6 @@ def setup_scratch_database
     :log_level => Puppet[:rails_loglevel],
     :database => ':memory:'
   )
-  Puppet[:railslog]     = '/dev/null'
+  Puppet[:railslog] = PuppetSpec::Files.tmpfile('storeconfigs.log')
   Puppet::Rails.init
 end

data/spec/lib/puppet_spec/files.rb

@@ -22,7 +22,7 @@ module PuppetSpec::Files
       fail "Not deleting tmpfile #{path} outside regular tmpdir" unless in_tmp(path)
 
       begin
-        FileUtils.rm_r path, :secure => true
+        FileUtils.rm_rf path, :secure => true
       rescue Errno::ENOENT
         # nothing to do
       end
@@ -36,10 +36,10 @@ module PuppetSpec::Files
     path
   end
 
-  def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
-  def self.tmpfile(name, dir = nil)
+  def tmpfile(name) PuppetSpec::Files.tmpfile(name) end
+  def self.tmpfile(name)
     # Generate a temporary file, just for the name...
-    source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
+    source = Tempfile.new(name)
     path = source.path
     source.close!
 

data/spec/lib/puppet_spec/matchers.rb

@@ -44,52 +44,54 @@ RSpec::Matchers.define :exit_with do |expected|
   end
 end
 
+class HavePrintedMatcher
+  attr_accessor :expected, :actual
 
-RSpec::Matchers.define :have_printed do |expected|
-  match do |block|
-    $stderr = $stdout = StringIO.new
+  def initialize(expected)
+    case expected
+    when String, Regexp
+      @expected = expected
+    else
+      @expected = expected.to_s
+    end
+  end
 
+  def matches?(block)
     begin
+      $stderr = $stdout = StringIO.new
       block.call
-    ensure
       $stdout.rewind
       @actual = $stdout.read
-
+    ensure
       $stdout = STDOUT
       $stderr = STDERR
     end
 
     if @actual then
-      case expected
+      case @expected
       when String
-        @actual.include? expected
+        @actual.include? @expected
       when Regexp
-        expected.match @actual
-      else
-        raise ArgumentError, "No idea how to match a #{@actual.class.name}"
+        @expected.match @actual
       end
+    else
+      false
     end
   end
 
-  failure_message_for_should do |actual|
-    if actual.nil? then
-      "expected #{expected.inspect}, but nothing was printed"
+  def failure_message_for_should
+    if @actual.nil? then
+      "expected #{@expected.inspect}, but nothing was printed"
     else
-      "expected #{expected.inspect} to be printed; got:\n#{actual}"
+      "expected #{@expected.inspect} to be printed; got:\n#{@actual}"
     end
   end
 
-  description do
-    "expect #{expected.inspect} to be printed"
+  def description
+    "expect #{@expected.inspect} to be printed"
   end
-
-  diffable
 end
 
-RSpec::Matchers.define :equal_attributes_of do |expected|
-  match do |actual|
-    actual.instance_variables.all? do |attr|
-      actual.instance_variable_get(attr) == expected.instance_variable_get(attr)
-    end
-  end
+def have_printed(what)
+  HavePrintedMatcher.new(what)
 end

data/spec/lib/puppet_spec/modules.rb

@@ -20,7 +20,7 @@ module PuppetSpec::Modules
         end
       end
 
-      Puppet::Module.new(name, :environment => environment, :path => module_dir)
+      Puppet::Module.new(name, module_dir, environment)
     end
   end
 end

data/spec/lib/puppet_spec/settings.rb

@@ -0,0 +1,16 @@
+module PuppetSpec::Settings
+
+  # It would probably be preferable to refactor defaults.rb such that the real definitions of
+  #  these settings were available as a variable, which was then accessible for use during tests.
+  #  However, I'm not doing that yet because I don't want to introduce any additional moving parts
+  #  to this already very large changeset.
+  #  Would be nice to clean this up later.  --cprice 2012-03-20
+  TEST_APP_DEFAULT_DEFINITIONS = {
+    :run_mode     => { :default => :test, :desc => "run mode" },
+    :name         => { :default => "test", :desc => "name" },
+    :logdir       => { :type => :directory, :default => "test", :desc => "logdir" },
+    :confdir      => { :type => :directory, :default => "test", :desc => "confdir" },
+    :vardir       => { :type => :directory, :default => "test", :desc => "vardir" },
+    :rundir       => { :type => :directory, :default => "test", :desc => "rundir" },
+  }
+end

data/spec/shared_behaviours/file_server_terminus.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 shared_examples_for "Puppet::Indirector::FileServerTerminus" do
   # This only works if the shared behaviour is included before
   # the 'before' block in the including context.
@@ -27,7 +27,7 @@ shared_examples_for "Puppet::Indirector::FileServerTerminus" do
     # Stub out the modules terminus
     @modules = mock 'modules terminus'
 
-    @request = Puppet::Indirector::Request.new(:indirection, :method, "puppet://myhost/one/myfile")
+    @request = Puppet::Indirector::Request.new(:indirection, :method, "puppet://myhost/one/myfile", nil)
   end
 
   it "should use the file server configuration to find files" do

data/spec/shared_behaviours/file_serving.rb

@@ -1,13 +1,8 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 
 shared_examples_for "Puppet::FileServing::Files" do |indirection|
   %w[find search].each do |method|
-    let(:request) { Puppet::Indirector::Request.new(indirection, method, 'foo') }
-
-    before :each do
-      # Stub this so we can set the :name setting
-      Puppet::Util::Settings::ReadOnly.stubs(:include?)
-    end
+    let(:request) { Puppet::Indirector::Request.new(indirection, method, 'foo', nil) }
 
     describe "##{method}" do
       it "should proxy to file terminus if the path is absolute" do
@@ -36,16 +31,16 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
             request.server = 'puppet_server'
           end
 
-          it "should proxy to rest terminus if we're 'apply'" do
-            Puppet[:name] = 'apply'
+          it "should proxy to rest terminus if default_file_terminus is rest" do
+            Puppet[:default_file_terminus] = "rest"
 
             described_class.indirection.terminus(:rest).class.any_instance.expects(method).with(request)
 
             subject.send(method, request)
           end
 
-          it "should proxy to rest terminus if we aren't 'apply'" do
-            Puppet[:name] = 'not_apply'
+          it "should proxy to rest terminus if default_file_terminus is not rest" do
+            Puppet[:default_file_terminus] = 'file_server'
 
             described_class.indirection.terminus(:rest).class.any_instance.expects(method).with(request)
 
@@ -58,16 +53,16 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
             request.server = nil
           end
 
-          it "should proxy to file_server if we're 'apply'" do
-            Puppet[:name] = 'apply'
+          it "should proxy to file_server if default_file_terminus is 'file_server'" do
+            Puppet[:default_file_terminus] = 'file_server'
 
             described_class.indirection.terminus(:file_server).class.any_instance.expects(method).with(request)
 
             subject.send(method, request)
           end
 
-          it "should proxy to rest if we're not 'apply'" do
-            Puppet[:name] = 'not_apply'
+          it "should proxy to rest if default_file_terminus is 'rest'" do
+            Puppet[:default_file_terminus] = "rest"
 
             described_class.indirection.terminus(:rest).class.any_instance.expects(method).with(request)