puppet 2.7.26 → 3.0.0.rc4

data/man/man8/puppet-plugin.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PLUGIN" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.

data/man/man8/puppet-queue.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-QUEUE" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-QUEUE" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-queue\fR \- Queuing daemon for asynchronous storeconfigs

data/man/man8/puppet-report.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-REPORT" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.
@@ -146,8 +146,7 @@ begin
   Puppet::Face[:report, "0\.0\.1"]\.save(report)
   Puppet\.notice "Uploaded report for #{report\.name}"
 rescue => detail
-  puts detail\.backtrace if Puppet[:trace]
-  Puppet\.err "Could not send report: #{detail}"
+  Puppet\.log_exception(detail, "Could not send report: #{detail}")
 end
 .
 .fi

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/man/man8/puppet-resource_type.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE_TYPE" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-RESOURCE_TYPE" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource_type\fR \- View classes, defined resource types, and nodes from all manifests\.

data/man/man8/puppet-secret_agent.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SECRET_AGENT" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-SECRET_AGENT" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-secret_agent\fR \- Mimics puppet agent\.

data/man/man8/puppet-status.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-STATUS" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-status\fR \- View puppet server status\.

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR

data/spec/fixtures/unit/indirector/hiera/global.yaml

@@ -0,0 +1,10 @@
+---
+integer: 3000
+string: 'apache'
+hash:
+  user:  'Hightower'
+  group: 'admin'
+  mode:  '0644'
+array:
+ - '0.ntp.puppetlabs.com'
+ - '1.ntp.puppetlabs.com'

data/spec/fixtures/unit/provider/package/pkg/dummy_solaris10

@@ -1 +1 @@
-dummy                                     2.5.5-0.111     installed  ----
+dummy                                     2.5.5-0.111     installed  -----

data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.known

@@ -0,0 +1 @@
+dummy                                    1.0.6-0.175.0.0.0.2.537    ---

data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.installed

@@ -0,0 +1 @@
+dummy                                    1.0.6-0.175.0.0.0.2.537 installed  u----

data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.known

@@ -0,0 +1 @@
+dummy                                    1.0.6-0.175.0.0.0.2.537 known      u----

data/spec/fixtures/unit/provider/package/pkg/publisher

@@ -1,2 +1,2 @@
-SUNWpcre (solaris)                            8.8-0.111       installed  ----
-service/network/ssh (solaris)                 0.5.11-0.151.0.1 installed  -----
+SUNWdummy (solaris)                            8.8-0.111       installed  -----
+service/network/dummy (solaris)                 0.5.11-0.151.0.1 installed  -----

data/spec/fixtures/unit/provider/package/pkg/simple

@@ -1,4 +1,2 @@
-SUNPython                                     2.5.5-0.111     installed  ----
-SUNWbind                                      9.3.6.1-0.111   installed  ----
-SUNWdistro-license-copyright                  0.5.11-0.111    installed  ----
-SUNWfppd                                      0.2008.8.18-0.111 installed  ----
+SUNWdummy                                     2.5.5-0.111     installed  -----
+dummy2                                      9.3.6.1-0.111   installed  -----

data/spec/fixtures/unit/provider/package/pkg/solaris11

@@ -1,12 +1,2 @@
-compress/zip                                      3.0-0.175.0.0.0.2.537      i--
-archiver/gnu-tar                                  1.26-0.175.0.0.0.2.537     i--
-compress/bzip2                                    1.0.6-0.175.0.0.0.2.537    i--
-compress/gzip                                     1.3.5-0.175.0.0.0.2.537    i--
-compress/p7zip                                    9.20.1-0.175.0.0.0.2.537   i--
-compress/unzip                                    6.0-0.175.0.0.0.2.537      i--
-compress/zip                                      3.0-0.175.0.0.0.2.537      i--
-x11/library/toolkit/libxaw7                       1.0.9-0.175.0.0.0.0.1215   i--
-x11/library/toolkit/libxt                         1.0.9-0.175.0.0.0.0.1215   i--
-shell/bash                                        4.1.9-0.175.0.0.0.2.537    i--
-shell/zsh                                         4.3.12-0.175.0.0.0.2.537   i--
-security/sudo                                     1.8.1.2-0.175.0.0.0.2.537  i--
+dummy/dummy                                      3.0-0.175.0.0.0.2.537      i--
+dummy/dummy2                                     1.8.1.2-0.175.0.0.0.2.537  i--

