sprinkle 0.7.4 → 0.7.5

data/spec/sprinkle/installers/thor_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 describe Sprinkle::Installers::Thor do
 
   before do
-    @package = mock(Sprinkle::Package, :name => 'spec')
+    @package = double(Sprinkle::Package, :name => 'spec')
   end
 
   def create_thor(names, options = {}, &block)

data/spec/sprinkle/installers/transfer_spec.rb

@@ -5,11 +5,11 @@ describe Sprinkle::Installers::Transfer do
   include Sprinkle::Deployment
 
   before do
-    @package = mock(Sprinkle::Package, :name => 'package', :sudo? => false)
+    @package = double(Sprinkle::Package, :name => 'package', :sudo? => false)
     @empty = Proc.new { }
-    @delivery = mock(Sprinkle::Deployment, :install => true)
-		@source = 'source'
-		@destination = 'destination'
+    @delivery = double(Sprinkle::Deployment, :install => true)
+    @source = 'source'
+    @destination = 'destination'
     @installer = create_transfer(@source, @destination)
     @roles = []
     @deployment = deployment do
@@ -21,13 +21,13 @@ describe Sprinkle::Installers::Transfer do
   def create_transfer(source, dest, options={}, &block)
     i = Sprinkle::Installers::Transfer.new(@package, source, dest, options, &block)
     i.delivery = @delivery
-		i
+    i
   end
 
   describe 'when created' do
     it 'should accept a source and destination to install' do
-      @installer.source.should == @source
-      @installer.destination.should == @destination
+      @installer.source.should eq @source
+      @installer.destination.should eq @destination
     end
   end
 
@@ -63,7 +63,7 @@ describe Sprinkle::Installers::Transfer do
       end
 
       it "should call the pre and post install commands around the file transfer" do
-        @installer_commands.should == ["op1",:TRANSFER, "op2"]
+        @installer_commands.should eq ["op1",:TRANSFER, "op2"]
       end
 
       # it "should call transfer with recursive defaulted to nil" do
@@ -85,7 +85,7 @@ describe Sprinkle::Installers::Transfer do
       end
 
       it "should call the pre and post install commands around the file transfer" do
