puppet 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9d3b6d97827d31437f89eddf9f9ebe7bdba1c8
-  data.tar.gz: aa84cc4a207e01010674f784720f9dba747dd7d6
+  metadata.gz: a2d87f415f2d5c4d6c42e63ff26236626b2d99a4
+  data.tar.gz: c8d13e9583a907081e8f498b82676a8740a0adf4
 SHA512:
-  metadata.gz: d43b4ec3e3857c62ce765f57d12508ff11a4a9728f06449d4abb231b80fa7c142e36f913e7ddf439956212388e459d083e23f2ea68c7e82bfe600c1aa1b30a7e
-  data.tar.gz: 8e12c44a4422f68e9c06b814d88f29c199668d40db3f8a9e366a5de1142a908e27699d01159847fa7dde52b3abe8879b18c2aad0a0b9c188701476db2ab32dd5
+  metadata.gz: df7b5edc26a97b652f61f338c596aed36fec7bb5ef3baa73a02df507a3d3b6553b160a208f9bf5c3eb80423f9b313c457f09a521debdc5277558b2310c9f278d
+  data.tar.gz: 789d4cf034c461fd1f2482686dcca9099e54dd6b723922c05b82119c29a9f9a0079174a4e0bc92bcf1e514320cd0342806f700d2fc1896eed02146f5ede11852

data/Gemfile

@@ -15,7 +15,7 @@ platforms :ruby do
   gem 'pry', :group => :development
   gem 'yard', :group => :development
   gem 'redcarpet', '~> 2.0', :group => :development
-  gem "racc", "~> 1.4", :group => :development
+  gem "racc", "1.4.9", :group => :development
 end
 
 gem "puppet", :path => File.dirname(__FILE__), :require => false
@@ -51,18 +51,19 @@ group(:extra) do
 end
 
 platforms :mswin, :mingw do
-  gem "sys-admin", "~> 1.5.6", :require => false
-  gem "win32-api", "~> 1.4.8", :require => false
-  gem "win32-dir", "~> 0.3.7", :require => false
-  gem "win32-eventlog", "~> 0.5.3", :require => false
-  gem "win32-process", "~> 0.6.5", :require => false
-  gem "win32-security", "~> 0.1.4", :require => false
-  gem "win32-service", "~> 0.7.2", :require => false
-  gem "win32-taskscheduler", "~> 0.2.2", :require => false
-  gem "win32console", "~> 1.3.2", :require => false
-  gem "windows-api", "~> 0.4.2", :require => false
-  gem "windows-pr", "~> 1.2.1", :require => false
-  gem "minitar", "~> 0.5.4", :require => false
+  gem "ffi", "1.9.0", :require => false
+  gem "sys-admin", "1.5.6", :require => false
+  gem "win32-api", "1.4.8", :require => false
+  gem "win32-dir", "0.4.3", :require => false
+  gem "win32-eventlog", "0.5.3", :require => false
+  gem "win32-process", "0.6.5", :require => false
+  gem "win32-security", "0.1.4", :require => false
+  gem "win32-service", "0.7.2", :require => false
+  gem "win32-taskscheduler", "0.2.2", :require => false
+  gem "win32console", "1.3.2", :require => false
+  gem "windows-api", "0.4.2", :require => false
+  gem "windows-pr", "1.2.2", :require => false
+  gem "minitar", "0.5.4", :require => false
 end
 
 if File.exists? "#{__FILE__}.local"

data/Rakefile

@@ -66,14 +66,3 @@ end
 task :spec do
   sh %{rspec -fd spec}
 end
-
-namespace "ci" do
-  task :spec do
-    ENV["LOG_SPEC_ORDER"] = "true"
-    sh %{rspec -r yarjuf -f JUnit -o result.xml -fd spec}
-  end
-
-  task :el6tests do
-    sh "cd acceptance/config/el6; rm -f el6.tar.gz; tar -czvf el6.tar.gz *"
-  end
-end

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow base-saucy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'

data/lib/puppet/external/pson/pure/parser.rb