data/spec/fixtures/unit/provider/package/sun/dummy.server

@@ -0,0 +1,12 @@
+   PKGINST:  SUNWdummy
+      NAME:  Dummy server
+  CATEGORY:  system
+      ARCH:  i386
+   VERSION:  11.11.0,REV=2010.10.12.04.23
+   BASEDIR:  /
+    VENDOR:  Oracle Corporation
+      DESC:  Dummy server (9.6.1-P3)
+  INSTDATE:  Nov 05 2010 09:14
+   HOTLINE:  Please contact your local service provider
+    STATUS:  completely installed
+

data/spec/fixtures/unit/provider/package/sun/simple

@@ -0,0 +1,24 @@
+   PKGINST:  SUNWdummy
+      NAME:  Dummy server
+  CATEGORY:  system
+      ARCH:  i386
+   VERSION:  11.11.0,REV=2010.10.12.04.23
+   BASEDIR:  /
+    VENDOR:  Oracle Corporation
+      DESC:  Dummy server (9.6.1-P3)
+  INSTDATE:  Nov 05 2010 09:14
+   HOTLINE:  Please contact your local service provider
+    STATUS:  completely installed
+
+   PKGINST:  SUNWdummyc
+      NAME:  Dummy client
+  CATEGORY:  system
+      ARCH:  i386
+   VERSION:  11.11.0,REV=2010.10.12.04.24
+   BASEDIR:  /
+    VENDOR:  Oracle Corporation
+      DESC:  Dummy client (9.6.1-P4)
+  INSTDATE:  Nov 05 2010 09:14
+   HOTLINE:  Please contact your local service provider
+    STATUS:  completely installed
+

data/spec/fixtures/unit/provider/service/smf/svcs.out

@@ -0,0 +1,3 @@
+legacy_run     16:19:12 lrc:/etc/rcS_d/S50sk98sol
+online         16:19:08 svc:/system/svc/restarter:default
+maintenance    16:19:13 svc:/network/cswrsyncd:default

data/spec/fixtures/unit/provider/zfs/zfs/zfs-list.out

@@ -0,0 +1,2 @@
+rpool                      7.75G  11.8G  32.5K  /rpool
+rpool/ROOT                 6.03G  11.8G    21K  legacy

data/spec/fixtures/unit/provider/zpool/zpool/zpool-list.out

@@ -0,0 +1,2 @@
+rpool  19.9G  7.19G  12.7G    36%  ONLINE  -
+mypool  19.9G  7.19G  12.7G    36%  ONLINE  -

data/spec/integration/application/apply_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet/application/apply'

data/spec/integration/application/doc_spec.rb

@@ -1,11 +1,12 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet_spec/files'
+require 'puppet/application/doc'
 
 describe Puppet::Application::Doc do
   include PuppetSpec::Files
 
-  it "should not generate an error when module dir overlaps parent of site.pp (#4798)", :'fails_on_ruby_1.9.2' => true, :unless => Puppet.features.microsoft_windows? do
+  it "should not generate an error when module dir overlaps parent of site.pp (#4798)", :if => Puppet.features.rdoc1?, :unless => Puppet.features.microsoft_windows? do
     begin
       # Note: the directory structure below is more complex than it
       # needs to be, but it's representative of the directory structure

data/spec/integration/configurer_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/configurer'

data/spec/integration/defaults_spec.rb

@@ -1,13 +1,10 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/defaults'
 require 'puppet/rails'
 
 describe "Puppet defaults" do
-  include Puppet::Util::Execution
-  after { Puppet.settings.clear }
-
   describe "when setting the :factpath" do
     it "should add the :factpath to Facter's search paths" do
       Facter.expects(:search).with("/my/fact/path")
