mcollective-client 2.2.4 → 2.4.0

data/spec/unit/plugins/mcollective/packagers/modulepackage_packager_spec.rb

@@ -0,0 +1,209 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/pluginpackager/modulepackage_packager.rb'
+
+module MCollective
+  module PluginPackager
+    describe ModulepackagePackager, :unless => MCollective::Util.windows? do
+      let(:data) do
+        {:agent  => {:files => ['./agent/rspec.rb']},
+         :common => {:files => ['./agent/rspec.ddl']},
+         :client => {:files => ['./application/rspec.rb']}}
+      end
+
+      let(:plugin) do
+        p = mock
+        p.stubs(:mcname).returns('mcollective')
+        p.stubs(:metadata).returns({
+          :version => '1.0',
+          :name => 'rspec',
+          :description => 'An rspec.',
+          :url => 'http://example.com/rspec/',
+        })
+        p.stubs(:revision).returns(1)
+        p.stubs(:target_path).returns('rspec_build')
+        p.stubs(:vendor).returns('puppetlabs')
+        p.stubs(:packagedata).returns(data)
+        p
+      end
+
+      let(:packager) do
+        p = ModulepackagePackager.new(plugin)
+        p.instance_variable_set(:@tmpdir, 'rspec_tmp')
+        p
+      end
+
+      before :each do
+        ModulepackagePackager.any_instance.stubs(:assert_new_enough_puppet)
+        @packager = packager
+      end
+
+      describe '#initialize' do
+        it 'should set the instance variables' do
+          new_packager = ModulepackagePackager.new(plugin)
+          new_packager.instance_variable_get(:@plugin).should == plugin
+          new_packager.instance_variable_get(:@package_name).should == 'mcollective_rspec'
+          new_packager.instance_variable_get(:@verbose).should == false
+          new_packager.instance_variable_get(:@keep_artifacts).should == nil
+        end
+
+        it 'should fail if no build command is present' do
+          ModulepackagePackager.any_instance.stubs(:assert_new_enough_puppet).raises("Cannot build package. 'puppet' is not present on the system")
+          expect{
+            new_packager = ModulepackagePackager.new(plugin)
+          }.to raise_error("Cannot build package. 'puppet' is not present on the system")
+        end
+      end
+
+      describe '#create_packages' do
+        before :each do
+          @packager.stubs(:puts)
+        end
+
+        it 'should run through the complete build process' do
+          Dir.expects(:mktmpdir).with('mcollective_packager').returns('rspec_tmp')
+          @packager.expects(:make_module)
+          @packager.expects(:run_build)
+          @packager.expects(:move_package)
+          @packager.expects(:cleanup_tmpdirs)
+          @packager.create_packages
+        end
+
+        it 'should clean up tmpdirs if keep_artifacts is false' do
+          Dir.stubs(:mktmpdir).raises('error')
+          @packager.expects(:cleanup_tmpdirs)
+          expect{
+            packager.create_packages
+          }.to raise_error('error')
+        end
+
+        it 'should keep the build artifacts if keep_artifacts is true' do
+          @packager.instance_variable_set(:@keep_artifacts, true)
+          Dir.stubs(:mktmpdir).raises('error')
+          @packager.expects(:cleanup_tmpdirs).never
+          expect{
+            @packager.create_packages
+          }.to raise_error('error')
+        end
+      end
+
+      describe '#assert_new_enough_puppet' do
+        before :each do
+          ModulepackagePackager.any_instance.unstub(:assert_new_enough_puppet)
+        end
+
+        let(:shell) do
+          s = mock
+          s.stubs(:runcommand)
+          s
+        end
+
+        it 'should ensure we have a puppet' do
+          PluginPackager.expects(:command_available?).with('puppet').returns(false)
+          expect {
+            packager.send(:assert_new_enough_puppet)
+          }.to raise_error('Cannot build package. \'puppet\' is not present on the system.')
+        end
+
+        it 'should find the version of puppet' do
+          PluginPackager.stubs(:command_available?).with('puppet').returns(true)
+          shell.expects(:stdout).returns("3.3.0\n")
+          Shell.stubs(:new).with('puppet --version').returns(shell)
+          packager.send(:assert_new_enough_puppet)
+        end
+
+        it 'should assert the version of puppet is >= 3.3.0' do
+          PluginPackager.expects(:command_available?).with('puppet').returns(true)
+          Shell.stubs(:new).with('puppet --version').returns(shell)
+          shell.stubs(:stdout).returns("3.2.0\n")
+          expect {
+            packager.send(:assert_new_enough_puppet)
+          }.to raise_error('Cannot build package. puppet 3.3.0 or greater required.  We have 3.2.0.')
+        end
+      end
+
+      describe '#make_module' do
+        it 'should copy the package content to the tmp build dir' do
+          file = mock()
+          File.stubs(:directory?).with('rspec_tmp/manifests').returns(false, true)
+          File.stubs(:directory?).with('rspec_tmp/files/agent/mcollective/agent').returns(false, true)
+          File.stubs(:directory?).with('rspec_tmp/files/common/mcollective/agent').returns(false, true)
+          File.stubs(:directory?).with('rspec_tmp/files/client/mcollective/application').returns(false)
+          FileUtils.expects(:mkdir_p).with('rspec_tmp/manifests')
+          FileUtils.expects(:mkdir_p).with('rspec_tmp/files/common/mcollective/agent')
+          FileUtils.expects(:mkdir_p).with('rspec_tmp/files/agent/mcollective/agent')
+          FileUtils.expects(:mkdir_p).with('rspec_tmp/files/client/mcollective/application')
+          FileUtils.expects(:cp_r).with('./agent/rspec.rb', 'rspec_tmp/files/agent/mcollective/agent')
+          FileUtils.expects(:cp_r).with('./agent/rspec.ddl', 'rspec_tmp/files/common/mcollective/agent')
+          FileUtils.expects(:cp_r).with('./application/rspec.rb', 'rspec_tmp/files/client/mcollective/application')
+          File.stubs(:open).with('rspec_tmp/manifests/common.pp', 'w').yields(file)
+          File.stubs(:open).with('rspec_tmp/manifests/agent.pp', 'w').yields(file)
+          File.stubs(:open).with('rspec_tmp/manifests/client.pp', 'w').yields(file)
+          File.stubs(:open).with('rspec_tmp/Modulefile', 'w').yields(file)
+          File.stubs(:open).with('rspec_tmp/README.md', 'w').yields(file)
+          file.expects(:puts).times(5)
+          @packager.send(:make_module)
+        end
+      end
+
+      describe '#run_build' do
+        before :each do
+          Dir.stubs(:chdir).yields
+        end
+
+        it 'should build the packages' do
+          PluginPackager.expects(:execute_verbosely).with(false).yields
+          PluginPackager.expects(:safe_system).with('puppet module build')
+          @packager.send(:run_build)
+        end
+
+        it 'should not build silently if verbose is false' do
+          @packager.instance_variable_set(:@verbose, true)
+          PluginPackager.expects(:execute_verbosely).with(true).yields
+          PluginPackager.expects(:safe_system).with('puppet module build')
+          @packager.send(:run_build)
+        end
+
+        it 'should write a message and raise an exception if the build fails' do
+          Dir.stubs(:chdir).raises('error')
+          @packager.expects(:puts).with('Build process has failed')
+          expect{
+            @packager.send(:run_build)
+          }.to raise_error('error')
+        end
+      end
+
+      describe '#move_package' do
+        it 'should copy all the build artifacts to the cwd' do
+          File.stubs(:join).with('rspec_tmp', 'pkg', 'puppetlabs-mcollective_rspec-1.0.tar.gz').returns('1.tar.gz')
+          FileUtils.expects(:cp).with('1.tar.gz', '.')
+          @packager.send(:move_package)
+        end
+
+        it 'should write a message and raise an exception if the artifacts cannot be copied' do
+          FileUtils.stubs(:cp).raises('error')
+          @packager.expects(:puts).with('Could not copy package to working directory')
+          expect{
+            @packager.send(:move_package)
+          }.to raise_error('error')
+        end
+      end
+
+      describe '#cleanup_tmpdirs' do
+        it 'should remove the tmp dirs' do
+          File.stubs(:directory?).with('rspec_tmp').returns(true)
+          FileUtils.expects(:rm_r).with('rspec_tmp')
+          @packager.send(:cleanup_tmpdirs)
+        end
+
+        it 'should write a message and raise an exception if it cannot remove the tmp dirs' do
+          File.stubs(:directory?).raises('error')
+          @packager.expects(:puts).with("Could not remove temporary build directory - 'rspec_tmp'")
+          expect{
+            @packager.send(:cleanup_tmpdirs)
+          }.to raise_error('error')
+        end
+      end
+    end
+  end
+end

