(#13429) refactor puppetral agent for telly compatibility

agent/puppetca/agent/puppetca.rb

@@ -23,7 +23,7 @@ def startup_hook
         signed = paths_for_cert(certname)[:signed]
         csr = paths_for_cert(certname)[:request]
 
-        msg = []
+        msg = new_msg_array
 
         if has_cert?(certname)
           File.unlink(signed)
@@ -105,6 +105,13 @@ def paths_for_cert(certname)
         {:signed => "#{@cadir}/signed/#{certname}.pem",
           :request => "#{@cadir}/requests/#{certname}.pem"}
       end
+
+      # This is only here to simplify testing, so that we can simulate
+      #  various lengths of the msg queue
+      def new_msg_array()
+        []
+      end
+      private :new_msg_array
     end
   end
 end

agent/puppetca/spec/puppetca_agent_spec.rb

@@ -48,10 +48,13 @@
     end
 
     it "should return the message if there are no certs but msg.size is not 0" do
+      @msg_array = []
+
       @agent.expects(:paths_for_cert).with("certname").twice.returns({:signed => "signed", :request => "request"})
       @agent.expects(:has_cert?).with("certname").returns(false)
       @agent.expects(:cert_waiting?).with("certname").returns(false)
-      Array.any_instance.expects(:size).returns(1)
+      @agent.expects(:new_msg_array).returns(@msg_array)
+      @msg_array.expects(:size).returns(1)
       result = @agent.call(:clean, :certname => "certname")
       result.should be_successful
       result.should have_data_items(:msg => "")

agent/puppetral/agent/puppetral.rb

@@ -1,4 +1,5 @@
 require 'puppet'
+require 'puppet/face/resource'
 
 module MCollective
   module Agent
@@ -17,6 +18,11 @@ module Agent
     # You can use puppetral to declare instances of any sensible Puppet type,
     # as long as you supply all of the attributes that the type requires.
     class Puppetral<RPC::Agent
+      def initialize
+        super
+        Puppet.initialize_settings
+      end
+
       metadata  :name        => "Resource Abstraction Layer Agent",
                 :description => "View and edit resources with Puppet's resource abstraction layer",
                 :author      => "R.I.Pienaar <[email protected]>, Max Martin <[email protected]>",

agent/puppetral/spec/puppetral_spec.rb

@@ -1,12 +1,30 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
+require 'tmpdir'
 
 describe "puppetral agent" do
   before :all do
     agent_file = File.join([File.dirname(__FILE__), "../agent/puppetral.rb"])
     @agent = MCollective::Test::LocalAgentTest.new("puppetral", :agent_file => agent_file).plugin
   end
 
+  # Not entirely thrilled with this; these tests end up causing puppet to actually
+  #  write some files in vardir, so we need to make sure that vardir is a real
+  #  directory that we can write to.  In an ideal world, I'd prefer that external
+  #  tools need not be quite so familiar with puppet's internal state and settings
+  #  implementations in order to run tests.  However, the current behavior of
+  #  puppet in "test" mode is to use "/dev/null" for all of the state / config
+  #  directories so that we will detect tests that attempt to write to them and
+  #  fail, since most spec tests should not be doing so.  --cprice 2012-04-24
+  before :each do
+    @vardir = Dir.mktmpdir
+    Puppet[:vardir] = @vardir
+  end
+
+  after :each do
+    FileUtils.rm_rf(@vardir) if File.directory?(@vardir)
+  end
+
   describe "#find" do
     it "should retrieve information about the type and title passed" do
       result = @agent.call(:find, :type => 'User', :title => 'bob')

spec/spec_helper.rb

@@ -7,6 +7,7 @@
 require 'rspec/mocks'
 require 'mocha'
 require 'tempfile'
+require 'puppet_spec_helper'
 
 RSpec.configure do |config|
   config.mock_with :mocha