@@ -55,16 +52,9 @@ describe "Puppet defaults" do
     end
   end
 
-  describe "when configuring the :crl" do
-    it "should warn if :cacrl is set to false" do
-      Puppet.expects(:warning)
-      Puppet.settings[:cacrl] = 'false'
-    end
-  end
-
   describe "when setting the :catalog_format" do
     it "should log a deprecation notice" do
-      Puppet.expects(:warning)
+      Puppet.expects(:deprecation_warning)
       Puppet.settings[:catalog_format] = 'marshal'
     end
     it "should copy the value to :preferred_serialization_format" do
@@ -122,35 +112,17 @@ describe "Puppet defaults" do
     Puppet.settings[:bindaddress].should == ""
   end
 
-  [:factdest].each do |setting|
-    it "should force the :factdest to be a directory" do
-      Puppet.settings[setting].should =~ /\/$/
-    end
-  end
-
   [:modulepath, :factpath].each do |setting|
     it "should configure '#{setting}' not to be a file setting, so multi-directory settings are acceptable" do
-      Puppet.settings.setting(setting).should be_instance_of(Puppet::Util::Settings::Setting)
+      Puppet.settings.setting(setting).should be_instance_of(Puppet::Settings::PathSetting)
     end
   end
 
-  describe "on a Unix-like platform it", :as_platform => :posix do
-    it "should add /usr/sbin and /sbin to the path if they're not there" do
-      withenv("PATH" => "/usr/bin#{File::PATH_SEPARATOR}/usr/local/bin") do
-        Puppet.settings[:path] = "none" # this causes it to ignore the setting
-        ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
-        ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
-      end
-    end
-  end
-
-  describe "on a Windows-like platform it", :as_platform => :windows do
-    it "should not add anything" do
-      path = "c:\\windows\\system32#{File::PATH_SEPARATOR}c:\\windows"
-      withenv("PATH" => path) do
-        Puppet.settings[:path] = "none" # this causes it to ignore the setting
-        ENV["PATH"].should == path
-      end
+  it "should add /usr/sbin and /sbin to the path if they're not there" do
+    Puppet::Util.withenv("PATH" => "/usr/bin:/usr/local/bin") do
+      Puppet.settings[:path] = "none" # this causes it to ignore the setting
+      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
+      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
     end
   end
 
@@ -247,22 +219,11 @@ describe "Puppet defaults" do
       Puppet.settings[:report_port].should == "1234"
     end
 
-    it "should set report_server when reportserver is set" do
-      Puppet.settings[:reportserver] = "reportserver"
-      Puppet.settings[:report_server].should == "reportserver"
-    end
-
     it "should use report_port when set" do
       Puppet.settings[:masterport] = "1234"
       Puppet.settings[:report_port] = "5678"
       Puppet.settings[:report_port].should == "5678"
     end
-
-    it "should prefer report_server over reportserver" do
-      Puppet.settings[:reportserver] = "reportserver"
-      Puppet.settings[:report_server] = "report_server"
-      Puppet.settings[:report_server].should == "report_server"
-    end
   end
 
   it "should have a :caname setting that defaults to the cert name" do
@@ -327,10 +288,19 @@ describe "Puppet defaults" do
     end
   end
 
-  describe "puppetdlock" do
-    it "(#2888) is not a file setting so it is absent from the Settings catalog" do
-      Puppet.settings.setting(:puppetdlockfile).should_not be_a_kind_of Puppet::Util::Settings::FileSetting
-      Puppet.settings.setting(:puppetdlockfile).should be_a Puppet::Util::Settings::Setting
+  describe "when configuring hiera" do
+    it "should have a hiera_config setting" do
+      Puppet.settings[:hiera_config].should_not be_nil
+    end
+  end
+
+  describe "when configuring the data_binding terminus" do
+    it "should have a data_binding_terminus setting" do
+      Puppet.settings[:data_binding_terminus].should_not be_nil
+    end
+
+    it "should be set to hiera by default" do
+      Puppet.settings[:data_binding_terminus].should == 'hiera'
     end
   end
 end

