puppet 3.4.2 → 3.4.3

data/spec/unit/type/user_spec.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# encoding: UTF-8
 require 'spec_helper'
 
 describe Puppet::Type.type(:user) do
@@ -339,12 +340,13 @@ describe Puppet::Type.type(:user) do
     end
   end
 
-  describe "when managing comment on Ruby 1.9", :if => String.respond_to?(:encode) do
+  describe "when managing comment on Ruby 1.9", :if => String.method_defined?(:encode) do
     it "should force value encoding to ASCII-8BIT" do
-      value = 'abcd'.encode(Encoding::UTF_8)
-      comment = described_class.new(:name => 'foo', :comment => value)
-      comment[:comment].should == 'abcd'
-      comment[:comment].encoding.should == Encoding::ASCII_8BIT
+      value = 'abcd™'
+      value.encoding.should == Encoding::UTF_8
+      user = described_class.new(:name => 'foo', :comment => value)
+      user[:comment].encoding.should == Encoding::ASCII_8BIT
+      user[:comment].should == value.force_encoding(Encoding::ASCII_8BIT)
     end
   end
 

data/spec/unit/util/windows/registry_spec.rb

@@ -82,5 +82,59 @@ describe Puppet::Util::Windows::Registry, :if => Puppet::Util::Platform.windows?
 
       subject.values(key).should == {}
     end
