sprinkle 0.7.4 → 0.7.5

data/lib/sprinkle/package/rendering.rb

@@ -11,7 +11,7 @@ module Sprinkle::Package
 
     def template(src, context=binding)
       eruby = Erubis::Eruby.new(src)
-      output = eruby.result(context)
+      eruby.result(context)
     rescue Object => e
       raise Sprinkle::Errors::TemplateError.new(e, src, context)
     end
@@ -41,4 +41,4 @@ module Sprinkle::Package
     end
 
   end
-end
+end

data/lib/sprinkle/policy.rb

@@ -6,7 +6,7 @@ module Sprinkle
       @name = name
       @roles = roles
     end
-    
+
     def to_s
       "Policy #{@name} is to be installed on #{@roles.inspect} but no server has such a role."
     end
@@ -17,8 +17,8 @@ module Sprinkle
   # Policies define a set of packages which are required for a certain
   # role (app, database, etc.). All policies defined will be run and all
   # packages required by the policy will be installed. So whereas defining
-  # a Sprinkle::Package merely defines it, defining a Sprinkle::Policy 
-  # actually causes those packages to install. 
+  # a Sprinkle::Package merely defines it, defining a Sprinkle::Policy
+  # actually causes those packages to install.
   #
   # == Example
   #
@@ -28,11 +28,11 @@ module Sprinkle
   #     requires :rails
   #   end
   #
-  # This says that for the blog on the app role, it requires certain 
+  # This says that for the blog on the app role, it requires certain
   # packages. The :roles option is <em>exactly</em> the same as a capistrano
   # or vlad role. A role merely defines what server the commands are run
   # on. This way, a single Sprinkle script can provision an entire group
-  # of servers. 
+  # of servers.
   #
   # To define a role, put in your actor specific configuration file (recipe or
   # script file):
@@ -50,11 +50,11 @@ module Sprinkle
   # multiple packages within the same role without having to wait for
   # that package to install repeatedly.
   class Policy
-    attr_reader :name 
+    attr_reader :name
     # roles for which a policy should be installed [required]
-    attr_reader :roles 
+    attr_reader :roles
 
-    # creates a new policy, 
+    # creates a new policy,
     # although policies are typically not created directly but
     # rather via the Core#policy helper.
     def initialize(name, metadata = {}, &block)
@@ -71,19 +71,19 @@ module Sprinkle
     def requires(package, *args)
       @packages << [package, args]
     end
-    
+
     def packages #:nodoc:
-       @packages.map {|x| x.first }
-     end
+      @packages.map {|x| x.first }
+    end
 
     def to_s #:nodoc:
        name; end
 
     def process(deployment) #:nodoc:
       raise NoMatchingServersError.new(@name, @roles) unless deployment.style.servers_for_role?(@roles)
-      
+
       all = []
-      
+
       logger.info "[#{name}]"
 
       cloud_info "--> Cloud hierarchy for policy #{@name}"

data/lib/sprinkle/script.rb

@@ -5,7 +5,11 @@ module Sprinkle
   # sprinkle script. 
   class Script
     include Sprinkle::Deployment
-    
+
+    def initialize
+      @deployment = nil
+    end
+
     # Run a given sprinkle script. This method is <b>blocking</b> so
     # it will not return until the sprinkling is complete or fails.
     #--

data/lib/sprinkle/verify.rb

@@ -86,6 +86,7 @@ module Sprinkle
       @commands = []
       @options ||= {}
       @options[:padding] = 4
+      @delivery = nil
       
       self.instance_eval(&block)
     end

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.7.4"
+  Version = "0.7.5"
 end

data/spec/spec_helper.rb

@@ -1,12 +1,18 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'sprinkle'
 
-class Object
-  def logger
-    # ActiveSupport::BufferedLogger was deprecated and replaced by ActiveSupport::Logger in Rails 4.
-    # Use ActiveSupport::Logger if available.
-    active_support_logger = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger : ActiveSupport::BufferedLogger
-    @@__log_file__ ||= StringIO.new
-    @@__log__ = active_support_logger.new @@__log_file__, active_support_logger::Severity::INFO
+module Sprinkle
+  module TestLogger
+    def logger
+      # ActiveSupport::BufferedLogger was deprecated and replaced by ActiveSupport::Logger in Rails 4.
+      # Use ActiveSupport::Logger if available.
+      active_support_logger = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger : ActiveSupport::BufferedLogger
+      @@__log_file__ ||= StringIO.new
+      @@__log__ = active_support_logger.new @@__log_file__, active_support_logger::Severity::INFO
+    end
   end
 end
+
+class Object
+  include Sprinkle::TestLogger
+end

data/spec/sprinkle/actors/capistrano_spec.rb

@@ -5,12 +5,12 @@ describe Sprinkle::Actors::Capistrano do
   before do
     @recipes = 'deploy'
     @cap = ::Capistrano::Configuration.new
-    ::Capistrano::Configuration.stub!(:new).and_return(@cap)
-    @cap.stub!(:load).and_return
+    ::Capistrano::Configuration.stub(:new).and_return(@cap)
+    @cap.stub(:load).and_return
   end
 
   def create_cap(&block)