data/spec/{unit/face → integration/faces}/ca_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/face'
 
@@ -21,62 +21,60 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     )
   end
 
-  def make_certs(csr_names, crt_names)
-    Array(csr_names).map do |name|
+  def given_certificate_requests_for(*names)
+    names.each do |name|
       Puppet::SSL::Host.new(name).generate_certificate_request
     end
+  end
 
-    Array(crt_names).map do |name|
+  def given_certificates_for(*names)
+    names.each do |name|
       Puppet::SSL::Host.new(name).generate
     end
   end
 
   context "#verify" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:verify) end
-
-    it "should not explode if there is no certificate" do
-      expect {
-        subject.verify('random-host').should == {
-          :host => 'random-host', :valid => false,
-          :error => 'Could not find a certificate for random-host'
-        }
-      }.to_not raise_error
+    it "should report if there is no certificate" do
+      subject.verify('random-host').should == {
+        :host => 'random-host', :valid => false,
+        :error => 'Could not find a certificate for random-host'
+      }
     end
 
-    it "should not explode if there is only a CSR" do
-      make_certs('random-host', [])
-      expect {
-        subject.verify('random-host').should == {
-          :host => 'random-host', :valid => false,
-          :error => 'Could not find a certificate for random-host'
-        }
-      }.to_not raise_error
+    it "should report that it cannot find a certificate when there is only a request" do
+      given_certificate_requests_for('random-host')
+
+      subject.verify('random-host').should == {
+        :host => 'random-host', :valid => false,
+        :error => 'Could not find a certificate for random-host'
+      }
     end
 
     it "should verify a signed certificate" do
-      make_certs([], 'random-host')
+      given_certificates_for('random-host')
+
       subject.verify('random-host').should == {
         :host => 'random-host', :valid => true
       }
     end
 
     it "should not verify a revoked certificate" do
-      make_certs([], 'random-host')
+      given_certificates_for('random-host')
+
       subject.revoke('random-host')
 
-      expect {
-        subject.verify('random-host').should == {
-          :host => 'random-host', :valid => false,
-          :error => 'certificate revoked'
-        }
-      }.to_not raise_error
+      subject.verify('random-host').should == {
+        :host => 'random-host', :valid => false,
+        :error => 'certificate revoked'
+      }
     end
 
     it "should verify a revoked certificate if CRL use was turned off" do
-      make_certs([], 'random-host')
+      given_certificates_for('random-host')
       subject.revoke('random-host')
 
       Puppet[:certificate_revocation] = false
+
       subject.verify('random-host').should == {
         :host => 'random-host', :valid => true
       }
@@ -84,38 +82,32 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#fingerprint" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:fingerprint) end
-
-    it "should have a 'digest' option" do
-      action.should be_option :digest
-    end
-
-    it "should not explode if there is no certificate" do
-      expect {
-        subject.fingerprint('random-host').should be_nil
-      }.to_not raise_error
+    it "should be nil if there is no certificate" do
+      subject.fingerprint('random-host').should be_nil
     end
 
     it "should fingerprint a CSR" do
-      make_certs('random-host', [])
-      expect {
-        subject.fingerprint('random-host').should =~ /^[0-9A-F:]+$/
-      }.to_not raise_error
+      given_certificate_requests_for('random-host')
+
+      subject.fingerprint('random-host').should =~ /^[0-9A-F:]+$/
     end
 
     it "should fingerprint a certificate" do
-      make_certs([], 'random-host')
+      given_certificates_for('random-host')
+
       subject.fingerprint('random-host').should =~ /^[0-9A-F:]+$/
     end
 
     %w{md5 MD5 sha1 ShA1 SHA1 RIPEMD160 sha256 sha512}.each do |digest|
       it "should fingerprint with #{digest.inspect}" do
-        make_certs([], 'random-host')
+        given_certificates_for('random-host')
+
         subject.fingerprint('random-host', :digest => digest).should =~ /^[0-9A-F:]+$/
       end
 
       it "should fingerprint with #{digest.to_sym} as a symbol" do