+
+    context "when reading non-ASCII values" do
+      # registered trademark symbol
+      let(:data) do
+        str = [0xAE].pack("C")
+        str.force_encoding('US-ASCII')
+        str
+      end
+
+      def expects_registry_value(array)
+        key.expects(:each_value).multiple_yields(array)
+
+        subject.values(key).first[1]
+      end
+
+      # The win32console gem applies this regex to strip out ANSI escape
+      # sequences. If the registered trademark had encoding US-ASCII,
+      # the regex would fail with 'invalid byte sequence in US-ASCII'
+      def strip_ansi_escapes(value)
+        value.sub(/([^\e]*)?\e([\[\(])([0-9\;\=]*)([a-zA-Z@])(.*)/, '\5')
+      end
+
+      it "encodes REG_SZ according to the current code page" do
+        reg_value = ['string', Win32::Registry::REG_SZ, data]
+
+        value = expects_registry_value(reg_value)
+
+        strip_ansi_escapes(value)
+      end
+
+      it "encodes REG_EXPAND_SZ based on the current code page" do
+        reg_value = ['expand', Win32::Registry::REG_EXPAND_SZ, "%SYSTEMROOT%\\#{data}"]
+
+        value = expects_registry_value(reg_value)
+
+        strip_ansi_escapes(value)
+      end
+
+      it "encodes REG_MULTI_SZ based on the current code page" do
+        reg_value = ['multi', Win32::Registry::REG_MULTI_SZ, ["one#{data}", "two#{data}"]]
+
+        value = expects_registry_value(reg_value)
+
+        value.each { |str| strip_ansi_escapes(str) }
+      end
+
+      it "passes REG_DWORD through" do
+        reg_value = ['dword', Win32::Registry::REG_DWORD, '1']
+
+        value = expects_registry_value(reg_value)
+
+        Integer(value).should == 1
+      end
+    end
   end
 end

data/spec/unit/util/windows/string_spec.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+#!/usr/bin/env ruby
+
+require 'spec_helper'
+require 'puppet/util/windows'
+
+describe "Puppet::Util::Windows::String", :if => Puppet.features.microsoft_windows? do
+  UTF16_NULL = [0, 0]
+
+  def wide_string(str)
+    Puppet::Util::Windows::String.wide_string(str)
+  end
+
+  def converts_to_wide_string(string_value)
+    expected = string_value.encode(Encoding::UTF_16LE)
+    expected_bytes = expected.bytes.to_a + UTF16_NULL
+
+    wide_string(string_value).bytes.to_a.should == expected_bytes
+  end
+
+  context "wide_string" do
+    it "should return encoding of UTF-16LE" do
+      wide_string("bob").encoding.should == Encoding::UTF_16LE
+    end
+
+    it "should return valid encoding" do
+      wide_string("bob").valid_encoding?.should be_true
+    end
+
+    it "should convert an ASCII string" do
+      converts_to_wide_string("bob".encode(Encoding::US_ASCII))
+    end
+
+    it "should convert a UTF-8 string" do
+      converts_to_wide_string("bob".encode(Encoding::UTF_8))
+    end
+
+    it "should convert a UTF-16LE string" do
+      converts_to_wide_string("bob\u00E8".encode(Encoding::UTF_16LE))
+    end
+
+    it "should convert a UTF-16BE string" do
+      converts_to_wide_string("bob\u00E8".encode(Encoding::UTF_16BE))
+    end
+
+    it "should convert an UTF-32LE string" do
+      converts_to_wide_string("bob\u00E8".encode(Encoding::UTF_32LE))
+    end
+
+    it "should convert an UTF-32BE string" do
+      converts_to_wide_string("bob\u00E8".encode(Encoding::UTF_32BE))
+    end
+  end
+end

data/tasks/benchmark.rake

@@ -0,0 +1,110 @@
+require 'benchmark'
+require 'tmpdir'
+require 'csv'
+
+namespace :benchmark do
+  def generate_scenario_tasks(location, name)
+    desc File.read(File.join(location, 'description'))
+    task name => "#{name}:run"
+
+    namespace name do
+      task :setup do
+        ENV['ITERATIONS'] ||= '10'
+        ENV['SIZE'] ||= '100'
+        ENV['TARGET'] ||= Dir.mktmpdir(name)
+        ENV['TARGET'] = File.expand_path(ENV['TARGET'])
+
+        mkdir_p(ENV['TARGET'])
+
+        require File.expand_path(File.join(location, 'benchmarker.rb'))
+
+        @benchmark = Benchmarker.new(ENV['TARGET'], ENV['SIZE'].to_i)
+      end
+
+      desc "Generate the #{name} scenario."
+      task :generate => :setup do
+        @benchmark.generate
+        @benchmark.setup
+      end
+
+      desc "Run the #{name} scenario."
+      task :run => :generate do
+        format = if RUBY_VERSION =~ /^1\.8/
+                   Benchmark::FMTSTR
+                 else
+                   Benchmark::FORMAT
+                 end
+
+        report = []
+        Benchmark.benchmark(Benchmark::CAPTION, 10, format, "> total:", "> avg:") do |b|
+          times = []
+          ENV['ITERATIONS'].to_i.times do |i|
+            start_time = Time.now.to_i
+            times << b.report("Run #{i + 1}") do
+              @benchmark.run
+            end
+            report << [to_millis(start_time), to_millis(times.last.real), 200, true, name]
+          end
+
+          sum = times.inject(Benchmark::Tms.new, &:+)
+
+          [sum, sum / times.length]
+        end
+
+        write_csv("#{name}.samples",
+                  %w{timestamp elapsed responsecode success name},
+                  report)
+      end
+
+      desc "Profile a single run of the #{name} scenario."
+      task :profile => :generate do
+        require 'ruby-prof'
+
+        result = RubyProf.profile do
+          @benchmark.run
+        end
+
+        printer = RubyProf::CallTreePrinter.new(result)
+        File.open(File.join("callgrind.#{name}.#{Time.now.to_i}.trace"), "w") do |f|
+          printer.print(f)
+        end
+      end
+
+      def to_millis(seconds)
+        (seconds * 1000).round
+      end
+
+      def write_csv(file, header, data)
+        CSV.open(file, 'w') do |csv|
+          csv << header
+          data.each do |line|
+            csv << line
+          end
+        end
+      end
+    end
+  end
+
+  scenarios = []
+  Dir.glob('benchmarks/*') do |location|
+    name = File.basename(location)
+    scenarios << name
+    generate_scenario_tasks(location, File.basename(location))
+  end
+
+  namespace :all do
+    desc "Profile all of the scenarios. (#{scenarios.join(', ')})"
+    task :profile do
+      scenarios.each do |name|
+        sh "rake benchmark:#{name}:profile"
+      end
+    end
+
+    desc "Run all of the scenarios. (#{scenarios.join(', ')})"
+    task :run do
+      scenarios.each do |name|
+        sh "rake benchmark:#{name}:run"
+      end
+    end
+  end
+end

data/tasks/ci.rake

@@ -4,7 +4,7 @@ require 'time'
 namespace "ci" do
   task :spec do
     ENV["LOG_SPEC_ORDER"] = "true"
-    sh %{rspec -r yarjuf -f JUnit -o result.xml -fd spec}
+    sh %{rspec -r yarjuf -f JUnit -o result.xml -fp spec}
   end
 
   desc "Tar up the acceptance/ directory so that package test runs have tests to run against."

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.4.2
-  prerelease: 
+  version: 3.4.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -984,6 +977,7 @@ files:
 - lib/puppet/util/windows/security.rb
 - lib/puppet/util/windows/security_descriptor.rb
 - lib/puppet/util/windows/sid.rb
+- lib/puppet/util/windows/string.rb
 - lib/puppet/util/windows/user.rb
 - lib/puppet/util/yaml.rb
 - lib/puppet/util/zaml.rb
@@ -1225,6 +1219,7 @@ files:
 - ext/windows/service/daemon.bat
 - ext/windows/service/daemon.rb
 - ext/yaml_nodes.rb
+- tasks/benchmark.rake
 - tasks/ci.rake
 - tasks/manpages.rake
 - tasks/parser.rake
@@ -2195,6 +2190,7 @@ files:
 - spec/unit/util/windows/root_certs_spec.rb
 - spec/unit/util/windows/security_descriptor_spec.rb
 - spec/unit/util/windows/sid_spec.rb
+- spec/unit/util/windows/string_spec.rb
 - spec/unit/util/yaml_spec.rb
 - spec/unit/util/zaml_spec.rb
 - spec/unit/util_spec.rb
@@ -2202,6 +2198,7 @@ files:
 - spec/watchr.rb
 homepage: https://github.com/puppetlabs/puppet
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -2212,22 +2209,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: puppet
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Puppet, an automated configuration management tool
 test_files:
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
@@ -3197,6 +3192,7 @@ test_files:
 - spec/unit/util/windows/root_certs_spec.rb
 - spec/unit/util/windows/security_descriptor_spec.rb
 - spec/unit/util/windows/sid_spec.rb
+- spec/unit/util/windows/string_spec.rb
 - spec/unit/util/yaml_spec.rb
 - spec/unit/util/zaml_spec.rb
 - spec/unit/util_spec.rb