-    Sprinkle::Actors::Capistrano.new &block
+    Sprinkle::Actors::Capistrano.new(&block)
   end
 
   describe 'when created' do
@@ -63,7 +63,7 @@ describe Sprinkle::Actors::Capistrano do
     describe 'without a block' do
 
       it 'should automatically load the default capistrano configuration' do
-        File.stub!(:exist?).with("Capfile").and_return true
+        File.stub(:exist?).with("Capfile").and_return true
         @cap.should_receive(:load).with('Capfile').and_return
       end
 
@@ -94,19 +94,19 @@ describe Sprinkle::Actors::Capistrano do
     before do
       @commands = %w( op1 op2 )
       @roles    = %w( app )
-      @package = stub(:name => "name")
+      @package = double(:name => "name")
       @cap = create_cap 
-      @verifier = stub(:package => @package, :commands => ["op1", "op2"])
+      @verifier = double(:package => @package, :commands => ["op1", "op2"])
     end
     
     it "should return true if successful" do
-      @cap.stub!(:run).and_return
+      @cap.stub(:run).and_return
       res = @cap.verify(@verifier, @roles)
       res.should == true
     end
     
     it "should return false if there was an error" do
-      @cap.stub!(:run).and_raise(::Capistrano::CommandError)
+      @cap.stub(:run).and_raise(::Capistrano::CommandError)
       res = @cap.verify(@verifier, @roles)
       res.should == false
     end
@@ -121,7 +121,7 @@ describe Sprinkle::Actors::Capistrano do
       @name     = 'name'
 
       @cap = create_cap do; recipes 'deploy'; end
-      @cap.stub!(:run).and_return
+      @cap.stub(:run).and_return
       
       @testing_errors = false
     end
@@ -130,8 +130,8 @@ describe Sprinkle::Actors::Capistrano do
       # pretend the package or installer has also added sudo
       @commands =["sudo op1"]
       @cap.stub(:sudo_command).and_return("sudo")
-      @cap.config.stub!(:fetch).and_return(:sudo)
-      @cap.unstub!(:run)
+      @cap.config.stub(:fetch).and_return(:sudo)
+      @cap.unstub(:run)
       @cap.config.should_receive(:invoke_command).with('op1', :via => :sudo).ordered.and_return
     end
 
@@ -166,7 +166,7 @@ describe Sprinkle::Actors::Capistrano do
       @name     = 'name'
 
       @cap = create_cap do; recipes 'deploy'; end
-      @cap.stub!(:run).and_return
+      @cap.stub(:run).and_return
       
       @package = Package.new(@name) {}
       @installer = Sprinkle::Installers::Transfer.new(@package, "file.txt","/tmp/file.txt")
@@ -202,7 +202,7 @@ describe Sprinkle::Actors::Capistrano do
       @name     = 'name'
 
       @cap = create_cap do; recipes 'deploy'; end
-      @cap.config.stub!(:invoke_command).and_return
+      @cap.config.stub(:invoke_command).and_return
     end
 
     it 'should run the supplied commands by default' do
@@ -217,7 +217,7 @@ describe Sprinkle::Actors::Capistrano do
     end
 
     it 'should be applicable for the supplied roles' do
-      @cap.stub!(:run).and_return
+      @cap.stub(:run).and_return
       @cap.config.should_receive(:task).with(:install_name, :roles => @roles).and_return
     end
 
@@ -235,7 +235,7 @@ describe Sprinkle::Actors::Capistrano do
       @name     = 'name'
 
       @cap = create_cap do; recipes 'deploy'; end
-      @cap.config.stub!(:upload).and_return
+      @cap.config.stub(:upload).and_return
       
       @package = Package.new(@name) {}
       @installer = Sprinkle::Installers::Transfer.new(@package, @source, @dest, :recursive => true)
@@ -247,7 +247,7 @@ describe Sprinkle::Actors::Capistrano do
     end
 
     it 'should be applicable for the supplied roles' do
-      @cap.stub!(:run).and_return
+      @cap.stub(:run).and_return
       @cap.config.should_receive(:task).with(:install_name, :roles => @roles).and_return
     end
 
@@ -265,7 +265,7 @@ describe Sprinkle::Actors::Capistrano do
       @name     = 'name'
 
       @cap = create_cap do; recipes 'deploy'; end
-      @cap.config.stub!(:upload).and_return
+      @cap.config.stub(:upload).and_return
       
       @package = Package.new(@name) {}
       @installer = Sprinkle::Installers::Transfer.new(@package, @source,@dest, :recursive => false)
@@ -277,7 +277,7 @@ describe Sprinkle::Actors::Capistrano do
     end
 
     it 'should be applicable for the supplied roles' do
-      @cap.stub!(:run).and_return
+      @cap.stub(:run).and_return
       @cap.config.should_receive(:task).with(:install_name, :roles => @roles).and_return
     end
 

data/spec/sprinkle/actors/local_spec.rb

@@ -16,7 +16,7 @@ describe Sprinkle::Actors::Local do
       @roles    = %w( app )
       @name     = 'name'
 