data/spec/unit/plugins/mcollective/packagers/rpmpackage_packager_spec.rb

@@ -4,164 +4,278 @@ require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/pluginpack
 
 module MCollective
   module PluginPackager
-    describe RpmpackagePackager do
-      let(:maketmpdir) do
-        tmpdir = Dir.mktmpdir("mc-test")
-        @tmpdirs << tmpdir
-        tmpdir
+    describe RpmpackagePackager, :unless => MCollective::Util.windows? do
+      let(:plugin) do
+        p = mock
+        p.stubs(:mcname).returns('mcollective')
+        p.stubs(:metadata).returns({:version => '1.0', :name => 'rspec'})
+        p.stubs(:revision).returns(1)
+        p.stubs(:target_path).returns('rspec_build')
+        p
       end
 
-      before :all do
-        @tmpdirs = []
+      let(:packager) do
+        p = RpmpackagePackager.new(plugin)
+        p.instance_variable_set(:@tmpdir, 'rspec_tmp')
+        p
       end
 
-      before :each do
-        PluginPackager.stubs(:build_tool?).with("rpmbuild-md5").returns(true)
-        PluginPackager.stubs(:build_tool?).with("rpmbuild").returns(true)
-        @plugin = mock()
-        @plugin.stubs(:iteration).returns("1")
-        @plugin.stubs(:metadata).returns({:name => "test", :version => "1"})
-        @plugin.stubs(:mcname).returns("mcollective")
-        RpmpackagePackager.any_instance.stubs(:rpmdir).returns('rpmdir')
-        RpmpackagePackager.any_instance.stubs(:srpmdir).returns('srpmdir')
+      let(:data) do
+        {:agent => {:files => ['agent/rspec.rb', 'agent/rspec.ddl']},
+         :client => {:files => ['application/rspec.rb']}}
       end
 