@@ -118,7 +118,7 @@ module PSON
         else
           raise TypeError, "#{source.inspect} is not like a string"
         end
-        if defined?(::Encoding)
+        if supports_encodings?(source)
           if source.encoding == ::Encoding::ASCII_8BIT
             b = source[0, 4].bytes.to_a
             source =
@@ -157,6 +157,14 @@ module PSON
         source
       end
 
+      def supports_encodings?(string)
+        # Some modules, such as REXML on 1.8.7 (see #22804) can actually create
+        # a top-level Encoding constant when they are misused. Therefore
+        # checking for just that constant is not enough, so we'll be a bit more
+        # robust about if we can actually support encoding transformations.
+        string.respond_to?(:encoding) && defined?(::Encoding)
+      end
+
       # Unescape characters in strings.
       UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
 

data/lib/puppet/provider/package/rpm.rb

@@ -11,7 +11,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   # eventually become this Puppet:Type::Package::ProviderRpm class.
   self::RPM_DESCRIPTION_DELIMITER = ':DESC:'
   # The query format by which we identify installed packages
-  self::NEVRA_FORMAT = %Q{'%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} #{self::RPM_DESCRIPTION_DELIMITER} %{SUMMARY}\\n'}
+  self::NEVRA_FORMAT = %Q{%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} #{self::RPM_DESCRIPTION_DELIMITER} %{SUMMARY}\\n}
   self::NEVRA_REGEX  = %r{^(\S+) (\S+) (\S+) (\S+) (\S+)(?: #{self::RPM_DESCRIPTION_DELIMITER} ?(.*))?$}
   self::RPM_PACKAGE_NOT_FOUND_REGEX = /package .+ is not installed/
   self::NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch, :description]
@@ -49,7 +49,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     # list out all of the packages
     begin
-      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf #{self::NEVRA_FORMAT}") { |process|
+      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf '#{self::NEVRA_FORMAT}'") { |process|
         # now turn each returned line into a package object
         process.each_line { |line|
           hash = nevra_to_hash(line)

data/lib/puppet/type/user.rb

@@ -124,8 +124,9 @@ module Puppet
     newproperty(:gid) do
       desc "The user's primary group.  Can be specified numerically or by name.
 
-        Note that users on Windows systems do not have a primary group; manage groups
-        with the `groups` attribute instead."
+        This attribute is not supported on Windows systems; use the `groups`
+        attribute instead. (On Windows, designating a primary group is only
+        meaningful for domain accounts, which Puppet does not currently manage.)"
 
       munge do |value|
         if value.is_a?(String) and value =~ /^[-0-9]+$/

data/lib/puppet/util/adsi.rb

@@ -175,7 +175,7 @@ module Puppet::Util::ADSI
     end
 
     def self.each(&block)
-      wql = Puppet::Util::ADSI.execquery("select name from win32_useraccount")
+      wql = Puppet::Util::ADSI.execquery('select name from win32_useraccount where localaccount = "TRUE"')
 
       users = []
       wql.each do |u|
@@ -283,7 +283,7 @@ module Puppet::Util::ADSI
     end
 
     def self.each(&block)
-      wql = Puppet::Util::ADSI.execquery( "select name from win32_group" )
+      wql = Puppet::Util::ADSI.execquery( 'select name from win32_group where localaccount = "TRUE"' )
 
       groups = []
       wql.each do |g|

data/lib/puppet/util/execution.rb

@@ -147,8 +147,8 @@ module Util::Execution
       begin
         exit_status = Puppet::Util::Windows::Process.wait_process(process_info.process_handle)
       ensure
-        Process.CloseHandle(process_info.process_handle)
-        Process.CloseHandle(process_info.thread_handle)
+        Puppet::Util::Windows::Process.CloseHandle(process_info.process_handle)
+        Puppet::Util::Windows::Process.CloseHandle(process_info.thread_handle)
       end
     end
 

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.3.1'
+  PUPPETVERSION = '3.3.2'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -24,7 +24,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
       names = ['group1', 'group2', 'group3']
       stub_groups = names.map{|n| stub(:name => n)}
 
-      connection.stubs(:execquery).with("select name from win32_group").returns stub_groups
+      connection.stubs(:execquery).with('select name from win32_group where localaccount = "TRUE"').returns stub_groups
 
       described_class.instances.map(&:name).should =~ names
     end

data/spec/unit/provider/package/aptrpm_spec.rb

@@ -19,7 +19,7 @@ describe Puppet::Type.type(:package).provider(:aptrpm) do
     def rpm
       pkg.provider.expects(:rpm).
         with('-q', 'faff', '--nosignature', '--nodigest', '--qf',
-             "'%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} :DESC: %{SUMMARY}\\n'")
+             "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} :DESC: %{SUMMARY}\\n")
     end
 
     it "should report absent packages" do

data/spec/unit/provider/package/rpm_spec.rb

@@ -30,7 +30,7 @@ describe provider_class do
     provider
   end
 
-  let(:nevra_format) { %Q{'%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} :DESC: %{SUMMARY}\\n'} }
+  let(:nevra_format) { %Q{%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} :DESC: %{SUMMARY}\\n} }
   let(:execute_options) do
     {:failonfail => true, :combine => true, :custom_environment => {}}
   end
