puppet 2.7.14 → 2.7.16

data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb

@@ -63,6 +63,30 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     genkey(key).should == "from=\"192.168.1.1\",no-pty,no-X11-forwarding ssh-rsa AAAAfsfddsjldjgksdflgkjsfdlgkj root@localhost\n"
   end
 
+  it "should parse comments" do
+    result = [{ :record_type => :comment, :line => "# hello" }]
+    @provider_class.parse("# hello\n").should == result
+  end
+
+  it "should parse comments with leading whitespace" do
+    result = [{ :record_type => :comment, :line => "  # hello" }]
+    @provider_class.parse("  # hello\n").should == result
+  end
+
+  it "should skip over lines with only whitespace" do
+    result = [{ :record_type => :comment, :line => "#before" },
+              { :record_type => :blank,   :line => "  " },
+              { :record_type => :comment, :line => "#after" }]
+    @provider_class.parse("#before\n  \n#after\n").should == result
+  end
+
+  it "should skip over completely empty lines" do
+    result = [{ :record_type => :comment, :line => "#before"},
+              { :record_type => :blank,   :line => ""},
+              { :record_type => :comment, :line => "#after"}]
+    @provider_class.parse("#before\n\n#after\n").should == result
+  end
+
   it "should be able to parse name if it includes whitespace" do
     @provider_class.parse_line('ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC7pHZ1XRj3tXbFpPFhMGU1bVwz7jr13zt/wuE+pVIJA8GlmHYuYtIxHPfDHlkixdwLachCpSQUL9NbYkkRFRn9m6PZ7125ohE4E4m96QS6SGSQowTiRn4Lzd9LV38g93EMHjPmEkdSq7MY4uJEd6DUYsLvaDYdIgBiLBIWPA3OrQ== fancy user')[:name].should == 'fancy user'
     @provider_class.parse_line('from="host1.reductlivelabs.com,host.reductivelabs.com",command="/usr/local/bin/run",ssh-pty ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC7pHZ1XRj3tXbFpPFhMGU1bVwz7jr13zt/wuE+pVIJA8GlmHYuYtIxHPfDHlkixdwLachCpSQUL9NbYkkRFRn9m6PZ7125ohE4E4m96QS6SGSQowTiRn4Lzd9LV38g93EMHjPmEkdSq7MY4uJEd6DUYsLvaDYdIgBiLBIWPA3OrQ== fancy user')[:name].should == 'fancy user'

data/spec/unit/reports/tagmail_spec.rb

@@ -163,6 +163,56 @@ describe tagmail do
         processor.process
       end
     end
+
+    context "when no message match a positive tag" do
+      before do
+        processor << log_entry
+      end
+
+      let(:log_entry) do
+        Puppet::Util::Log.new(
+          :level   => :notice,
+          :message => 'Unnotices change',
+          :tags    => %w{not_present_in_tagmail.conf}
+        )
+      end
+
+      it "should send no email if there are changes" do
+        processor.expects(:send).never
+        processor.expects(:raw_summary).returns({
+          "resources" => { "changed" => 1, "out_of_sync" => 0 }
+        })
+        processor.process
+      end
+
+      it "should send no email if there are resources out of sync" do
+        processor.expects(:send).never
+        processor.expects(:raw_summary).returns({
+          "resources" => { "changed" => 0, "out_of_sync" => 1 }
+        })
+        processor.process
+      end
+
+      it "should send no email if no changes or resources out of sync" do
+        processor.expects(:send).never
+        processor.expects(:raw_summary).returns({
+          "resources" => { "changed" => 0, "out_of_sync" => 0 }
+        })
+        processor.process
+      end
+
+      it "should send no email if raw_summary is not defined" do
+        processor.expects(:send).never
+        processor.expects(:raw_summary).returns(nil)
+        processor.process
+      end
+
+      it "should send no email if there are no resource metrics" do
+        processor.expects(:send).never
+        processor.expects(:raw_summary).returns({'resources' => nil})
+        processor.process
+      end
+    end
   end
 end
 

data/spec/unit/type/cron_spec.rb