-      after :all do
-        @tmpdirs.each{|tmpdir| FileUtils.rm_rf tmpdir if File.directory? tmpdir}
+      before :each do
+        RpmpackagePackager.any_instance.stubs(:select_command).returns('rpmbuild')
+        RpmpackagePackager.any_instance.stubs(:rpmdir).returns('rspec_rpm')
+        RpmpackagePackager.any_instance.stubs(:srpmdir).returns('rspec_srpm')
+        @packager = packager
       end
 
-      describe "#initialize" do
+      describe '#initialize' do
+        it 'should set the instance variables' do
+          new_packager = RpmpackagePackager.new(plugin)
+          new_packager.instance_variable_get(:@plugin).should == plugin
+          new_packager.instance_variable_get(:@package_name).should == 'mcollective-rspec'
+          new_packager.instance_variable_get(:@package_name_and_version).should == 'mcollective-rspec-1.0'
+          new_packager.instance_variable_get(:@verbose).should == false
+          new_packager.instance_variable_get(:@libdir).should == '/usr/libexec/mcollective/mcollective/'
+          new_packager.instance_variable_get(:@signature).should == nil
+          new_packager.instance_variable_get(:@rpmdir).should == 'rspec_rpm'
+          new_packager.instance_variable_get(:@srpmdir).should == 'rspec_srpm'
+          new_packager.instance_variable_get(:@keep_artifacts).should == nil
+        end
 