@@ -47,7 +47,7 @@ describe provider_class do
   describe "self.instances" do
     describe "with a modern version of RPM" do
       it "should include all the modern flags" do
-        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf #{nevra_format}").yields(packages)
+        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}'").yields(packages)
 
         installed_packages = subject.instances
       end
@@ -56,7 +56,7 @@ describe provider_class do
     describe "with a version of RPM < 4.1" do
       let(:rpm_version) { "RPM version 4.0.2\n" }
       it "should exclude the --nosignature flag" do
-        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa  --nodigest --qf #{nevra_format}").yields(packages)
+        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa  --nodigest --qf '#{nevra_format}'").yields(packages)
 
         installed_packages = subject.instances
       end
@@ -65,14 +65,14 @@ describe provider_class do
     describe "with a version of RPM < 4.0.2" do
       let(:rpm_version) { "RPM version 3.0.5\n" }
       it "should exclude the --nodigest flag" do
-        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa   --qf #{nevra_format}").yields(packages)
+        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa   --qf '#{nevra_format}'").yields(packages)
 
         installed_packages = subject.instances
       end
     end
 
     it "returns an array of packages" do
-      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf #{nevra_format}").yields(packages)
+      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}'").yields(packages)
 
       installed_packages = subject.instances
 

data/spec/unit/provider/package/yum_spec.rb

@@ -153,7 +153,7 @@ _pkg mysummaryless 0 1.2.3.4 5.el4 noarch
     end
 
     def expect_execpipe_to_provide_package_info_for_an_rpm_query
-      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf #{nevra_format}").yields(packages)
+      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}'").yields(packages)
     end
 
     def expect_python_yumhelper_call_to_return_latest_info

data/spec/unit/provider/user/windows_adsi_spec.rb

@@ -24,7 +24,7 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
     it "should enumerate all users" do
       names = ['user1', 'user2', 'user3']
       stub_users = names.map{|n| stub(:name => n)}
-      connection.stubs(:execquery).with("select name from win32_useraccount").returns(stub_users)
+      connection.stubs(:execquery).with('select name from win32_useraccount where localaccount = "TRUE"').returns(stub_users)
 
       described_class.instances.map(&:name).should =~ names
     end

data/spec/unit/util/adsi_spec.rb

@@ -85,7 +85,7 @@ describe Puppet::Util::ADSI do
     it "should return an enumeration of IADsUser wrapped objects" do
       name = 'Administrator'
       wmi_users = [stub('WMI', :name => name)]
-      Puppet::Util::ADSI.expects(:execquery).with("select name from win32_useraccount").returns(wmi_users)
+      Puppet::Util::ADSI.expects(:execquery).with('select name from win32_useraccount where localaccount = "TRUE"').returns(wmi_users)
 
       native_user = stub('IADsUser')
       homedir = "C:\\Users\\#{name}"
