@@ -46,6 +46,8 @@ BANNER "Verbose output") { |OPTIONS[:verbose]| } opts.on("-c", "--cloud", "Show powder cloud, ie. package hierarchy and installation order") { |OPTIONS[:cloud]| } + opts.on("-f", "--force", + "Force installation of all packages even if it is detected that it has been previously installed") { |OPTIONS[:force]| } opts.on("-h", "--help", "Show this help message.") { puts opts; exit } opts.parse!(ARGV) @@ -55,6 +57,10 @@ BANNER end end +def force_mode(options) + Sprinkle::OPTIONS[:force] = OPTIONS[:force] || false +end + def operation_mode(options) Sprinkle::OPTIONS[:testing] = OPTIONS[:testing] || false end @@ -72,6 +78,7 @@ require 'sprinkle' powder = OPTIONS[:path] raise "Sprinkle script is not readable: #{powder}" unless File.readable?(powder) +force_mode(OPTIONS) operation_mode(OPTIONS) powder_cloud(OPTIONS) log_level(OPTIONS) bin/sprinkle @@ -13,7 +13,7 @@ Dir[File.dirname(__FILE__) + '/sprinkle/extensions/*.rb'].each { |e| require e } # Configuration options module Sprinkle - OPTIONS = { :testing => false, :verbose => false } + OPTIONS = { :testing => false, :verbose => false, :force => false } end # Define a logging target and understand packages, policies and deployment DSL lib/sprinkle.rb @@ -52,10 +52,25 @@ module Sprinkle def process(deployment, roles) return if meta_package? + + # Run a pre-test to see if the software is already installed. If so, + # we can skip it, unless we have the force option turned on! + unless @verifications.empty? || Sprinkle::OPTIONS[:force] + begin + process_verifications(deployment, roles) + return + rescue Sprinkle::VerificationFailed => e + # Continue + end + end @installer.defaults(deployment) @installer.process(roles) + process_verifications(deployment, roles) + end + + def process_verifications(deployment, roles) @verifications.each do |v| v.defaults(deployment) v.process(roles) lib/sprinkle/package.rb @@ -20,7 +20,11 @@ module Sprinkle unless Sprinkle::OPTIONS[:testing] logger.info "--> Verifying #{@package.name} for roles: #{roles}" - @delivery.process(@package.name, @commands, roles).to_s + + unless @delivery.process(@package.name, @commands, roles, true) + # Verification failed, halt sprinkling gracefully. + raise Sprinkle::VerificationFailed.new(@package, @description) + end end end @@ -32,4 +36,15 @@ module Sprinkle @commands << "test -d #{dir}" end end + + class VerificationFailed < Exception + attr_accessor :package, :description + + def initialize(package, description) + super("Verifying #{package.name}#{description} failed.") + + @package = package + @description = description + end + end end \ No newline at end of file lib/sprinkle/verify.rb @@ -240,25 +240,83 @@ CODE @installer.stub!(:process) 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) + describe 'with forcing' do + before do + # Being explicit + Sprinkle::OPTIONS[:force] = true end - @pkg.process(@deployment, @roles) + it 'should process verifications only once' do + @pkg.should_receive(:process_verifications).once + @pkg.process(@deployment, @roles) + end + + after do + # Being explicit + Sprinkle::OPTIONS[:force] = false + end end - it 'should request _each_ verification to process' do - @pkg.verifications.each do |v| - v.stub!(:defaults) - v.should_receive(:process).with(@roles).once + describe 'without forcing' do + before do + # Being explicit + Sprinkle::OPTIONS[:force] = false + end + + it 'should process verifications twice' do + @pkg.should_receive(:process_verifications).twice.and_raise(Sprinkle::VerificationFailed.new(@pkg, '')) + end + + it 'should continue with installation if pre-verification fails' do + @pkg.should_receive(:process_verifications).twice.and_raise(Sprinkle::VerificationFailed.new(@pkg, '')) + @installer.should_receive(:defaults) + @installer.should_receive(:process) end - @pkg.process(@deployment, @roles) + it 'should only process verifications once and should not process installer if verifications succeed' do + @pkg.should_receive(:process_verifications).once.and_return(nil) + @installer.should_not_receive(:defaults) + @installer.should_not_receive(:process) + end + + after do + begin + @pkg.process(@deployment, @roles) + rescue Sprinkle::VerificationFailed => e; end + end + end + end + + end + + describe 'when processing verifications' do + before do + @deployment = mock(Sprinkle::Deployment) + @roles = [ :app, :db ] + @installer = mock(Sprinkle::Installers::Installer, :defaults => true, :process => true) + @pkg = create_package_with_blank_verify(3) + @pkg.installer = @installer + @installer.stub!(:defaults) + @installer.stub!(:process) + 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) end end + it 'should request _each_ verification to process' do + @pkg.verifications.each do |v| + v.stub!(:defaults) + v.should_receive(:process).with(@roles).once + end + end + + after do + @pkg.process_verifications(@deployment, @roles) + end end describe 'hierarchies' do spec/sprinkle/package_spec.rb @@ -5,7 +5,7 @@ describe Sprinkle::Verify do @name = :package @package = package @name do gem 'nonexistent' - verify do + verify 'moo' do has_file 'my_file.txt' has_directory 'mydir' end @@ -55,9 +55,17 @@ describe Sprinkle::Verify do end it 'should call process on the delivery with the correct parameters' do - @delivery.should_receive(:process).with(@name, @verification.commands, [:app]).once + @delivery.should_receive(:process).with(@name, @verification.commands, [:app], true).once.and_return(true) @verification.process([:app]) end + + it 'should raise Sprinkle::VerificationFailed exception when commands fail' do + @delivery.should_receive(:process).once.and_return(false) + lambda { @verification.process([:app]) }.should raise_error(Sprinkle::VerificationFailed) do |error| + error.package.should eql(@package) + error.description.should eql('moo') + end + end end describe 'when testing' do spec/sprinkle/verify_spec.rb 8255114c7d49999c95c7aa914e2fdcffc6624c19 Mitchell Hashimoto mitchell.hashimoto@gmail.com http://github.com/crafterm/sprinkle/commit/92d49aa3bba21e3e7b139f7cc836d7e392c0f015 92d49aa3bba21e3e7b139f7cc836d7e392c0f015 2008-07-17T02:51:47-07:00 2008-07-17T02:51:47-07:00 When a verification fails, the VerificationFailed exception is raised. Verifications are ran BEFORE a package is installed to check if it has already been installed. If so, it skips. The -f flag has been introduced to force the installation regardless of whether the pre-verification is successful. e136afdf403b1b09ba60e5028170050937f1db3f Mitchell Hashimoto mitchell.hashimoto@gmail.com