-        it "should raise and exception if neither rpmbuild or rpmbuild-md5 is installed is not present" do
-          PluginPackager.expects(:build_tool?).with("rpmbuild-md5").returns(false)
-          PluginPackager.expects(:build_tool?).with("rpmbuild").returns(false)
+        it 'should fail if no build command is present' do
+          RpmpackagePackager.any_instance.stubs(:select_command).returns(nil)
           expect{
-            RpmpackagePackager.new("plugin")
-          }.to raise_exception(RuntimeError, "creating rpms require 'rpmbuild' or 'rpmbuild-md5' to be installed")
+            new_packager = RpmpackagePackager.new(plugin)
+          }.to raise_error("Cannot build package. 'rpmbuild' or 'rpmbuild-md5' is not present on the system")
         end
+      end
 
-        it "should set the correct libdir" do
-          packager = RpmpackagePackager.new("plugin")
-          packager.libdir.should == "/usr/libexec/mcollective/mcollective/"
+      describe '#select_command' do
+        it 'should return the command string for rpmbuild if its present' do
+          RpmpackagePackager.any_instance.unstub(:select_command)
+          PluginPackager.stubs(:command_available?).with('rpmbuild-md5').returns(false)
+          PluginPackager.stubs(:command_available?).with('rpmbuild').returns(true)
+          @packager.select_command.should == 'rpmbuild'
+        end
 
-          packager = RpmpackagePackager.new("plugin", "/tmp/")
-          packager.libdir.should == "/tmp/"
+        it 'should return the command string for rpmbuild-md5 if its present' do
+          RpmpackagePackager.any_instance.unstub(:select_command)
+          PluginPackager.stubs(:command_available?).with('rpmbuild-md5').returns(true)
+          @packager.select_command.should == 'rpmbuild-md5'
         end
 
+        it 'should return nil if neither are present' do
+          RpmpackagePackager.any_instance.unstub(:select_command)
+          PluginPackager.stubs(:command_available?).with('rpmbuild-md5').returns(false)
+          PluginPackager.stubs(:command_available?).with('rpmbuild').returns(false)
+          @packager.select_command.should == nil
+        end
       end
 
-      describe "#create_packages" do
+      describe '#create_packages' do
         before :each do
-          @packager = RpmpackagePackager.new(@plugin)
-          @packager.tmpdir = maketmpdir
-          @packager.stubs(:create_package)
-          @packager.stubs(:cleanup_tmpdirs)
-          @plugin.stubs(:packagedata).returns(:test => {:files => ["test.rb"]})
-          @packager.stubs(:prepare_tmpdirs)
-          Dir.stubs(:mktmpdir)
+          @packager.stubs(:puts)
         end
 
-        it "should set the package instance variables" do
+        it 'should run through the complete build process' do
+          Dir.expects(:mktmpdir).with('mcollective_packager').returns('rspec_tmp')
+          @packager.expects(:prepare_tmpdirs)
+          @packager.expects(:make_spec_file)
+          @packager.expects(:run_build)
+          @packager.expects(:move_packages)
+          @packager.expects(:cleanup_tmpdirs)
           @packager.create_packages
-          @packager.current_package_type.should == :test
-          @packager.current_package_data.should == {:files => ["test.rb"]}
-          @packager.current_package_name.should == "mcollective-test-test"
         end
 
-        it "should create the build dir" do
-          @packager.expects(:prepare_tmpdirs)
-          @packager.create_packages
+        it 'should clean up tmpdirs if keep_artifacts is false' do
+          Dir.stubs(:mktmpdir).raises('error')
+          @packager.expects(:cleanup_tmpdirs)
+          expect{
+            packager.create_packages
+          }.to raise_error('error')
         end
 
