puppet 2.7.13 → 2.7.14

data/lib/puppet/util/network_device/transport/base.rb

@@ -23,4 +23,4 @@ class Puppet::Util::NetworkDevice::Transport::Base
     end
   end
 
-end
+end

data/lib/puppet/util/network_device/transport/ssh.rb

@@ -118,4 +118,4 @@ class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice:
       end
     end
   end
-end
+end

data/lib/puppet/util/settings.rb

@@ -1,7 +1,6 @@
 require 'puppet'
 require 'sync'
 require 'getoptlong'
-require 'puppet/external/event-loop'
 require 'puppet/util/loadedfile'
 
 # The class for handling configuration files.
@@ -296,10 +295,6 @@ class Puppet::Util::Settings
     @sync.synchronize do
       unsafe_parse(self[:config])
     end
-
-    # Create a timer so that this file will get checked automatically
-    # and reparsed if necessary.
-    set_filetimeout_timer
   end
 
   # Unsafely parse the file -- this isn't thread-safe and causes plenty of problems if used directly.
@@ -549,12 +544,6 @@ class Puppet::Util::Settings
     call.each { |setting| setting.handle(self.value(setting.name)) }
   end
 
-  # Create a timer to check whether the file should be reparsed.
-  def set_filetimeout_timer
-    return unless timeout = self[:filetimeout] and timeout = Integer(timeout) and timeout > 0
-    timer = EventLoop::Timer.new(:interval => timeout, :tolerance => 1, :start? => true) { self.reparse }
-  end
-
   # Convert the settings we manage into a catalog full of resources that model those settings.
   def to_catalog(*sections)
     sections = nil if sections.empty?
@@ -932,4 +921,6 @@ if @config.include?(:run_mode)
       end
     end
   end
+
+
 end

data/lib/puppet/util/settings/file_setting.rb

@@ -50,12 +50,10 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
   def munge(value)
     # If it's not a fully qualified path...
     if value.is_a?(String) and value !~ /^\$/ and value != 'false'
-      # Make it one
+      # Preserve trailing slash (stripped by expand_path)
+      isdir = value =~ /\/$/
       value = File.expand_path(value)
-    end
-    if value.to_s =~ /\/$/
-      @type = :directory
-      return value.sub(/\/$/, '')
+      value += '/' if isdir
     end
     value
   end

data/lib/puppet/util/terminal.rb

@@ -0,0 +1,16 @@
+module Puppet::Util::Terminal
+  # Attempts to determine the width of the terminal.  This is currently only
+  # supported on POSIX systems, and relies on the claims of `stty` (or `tput`).
+  #
+  # Inspired by code from Thor; thanks wycats!
+  # @return [Number] The column width of the terminal.  Defaults to 80 columns.
+  def self.width
+    if Puppet.features.posix?
+      result = %x{stty size 2>/dev/null}.split[1] ||
+               %x{tput cols 2>/dev/null}.split[0]
+    end
+    return (result || '80').to_i
+  rescue
+    return 80
+  end
+end

data/lib/puppet/util/zaml.rb