-        make_certs([], 'random-host')
+        given_certificates_for('random-host')
+
         subject.fingerprint('random-host', :digest => digest.to_sym).
           should =~ /^[0-9A-F:]+$/
       end
@@ -123,24 +115,21 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#print" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:print) end
-
-    it "should not explode if there is no certificate" do
-      expect {
-        subject.print('random-host').should be_nil
-      }.to_not raise_error
+    it "should be nil if there is no certificate" do
+      subject.print('random-host').should be_nil
     end
 
     it "should return nothing if there is only a CSR" do
-      make_certs('random-host', [])
-      expect {
-        subject.print('random-host').should be_nil
-      }.to_not raise_error
+      given_certificate_requests_for('random-host')
+
+      subject.print('random-host').should be_nil
     end
 
     it "should return the certificate content if there is a cert" do
-      make_certs([], 'random-host')
+      given_certificates_for('random-host')
+
       text = subject.print('random-host')
+
       text.should be_an_instance_of String
       text.should =~ /^Certificate:/
       text.should =~ /Issuer: CN=Puppet CA: /
@@ -149,25 +138,19 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#sign" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:sign) end
-
-    it "should not explode if there is no CSR" do
-      expect {
-        subject.sign('random-host').
-          should == 'Could not find certificate request for random-host'
-      }.to_not raise_error
+    it "should report that there is no CSR" do
+      subject.sign('random-host').should == 'Could not find certificate request for random-host'
     end
 
-    it "should not explode if there is a signed cert" do
-      make_certs([], 'random-host')
-      expect {
-        subject.sign('random-host').
-          should == 'Could not find certificate request for random-host'
-      }.to_not raise_error
+    it "should report that there is no CSR when even when there is a certificate" do
+      given_certificates_for('random-host')
+
+      subject.sign('random-host').should == 'Could not find certificate request for random-host'
     end
 
     it "should sign a CSR if one exists" do
-      make_certs('random-host', [])
+      given_certificate_requests_for('random-host')
+
       subject.sign('random-host').should be_an_instance_of Puppet::SSL::Certificate
 
       list = subject.list(:signed => true)
@@ -200,8 +183,6 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#generate" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:generate) end
-
     it "should generate a certificate if requested" do
       subject.list(:all => true).should == []
 
@@ -212,18 +193,16 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
       list.first.name.should == 'random-host'
     end
 
-    it "should not explode if a CSR with that name already exists" do
-      make_certs('random-host', [])
-      expect {
-        subject.generate('random-host').should =~ /already has a certificate request/
-      }.to_not raise_error
+    it "should report if a CSR with that name already exists" do
+      given_certificate_requests_for('random-host')
+
+      subject.generate('random-host').should =~ /already has a certificate request/
     end
 
-    it "should not explode if the certificate with that name already exists" do
-      make_certs([], 'random-host')
-      expect {
-        subject.generate('random-host').should =~ /already has a certificate/
-      }.to_not raise_error
+    it "should report if the certificate with that name already exists" do
+      given_certificates_for('random-host')
+
+      subject.generate('random-host').should =~ /already has a certificate/
     end
 
     it "should include the specified DNS alt names" do
@@ -239,21 +218,12 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#revoke" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:revoke) end
-
-    it "should not explode when asked to revoke something that doesn't exist" do
-      expect { subject.revoke('nonesuch') }.to_not raise_error
-    end
-
-    it "should let the user know what went wrong" do
+    it "should let the user know what went wrong when there is nothing to revoke" do
       subject.revoke('nonesuch').should == 'Nothing was revoked'
     end
 
     it "should revoke a certificate" do
-      make_certs([], 'random-host')
-      found = subject.list(:all => true, :subject => 'random-host')
-      subject.get_action(:list).when_rendering(:console).call(found).
-        should =~ /^\+ random-host/
+      given_certificates_for('random-host')
 
       subject.revoke('random-host')
 