-      @local.stub!(:run_command).and_return(0)
+      @local.stub(:run_command).and_return(0)
     end
 
     it 'should run the commands on the local system' do
@@ -36,13 +36,13 @@ describe Sprinkle::Actors::Local do
     end
     
     it 'should return false when verification fails' do
-      @local.stub!(:run_command).and_return(1)
+      @local.stub(:run_command).and_return(1)
       res = @local.verify @verifier, @roles
       res.should == false
     end
 
     it 'should run the commands on the local system' do
-      @local.stub!(:run_command).and_return(0)
+      @local.stub(:run_command).and_return(0)
       res = @local.verify @verifier, @roles
       res.should == true
     end

data/spec/sprinkle/deployment_spec.rb

@@ -39,8 +39,8 @@ describe Sprinkle::Deployment do
   describe 'delivery specification' do
     
     before do
-      @actor = mock(Sprinkle::Actors::Capistrano)
-      Sprinkle::Actors::Capistrano.stub!(:new).and_return(@actor)
+      @actor = double(Sprinkle::Actors::Capistrano)
+      Sprinkle::Actors::Capistrano.stub(:new).and_return(@actor)
     end
 
     it 'should automatically instantiate the delivery type' do 
@@ -64,7 +64,7 @@ describe Sprinkle::Deployment do
   describe 'when processing policies' do 
     
     before do 
-      @policy = mock(Sprinkle::Policy, :process => true)
+      @policy = double(Sprinkle::Policy, :process => true)
       Sprinkle::POLICIES.clear
       Sprinkle::POLICIES << @policy 
       @deployment = create_deployment

data/spec/sprinkle/installers/apt_spec.rb

@@ -13,7 +13,7 @@ describe Sprinkle::Installers::Apt do
   end
 
   def create_apt(*debs, &block)
-    installer=@package.apt *debs, &block
+    @package.apt(*debs, &block)
   end
 
   describe 'when created' do

data/spec/sprinkle/installers/binary_spec.rb

@@ -23,7 +23,7 @@ describe Sprinkle::Installers::Binary do
   end
 
   def create_binary(binary, version = nil, &block)
-    @package = mock(Sprinkle::Package, :name => 'package', :version => version)
+    @package = double(Sprinkle::Package, :name => 'package', :version => version)
     Sprinkle::Installers::Binary.new(@package, binary, &block)
   end
 

data/spec/sprinkle/installers/brew_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe Sprinkle::Installers::Brew do
 
   before do
-    @formula = mock(Sprinkle::Package, :name => 'formula', :sudo? => false)
+    @formula = double(Sprinkle::Package, :name => 'formula', :sudo? => false)
   end
 
   def create_brew(*formulas, &block)

data/spec/sprinkle/installers/bsd_port_spec.rb

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

data/spec/sprinkle/installers/file_spec.rb

@@ -4,9 +4,9 @@ describe Sprinkle::Installers::FileInstaller 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)
+    @delivery = double(Sprinkle::Deployment, :install => true)
     @source = 'source'
     @destination = 'destination'
     @contents = "hi"
@@ -26,8 +26,8 @@ describe Sprinkle::Installers::FileInstaller do
 
   describe 'when created' do
     it 'should accept a source and destination to install' do
-      @installer.contents.should == @contents
-      @installer.destination.should == @destination
+      @installer.contents.should eq @contents
+      @installer.destination.should eq @destination
     end
   end
 
@@ -63,7 +63,7 @@ describe Sprinkle::Installers::FileInstaller do
       end
 
       it "should run commands in correct order" do
-        @installer_commands.should == [
+        @installer_commands.should eq [
           :TRANSFER,
           "sudo mv /tmp/sprinkle_#{@destination} #{@destination}",
           "sudo chmod 744 #{@destination}",
@@ -82,7 +82,7 @@ describe Sprinkle::Installers::FileInstaller do
       end
 
       it "should run commands in correct order" do
-        @installer_commands.should == [
+        @installer_commands.should eq [
           :TRANSFER,
           "sudo mv /tmp/sprinkle_#{@destination} #{@destination}",
           "sudo chown root #{@destination}",
@@ -104,7 +104,7 @@ describe Sprinkle::Installers::FileInstaller 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
 
     end
@@ -121,7 +121,7 @@ describe Sprinkle::Installers::FileInstaller 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
@@ -137,7 +137,7 @@ describe Sprinkle::Installers::FileInstaller 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

data/spec/sprinkle/installers/freebsd_pkg_spec.rb

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

data/spec/sprinkle/installers/freebsd_portinstall_spec.rb

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

data/spec/sprinkle/installers/gem_spec.rb

@@ -9,7 +9,7 @@ describe Sprinkle::Installers::Gem do
   end
 
   def create_gem(gem, version = nil, options = {}, &block)
-    # @package = mock(Sprinkle::Package, :name => gem, :version => version)
+    # @package = double(Sprinkle::Package, :name => gem, :version => version)
     @package = Package.new "test" do; end
     @package.version version
     Sprinkle::Installers::Gem.new(@package, gem, options, &block)