@@ -242,7 +242,9 @@ class String
   end
   def to_zaml(z)
     z.first_time_only(self) {
-      num = '[-+]?(0x)?\d+\.?\d*'
+      hex_num = '0x[a-f\d]+'
+      float = '\d+\.?\d*'
+      num = "[-+]?(?:#{float}|#{hex_num})"
       case
         when self == ''
           z.emit('""')

data/lib/semver.rb

@@ -17,17 +17,21 @@ class SemVer < Numeric
     versions.select { |v| v.matched_by?("#{pattern}") }.sort.last
   end
 
+  def self.pre(vstring)
+    vstring =~ /-/ ? vstring : vstring + '-'
+  end
+
   def self.[](range)
     range.gsub(/([><=])\s+/, '\1').split(/\b\s+(?!-)/).map do |r|
       case r
       when SemVer::VERSION
-        SemVer.new(r + '-') .. SemVer.new(r)
+        SemVer.new(pre(r)) .. SemVer.new(r)
       when SemVer::SIMPLE_RANGE
         r += ".0" unless SemVer.valid?(r.gsub(/x/i, '0'))
         SemVer.new(r.gsub(/x/i, '0'))...SemVer.new(r.gsub(/(\d+)\.x/i) { "#{$1.to_i + 1}.0" } + '-')
       when /\s+-\s+/
         a, b = r.split(/\s+-\s+/)
-        SemVer.new(a + '-') .. SemVer.new(b)
+        SemVer.new(pre(a)) .. SemVer.new(b)
       when /^~/
         ver = r.sub(/~/, '').split('.').map(&:to_i)
         start = (ver + [0] * (3 - ver.length)).join('.')
@@ -36,20 +40,24 @@ class SemVer < Numeric
         ver[-1] = ver.last + 1
 
         finish = (ver + [0] * (3 - ver.length)).join('.')
-        SemVer.new(start + '-') ... SemVer.new(finish + '-')
+        SemVer.new(pre(start)) ... SemVer.new(pre(finish))
       when /^>=/
         ver = r.sub(/^>=/, '')
-        SemVer.new(ver + '-') .. SemVer::MAX
+        SemVer.new(pre(ver)) .. SemVer::MAX
       when /^<=/
         ver = r.sub(/^<=/, '')
         SemVer::MIN .. SemVer.new(ver)
       when /^>/
-        ver = r.sub(/^>/, '').split('.').map(&:to_i)
-        ver[2] = ver.last + 1
+        if r =~ /-/
+          ver = [r[1..-1]]
+        else
+          ver = r.sub(/^>/, '').split('.').map(&:to_i)
+          ver[2] = ver.last + 1
+        end
         SemVer.new(ver.join('.') + '-') .. SemVer::MAX
       when /^</
         ver = r.sub(/^</, '')
-        SemVer::MIN ... SemVer.new(ver + '-')
+        SemVer::MIN ... SemVer.new(pre(ver))
       else
         (1..1)
       end

data/spec/fixtures/releases/jamtur01-apache/metadata.json

@@ -1 +1 @@
-{"dependencies":[],"types":[{"providers":[{"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu  Required binaries: ``a2enmod``, ``a2dismod``.    Default for ``operatingsystem`` == ``debianubuntu``.  "}],"parameters":[{"name":"name","doc":"The name of the module to be managed"}],"properties":[{"name":"ensure","doc":"The basic property that the resource should be in.  Valid values are ``present``, ``absent``."}],"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu"}],"checksums":{"manifests/params.pp":"71734796921dbdbfd58f503622527616","tests/ssl.pp":"191912535199531fd631f911c6329e56","tests/vhost.pp":"1b91e03c8ef89a7ecb6793831ac18399","manifests/php.pp":"b78cc593f1c4cd800c906e0891c9b11f","files/httpd":"295f5e924afe6f752d29327e73fe6d0a","tests/php.pp":"ce7bb9eef69d32b42a32ce32d9653625","lib/puppet/provider/a2mod/a2mod.rb":"18c5bb180b75a2375e95e07f88a94257","files/test.vhost":"0602022c19a7b6b289f218c7b93c1aea","manifests/ssl.pp":"b4334a161a2ba5fa8a62cf7b38f352c8","manifests/dev.pp":"510813942246cc9a7786d8f2d8874a35","manifests/vhost.pp":"cbc4657b0cce5cd432057393d5f6b0c2","tests/init.pp":"4eac4a7ef68499854c54a78879e25535","lib/puppet/type/a2mod.rb":"0e1b4843431413a10320ac1f6a055d15","tests/apache.pp":"4eac4a7ef68499854c54a78879e25535","tests/dev.pp":"4cf15c1fecea3ca86009f182b402c7ab","templates/vhost-default.conf.erb":"9055aed946e1111c30ab81fedac2c8b0","manifests/init.pp":"dc503e26e8021351078813b541c4bd3d","Modulefile":"d43334b4072cd1744121b3b25cd9ed15"},"version":"0.0.1","name":"jamtur01-apache"}
+{"dependencies":[],"types":[{"providers":[{"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu  Required binaries: ``a2enmod``, ``a2dismod``.    Default for ``operatingsystem`` == ``debianubuntu``.  "}],"parameters":[{"name":"name","doc":"The name of the module to be managed"}],"properties":[{"name":"ensure","doc":"The basic property that the resource should be in.  Valid values are ``present``, ``absent``."}],"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu"}],"checksums":{"manifests/params.pp":"71734796921dbdbfd58f503622527616","tests/ssl.pp":"191912535199531fd631f911c6329e56","tests/vhost.pp":"1b91e03c8ef89a7ecb6793831ac18399","manifests/php.pp":"b78cc593f1c4cd800c906e0891c9b11f","files/httpd":"295f5e924afe6f752d29327e73fe6d0a","tests/php.pp":"ce7bb9eef69d32b42a32ce32d9653625","lib/puppet/provider/a2mod/a2mod.rb":"18c5bb180b75a2375e95e07f88a94257","files/test.vhost":"0602022c19a7b6b289f218c7b93c1aea","manifests/ssl.pp":"b4334a161a2ba5fa8a62cf7b38f352c8","manifests/dev.pp":"510813942246cc9a7786d8f2d8874a35","manifests/vhost.pp":"cbc4657b0cce5cd432057393d5f6b0c2","tests/init.pp":"4eac4a7ef68499854c54a78879e25535","lib/puppet/type/a2mod.rb":"0e1b4843431413a10320ac1f6a055d15","tests/apache.pp":"4eac4a7ef68499854c54a78879e25535","tests/dev.pp":"4cf15c1fecea3ca86009f182b402c7ab","templates/vhost-default.conf.erb":"9055aed946e1111c30ab81fedac2c8b0","manifests/init.pp":"dc503e26e8021351078813b541c4bd3d","Modulefile":"d43334b4072cd1744121b3b25cd9ed15"},"version":"0.0.1","name":"jamtur01-apache"}

data/spec/fixtures/unit/parser/lexer/arithmetic_expression.pp

@@ -5,4 +5,4 @@ $two = 2.034e-2
 $result = ((( $two + 2) / $one) + 4 * 5.45) - (6 << 7) + (0x800 + -9)
 
 
-notice("result is $result == 1295.87692307692")
+notice("result is $result == 1295.87692307692")

data/spec/fixtures/unit/provider/package/pkg/dummy

@@ -0,0 +1 @@
+dummy                                     2.5.5-0.111     installed  ----

data/spec/fixtures/unit/provider/package/pkg/incomplete

@@ -0,0 +1 @@
+dummy                                     2.5.5-0.111     installed  ---- RANDOM_TRASH  

data/spec/fixtures/unit/provider/package/pkg/publisher

@@ -0,0 +1,2 @@
+SUNWpcre (solaris)                            8.8-0.111       installed  ----
+service/network/ssh (solaris)                 0.5.11-0.151.0.1 installed  -----

data/spec/fixtures/unit/provider/package/pkg/simple

@@ -0,0 +1,4 @@
+SUNPython                                     2.5.5-0.111     installed  ----
+SUNWbind                                      9.3.6.1-0.111   installed  ----
+SUNWdistro-license-copyright                  0.5.11-0.111    installed  ----
+SUNWfppd                                      0.2008.8.18-0.111 installed  ----

data/spec/fixtures/unit/reports/tagmail/tagmail_email.conf

@@ -0,0 +1,2 @@
+secure: user@domain.com
+

data/spec/fixtures/yaml/report0.25.x.yaml

@@ -61,4 +61,4 @@
           - Total
           - 0
   records: {}
-  time: 2010-09-23 16:17:26.987789 -07:00
+  time: 2010-09-23 16:17:26.987789 -07:00

data/spec/fixtures/yaml/report2.6.x.yaml

@@ -187,4 +187,4 @@
         - hourly
       time: 2010-09-23 15:44:06.432185 -07:00
       version: 1285281846
-  time: 2010-09-23 15:44:05.894401 -07:00
+  time: 2010-09-23 15:44:05.894401 -07:00

data/spec/integration/faces/documentation_spec.rb

@@ -49,7 +49,7 @@ describe "documentation of faces" do
       # REVISIT: This is less that ideal, I think, but right now I am more
       # comfortable watching us ship with some copyright than without any; we
       # can redress that when it becomes appropriate. --daniel 2011-04-27
-      its :copyright do should =~ /2011/ end
+      its :copyright do should =~ /20\d{2}/ end
     end
   end
 end

data/spec/integration/network/rest_authconfig_spec.rb

@@ -142,4 +142,4 @@ describe Puppet::Network::RestAuthConfig do
     @auth.should_not allow(request)
   end
 
-end
+end

data/spec/lib/puppet_spec/compiler.rb

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

data/spec/lib/puppet_spec/database.rb

@@ -0,0 +1,30 @@
+# This just makes some nice things available at global scope, and for setup of
+# tests to use a real fake database, rather than a fake stubs-that-don't-work
+# version of the same.  Fun times.
+def sqlite?
+  if $sqlite.nil?
+    begin
+      require 'sqlite3'
+      $sqlite = true
+    rescue LoadError
+      $sqlite = false
+    end
+  end
+  $sqlite
+end
+
+def can_use_scratch_database?
+  sqlite? and Puppet.features.rails?
+end
+
+
+# This is expected to be called in your `before :each` block, and will get you
+# ready to roll with a serious database and all.  Cleanup is handled
+# automatically for you.  Nothing to do there.
+def setup_scratch_database
+  dir = PuppetSpec::Files.tmpdir('puppet-sqlite')
+  Puppet[:dbadapter]    = 'sqlite3'
+  Puppet[:dblocation]   = (dir + 'storeconfigs.sqlite').to_s
+  Puppet[:railslog]     = '/dev/null'
+  Puppet::Rails.init
+end

data/spec/lib/puppet_spec/files.rb

@@ -35,7 +35,8 @@ module PuppetSpec::Files
     path
   end
 
-  def tmpfile(name)
+  def tmpfile(name) PuppetSpec::Files.tmpfile(name) end
+  def self.tmpfile(name)
     # Generate a temporary file, just for the name...
     source = Tempfile.new(name)
     path = source.path
@@ -49,7 +50,8 @@ module PuppetSpec::Files
     path
   end
 
-  def tmpdir(name)
+  def tmpdir(name) PuppetSpec::Files.tmpdir(name) end
+  def self.tmpdir(name)
     path = tmpfile(name)
     FileUtils.mkdir_p(path)
     path

data/spec/shared_behaviours/path_parameters.rb

@@ -87,26 +87,7 @@ shared_examples_for "all path parameters" do |param, options|
     @param = param
   end
 
-  before :each do
-    @file_separator = File::SEPARATOR
-  end
-  after :each do
-    with_verbose_disabled do
-      verbose, $VERBOSE = $VERBOSE, nil
-      File::SEPARATOR = @file_separator
-      $VERBOSE = verbose
-    end
-  end
-
-  describe "on a Unix-like platform it" do
-    before :each do
-      with_verbose_disabled do
-        File::SEPARATOR = '/'
-      end
-      Puppet.features.stubs(:microsoft_windows?).returns(false)
-      Puppet.features.stubs(:posix?).returns(true)
-    end
-
+  describe "on a Unix-like platform it", :as_platform => :posix do
     if array then
       it_should_behave_like "all pathname parameters with arrays", false
     end
@@ -134,15 +115,7 @@ shared_examples_for "all path parameters" do |param, options|
     end
   end
 
-  describe "on a Windows-like platform it" do
-    before :each do
-      with_verbose_disabled do
-        File::SEPARATOR = '\\'
-      end
-      Puppet.features.stubs(:microsoft_windows?).returns(true)
-      Puppet.features.stubs(:posix?).returns(false)
-    end
-
+  describe "on a Windows-like platform it", :as_platform => :windows do
     if array then
       it_should_behave_like "all pathname parameters with arrays", true
     end

data/spec/shared_contexts/platform.rb

@@ -0,0 +1,43 @@
+# Contexts for stubbing platforms
+# In a describe or context block, adding :as_platform => :windows or
+# :as_platform => :posix will stub the relevant Puppet features, as well as
+# the behavior of Ruby's filesystem methods by changing File::ALT_SEPARATOR.
+
+shared_context "windows", :as_platform => :windows do
+  before :each do
+    Facter.stubs(:value).with(:operatingsystem).returns 'Windows'
+    Puppet.features.stubs(:microsoft_windows?).returns(true)
+    Puppet.features.stubs(:posix?).returns(false)
+  end
+
+  around do |example|
+    file_alt_separator = File::ALT_SEPARATOR
+    # prevent Ruby from warning about changing a constant
+    with_verbose_disabled do
+      File::ALT_SEPARATOR = '\\'
+    end
+    example.run
+    with_verbose_disabled do
+      File::ALT_SEPARATOR = file_alt_separator
+    end
+  end
+end
+
+shared_context "posix", :as_platform => :posix do
+  before :each do
+    Puppet.features.stubs(:microsoft_windows?).returns(false)
+    Puppet.features.stubs(:posix?).returns(true)
+  end
+
+  around do |example|
+    file_alt_separator = File::ALT_SEPARATOR
+    # prevent Ruby from warning about changing a constant
+    with_verbose_disabled do
+      File::ALT_SEPARATOR = nil
+    end
+    example.run
+    with_verbose_disabled do
+      File::ALT_SEPARATOR = file_alt_separator
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+# NOTE: a lot of the stuff in this file is duplicated in the "puppet_spec_helper" in the project
+#  puppetlabs_spec_helper.  We should probably eat our own dog food and get rid of most of this from here,
+#  and have the puppet core itself use puppetlabs_spec_helper
+
 dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift File.join(dir, 'lib')
 
@@ -21,8 +25,14 @@ require 'puppet_spec/verbose'
 require 'puppet_spec/files'
 require 'puppet_spec/fixtures'
 require 'puppet_spec/matchers'
+require 'puppet_spec/database'
 require 'monkey_patches/alias_should_to_must'
 require 'monkey_patches/publicize_methods'
+require 'puppet/test/test_helper'
+
+Pathname.glob("#{dir}/shared_contexts/*.rb") do |file|
+  require file.relative_path_from(Pathname.new(dir))
+end
 
 Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
   require behaviour.relative_path_from(Pathname.new(dir))
@@ -33,97 +43,58 @@ RSpec.configure do |config|
 
   config.mock_with :mocha
 
+  config.before :all do
+    Puppet::Test::TestHelper.before_all_tests()
+  end
+
+  config.after :all do
+    Puppet::Test::TestHelper.after_all_tests()
+  end
+
   config.before :each do
     # Disabling garbage collection inside each test, and only running it at
     # the end of each block, gives us an ~ 15 percent speedup, and more on
     # some platforms *cough* windows *cough* that are a little slower.
     GC.disable
 
-    # We need to preserve the current state of all our indirection cache and
-    # terminus classes.  This is pretty important, because changes to these
-    # are global and lead to order dependencies in our testing.
-    #
-    # We go direct to the implementation because there is no safe, sane public
-    # API to manage restoration of these to their default values.  This
-    # should, once the value is proved, be moved to a standard API on the
-    # indirector.
-    #
-    # To make things worse, a number of the tests stub parts of the
-    # indirector.  These stubs have very specific expectations that what
-    # little of the public API we could use is, well, likely to explode
-    # randomly in some tests.  So, direct access.  --daniel 2011-08-30
-    $saved_indirection_state = {}
-    indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
-    indirections.each do |indirector|
-      $saved_indirection_state[indirector.name] = {
-        :@terminus_class => indirector.instance_variable_get(:@terminus_class),
-        :@cache_class    => indirector.instance_variable_get(:@cache_class)
-      }
-    end
-
-    # these globals are set by Application
-    $puppet_application_mode = nil
-    $puppet_application_name = nil
-
     # REVISIT: I think this conceals other bad tests, but I don't have time to
     # fully diagnose those right now.  When you read this, please come tell me
     # I suck for letting this float. --daniel 2011-04-21
     Signal.stubs(:trap)
 
-    # Longer keys are secure, but they sure make for some slow testing - both
-    # in terms of generating keys, and in terms of anything the next step down
-    # the line doing validation or whatever.  Most tests don't care how long
-    # or secure it is, just that it exists, so these are better and faster
-    # defaults, in testing only.
-    #
-    # I would make these even shorter, but OpenSSL doesn't support anything
-    # below 512 bits.  Sad, really, because a 0 bit key would be just fine.
-    Puppet[:req_bits]  = 512
-    Puppet[:keylength] = 512
-
-    # Set the confdir and vardir to gibberish so that tests
-    # have to be correctly mocked.
-    Puppet[:confdir] = "/dev/null"
-    Puppet[:vardir] = "/dev/null"
-
-    # Avoid opening ports to the outside world
-    Puppet.settings[:bindaddress] = "127.0.0.1"
 
+    # TODO: in a more sane world, we'd move this logging redirection into our TestHelper class.
+    #  Without doing so, external projects will all have to roll their own solution for
+    #  redirecting logging, and for validating expected log messages.  However, because the
+    #  current implementation of this involves creating an instance variable "@logs" on
+    #  EVERY SINGLE TEST CLASS, and because there are over 1300 tests that are written to expect
+    #  this instance variable to be available--we can't easily solve this problem right now.
+    #
+    # redirecting logging away from console, because otherwise the test output will be
+    #  obscured by all of the log output
     @logs = []
     Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs))
 
     @log_level = Puppet::Util::Log.level