@@ -34,7 +34,8 @@ describe Puppet::Type.type(:cron), :unless => Puppet.features.microsoft_windows?
   end
 
 
-  describe "when validating attribute" do
+  describe "when validating values" do
+
     describe "ensure" do
       it "should support present as a value for ensure" do
         proc { described_class.new(:name => 'foo', :ensure => :present) }.should_not raise_error
@@ -459,6 +460,25 @@ describe Puppet::Type.type(:cron), :unless => Puppet.features.microsoft_windows?
     end
   end
 
+  describe "when autorequiring resources" do
+
+    before :each do
+      @user_bob = Puppet::Type.type(:user).new(:name => 'bob', :ensure => :present)
+      @user_alice = Puppet::Type.type(:user).new(:name => 'alice', :ensure => :present)
+      @catalog = Puppet::Resource::Catalog.new
+      @catalog.add_resource @user_bob, @user_alice
+    end
+
+    it "should autorequire the user" do
+      @resource = described_class.new(:name => 'dummy', :command => '/usr/bin/uptime', :user => 'alice')
+      @catalog.add_resource @resource
+      req = @resource.autorequire
+      req.size.should == 1
+      req[0].target.must == @resource
+      req[0].source.must == @user_alice
+    end
+  end
+
   it "should require a command when adding an entry" do
     entry = described_class.new(:name => "test_entry", :ensure => :present)
     expect { entry.value(:command) }.should raise_error(Puppet::Error, /No command/)

data/spec/unit/type/filebucket_spec.rb

@@ -2,6 +2,8 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:filebucket) do
+  include PuppetSpec::Files
+
   describe "when validating attributes" do
     %w{name server port path}.each do |attr|
       it "should have a '#{attr}' parameter" do
@@ -35,16 +37,42 @@ describe Puppet::Type.type(:filebucket) do
     bucket.bucket.should be_local
   end
 
-  it "not be local if path is false" do
-    bucket = Puppet::Type.type(:filebucket).new :name => "main", :path => false
+  describe "path" do
+    def bucket(hash)
+      Puppet::Type.type(:filebucket).new({:name => 'main'}.merge(hash))
+    end
 
-    bucket.bucket.should_not be_local
-  end
+    it "should accept false as a value" do
+      expect { bucket(:path => false) }.not_to raise_error
+    end
 
-  it "be local if both a path and a server are specified" do
-    bucket = Puppet::Type.type(:filebucket).new :name => "main", :server => "puppet", :path => "/my/path"
+    it "should accept true as a value" do
+      expect { bucket(:path => true) }.not_to raise_error
+    end
 
-    bucket.bucket.should be_local
+    it "should fail when given an array of values" do
+      expect { bucket(:path => ['one', 'two']) }.
+        to raise_error Puppet::Error, /only have one filebucket path/
+    end
+
+    %w{one ../one one/two}.each do |path|
+      it "should fail if given a relative path of #{path.inspect}" do
+        expect { bucket(:path => path) }.
+          to raise_error Puppet::Error, /Filebucket paths must be absolute/
+      end
+    end
+
+    it "should succeed if given an absolute path" do
+      expect { bucket(:path => make_absolute('/tmp/bucket')) }.not_to raise_error
+    end
+
+    it "not be local if path is false" do
+      bucket(:path => false).bucket.should_not be_local
+    end
+
+    it "be local if both a path and a server are specified" do
+      bucket(:server => "puppet", :path => make_absolute("/my/path")).bucket.should be_local
+    end
   end
 
   describe "when creating the filebucket" do
@@ -53,10 +81,12 @@ describe Puppet::Type.type(:filebucket) do
     end
 
     it "should use any provided path" do
-      bucket = Puppet::Type.type(:filebucket).new :name => "main", :path => "/foo/bar"
-      Puppet::FileBucket::Dipper.expects(:new).with(:Path => "/foo/bar").returns @bucket
+      path = make_absolute("/foo/bar")
+      bucket = Puppet::Type.type(:filebucket).new :name => "main", :path => path
+      Puppet::FileBucket::Dipper.expects(:new).with(:Path => path).returns @bucket
       bucket.bucket
     end