@@ -248,7 +248,7 @@ describe Puppet::Util::ADSI do
     it "should return an enumeration of IADsGroup wrapped objects" do
       name = 'Administrators'
       wmi_groups = [stub('WMI', :name => name)]
-      Puppet::Util::ADSI.expects(:execquery).with("select name from win32_group").returns(wmi_groups)
+      Puppet::Util::ADSI.expects(:execquery).with('select name from win32_group where localaccount = "TRUE"').returns(wmi_groups)
 
       native_group = stub('IADsGroup')
       native_group.expects(:Members).returns([stub(:Name => 'Administrator')])

data/spec/unit/util/execution_spec.rb

@@ -306,8 +306,8 @@ describe Puppet::Util::Execution do
           Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
 
           Puppet::Util::Windows::Process.expects(:wait_process).with(process_handle).raises('whatever')
-          Process.expects(:CloseHandle).with(thread_handle)
-          Process.expects(:CloseHandle).with(process_handle)
+          Puppet::Util::Windows::Process.expects(:CloseHandle).with(thread_handle)
+          Puppet::Util::Windows::Process.expects(:CloseHandle).with(process_handle)
 
           expect { Puppet::Util::Execution.execute('test command') }.to raise_error(RuntimeError)
         end

data/tasks/ci.rake

@@ -0,0 +1,48 @@
+namespace "ci" do
+  task :spec do
+    ENV["LOG_SPEC_ORDER"] = "true"
+    sh %{rspec -r yarjuf -f JUnit -o result.xml -fd spec}
+  end
+
+  def get_parameter_value_from_actions(actions, parameter)
+    parameters = actions.select { |h| h.key?('parameters') }.first["parameters"]
+    parameters.select { |h| h['name'] == parameter }.first['value']
+  end
+
+  desc <<-EOS
+    Check to see if the job at the url given in DOWNSTREAM_JOB has begun a build including the given BUILD_SELECTOR parameter.
+    An example `rake ci:check_for_downstream DOWNSTREAM_JOB='http://jenkins-foss.delivery.puppetlabs.net/job/Puppet-Package-Acceptance-master' BUILD_SELECTOR=123`
+    You may optionally set TIMEOUT_MIN, which defaults to 20 min.
+  EOS
+  task :check_for_downstream do
+    downstream_url = ENV['DOWNSTREAM_JOB'] || raise('No ENV DOWNSTREAM_JOB set!')
+    downstream_url += '/api/json?depth=1'
+    expected_selector = ENV['BUILD_SELECTOR'] || raise('No ENV BUILD_SELECTOR set!')
+    timeout = (ENV['TIMEOUT_MIN'] || 20) * 60
+    puts "Waiting for a downstream job calling for BUILD_SELECTOR #{expected_selector}"
+    success = false
+    require 'json'
+    require 'timeout'
+    require 'net/http'
+    Timeout.timeout(timeout) do
+      loop do
+        uri = URI(downstream_url)
+        status = Net::HTTP.get(uri)
+        json = JSON.parse(status)
+        build_selector = get_parameter_value_from_actions(json['builds'].first['actions'], 'BUILD_SELECTOR')
+        if build_selector < expected_selector && json['queueItem']
+          queued_actions = json['queueItem']['actions']
+          build_selector = get_parameter_value_from_actions(queued_actions, 'BUILD_SELECTOR') if queued_actions
+        end
+        puts " * downstream job's last build selector: #{build_selector}"
+        break if build_selector >= expected_selector
+        sleep 60
+      end
+    end
+  end
+
+  desc "Tar up the acceptance/ directory so that package test runs have tests to run against."
+  task :acceptance_artifacts do
+    sh "cd acceptance; rm -f acceptance-artifacts.tar.gz; tar -czv --exclude .bundle -f acceptance-artifacts.tar.gz *"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1200,6 +1200,7 @@ files:
 - ext/windows/service/daemon.bat
 - ext/windows/service/daemon.rb
 - ext/yaml_nodes.rb
+- tasks/ci.rake
 - tasks/manpages.rake
 - tasks/parser.rake
 - spec/fixtures/faulty_face/puppet/face/syntax.rb