-        @installer_commands.should == ["op1",:TRANSFER, 
+        @installer_commands.should eq ["op1",:TRANSFER, 
           "sudo mv /tmp/sprinkle_destination destination", "op2"]
       end
     end
@@ -101,52 +101,52 @@ describe Sprinkle::Installers::Transfer do
       end
 
       it "should call the pre and post install commands around the file transfer" do
-        @installer_commands.should == ["op1","op1-1",:TRANSFER, "op2","op2-1"]
+        @installer_commands.should eq ["op1","op1-1",:TRANSFER, "op2","op2-1"]
       end
 
     end
 
-		after do
+    after do
       @installer.process @roles
     end
   end
 
-	describe "if the :render flag is true" do
-		before do
+  describe "if the :render flag is true" do
+    before do
+      allow(::ActiveSupport::Deprecation).to receive(:warn)
       @installer = create_transfer @source, @destination, :render => true
-			@delivery = @installer.delivery
-			@delivery.stub!(:render_template_file)
+      @delivery = @installer.delivery
+      @delivery.stub(:render_template_file)
+      @tempfile = Tempfile.new("foo")
     end
 
-		it "should render the source file as a template to a tempfile" do
-			@tempfile = Tempfile.new("foo")
-			@installer.should_receive(:render_template_file).with(@source, anything, @package.name).and_return(@tempfile)
-			@delivery.stub!(:transfer)
-		end
+    it "should render the source file as a template to a tempfile" do
+      @installer.should_receive(:render_template_file).with(@source, anything, @package.name).and_return(@tempfile)
+      @delivery.stub(:transfer)
+    end
 
-		it "should call transfer with recursive set to false" do
-			@tempfile = Tempfile.new("foo")
-			@installer.should_receive(:render_template_file).with(@source, anything, @package.name).and_return(@tempfile)
-			@installer.options[:recursive].should == false
-		end
+    it "should call transfer with recursive set to false" do
+      @installer.should_receive(:render_template_file).with(@source, anything, @package.name).and_return(@tempfile)
+      @installer.options[:recursive].should eq false
+    end
 
-		after do
+    after do
       @installer.process @roles
     end
-	end
+  end
 
-	describe "if the :recursive flag is explicitly set to false" do
-		before do
+  describe "if the :recursive flag is explicitly set to false" do
+    before do
       @installer = create_transfer @source, @destination, :recursive => false
     end
 
-		it "should call transfer with recursive set to false" do
-			delivery = @installer.delivery
-			@installer.options[:recursive].should == false
-		end
+    it "should call transfer with recursive set to false" do
+      @installer.delivery
+      @installer.options[:recursive].should eq false
+    end
 
-		after do
+    after do
       @installer.process @roles
     end
-	end
+  end
 end

data/spec/sprinkle/installers/user_spec.rb

@@ -3,34 +3,40 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 describe Sprinkle::Installers::User do
 
   before do
-    @package = mock(Sprinkle::Package, :name => 'spec')
+    @package = double(Sprinkle::Package, :name => 'spec', :sudo? => false)
     @user = "bob"
   end
 
   def create_user(name, options = {}, &block)
-    Sprinkle::Installers::User.new "spec", name, options, &block
+    Sprinkle::Installers::User.new @package, name, options, &block
   end
 
   describe 'during installation' do
-    
+
     it "should invoke add user" do
       @installer = create_user 'bob'
       @install_commands = @installer.send :install_commands
-      @install_commands.should == "adduser  --gecos ,,, bob"
+      @install_commands.should == "adduser --gecos ,,, bob"
     end
-    
+
     it "should merge flags" do
       @installer = create_user 'bob', :flags => "-x"
       @install_commands = @installer.send :install_commands
       @install_commands.should == "adduser -x --gecos ,,, bob"
     end
-    
+
     it "should use actual gecos options if passed" do
       @installer = create_user 'bob', :flags => "--gecos bob,,,"
       @install_commands = @installer.send :install_commands
       @install_commands.should == "adduser --gecos bob,,, bob"
     end
 
+    it "should use sudo if sudo specified" do
+      @installer = create_user 'bob', :sudo => true
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == "sudo adduser --gecos ,,, bob"
+    end
+
   end
 
-end
+end

data/spec/sprinkle/installers/yum_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 describe Sprinkle::Installers::Yum do
 
   before do
-    @package = mock(Sprinkle::Package, :name => 'package')
+    @package = double(Sprinkle::Package, :name => 'package')
   end
 
   def create_rpm(rpms, &block)

data/spec/sprinkle/installers/zypper_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 describe Sprinkle::Installers::Zypper do
 
   before do
-    @package = mock(Sprinkle::Package, :name => 'package')
+    @package = double(Sprinkle::Package, :name => 'package')
   end
 
   def create_zypper(*packages, &block)

data/spec/sprinkle/package/package_repository_spec.rb

@@ -14,33 +14,33 @@ describe Sprinkle::Package::PackageRepository do
 
   it 'should allow adding a package' do
     @repository.add @test_package
-    @repository.count.should == 1
+    @repository.count.should eq 1
   end
   
   it 'should allow clearing' do
     @repository.add @test_package
     @repository.clear
-    @repository.count.should == 0
+    @repository.count.should eq 0
   end
   
   it "should find by provides" do
     @repository.add @mysql_package
-    @repository.find_all("db").should == [ @mysql_package ]
+    @repository.find_all("db").should eq [ @mysql_package ]
   end
   
   it "should find by name" do
     @repository.add @test_package
-    @repository.find_all("test").should == [ @test_package ]
+    @repository.find_all("test").should eq [ @test_package ]
   end
   
   it "should filter by version" do
     @repository.add @test_package
     @repository.add @test_v2_package
-    @repository.find_all("test").size.should == 2
-    @repository.first("test", :version => "2").should == @test_v2_package
+    @repository.find_all("test").size.should eq 2
+    @repository.first("test", :version => "2").should eq @test_v2_package
   end
 
   after do
   end
   
-end
+end

data/spec/sprinkle/package_spec.rb

@@ -8,7 +8,7 @@ describe Sprinkle::Package do
     @empty = Proc.new { }
     @opts = { }
   end
-  
+
   after do
     Sprinkle::Package::PACKAGES.clear
   end
@@ -56,14 +56,14 @@ CODE
       pkg = package @name do
         description 'my package description'
       end
-      pkg.description.should == 'my package description'
+      pkg.description.should eq 'my package description'
     end
 
     it 'should optionally accept a version' do
       pkg = package @name do
         version '2.0.2'
       end
-      pkg.version.should == '2.0.2'
+      pkg.version.should eq '2.0.2'
     end
 
     it 'should optionally accept configuration defaults' do
@@ -87,14 +87,14 @@ CODE
         defaults :username => 'deploy'
         add_user opts[:username]
       end
-      pkg.installers.first.class.should == Sprinkle::Installers::User
+      pkg.installers.first.class.should eq Sprinkle::Installers::User
       install_commands = pkg.installers.first.send :install_commands
-      install_commands.should == 'adduser  --gecos ,,, deploy'
+      install_commands.should == 'adduser --gecos ,,, deploy'
 
       instance = pkg.instance :username => 'deployer'
 
       install_commands = instance.installers.first.send :install_commands
-      install_commands.should == 'adduser  --gecos ,,, deployer'
+      install_commands.should == 'adduser --gecos ,,, deployer'
     end
 
     it 'should optionally accept an installer' do
@@ -108,31 +108,31 @@ CODE
       pkg = package @name do
         requires :webserver, :database
       end
-      pkg.dependencies.should == [:webserver, :database]
+      pkg.dependencies.should eq [:webserver, :database]
     end
 
     it 'should optionally accept recommended dependencies' do
       pkg = package @name do
         recommends :webserver, :database
       end
-      pkg.recommends.should == [:webserver, :database]
+      pkg.recommends.should eq [:webserver, :database]
     end
 
     it 'should optionally accept optional dependencies' do
       pkg = package @name do
         optional :webserver_configuration, :database_configuration
       end
-      pkg.optional.should == [:webserver_configuration, :database_configuration]
+      pkg.optional.should eq [:webserver_configuration, :database_configuration]
     end
 
     it 'should optionally define a virtual package implementation' do
       pkg = package @name, :provides => :database do; end
-      pkg.provides.should == :database
+      pkg.provides.should eq :database
     end
 
     it 'should be able to represent itself as a string' do
       pkg = package @name do; end
-      pkg.to_s.should == @name.to_s
+      pkg.to_s.should eq @name.to_s
     end
 
   end
@@ -140,8 +140,8 @@ CODE
   describe 'helper method' do
 
     it 'should add new packages to the global package repository' do
-      pkg = package @name do; end
-      Sprinkle::Package::PACKAGES.count.should == 1
+      package @name do; end
+      Sprinkle::Package::PACKAGES.count.should eq 1
     end
 
   end
@@ -153,7 +153,7 @@ CODE
         apt %w( deb1 deb2 )
       end
       pkg.should respond_to(:apt)
-      pkg.installers.first.class.should == Sprinkle::Installers::Apt
+      pkg.installers.first.class.should eq Sprinkle::Installers::Apt
     end
 
     it 'should optionally accept an rpm installer' do
@@ -161,7 +161,7 @@ CODE
         rpm %w( rpm1 rpm2 )
       end
       pkg.should respond_to(:rpm)
-      pkg.installers.first.class.should == Sprinkle::Installers::Rpm
+      pkg.installers.first.class.should eq Sprinkle::Installers::Rpm
     end
 
     it 'should optionally accept a gem installer' do
@@ -169,7 +169,7 @@ CODE
         gem 'gem'
       end
       pkg.should respond_to(:gem)
-      pkg.installers.first.class.should == Sprinkle::Installers::Gem
+      pkg.installers.first.class.should eq Sprinkle::Installers::Gem
     end
 
     it 'should optionally accept a noop installer' do
@@ -178,10 +178,10 @@ CODE
         end
       end
       pkg.should respond_to(:noop)
-      pkg.installers.first.class.should == Sprinkle::Installers::Runner
+      pkg.installers.first.class.should eq Sprinkle::Installers::Runner
       @installer = pkg.installers.first
       @install_commands = @installer.send :install_commands
-      @install_commands.should == ['echo noop']
+      @install_commands.should eq ['echo noop']
     end
 
     it 'should optionally accept an group installer' do
@@ -189,7 +189,7 @@ CODE
         add_group 'bob'
       end
       pkg.should respond_to(:add_group)
-      pkg.installers.first.class.should == Sprinkle::Installers::Group
+      pkg.installers.first.class.should eq Sprinkle::Installers::Group
     end
 
     it 'should optionally accept a source installer' do
@@ -197,7 +197,7 @@ CODE
         source 'archive'
       end
       pkg.should respond_to(:source)
-      pkg.installers.first.class.should == Sprinkle::Installers::Source
+      pkg.installers.first.class.should eq Sprinkle::Installers::Source
     end
 
     it 'should optionally accept an user installer' do
@@ -205,7 +205,7 @@ CODE
         add_user 'bob'
       end
       pkg.should respond_to(:add_user)
-      pkg.installers.first.class.should == Sprinkle::Installers::User
+      pkg.installers.first.class.should eq Sprinkle::Installers::User
     end
 
     it 'should allow multiple installer steps to be defined and respect order' do
@@ -214,9 +214,9 @@ CODE
         gem 'momoney'
       end
 
-      pkg.installers.length.should == 2
-      pkg.installers[0].class.should == Sprinkle::Installers::Source
-      pkg.installers[1].class.should == Sprinkle::Installers::Gem
+      pkg.installers.length.should eq 2
+      pkg.installers[0].class.should eq Sprinkle::Installers::Source
+      pkg.installers[1].class.should eq Sprinkle::Installers::Gem
     end
 
 		it 'should optionally accept a runner installer' do
@@ -224,7 +224,7 @@ CODE
 				runner 'obscure_installer_by_custom_cmd'
 			end
 			pkg.should respond_to(:runner)
-			pkg.installers.first.class.should == Sprinkle::Installers::Runner
+			pkg.installers.first.class.should eq Sprinkle::Installers::Runner
 		end
   end
 
@@ -235,7 +235,7 @@ CODE
         source 'archive' do; end
       end
       pkg.should respond_to(:source)
-      pkg.installers.first.class.should == Sprinkle::Installers::Source
+      pkg.installers.first.class.should eq Sprinkle::Installers::Source
     end
 
     it 'should forward block to installer superclass' do
@@ -281,16 +281,16 @@ CODE
   describe 'when processing' do
 
     before do
-      @deployment = mock(Sprinkle::Deployment)
+      @deployment = double(Sprinkle::Deployment)
       @roles = [ :app, :db ]
-      @installer = mock(Sprinkle::Installers::Installer, :defaults => true, :process => true)
+      @installer = double(Sprinkle::Installers::Installer, :defaults => true, :process => true)
       @package = package @name do; end
     end
 
     describe 'with an installer' do
 
       before do
-        @package.installers = [ @installer ]
+        @package.installers << @installer
       end
 
       it 'should configure itself against the deployment context' do
@@ -318,9 +318,9 @@ CODE
     describe 'with verifications' do
       before do
         @pkg = create_package_with_blank_verify(3)
-        @pkg.installers = [ @installer ]
-        @installer.stub!(:defaults)
-        @installer.stub!(:process)
+        @pkg.installers.replace [ @installer ]
+        @installer.stub(:defaults)
+        @installer.stub(:process)
       end
 
       describe 'with forcing' do
@@ -366,7 +366,8 @@ CODE
         after do
           begin
             @pkg.process(@deployment, @roles)
-          rescue Sprinkle::VerificationFailed => e; end
+          rescue Sprinkle::VerificationFailed
+          end
         end
       end
     end
@@ -375,35 +376,35 @@ CODE
 
   describe 'when processing verifications' do
     before do
-      @deployment = mock(Sprinkle::Deployment)
+      @deployment = double(Sprinkle::Deployment)
       @roles = [ :app, :db ]
-      @installer = mock(Sprinkle::Installers::Installer, :defaults => true, :process => true)
+      @installer = double(Sprinkle::Installers::Installer, :defaults => true, :process => true)
       @pkg = create_package_with_blank_verify(3)
-      @pkg.installers = [ @installer ]
-      @installer.stub!(:defaults)
-      @installer.stub!(:process)
-      @logger = mock(:debug => true, :debug? => true)
-      @logger.stub!(:info)
+      @pkg.installers.replace [ @installer ]
+      @installer.stub(:defaults)
+      @installer.stub(:process)
+      @logger = double(:debug => true, :debug? => true)
+      @logger.stub(:info)
     end
 
     it 'should request _each_ verification to configure itself against the deployment context' do
       @pkg.verifications.each do |v|
         v.should_receive(:defaults).with(@deployment).once
-        v.stub!(:process)
+        v.stub(:process)
       end
     end
 
     it 'should request _each_ verification to process' do
       @pkg.verifications.each do |v|
-        v.stub!(:defaults)
+        v.stub(:defaults)
         v.should_receive(:process).with(@roles).once
       end
     end
 
     it 'should enter a log info event to notify user whats happening' do
       @pkg.verifications.each do |v|
-        v.stub!(:defaults)
-        v.stub!(:process)
+        v.stub(:defaults)
+        v.stub(:process)
       end
 
       @pkg.should_receive(:logger).once.and_return(@logger)
@@ -426,16 +427,15 @@ CODE
 
     it 'should be able to return a dependency hierarchy tree' do
       @ai, @bi, @ci, @di, @ei = @a, @b, @c, @d, @e
-      @b.should_receive(:instance).any_number_of_times.and_return(@bi)
-      @c.should_receive(:instance).any_number_of_times.and_return(@ci)
-      @d.should_receive(:instance).any_number_of_times.and_return(@di)
-      @e.should_receive(:instance).any_number_of_times.and_return(@ei)
-      
-      @a.tree.flatten.should == [ @d, @c, @b, @a ]
-      @b.tree.flatten.should == [ @d, @c, @b ]
-      @c.tree.flatten.should == [ @d, @c ]
-      @d.tree.flatten.should == [ @d ]
-      @e.tree.flatten.should == [ @e, @d ]
+      @b.should_receive(:instance).at_least(:once).and_return(@bi)
+      @c.should_receive(:instance).at_least(:once).and_return(@ci)
+      @d.should_receive(:instance).at_least(:once).and_return(@di)
+
+      @a.tree.flatten.should eq [ @d, @c, @b, @a ]
+      @b.tree.flatten.should eq [ @d, @c, @b ]
+      @c.tree.flatten.should eq [ @d, @c ]
+      @d.tree.flatten.should eq [ @d ]
+      @e.tree.flatten.should eq [ @e, @d ]
     end
 
     describe 'with missing recommendations' do
@@ -445,7 +445,7 @@ CODE
       end
 
       it 'should ignore missing recommendations' do
-        @d.tree.flatten.should == [ @d ]
+        @d.tree.flatten.should eq [ @d ]
       end
 
     end
@@ -457,7 +457,7 @@ CODE
       end
 
       it 'should ignore missing recommendations' do
-        @d.tree.flatten.should == [ @d ]
+        @d.tree.flatten.should eq [ @d ]
       end
 
     end
@@ -467,11 +467,11 @@ CODE
       @a.tree do
         @count += 1
       end
-      @count.should == 3
+      @count.should eq 3
     end
 
     it 'should maintain a depth count of how deep the hierarchy is' do
-      instance=mock
+      instance=double
       @b.should_receive(:instance).and_return(instance)
       instance.should_receive(:tree).with(2).and_return([@b])
       @a.tree do; end