From fa300fda9494ee4357b322928afbbff720a4e431 Mon Sep 17 00:00:00 2001 From: slainer68 Date: Wed, 24 Aug 2011 12:30:52 +0200 Subject: [PATCH] Fixing Sprinkle::Installers::Transfer pre and post hooks. --- lib/sprinkle/installers/transfer.rb | 4 ++-- spec/sprinkle/installers/transfer_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sprinkle/installers/transfer.rb b/lib/sprinkle/installers/transfer.rb index 27cbaaa..83faafe 100644 --- a/lib/sprinkle/installers/transfer.rb +++ b/lib/sprinkle/installers/transfer.rb @@ -135,7 +135,7 @@ def process(roles) #:nodoc: unless pre.empty? sequence = pre; sequence = sequence.join('; ') if sequence.is_a? Array logger.info "#{@package.name} pre-transfer commands: #{sequence} for roles: #{roles}\n" - @delivery.process @package.name, sequence, roles + @delivery.process @package.name, [pre].flatten, roles end recursive = @options[:recursive] @@ -169,7 +169,7 @@ def process(roles) #:nodoc: unless post.empty? sequence = post; sequence = sequence.join('; ') if sequence.is_a? Array logger.info "#{@package.name} post-transfer commands: #{sequence} for roles: #{roles}\n" - @delivery.process @package.name, sequence, roles + @delivery.process @package.name, [post].flatten, roles end end end diff --git a/spec/sprinkle/installers/transfer_spec.rb b/spec/sprinkle/installers/transfer_spec.rb index faff799..7681490 100644 --- a/spec/sprinkle/installers/transfer_spec.rb +++ b/spec/sprinkle/installers/transfer_spec.rb @@ -42,9 +42,9 @@ def create_transfer(source, dest, options={}, &block) end it "should call the pre and post install commands around the file transfer" do - @delivery.should_receive(:process).with(@package.name, 'op1', @roles).once.ordered.and_return + @delivery.should_receive(:process).with(@package.name, ['op1'], @roles).once.ordered.and_return @delivery.should_receive(:transfer).ordered.and_return - @delivery.should_receive(:process).with(@package.name, 'op2', @roles).once.ordered.and_return + @delivery.should_receive(:process).with(@package.name, ['op2'], @roles).once.ordered.and_return end it "should call transfer with recursive defaulted to nil" do