-        it "should create packages" do
-          @packager.expects(:create_package)
-          @packager.create_packages
+        it 'should keep the build artifacts if keep_artifacts is true' do
+          @packager.instance_variable_set(:@keep_artifacts, true)
+          Dir.stubs(:mktmpdir).raises('error')
+          @packager.expects(:cleanup_tmpdirs).never
+          expect{
+            @packager.create_packages
+          }.to raise_error('error')
+        end
+      end
+
+      describe '#run_build' do
+        it 'should build the packages' do
+          @packager.expects(:create_tar).returns('rspec.tgz')
+          PluginPackager.expects(:execute_verbosely).with(false).yields
+          PluginPackager.expects(:safe_system).with('rpmbuild -ta --quiet rspec.tgz')
+          @packager.send(:run_build)
+        end
+
+        it 'should sign the packages if a signature is defined' do
+          @packager.instance_variable_set(:@signature, true)
+          @packager.expects(:create_tar).returns('rspec.tgz')
+          PluginPackager.expects(:execute_verbosely).with(false).yields
+          PluginPackager.expects(:safe_system).with('rpmbuild -ta --quiet --sign rspec.tgz')
+          @packager.send(:run_build)
+        end
+
+        it 'should not build silently if verbose is false' do
+          @packager.instance_variable_set(:@verbose, true)
+          @packager.expects(:create_tar).returns('rspec.tgz')
+          PluginPackager.expects(:execute_verbosely).with(true).yields
+          PluginPackager.expects(:safe_system).with('rpmbuild -ta rspec.tgz')
+          @packager.send(:run_build)
         end
 
+        it 'should write a message and raise an exception if the build fails' do
+          @packager.stubs(:create_tar).raises('error')
+          @packager.expects(:puts).with('Build process has failed')
+          expect{
+            @packager.send(:run_build)
+          }.to raise_error('error')
+        end
       end
 
-      describe "#create_package" do
-        before :each do
-          @packager = RpmpackagePackager.new(@plugin)
+      describe '#create_tar' do
+        it 'should create the tarball' do
+          PluginPackager.expects(:execute_verbosely).with(false).yields
+          Dir.expects(:chdir).with('rspec_tmp').yields
+          PluginPackager.expects(:safe_system).with('tar -cvzf rspec_tmp/mcollective-rspec-1.0.tgz mcollective-rspec-1.0')
+          @packager.send(:create_tar)
         end
 
-        it "should create the package" do
-          Dir.expects(:chdir)
-          PluginPackager.expects(:safe_system).with("rpmbuild-md5 -ta   /tmp/mcollective-testplugin-test-1.tgz")
-          FileUtils.expects(:cp).times(2)
-          @packager.tmpdir = "/tmp"
-          @packager.verbose = "true"
-          @packager.expects(:make_spec_file)
-          @packager.current_package_name = "mcollective-testplugin-test"
-          @packager.expects(:puts).with('Created RPM and SRPM packages for mcollective-testplugin-test')
-          @packager.create_package(:test, {:files => ["foo.rb"]})
-        end
-
-        it "should sign the package if a signature is given" do
-          Dir.expects(:chdir)
-          PluginPackager.expects(:safe_system).with("rpmbuild-md5 -ta  --sign /tmp/mcollective-testplugin-test-1.tgz")
-          FileUtils.expects(:cp).times(2)
-          @packager.signature = true
-          @packager.tmpdir = "/tmp"
-          @packager.verbose = "true"
-          @packager.expects(:make_spec_file)
-          @packager.current_package_name = "mcollective-testplugin-test"
-          @packager.expects(:puts).with('Created RPM and SRPM packages for mcollective-testplugin-test')
-          @packager.create_package(:test, {:files => ["foo.rb"]})
+        it 'should write a message and raise an exception if the tarball cannot be built' do
+          PluginPackager.expects(:execute_verbosely).with(false).raises('error')
+          @packager.expects(:puts).with("Could not create tarball - 'rspec_tmp/mcollective-rspec-1.0.tgz'")
+          expect{
+            @packager.send(:create_tar)
+          }.to raise_error('error')
         end
