puppet 2.7.8 → 2.7.9

data/spec/unit/type/file_spec.rb

@@ -1253,6 +1253,36 @@ describe Puppet::Type.type(:file) do
   end
 
   describe "when autorequiring" do
+    describe "target" do
+      it "should require file resource when specified with the target property" do
+        file = described_class.new(:path => File.expand_path("/foo"), :ensure => :directory)
+        link = described_class.new(:path => File.expand_path("/bar"), :ensure => :symlink, :target => File.expand_path("/foo"))
+        catalog.add_resource file
+        catalog.add_resource link
+        reqs = link.autorequire
+        reqs.size.must == 1
+        reqs[0].source.must == file
+        reqs[0].target.must == link
+      end
+
+      it "should require file resource when specified with the ensure property" do
+        file = described_class.new(:path => File.expand_path("/foo"), :ensure => :directory)
+        link = described_class.new(:path => File.expand_path("/bar"), :ensure => File.expand_path("/foo"))
+        catalog.add_resource file
+        catalog.add_resource link
+        reqs = link.autorequire
+        reqs.size.must == 1
+        reqs[0].source.must == file
+        reqs[0].target.must == link
+      end
+
+      it "should not require target if target is not managed" do
+        link = described_class.new(:path => File.expand_path('/foo'), :ensure => :symlink, :target => '/bar')
+        catalog.add_resource link
+        link.autorequire.size.should == 0
+      end
+    end
+
     describe "directories" do
       it "should autorequire its parent directory" do
         dir = described_class.new(:path => File.dirname(path))

data/spec/unit/util/queue/stomp_spec.rb

@@ -13,7 +13,7 @@ describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on
   before do
     # So we make sure we never create a real client instance.
     # Otherwise we'll try to connect, and that's bad.
-    Stomp::Client.stubs(:new).returns stub("client")
+    Stomp::Client.stubs(:new).returns stub("client", :publish => true)
   end
 
   it 'should be registered with Puppet::Util::Queue as :stomp type' do
@@ -22,7 +22,7 @@ describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on
 
   describe "when initializing" do
     it "should create a Stomp client instance" do
-      Stomp::Client.expects(:new).returns stub("stomp_client")
+      Stomp::Client.expects(:new).returns stub("stomp_client", :publish => true)
       Puppet::Util::Queue::Stomp.new
     end
 
@@ -65,7 +65,7 @@ describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on
 
   describe "when publishing a message" do
     before do
-      @client = stub 'client'
+      @client = stub 'client', :publish => true
       Stomp::Client.stubs(:new).returns @client
       @queue = Puppet::Util::Queue::Stomp.new
     end
@@ -84,11 +84,16 @@ describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on
       @client.expects(:publish).with { |queue, msg, options| options[:persistent] == true }
       @queue.publish_message('fooqueue', 'Smite!')
     end
+
+    it "should use send when the gem does not support publish" do
+      Stomp::Client.stubs(:new).returns(stub('client', :send => true))
+      Puppet::Util::Queue::Stomp.new.publish_message('fooqueue', 'Smite!')
+    end
   end
 
   describe "when subscribing to a queue" do
     before do
-      @client = stub 'client', :acknowledge => true
+      @client = stub 'client', :acknowledge => true, :publish => true
       Stomp::Client.stubs(:new).returns @client
       @queue = Puppet::Util::Queue::Stomp.new
     end

data/spec/unit/util/zaml_spec.rb

@@ -1,4 +1,16 @@
 #!/usr/bin/env rspec
+# encoding: UTF-8
+#
+# The above encoding line is a magic comment to set the default source encoding
+# of this file for the Ruby interpreter.  It must be on the first or second
+# line of the file if an interpreter is in use.  In Ruby 1.9 and later, the
+# source encoding determines the encoding of String and Regexp objects created
+# from this source file.  This explicit encoding is important becuase otherwise
+# Ruby will pick an encoding based on LANG or LC_CTYPE environment variables.
+# These may be different from site to site so it's important for us to
+# establish a consistent behavior.  For more information on M17n please see:
+# http://links.puppetlabs.com/understanding_m17n
+
 require 'spec_helper'
 
 require 'puppet/util/monkey_patches'
@@ -60,3 +72,28 @@ describe "Pure ruby yaml implementation" do
     x2[2].should equal(x2)
   end
 end
+
+# Note, many of these tests will pass on Ruby 1.8 but fail on 1.9 if the patch
+# fix is not applied to Puppet or there's a regression.  These version
+# dependant failures are intentional since the string encoding behavior changed
+# significantly in 1.9.
+describe "UTF-8 encoded String#to_yaml (Bug #11246)" do
+  # JJM All of these snowmen are different representations of the same
+  # UTF-8 encoded string.
+  let(:snowman)         { 'Snowman: [☃]' }
+  let(:snowman_escaped) { "Snowman: [\xE2\x98\x83]" }
+
+  describe "UTF-8 String Literal" do
+    subject { snowman }
+
+    it "should serialize to YAML" do
+      subject.to_yaml
+    end
+    it "should serialize and deserialize to the same thing" do
+      YAML.load(subject.to_yaml).should == subject
+    end
+    it "should serialize and deserialize to a String compatible with a UTF-8 encoded Regexp" do
+      YAML.load(subject.to_yaml).should =~ /☃/u
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 7
-  - 8
-  version: 2.7.8
+  - 9
+  version: 2.7.9
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
@@ -39,13 +39,13 @@ executables:
 - filebucket
 - pi
 - puppet
+- puppetdoc
+- ralsh
 - puppetca
 - puppetd