@@ -264,19 +234,12 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#destroy" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:destroy) end
-
-    it "should not explode when asked to delete something that doesn't exist" do
-      expect { subject.destroy('nonesuch') }.to_not raise_error
-    end
-
     it "should let the user know if nothing was deleted" do
       subject.destroy('nonesuch').should == "Nothing was deleted"
     end
 
     it "should destroy a CSR, if we have one" do
-      make_certs('random-host', [])
-      subject.list(:pending => true, :subject => 'random-host').should_not == []
+      given_certificate_requests_for('random-host')
 
       subject.destroy('random-host')
 
@@ -284,8 +247,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     end
 
     it "should destroy a certificate, if we have one" do
-      make_certs([], 'random-host')
-      subject.list(:signed => true, :subject => 'random-host').should_not == []
+      given_certificates_for('random-host')
 
       subject.destroy('random-host')
 
@@ -293,24 +255,16 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     end
 
     it "should tell the user something was deleted" do
-      make_certs([], 'random-host')
+      given_certificates_for('random-host')
+
       subject.list(:signed => true, :subject => 'random-host').should_not == []
+
       subject.destroy('random-host').
         should == "Deleted for random-host: Puppet::SSL::Certificate, Puppet::SSL::Key"
     end
   end
 
   context "#list" do
-    let :action do Puppet::Face[:ca, '0.1.0'].get_action(:list) end
-
-    context "options" do
-      subject { Puppet::Face[:ca, '0.1.0'].get_action(:list) }
-      it { should be_option :pending }
-      it { should be_option :signed  }
-      it { should be_option :all     }
-      it { should be_option :subject }
-    end
-
     context "with no hosts in CA" do
       [
         {},
@@ -322,15 +276,13 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
           subject.list(type).should == []
         end
 
-        it "should not fail when a matcher is passed" do
-          expect {
-            subject.list(type.merge :subject => '.').should == []
-          }.to_not raise_error
+        it "should return nothing when a matcher is passed" do
+          subject.list(type.merge :subject => '.').should == []
         end
 
         context "when_rendering :console" do
           it "should return nothing for #{type.inspect}" do
-            action.when_rendering(:console).call(subject.list(type)).should == ""
+            subject.get_action(:list).when_rendering(:console).call(subject.list(type)).should == ""
           end
         end
       end
@@ -351,7 +303,9 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
         { :pending => true, :signed => true } => all_names,
       }.each do |input, expect|
         it "should map #{input.inspect} to #{expect.inspect}" do
-          make_certs(csr_names, crt_names)
+          given_certificate_requests_for(*csr_names)
+          given_certificates_for(*crt_names)
+
           subject.list(input).map(&:name).should =~ expect
         end
 
@@ -359,22 +313,27 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
           filtered = expect.select {|x| Regexp.new(pattern).match(x) }
 
           it "should filter all hosts matching #{pattern.inspect} to #{filtered.inspect}" do
-            make_certs(csr_names, crt_names)
+            given_certificate_requests_for(*csr_names)
+            given_certificates_for(*crt_names)
+
             subject.list(input.merge :subject => pattern).map(&:name).should =~ filtered
           end
         end
       end
 
       context "when_rendering :console" do
-        { [["csr1.local"], []] => '^  csr1.local ',
-          [[], ["crt1.local"]] => '^\+ crt1.local ',
-          [["csr2"], ["crt2"]] => ['^  csr2 ', '^\+ crt2 ']
+        { [["csr1.local"], []] => [/^  csr1.local /],
+          [[], ["crt1.local"]] => [/^\+ crt1.local /],
+          [["csr2"], ["crt2"]] => [/^  csr2 /, /^\+ crt2 /]
         }.each do |input, pattern|
           it "should render #{input.inspect} to match #{pattern.inspect}" do
-            make_certs(*input)
-            text = action.when_rendering(:console).call(subject.list(:all => true))
-            Array(pattern).each do |item|
-              text.should =~ Regexp.new(item)
+            given_certificate_requests_for(*input[0])
+            given_certificates_for(*input[1])
+
+            text = subject.get_action(:list).when_rendering(:console).call(subject.list(:all => true))
+
+            pattern.each do |item|
+              text.should =~ item
             end
           end
         end