+      end
 
-        it "should raise an error if the package can't be built" do
-          @packager = RpmpackagePackager.new(@plugin)
-          @packager.tmpdir = "/tmp"
-          @packager.expects(:make_spec_file)
-          PluginPackager.stubs(:do_quietly?).raises("foo")
+      describe '#move_packages' do
+        it 'should copy all the build artifacts to the cwd' do
+          File.stubs(:join).with('rspec_rpm', 'noarch', 'mcollective-rspec-*-1.0-1.noarch.rpm').returns('rspec_rpm/noarch/mcollective-rspec-*-1.0-1.noarch.rpm')
+          File.stubs(:join).with('rspec_srpm', 'mcollective-rspec-1.0-1.src.rpm').returns('1.src.rpm')
+          Dir.stubs(:glob).with('rspec_rpm/noarch/mcollective-rspec-*-1.0-1.noarch.rpm').returns(['1.rpm', '2.rpm'])
+          Dir.stubs(:glob).with('rspec_srpm/mcollective-rspec-1.0-1.src.rpm').returns(['1.src.rpm'])
+          FileUtils.expects(:cp).with(['1.rpm', '2.rpm', '1.src.rpm'], '.')
+          @packager.send(:move_packages)
+        end
+
+        it 'should write a message and raise an exception if the artifacts cannot be copied' do
+          Dir.stubs(:glob).raises('error')
+          @packager.expects(:puts).with('Could not copy packages to working directory')
+          expect{
+            @packager.send(:move_packages)
+          }.to raise_error('error')
+        end
+      end
+
+      describe '#make_spec_file' do
+        it 'should create a specfile from the erb template' do
+          erb = mock
+          file = mock
+          erb.stubs(:result).returns('<% rspec =%>')
+          File.stubs(:dirname).returns('rspec_template')
+          File.expects(:read).with('rspec_template/templates/redhat/rpm_spec.erb').returns(erb)
+          ERB.expects(:new).with(erb, nil, '-').returns(erb)
+          File.expects(:open).with('rspec_tmp/mcollective-rspec-1.0/mcollective-rspec-1.0.spec', 'w').yields(file)
+          file.expects(:puts).with('<% rspec =%>')
+          @packager.send(:make_spec_file)
+        end
+
+        it 'should write a message and raise an exception if it could not create the specfile' do
+          ERB.stubs(:new).raises('error')
+          @packager.expects(:puts).with("Could not create specfile - 'rspec_tmp/mcollective-rspec-1.0/mcollective-rspec-1.0.spec'")
           expect{
-            @packager.create_package("", "")
-          }.to raise_error(RuntimeError, "Could not build package. Reason - foo")
+            @packager.send(:make_spec_file)
+          }.to raise_error('error')
         end
       end
 
-      describe "#make_spec_file" do
+      describe '#prepare_tmpdirs' do
         before :each do
-          @plugin = mock
-          @packager = RpmpackagePackager.new(@plugin)
+          pluginfiles = ['/agent/rspec.rb', '/agent/rspec.ddl', '/application/rspec.rb']
+          @packager.stubs(:plugin_files).returns(pluginfiles)
+        end
+
+        it 'should copy the package content to the tmp build dir' do
+          File.stubs(:directory?).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent').returns(false, true)
+          File.stubs(:directory?).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/application').returns(false)
+          FileUtils.expects(:mkdir_p).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent')
+          FileUtils.expects(:mkdir_p).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/application')
+          FileUtils.expects(:cp_r).with('/agent/rspec.rb', 'rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent')
+          FileUtils.expects(:cp_r).with('/agent/rspec.ddl', 'rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent')
+          FileUtils.expects(:cp_r).with('/application/rspec.rb', 'rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/application')
+          @packager.send(:prepare_tmpdirs)
+        end
+
+        it 'should fail if we do not have permission to create the directory' do
+          File.stubs(:directory?).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent').raises(Errno::EACCES)
+          @packager.expects(:puts)
+          expect{
+            @packager.send(:prepare_tmpdirs)
+          }.to raise_error(Errno::EACCES)
+        end
+
+        it 'should fail if the files we are trying to copy do not exist' do
+          File.stubs(:directory?).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent').raises(Errno::ENOENT)
+          @packager.expects(:puts)
+          expect{
+            @packager.send(:prepare_tmpdirs)
+          }.to raise_error(Errno::ENOENT)
+
         end
 