-- puppetdoc
 - puppetmasterd
 - puppetqd
 - puppetrun
-- ralsh
 extensions: []
 
 extra_rdoc_files: []
@@ -56,16 +56,12 @@ files:
 - LICENSE
 - Rakefile
 - README.md
+- README_DEVELOPER.md
 - install.rb
 - bin/filebucket
 - bin/pi
 - bin/puppet
-- bin/puppetca
-- bin/puppetd
 - bin/puppetdoc
-- bin/puppetmasterd
-- bin/puppetqd
-- bin/puppetrun
 - bin/ralsh
 - lib/puppet/agent/locker.rb
 - lib/puppet/agent.rb
@@ -92,6 +88,7 @@ files:
 - lib/puppet/application/kick.rb
 - lib/puppet/application/man.rb
 - lib/puppet/application/master.rb
+- lib/puppet/application/module.rb
 - lib/puppet/application/node.rb
 - lib/puppet/application/parser.rb
 - lib/puppet/application/plugin.rb
@@ -147,6 +144,13 @@ files:
 - lib/puppet/face/help.rb
 - lib/puppet/face/key.rb
 - lib/puppet/face/man.rb
+- lib/puppet/face/module/build.rb
+- lib/puppet/face/module/changes.rb
+- lib/puppet/face/module/clean.rb
+- lib/puppet/face/module/generate.rb
+- lib/puppet/face/module/install.rb
+- lib/puppet/face/module/search.rb
+- lib/puppet/face/module.rb
 - lib/puppet/face/node/clean.rb
 - lib/puppet/face/node.rb
 - lib/puppet/face/parser.rb
@@ -281,6 +285,32 @@ files:
 - lib/puppet/interface.rb
 - lib/puppet/metatype/manager.rb
 - lib/puppet/module.rb
+- lib/puppet/module_tool/applications/application.rb
+- lib/puppet/module_tool/applications/builder.rb
+- lib/puppet/module_tool/applications/checksummer.rb
+- lib/puppet/module_tool/applications/cleaner.rb
+- lib/puppet/module_tool/applications/generator.rb
+- lib/puppet/module_tool/applications/installer.rb
+- lib/puppet/module_tool/applications/searcher.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
+- lib/puppet/module_tool/skeleton/templates/generator/README.erb
+- lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
+- lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
+- lib/puppet/module_tool/skeleton.rb
+- lib/puppet/module_tool/utils/interrogation.rb
+- lib/puppet/module_tool/utils.rb
+- lib/puppet/module_tool.rb
 - lib/puppet/network/authconfig.rb
 - lib/puppet/network/authorization.rb
 - lib/puppet/network/authstore.rb
@@ -1074,6 +1104,25 @@ files:
 - test/util/utiltest.rb
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/integration/provider/mailalias/aliases/test1
+- spec/fixtures/releases/jamtur01-apache/files/httpd
+- spec/fixtures/releases/jamtur01-apache/files/test.vhost
+- spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb
+- spec/fixtures/releases/jamtur01-apache/lib/puppet/type/a2mod.rb
+- spec/fixtures/releases/jamtur01-apache/manifests/dev.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/init.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/params.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/php.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp
+- spec/fixtures/releases/jamtur01-apache/metadata.json
+- spec/fixtures/releases/jamtur01-apache/Modulefile
+- spec/fixtures/releases/jamtur01-apache/templates/vhost-default.conf.erb
+- spec/fixtures/releases/jamtur01-apache/tests/apache.pp
+- spec/fixtures/releases/jamtur01-apache/tests/dev.pp
+- spec/fixtures/releases/jamtur01-apache/tests/init.pp
+- spec/fixtures/releases/jamtur01-apache/tests/php.pp
+- spec/fixtures/releases/jamtur01-apache/tests/ssl.pp
+- spec/fixtures/releases/jamtur01-apache/tests/vhost.pp
 - spec/fixtures/unit/parser/lexer/aliastest.pp
 - spec/fixtures/unit/parser/lexer/append.pp
 - spec/fixtures/unit/parser/lexer/argumentdefaults.pp
@@ -1157,6 +1206,7 @@ files:
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
 - spec/integration/indirector/node/ldap_spec.rb
+- spec/integration/module_tool_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/handler_spec.rb
 - spec/integration/network/rest_authconfig_spec.rb
@@ -1259,6 +1309,13 @@ files:
 - spec/unit/face/file_spec.rb
 - spec/unit/face/help_spec.rb
 - spec/unit/face/key_spec.rb
+- spec/unit/face/module/build_spec.rb
+- spec/unit/face/module/changes_spec.rb
+- spec/unit/face/module/clean_spec.rb
+- spec/unit/face/module/generate_spec.rb
+- spec/unit/face/module/install_spec.rb
+- spec/unit/face/module/search_spec.rb
+- spec/unit/face/module_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/plugin_spec.rb
 - spec/unit/face/report_spec.rb
@@ -1367,6 +1424,10 @@ files:
 - spec/unit/interface/option_spec.rb
 - spec/unit/interface_spec.rb
 - 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_spec.rb
 - spec/unit/network/authconfig_spec.rb
 - spec/unit/network/authstore_spec.rb
 - spec/unit/network/format_handler_spec.rb
@@ -1675,6 +1736,11 @@ files:
 - spec/unit/util/zaml_spec.rb
 - spec/unit/util_spec.rb
 - spec/watchr.rb
+- bin/puppetca
+- bin/puppetd
+- bin/puppetmasterd
+- bin/puppetqd
+- bin/puppetrun
 homepage: http://puppetlabs.com
 licenses: []