puppet 2.7.11 → 2.7.12

data/test/lib/puppettest/certificates.rb

@@ -17,6 +17,10 @@ module PuppetTest::Certificates
   end
 
   def mkCA
+    # The defaults make tests that consume this very slow.
+    Puppet[:req_bits]  = 512
+    Puppet[:keylength] = 512
+
     ca = nil
     assert_nothing_raised {
       ca = Puppet::SSLCertificates::CA.new
@@ -26,6 +30,10 @@ module PuppetTest::Certificates
   end
 
   def mkStore(ca)
+    # The defaults make tests that consume this very slow.
+    Puppet[:req_bits]  = 512
+    Puppet[:keylength] = 512
+
     store = OpenSSL::X509::Store.new
     store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
     store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK
@@ -35,6 +43,10 @@ module PuppetTest::Certificates
   end
 
   def mkcert(hostname)
+    # The defaults make tests that consume this very slow.
+    Puppet[:req_bits]  = 512
+    Puppet[:keylength] = 512
+
     cert = nil
     assert_nothing_raised {
       cert = Puppet::SSLCertificates::Certificate.new(:name => hostname)
@@ -45,6 +57,10 @@ module PuppetTest::Certificates
   end
 
   def mksignedcert(ca = nil, hostname = nil)
+    # The defaults make tests that consume this very slow.
+    Puppet[:req_bits]  = 512
+    Puppet[:keylength] = 512
+
     ca ||= mkCA()
     hostname ||= "ttltest.example.com"
 

data/test/lib/puppettest/servertest.rb

@@ -31,6 +31,10 @@ module PuppetTest::ServerTest
 
   # create a server, forked into the background
   def mkserver(handlers = nil)
+    # The defaults make for very slow tests.
+    Puppet[:req_bits]  = 512
+    Puppet[:keylength] = 512
+
     Puppet[:name] = "puppetmasterd"
     # our default handlers
     unless handlers

data/test/util/pidlock.rb

@@ -0,0 +1,125 @@
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
+
+require 'puppet/util/pidlock'
+require 'fileutils'
+
+# This is *fucked* *up*
+Puppet.debug = false
+
+class TestPuppetUtilPidlock < Test::Unit::TestCase
+  include PuppetTest
+
+  def setup
+    super
+    @workdir = tstdir
+  end
+
+  def teardown
+    super
+    FileUtils.rm_rf(@workdir)
+  end
+
+  def test_00_basic_create
+    l = nil
+    assert_nothing_raised { l = Puppet::Util::Pidlock.new(@workdir + '/nothingmuch') }
+
+    assert_equal Puppet::Util::Pidlock, l.class
+
+    assert_equal @workdir + '/nothingmuch', l.lockfile
+  end
+
+  def test_10_uncontended_lock
+    l = Puppet::Util::Pidlock.new(@workdir + '/test_lock')
+
+    assert !l.locked?
+    assert !l.mine?
+    assert l.lock
+    assert l.locked?
+    assert l.mine?
+    assert !l.anonymous?
+    # It's OK to call lock multiple times
+    assert l.lock
+    assert l.unlock
+    assert !l.locked?
+    assert !l.mine?
+  end
+
+  def test_20_someone_elses_lock
+    childpid = nil
+    l = Puppet::Util::Pidlock.new(@workdir + '/someone_elses_lock')
+
+    # First, we need a PID that's guaranteed to be (a) used, (b) someone
+    # else's, and (c) around for the life of this test.
+    childpid = fork { loop do; sleep 10; end }
+
+    File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+
+    assert l.locked?
+    assert !l.mine?
+    assert !l.lock
+    assert l.locked?
+    assert !l.mine?
+    assert !l.unlock
+    assert l.locked?
+    assert !l.mine?
+  ensure
+    Process.kill("KILL", childpid) unless childpid.nil?
+  end
+
+  def test_30_stale_lock
+    # This is a bit hard to guarantee, but we need a PID that is definitely
+    # unused, and will stay so for the the life of this test.  Our best
+    # bet is to create a process, get it's PID, let it die, and *then*
+    # lock on it.
+    childpid = fork { exit }
+
+    # Now we can't continue until we're sure that the PID is dead
+    Process.wait(childpid)
+
+    l = Puppet::Util::Pidlock.new(@workdir + '/stale_lock')
+
+    # locked? should clear the lockfile
+    File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+    assert File.exists?(l.lockfile)
+    assert !l.locked?
+    assert !File.exists?(l.lockfile)
+
+    # lock should replace the lockfile with our own
+    File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+    assert File.exists?(l.lockfile)
+    assert l.lock
+    assert l.locked?
+    assert l.mine?
+
+    # unlock should fail, but should clear the stale lockfile.
+    File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+    assert File.exists?(l.lockfile)
+    assert !l.unlock
+    assert !File.exists?(l.lockfile)
+  end
+
+  def test_40_not_locked_at_all
+    l = Puppet::Util::Pidlock.new(@workdir + '/not_locked')
+
+    assert !l.locked?
+    # We can't unlock if we don't hold the lock
+    assert !l.unlock
+  end
+
+  def test_50_anonymous_lock
+    l = Puppet::Util::Pidlock.new(@workdir + '/anonymous_lock')
+
+    assert !l.locked?
+    assert l.lock(:anonymous => true)
+    assert l.locked?
+    assert l.anonymous?
+    assert !l.mine?
+    assert "", File.read(l.lockfile)
+    assert !l.unlock
+    assert l.locked?
+    assert l.anonymous?
+    assert l.unlock(:anonymous => true)
+    assert !File.exists?(l.lockfile)
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 7
-  - 11
-  version: 2.7.11
+  - 12
+  version: 2.7.12
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 Z
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
@@ -63,7 +63,6 @@ files:
 - bin/puppet
 - bin/puppetdoc
 - bin/ralsh
-- lib/puppet/agent/disabler.rb
 - lib/puppet/agent/locker.rb
 - lib/puppet/agent.rb
 - lib/puppet/application/agent.rb
@@ -196,6 +195,9 @@ files:
 - lib/puppet/file_serving/mount.rb
 - lib/puppet/file_serving/terminus_helper.rb
 - lib/puppet/file_serving.rb
+- lib/puppet/forge/cache.rb
+- lib/puppet/forge/repository.rb
+- lib/puppet/forge.rb
 - lib/puppet/indirector/active_record.rb
 - lib/puppet/indirector/catalog/active_record.rb
 - lib/puppet/indirector/catalog/compiler.rb
@@ -311,13 +313,11 @@ files:
 - lib/puppet/module_tool/applications/uninstaller.rb
 - lib/puppet/module_tool/applications/unpacker.rb
 - lib/puppet/module_tool/applications.rb
-- lib/puppet/module_tool/cache.rb
 - lib/puppet/module_tool/checksums.rb
 - lib/puppet/module_tool/contents_description.rb
 - lib/puppet/module_tool/dependency.rb
 - lib/puppet/module_tool/metadata.rb
 - lib/puppet/module_tool/modulefile.rb
-- lib/puppet/module_tool/repository.rb
 - lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
 - lib/puppet/module_tool/skeleton/templates/generator/metadata.json
 - lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb
@@ -689,13 +689,13 @@ files:
 - lib/puppet/type/zpool.rb
 - lib/puppet/type.rb
 - lib/puppet/util/adsi.rb
-- lib/puppet/util/anonymous_filelock.rb
 - lib/puppet/util/autoload/file_cache.rb
 - lib/puppet/util/autoload.rb
 - lib/puppet/util/backups.rb
 - lib/puppet/util/cacher.rb
 - lib/puppet/util/checksums.rb
 - lib/puppet/util/classgen.rb
+- lib/puppet/util/colors.rb
 - lib/puppet/util/command_line.rb
 - lib/puppet/util/constant_inflector.rb
 - lib/puppet/util/diff.rb
@@ -778,7 +778,9 @@ files:
 - lib/puppet/util/user_attr.rb
 - lib/puppet/util/warnings.rb
 - lib/puppet/util/windows/error.rb
+- lib/puppet/util/windows/process.rb
 - lib/puppet/util/windows/security.rb
+- lib/puppet/util/windows/user.rb
 - lib/puppet/util/windows.rb
 - lib/puppet/util/zaml.rb
 - lib/puppet/util.rb
@@ -915,7 +917,6 @@ files:
 - ext/puppet-test
 - ext/puppetlisten/puppetlisten.rb
 - ext/puppetlisten/puppetrun.rb
-- ext/puppetstoredconfigclean.rb
 - ext/pure_ruby_dsl/dsl_test.rb
 - ext/rack/files/apache2.conf
 - ext/rack/files/config.ru
@@ -1127,6 +1128,7 @@ files:
 - test/util/log.rb
 - test/util/metrics.rb
 - test/util/package.rb
+- test/util/pidlock.rb
 - test/util/settings.rb
 - test/util/storage.rb
 - test/util/subclass_loader.rb
@@ -1211,6 +1213,10 @@ files:
 - spec/fixtures/unit/provider/mount/parsed/openbsd.mount
 - spec/fixtures/unit/provider/mount/parsed/solaris.fstab
 - spec/fixtures/unit/provider/mount/parsed/solaris.mount
+- spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
+- spec/fixtures/unit/provider/package/openbsd/pkginfo.list
+- spec/fixtures/unit/provider/package/openbsd/pkginfo.query
+- spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/ssh_authorized_key/parsed/authorized_keys
 - spec/fixtures/unit/provider/ssh_authorized_key/parsed/authorized_keys1
 - spec/fixtures/unit/provider/ssh_authorized_key/parsed/authorized_keys2
@@ -1276,6 +1282,7 @@ files:
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/windows/security_spec.rb
+- spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/puppet/face/1.0.0/huzzah.rb
@@ -1286,6 +1293,7 @@ files:
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/matchers.rb
+- spec/lib/puppet_spec/modules.rb
 - spec/lib/puppet_spec/verbose.rb
 - spec/monkey_patches/alias_should_to_must.rb
 - spec/monkey_patches/publicize_methods.rb
@@ -1300,8 +1308,8 @@ files:
 - spec/shared_behaviours/things_that_declare_options.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/unit/agent/disabler_spec.rb
 - spec/unit/agent/locker_spec.rb
+- spec/unit/agent_backward_compatibility_spec.rb
 - spec/unit/agent_spec.rb
 - spec/unit/application/agent_spec.rb
 - spec/unit/application/apply_spec.rb
@@ -1366,6 +1374,8 @@ files:
 - spec/unit/file_serving/mount/plugins_spec.rb
 - spec/unit/file_serving/mount_spec.rb
 - spec/unit/file_serving/terminus_helper_spec.rb
+- spec/unit/forge/repository_spec.rb
+- spec/unit/forge_spec.rb
 - spec/unit/indirector/active_record_spec.rb
 - spec/unit/indirector/catalog/active_record_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
@@ -1459,7 +1469,6 @@ files:
 - spec/unit/module_spec.rb
 - spec/unit/module_tool/application_spec.rb
 - spec/unit/module_tool/metadata_spec.rb
-- spec/unit/module_tool/repository_spec.rb
 - spec/unit/module_tool/uninstaller_spec.rb
 - spec/unit/module_tool_spec.rb
 - spec/unit/network/authconfig_spec.rb
@@ -1593,6 +1602,7 @@ files:
 - spec/unit/provider/package/macports_spec.rb
 - spec/unit/provider/package/msi_spec.rb
 - spec/unit/provider/package/nim_spec.rb
+- spec/unit/provider/package/openbsd_spec.rb
 - spec/unit/provider/package/pacman_spec.rb
 - spec/unit/provider/package/pip_spec.rb
 - spec/unit/provider/package/pkg_spec.rb
@@ -1615,7 +1625,7 @@ files:
 - spec/unit/provider/service/smf_spec.rb
 - spec/unit/provider/service/src_spec.rb
 - spec/unit/provider/service/systemd_spec.rb
-- spec/unit/provider/service/upstart.rb
+- spec/unit/provider/service/upstart_spec.rb
 - spec/unit/provider/service/windows_spec.rb
 - spec/unit/provider/ssh_authorized_key/parsed_spec.rb
 - spec/unit/provider/sshkey/parsed_spec.rb
@@ -1717,7 +1727,6 @@ files:
 - spec/unit/type/zpool_spec.rb
 - spec/unit/type_spec.rb
 - spec/unit/util/adsi_spec.rb
-- spec/unit/util/anonymous_filelock_spec.rb
 - spec/unit/util/autoload/file_cache_spec.rb
 - spec/unit/util/autoload_spec.rb
 - spec/unit/util/backups_spec.rb
@@ -1726,6 +1735,7 @@ files:
 - spec/unit/util/checksums_spec.rb
 - spec/unit/util/command_line_spec.rb
 - spec/unit/util/constant_inflector_spec.rb
+- spec/unit/util/diff_spec.rb
 - spec/unit/util/errors_spec.rb
 - spec/unit/util/execution_spec.rb
 - spec/unit/util/execution_stub_spec.rb
@@ -1760,7 +1770,6 @@ files:
 - spec/unit/util/network_device/transport/telnet_spec.rb
 - spec/unit/util/network_device_spec.rb
 - spec/unit/util/package_spec.rb
-- spec/unit/util/pidlock_spec.rb
 - spec/unit/util/posix_spec.rb
 - spec/unit/util/pson_spec.rb
 - spec/unit/util/queue/stomp_spec.rb

data/ext/puppetstoredconfigclean.rb

@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-
-# Script to clean up stored configs for (a) given host(s)
-#
-# Credits:
-# Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb (link no longer valid),
-# which haven been initially posted by James Turnbull
-# duritong adapted and improved the script a bit.
-
-require 'getoptlong'
-require 'puppet'
-require 'puppet/rails'
-
-config = Puppet[:config]
-
-def printusage(error_code)
-  puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
-  puts "\n Options:"
-  puts "--config <puppet config file>"
-  exit(error_code)
-end
-
-opts = GetoptLong.new(
-  [ "--config",  "-c", GetoptLong::REQUIRED_ARGUMENT ],
-  [ "--help",    "-h", GetoptLong::NO_ARGUMENT ],
-  [ "--usage",   "-u", GetoptLong::NO_ARGUMENT ],
-  [ "--version", "-v", GetoptLong::NO_ARGUMENT ]
-)
-
-begin
-  opts.each do |opt, arg|
-    case opt
-    when "--config"
-      config = arg
-
-    when "--help"
-      printusage(0)
-
-    when "--usage"
-      printusage(0)
-
-    when "--version"
-      puts "#{Puppet.version}"
-      exit
-    end
-  end
-rescue GetoptLong::InvalidOption => detail
-  $stderr.puts "Try '#{$0} --help'"
-  exit(1)
-end
-
-printusage(1) unless ARGV.size > 0
-
-if config != Puppet[:config]
-  Puppet[:config]=config
-  Puppet.settings.parse
-end
-
-master = Puppet.settings.instance_variable_get(:@values)[:master]
-main = Puppet.settings.instance_variable_get(:@values)[:main]
-db_config = main.merge(master)
-
-# get default values
-[:master, :main, :rails].each do |section|
-  Puppet.settings.params(section).each do |key|
-    db_config[key] ||= Puppet[key]
-  end
-end
-
-adapter = db_config[:dbadapter]
-args = {:adapter => adapter, :log_level => db_config[:rails_loglevel]}
-
-case adapter
-  when "sqlite3"
-    args[:dbfile] = db_config[:dblocation]
-  when "mysql", "mysql2", "postgresql"
-    args[:host]     = db_config[:dbserver] unless db_config[:dbserver].to_s.empty?
-    args[:username] = db_config[:dbuser] unless db_config[:dbuser].to_s.empty?
-    args[:password] = db_config[:dbpassword] unless db_config[:dbpassword].to_s.empty?
-    args[:database] = db_config[:dbname] unless db_config[:dbname].to_s.empty?
-    args[:port]     = db_config[:dbport] unless db_config[:dbport].to_s.empty?
-    socket          = db_config[:dbsocket]
-    args[:socket]   = socket unless socket.to_s.empty?
-  else
-    raise ArgumentError, "Invalid db adapter #{adapter}"
-end
-
-args[:database] = "puppet" unless not args[:database].to_s.empty?
-
-ActiveRecord::Base.establish_connection(args)
-
-ARGV.each do |hostname|
-  if @host = Puppet::Rails::Host.find_by_name(hostname.strip)
-    print "Removing #{hostname} from storedconfig..."
-    $stdout.flush
-    @host.destroy
-    puts "done."
-  else
-    puts "Error: Can't find host #{hostname}."
-  end
-end
-
-exit 0