-        it "should raise an exception if specfile cannot be built" do
-          File.expects(:dirname).raises("test error")
+        it 'should write a message an error if the something else goes wrong and raise an exception' do
+          File.stubs(:directory?).with('rspec_tmp/mcollective-rspec-1.0/usr/libexec/mcollective/mcollective/agent').raises('error')
+          @packager.expects(:puts)
           expect{
-            @packager.make_spec_file
-          }.to raise_error(RuntimeError, "Could not create specfile - test error")
+            @packager.send(:prepare_tmpdirs)
+          }.to raise_error('error')
         end
+      end
 
-        it "should create the specfile from the erb" do
-          File.stubs(:read).returns("specfile")
-          @plugin.stubs(:metadata).returns({:version => 2})
-          @packager.current_package_name = "test"
-          @packager.tmpdir = maketmpdir
-          Dir.mkdir(File.join(@packager.tmpdir, "test-2"))
-          @packager.make_spec_file
-          File.read(File.join(@packager.tmpdir, "test-2", "test-2.spec")).should == "specfile"
+      describe '#plugin_files' do
+        it 'should return the package files in a single array' do
+          files = ['agent/rspec.rb', 'agent/rspec.ddl', 'application/rspec.rb']
+          plugin.stubs(:packagedata).returns(data)
+          result = @packager.send(:plugin_files)
+          (files | result).should == files
         end
       end
 
-      describe "#prepare_tmpdirs" do
-        it "should create the tmp dirs and cp the package files" do
-          @plugin.stubs(:target_path).returns("")
-          packager = RpmpackagePackager.new(@plugin)
-          FileUtils.expects(:mkdir_p)
-          File.stubs(:join).returns("/target")
-          FileUtils.expects(:cp_r).with("test.rb", "/target")
-          packager.prepare_tmpdirs({:files => ["test.rb"]})
+      describe '#package_files' do
+        it 'should return the package files and ommit the directories' do
+          files = ['/rspec', '/rspec/1.rb', '/rspec/2.rb']
+          File.expects(:directory?).with('/rspec').returns(true)
+          File.expects(:directory?).with('/rspec/1.rb').returns(false)
+          File.expects(:directory?).with('/rspec/2.rb').returns(false)
+          @packager.send(:package_files, files).should == ['/usr/libexec/mcollective/mcollective/rspec/1.rb', 
+                                                           '/usr/libexec/mcollective/mcollective/rspec/2.rb']
         end
       end
 
-      describe "#cleanup_tmpdirs" do
-        it "should remove the temp directories" do
-          packager = RpmpackagePackager.new("package")
-          packager.tmpdir = maketmpdir
-          packager.cleanup_tmpdirs
-          File.directory?(packager.tmpdir).should == false
+      describe '#cleanup_tmpdirs' do
+        it 'should remove the tmp dirs' do
+          File.stubs(:directory?).with('rspec_tmp').returns(true)
+          FileUtils.expects(:rm_r).with('rspec_tmp')
+          @packager.send(:cleanup_tmpdirs)
+        end
+
+        it 'should write a message and raise an exception if it cannot remove the tmp dirs' do
+          File.stubs(:directory?).raises('error')
+          @packager.expects(:puts).with("Could not remove temporary build directory - 'rspec_tmp'")
+          expect{
+            @packager.send(:cleanup_tmpdirs)
+          }.to raise_error('error')
         end
       end
     end