+
     it "should use any provided server and port" do
       bucket = Puppet::Type.type(:filebucket).new :name => "main", :server => "myserv", :port => "myport", :path => false
       Puppet::FileBucket::Dipper.expects(:new).with(:Server => "myserv", :Port => "myport").returns @bucket

data/spec/unit/util/colors_spec.rb

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+require 'spec_helper'
+
+describe Puppet::Util::Colors do
+  include Puppet::Util::Colors
+
+  let (:message) { 'a message' }
+  let (:color) { :black }
+  let (:subject) { self }
+
+  describe ".console_color" do
+    it { should respond_to :console_color }
+
+    it "should generate ANSI escape sequences" do
+      subject.console_color(color, message).should == "\e[0;30m#{message}\e[0m"
+    end
+  end
+
+  describe ".html_color" do
+    it { should respond_to :html_color }
+
+    it "should generate an HTML span element and style attribute" do
+      subject.html_color(color, message).should =~ /<span style=\"color: #FFA0A0\">#{message}<\/span>/
+    end
+  end
+
+  describe ".colorize" do
+    it { should respond_to :colorize }
+
+    context "ansicolor supported" do
+      before :each do
+        subject.stubs(:console_has_color?).returns(true)
+      end
+
+      it "should colorize console output" do
+        Puppet[:color] = true
+
+        subject.expects(:console_color).with(color, message)
+        subject.colorize(:black, message)
+      end
+
+      it "should not colorize unknown color schemes" do
+        Puppet[:color] = :thisisanunknownscheme
+
+        subject.colorize(:black, message).should == message
+      end
+    end
+
+    context "ansicolor not supported" do
+      before :each do
+        subject.stubs(:console_has_color?).returns(false)
+      end
+
+      it "should not colorize console output" do
+        Puppet[:color] = true
+
+        subject.expects(:console_color).never
+        subject.colorize(:black, message).should == message
+      end
+
+      it "should colorize html output" do
+        Puppet[:color] = :html
+
+        subject.expects(:html_color).with(color, message)
+        subject.colorize(color, message)
+      end
+    end
+  end
+end

data/spec/unit/util/log/destinations_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#!/usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/log'
@@ -107,24 +107,28 @@ end
 
 describe Puppet::Util::Log.desttypes[:console] do
   describe "when color is available" do
+    before :each do
+      subject.stubs(:console_has_color?).returns(true)
+    end
+
     it "should support color output" do
-      Puppet.stubs(:[]).with(:color).returns(true)
+      Puppet[:color] = true
       subject.colorize(:red, 'version').should == "\e[0;31mversion\e[0m"
     end
 
     it "should withhold color output when not appropriate" do
-      Puppet.stubs(:[]).with(:color).returns(false)
+      Puppet[:color] = false
       subject.colorize(:red, 'version').should == "version"
     end
 
     it "should handle multiple overlapping colors in a stack-like way" do