+
+    Puppet::Test::TestHelper.before_each_test()
+
   end
 
   config.after :each do
-    Puppet.settings.clear
-    Puppet::Node::Environment.clear
-    Puppet::Util::Storage.clear
-    Puppet::Util::ExecutionStub.reset
+    Puppet::Test::TestHelper.after_each_test()
 
+    # TODO: would like to move this into puppetlabs_spec_helper, but there are namespace issues at the moment.
     PuppetSpec::Files.cleanup
 
+    # TODO: this should be abstracted in the future--see comments above the '@logs' block in the
+    #  "before" code above.
+    #
+    # clean up after the logging changes that we made before each test.
     @logs.clear
     Puppet::Util::Log.close_all
     Puppet::Util::Log.level = @log_level
 
-    # Restore the indirector configuration.  See before hook.
-    indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
-    indirections.each do |indirector|
-      $saved_indirection_state.fetch(indirector.name, {}).each do |variable, value|
-        indirector.instance_variable_set(variable, value)
-      end
-    end
-    $saved_indirection_state = nil
-
-    # Some tests can cause us to connect, in which case the lingering
-    # connection is a resource that can cause unexpected failure in later
-    # tests, as well as sharing state accidentally.
-    # We're testing if ActiveRecord::Base is defined because some test cases
-    # may stub Puppet.features.rails? which is how we should normally
-    # introspect for this functionality.
-    ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
-
     # This will perform a GC between tests, but only if actually required.  We
     # experimented with forcing a GC run, and that was less efficient than
     # just letting it run all the time.