-      Puppet.stubs(:[]).with(:color).returns(true)
+      Puppet[:color] = true
       vstring = subject.colorize(:red, 'version')
       subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[0;31mversion\e[0;32m)\e[0m"
     end
 
     it "should handle resets in a stack-like way" do
-      Puppet.stubs(:[]).with(:color).returns(true)
+      Puppet[:color] = true
       vstring = subject.colorize(:reset, 'version')
       subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[mversion\e[0;32m)\e[0m"
     end
@@ -133,24 +137,28 @@ end
 
 describe Puppet::Util::Log.desttypes[:telly_prototype_console] do
   describe "when color is available" do
+    before :each do
+      subject.stubs(:console_has_color?).returns(true)
+    end
+
     it "should support color output" do
-      Puppet.stubs(:[]).with(:color).returns(true)
+      Puppet[:color] = true
       subject.colorize(:red, 'version').should == "\e[0;31mversion\e[0m"
     end
 
     it "should withhold color output when not appropriate" do
-      Puppet.stubs(:[]).with(:color).returns(false)
+      Puppet[:color] = false
       subject.colorize(:red, 'version').should == "version"
     end
 
     it "should handle multiple overlapping colors in a stack-like way" do
-      Puppet.stubs(:[]).with(:color).returns(true)
+      Puppet[:color] = true
       vstring = subject.colorize(:red, 'version')
       subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[0;31mversion\e[0;32m)\e[0m"
     end
 
     it "should handle resets in a stack-like way" do
-      Puppet.stubs(:[]).with(:color).returns(true)
+      Puppet[:color] = true
       vstring = subject.colorize(:reset, 'version')
       subject.colorize(:green, "(#{vstring})").should == "\e[0;32m(\e[mversion\e[0;32m)\e[0m"
     end

data/spec/unit/util/log_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#!/usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/log'
@@ -42,6 +42,7 @@ describe Puppet::Util::Log do
   describe Puppet::Util::Log::DestConsole do
     before do
       @console = Puppet::Util::Log::DestConsole.new
+      @console.stubs(:console_has_color?).returns(true)
     end
 
     it "should colorize if Puppet[:color] is :ansi" do

data/spec/unit/util_spec.rb

@@ -571,6 +571,17 @@ describe Puppet::Util do
       Puppet::Util.which(base).should be_nil
     end
 
+    it "should ignore ~user directories if the user doesn't exist" do
+      # Windows treats *any* user as a "user that doesn't exist", which means
+      # that this will work correctly across all our platforms, and should
+      # behave consistently.  If they ever implement it correctly (eg: to do
+      # the lookup for real) it should just work transparently.
+      baduser = 'if_this_user_exists_I_will_eat_my_hat'
+      Puppet::Util::Execution.withenv("PATH" => "~#{baduser}#{File::PATH_SEPARATOR}#{base}") do
+        Puppet::Util.which('foo').should == path
+      end
+    end
+
     describe "on POSIX systems" do
       before :each do
         Puppet.features.stubs(:posix?).returns true

data/tasks/rake/gem.rake

@@ -27,7 +27,7 @@ spec = Gem::Specification.new do |spec|
     spec.files = GEM_FILES.to_a
     spec.executables = EXECUTABLES.gsub(/sbin\/|bin\//, '').to_a
     spec.version = Puppet::PUPPETVERSION
-    spec.add_dependency('facter', '>= 1.5.1')
+    spec.add_dependency('facter', '~> 1.5')
     spec.summary = 'Puppet, an automated configuration management tool'
     spec.description = 'Puppet, an automated configuration management tool'
     spec.author = 'Puppet Labs'

data/tasks/rake/manpages.rake

@@ -7,6 +7,16 @@ task :gen_manpages do
 
   helpface = Puppet::Face[:help, '0.0.1']
   manface  = Puppet::Face[:man, '0.0.1']
+
+  # TODO: This line is terrible.  The reason we need this here is because we
+  #  handle state initialization differently when we run via command line
+  #  (application.rb) than we do when we try to use Faces as library code.
+  #  This is bad, we need to come up with an official stance on what our
+  #  API is and what the entry points, so that we can make sure that
+  #  state initialization is consistent.  See:
+  # http://projects.puppetlabs.com/issues/14441
+  Puppet::Util::Instrumentation.init()
+
   sbins = Dir.glob(%w{sbin/*})
   bins  = Dir.glob(%w{bin/*})
   non_face_applications = helpface.legacy_applications
@@ -49,9 +59,7 @@ task :gen_manpages do
   # Create face man pages
   faces.each do |face|
     File.open("./man/man8/puppet-#{face}.8.ronn", 'w') do |fh|
-      # For some reason no one understands at the moment, it duplicates termini,
-      # so we have to remove the dupes with a gsub.
-      fh.write manface.man("#{face}", {:render_as => :s}).gsub(/^(\* `[^`]+`)\n\1/, '\1')
+      fh.write manface.man("#{face}")
     end
 
     %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{face}.8.ronn}

data/test/network/handler/fileserver.rb

@@ -1100,14 +1100,20 @@ allow *
     mounts = {}
     Puppet[:modulepath] = moddir
 
-    mods = %w{green red}.collect do |name|
+    %w{green red}.each do |name|
       path = File::join(moddir, name, Puppet::Module::FILES)
       FileUtils::mkdir_p(path)
       if name == "green"
         file = File::join(path, "test.txt")
         File::open(file, "w") { |f| f.print name }
       end
+    end
+
+    # We changed modulepath, so we have to clear the environment cache to
+    # refresh it
+    Puppet::Node::Environment.current.modules = nil
 
+    mods = %w{green red}.map do |name|
       Puppet::Module::find(name)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 51
   prerelease: 
   segments: 
   - 2
   - 7
-  - 14
-  version: 2.7.14
+  - 16
+  version: 2.7.16
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
@@ -23,14 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 5
         segments: 
         - 1
         - 5
-        - 1
-        version: 1.5.1
+        version: "1.5"
   type: :runtime
   version_requirements: *id001
 description: Puppet, an automated configuration management tool
@@ -751,6 +750,7 @@ files:
 - lib/puppet/util/network_device.rb
 - lib/puppet/util/package.rb
 - lib/puppet/util/pidlock.rb
+- lib/puppet/util/platform.rb
 - lib/puppet/util/plugins.rb
 - lib/puppet/util/posix.rb
 - lib/puppet/util/provider_features.rb
@@ -834,6 +834,7 @@ files:
 - man/man8/pi.8
 - man/man8/puppet-agent.8
 - man/man8/puppet-apply.8
+- man/man8/puppet-ca.8
 - man/man8/puppet-catalog.8
 - man/man8/puppet-cert.8
 - man/man8/puppet-certificate.8
@@ -848,10 +849,14 @@ files:
 - man/man8/puppet-filebucket.8
 - man/man8/puppet-help.8
 - man/man8/puppet-inspect.8
+- man/man8/puppet-instrumentation_data.8
+- man/man8/puppet-instrumentation_listener.8
+- man/man8/puppet-instrumentation_probe.8
 - man/man8/puppet-key.8
 - man/man8/puppet-kick.8
 - man/man8/puppet-man.8
 - man/man8/puppet-master.8
+- man/man8/puppet-module.8
 - man/man8/puppet-node.8
 - man/man8/puppet-parser.8
 - man/man8/puppet-plugin.8
@@ -1221,14 +1226,19 @@ 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/gem/line-with-1.8.5-warning
 - 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/pkg/dummy
+- spec/fixtures/unit/provider/package/pkg/dummy_solaris10
+- spec/fixtures/unit/provider/package/pkg/dummy_solaris11
 - spec/fixtures/unit/provider/package/pkg/incomplete
 - spec/fixtures/unit/provider/package/pkg/publisher
 - spec/fixtures/unit/provider/package/pkg/simple
+- spec/fixtures/unit/provider/package/pkg/solaris11
+- spec/fixtures/unit/provider/package/pkg/unknown_status
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
+- spec/fixtures/unit/provider/service/gentoo/rc_update_show
 - 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
@@ -1643,6 +1653,7 @@ files:
 - spec/unit/provider/service/daemontools_spec.rb
 - spec/unit/provider/service/debian_spec.rb
 - spec/unit/provider/service/freebsd_spec.rb
+- spec/unit/provider/service/gentoo_spec.rb
 - spec/unit/provider/service/init_spec.rb
 - spec/unit/provider/service/launchd_spec.rb
 - spec/unit/provider/service/redhat_spec.rb
@@ -1758,6 +1769,7 @@ files:
 - spec/unit/util/cache_accumulator_spec.rb
 - spec/unit/util/cacher_spec.rb
 - spec/unit/util/checksums_spec.rb
+- spec/unit/util/colors_spec.rb
 - spec/unit/util/command_line_spec.rb
 - spec/unit/util/constant_inflector_spec.rb
 - spec/unit/util/diff_spec.rb
@@ -1857,7 +1869,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: puppet
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Puppet, an automated configuration management tool