sprinkle 0.2.6 → 0.3.0

data/spec/sprinkle/installers/noop_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::Noop do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'spec')
+  end
+
+  def create_noop(names, options = {}, &block)
+    Sprinkle::Installers::Noop.new(@package, options, &block)
+  end
+
+  describe 'during installation' do
+
+    it 'should always be empty' do
+      @installer = create_noop 'spec'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == 'echo noop'
+    end
+
+  end
+
+end

data/spec/sprinkle/installers/source_spec.rb

@@ -25,6 +25,8 @@ describe Sprinkle::Installers::Source do
 
       with %w( debug extras )
       without %w( fancyisms )
+
+      option %w( foo bar baz )
     end
 
     @installer.defaults(@deployment)
@@ -86,6 +88,10 @@ describe Sprinkle::Installers::Source do
       @installer.without.should == %w( fancyisms )
     end
 
+    it 'should support specification of "option" options' do
+      @installer.option.should == %w( foo bar baz )
+    end
+
     it 'should support customized build area' do
       @installer.prefix.should == '/usr/local'
     end
@@ -341,5 +347,25 @@ describe Sprinkle::Installers::Source do
     end
 
   end
+  
+  describe 'base dir calculation' do
+    
+    %w( tar tar.gz tgz tar.bz2 tb2 zip ).each do |archive|
+      
+      it "should recognize #{archive} style archives" do
+        @installer.source = "blah.#{archive}"
+        @installer.send(:base_dir).should == 'blah'
+      end
+      
+    end
+    
+    # def base_dir #:nodoc:
+    #   if archive_name.split('/').last =~ /(.*)\.(tar\.gz|tgz|tar\.bz2|tar|tb2)/
+    #     return $1
+    #   end
+    #   raise "Unknown base path for source archive: #{@source}, please update code knowledge"
+    # end    
+    
+  end
 
 end

data/spec/sprinkle/installers/transfer_spec.rb

@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'tempfile'
+
+describe Sprinkle::Installers::Transfer do
+  include Sprinkle::Deployment
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+    @empty = Proc.new { }
+    @delivery = mock(Sprinkle::Deployment, :process => true)
+		@source = 'source'
+		@destination = 'destination'
+    @installer = create_transfer(@source, @destination)
+    @roles = []
+    @deployment = deployment do
+      delivery :capistrano
+      installer do; prefix '/usr/bin'; end
+    end
+  end
+  
+  def create_transfer(source, dest, options={}, &block)
+    i = Sprinkle::Installers::Transfer.new(@package, source, dest, options, &block)
+    i.delivery = @delivery
+		i
+  end
+  
+  describe 'when created' do
+    it 'should accept a source and destination to install' do
+      @installer.source.should == @source
+      @installer.destination.should == @destination
+    end
+  end
+  
+  describe 'during installation' do
+    before do
+      @installer = create_transfer @source, @destination do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+
+			@delivery = @installer.delivery
+    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(:transfer).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
+			@delivery.should_receive(:process).and_return
+      @delivery.should_receive(:transfer).with(@package.name, @source, @destination, @roles, nil)		
+		end	
+  
+		after do
+      @installer.process @roles
+    end
+  end
+
+	describe "if the :render flag is true" do
+		before do
+      @installer = create_transfer @source, @destination, :render => true
+			@delivery = @installer.delivery
+			@delivery.stub!(:render_template_file)
+    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 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)
+			@delivery.should_receive(:transfer).with(@package.name, @tempfile.path, @destination, @roles, false).ordered.and_return
+		end
+		
+		after do
+      @installer.process @roles
+    end
+	end
+	
+	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
+			delivery.should_receive(:transfer).with(@package.name, @source, @destination, @roles, false).ordered.and_return
+		end
+		
+		after do
+      @installer.process @roles
+    end
+	end
+end

data/spec/sprinkle/package_spec.rb

@@ -22,7 +22,7 @@ describe Sprinkle::Package do
         end
       end
       
-      pre_count = pkg.installer.instance_variable_get(:@pre)[:install].length
+      pre_count = pkg.installers.first.instance_variable_get(:@pre)[:install].length
     }.should change { pre_count }.by(1)
 CODE
   end
@@ -66,7 +66,7 @@ CODE
       pkg = package @name do
         gem 'rails'
       end
-      pkg.installer.should_not be_nil
+      pkg.installers.should_not be_empty
     end
 
     it 'should optionally accept dependencies' do
@@ -123,7 +123,7 @@ CODE
         apt %w( deb1 deb2 )
       end
       pkg.should respond_to(:apt)
-      pkg.installer.class.should == Sprinkle::Installers::Apt
+      pkg.installers.first.class.should == Sprinkle::Installers::Apt
     end
 
     it 'should optionally accept an rpm installer' do
@@ -131,7 +131,7 @@ CODE
         rpm %w( rpm1 rpm2 )
       end
       pkg.should respond_to(:rpm)
-      pkg.installer.class.should == Sprinkle::Installers::Rpm
+      pkg.installers.first.class.should == Sprinkle::Installers::Rpm
     end
 
     it 'should optionally accept a gem installer' do
@@ -139,7 +139,7 @@ CODE
         gem 'gem'
       end
       pkg.should respond_to(:gem)
-      pkg.installer.class.should == Sprinkle::Installers::Gem
+      pkg.installers.first.class.should == Sprinkle::Installers::Gem
     end
 
     it 'should optionally accept a source installer' do
@@ -147,9 +147,19 @@ CODE
         source 'archive'
       end
       pkg.should respond_to(:source)
-      pkg.installer.class.should == Sprinkle::Installers::Source
+      pkg.installers.first.class.should == Sprinkle::Installers::Source
     end
 
+    it 'should allow multiple installer steps to be defined and respect order' do
+      pkg = package @name do
+        source 'archive'
+        gem 'momoney'
+      end
+
+      pkg.installers.length.should == 2
+      pkg.installers[0].class.should == Sprinkle::Installers::Source
+      pkg.installers[1].class.should == Sprinkle::Installers::Gem
+    end
   end
 
   describe 'with a source installer' do
@@ -159,7 +169,7 @@ CODE
         source 'archive' do; end
       end
       pkg.should respond_to(:source)
-      pkg.installer.class.should == Sprinkle::Installers::Source
+      pkg.installers.first.class.should == Sprinkle::Installers::Source
     end
     
     it 'should forward block to installer superclass' do
@@ -214,7 +224,7 @@ CODE
     describe 'with an installer' do
 
       before do
-        @package.installer = @installer
+        @package.installers = [ @installer ]
       end
 
       it 'should configure itself against the deployment context' do
@@ -242,7 +252,7 @@ CODE
     describe 'with verifications' do
       before do
         @pkg = create_package_with_blank_verify(3)
-        @pkg.installer = @installer
+        @pkg.installers = [ @installer ]
         @installer.stub!(:defaults)
         @installer.stub!(:process)
       end
@@ -303,7 +313,7 @@ CODE
       @roles = [ :app, :db ]
       @installer = mock(Sprinkle::Installers::Installer, :defaults => true, :process => true)
       @pkg = create_package_with_blank_verify(3)
-      @pkg.installer = @installer
+      @pkg.installers = [ @installer ]
       @installer.stub!(:defaults)
       @installer.stub!(:process)
       @logger = mock(ActiveSupport::BufferedLogger, :debug => true, :debug? => true)

data/spec/sprinkle/sequence_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Sprinkle::Sequence do
+
+  before do
+    @sequence = Sprinkle::Sequence.new do
+      section1 do
+        'command1'
+      end
+
+      section2 do
+        'command2'
+      end
+    end
+  end
+
+  describe 'during initialization' do
+
+    it 'should yield the block, storing all section definitions provided' do
+      @sequence.stages.size.should == 2
+    end
+
+  end
+
+  describe 'during iteration' do
+
+    before do
+      @stages = { }
+      @sequence.each do |stage, commands|
+        @stages[stage] = commands
+      end
+    end
+
+    it 'should yield to a given block with the stage and commands for that stage' do
+      @stages.size.should == 2
+      @stages.keys.should include(:section1)
+      @stages[:section1].should == 'command1'
+      @stages.keys.should include(:section2)
+      @stages[:section2].should == 'command2'
+    end
+
+  end
+
+end

data/spec/sprinkle/verify_spec.rb

@@ -36,6 +36,9 @@ describe Sprinkle::Verify do
         # Check that a gem exists
         has_gem 'rails'
         has_gem 'rails', '2.1.0'
+        
+        # Check for a certain RPM package
+        has_rpm 'ntp'
       end
     end
     @verification = @package.verifications[0]
@@ -90,6 +93,10 @@ describe Sprinkle::Verify do
       @verification.commands.should include("sudo gem list | grep -e '^rails (.*.*)$'")
       @verification.commands.should include("sudo gem list | grep -e '^rails (.*2\\.1\\.0.*)$'")
     end
+    
+    it 'should check that an RPM is installed' do
+      @verification.commands.should include("rpm -qa | grep ntp")
+    end
   end
   
   describe 'with configurations' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,69 +9,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 +10:00
-default_executable: 
+date: 2009-12-12 00:00:00 +13:00
+default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
+  name: rspec
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: activesupport
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 2.0.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: capistrano
+  name: highline
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.5
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
+  name: capistrano
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.5.5
     version: 
 description: Ruby DSL based software provisioning tool
-email: 
-- crafterm@redartisan.com
+email: crafterm@redartisan.com
 executables: 
 - sprinkle
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+- README.markdown
+- TODO
 files: 
+- .gitignore
 - CREDITS
-- History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.markdown
 - Rakefile
+- VERSION
 - bin/sprinkle
-- config/hoe.rb
-- config/requirements.rb
 - examples/packages/build_essential.rb
 - examples/packages/databases/mysql.rb
 - examples/packages/databases/sqlite3.rb
@@ -107,13 +104,15 @@ files:
 - lib/sprinkle/extensions/string.rb
 - lib/sprinkle/extensions/symbol.rb
 - lib/sprinkle/installers/apt.rb
-- lib/sprinkle/installers/noop.rb
+- lib/sprinkle/installers/binary.rb
 - lib/sprinkle/installers/bsd_port.rb
 - lib/sprinkle/installers/deb.rb
 - lib/sprinkle/installers/freebsd_pkg.rb
+- lib/sprinkle/installers/freebsd_portinstall.rb
 - lib/sprinkle/installers/gem.rb
 - lib/sprinkle/installers/installer.rb
 - lib/sprinkle/installers/mac_port.rb
+- lib/sprinkle/installers/noop.rb
 - lib/sprinkle/installers/openbsd_pkg.rb
 - lib/sprinkle/installers/opensolaris_pkg.rb
 - lib/sprinkle/installers/push_text.rb
@@ -129,10 +128,11 @@ files:
 - lib/sprinkle/verifiers/executable.rb
 - lib/sprinkle/verifiers/file.rb
 - lib/sprinkle/verifiers/process.rb
+- lib/sprinkle/verifiers/rpm.rb
 - lib/sprinkle/verifiers/ruby.rb
 - lib/sprinkle/verifiers/symlink.rb
 - lib/sprinkle/verify.rb
-- lib/sprinkle/version.rb
+- script/console
 - script/destroy
 - script/generate
 - spec/spec.opts
@@ -146,33 +146,32 @@ files:
 - spec/sprinkle/installers/apt_spec.rb
 - spec/sprinkle/installers/bsd_port_spec.rb
 - spec/sprinkle/installers/freebsd_pkg_spec.rb
+- spec/sprinkle/installers/freebsd_portinstall_spec.rb
 - spec/sprinkle/installers/gem_spec.rb
 - spec/sprinkle/installers/installer_spec.rb
 - spec/sprinkle/installers/mac_port_spec.rb
+- spec/sprinkle/installers/noop_spec.rb
 - spec/sprinkle/installers/openbsd_pkg_spec.rb
 - spec/sprinkle/installers/opensolaris_pkg_spec.rb
 - spec/sprinkle/installers/push_text_spec.rb
 - spec/sprinkle/installers/rake_spec.rb
 - spec/sprinkle/installers/rpm_spec.rb
 - spec/sprinkle/installers/source_spec.rb
+- spec/sprinkle/installers/transfer_spec.rb
 - spec/sprinkle/installers/yum_spec.rb
 - spec/sprinkle/package_spec.rb
 - spec/sprinkle/policy_spec.rb
 - spec/sprinkle/script_spec.rb
 - spec/sprinkle/sprinkle_spec.rb
 - spec/sprinkle/verify_spec.rb
-- sprinkle.gemspec
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/rspec.rake
+- TODO
 has_rdoc: true
-homepage: http://sprinkle.rubyforge.org
+homepage: http://github.com/crafterm/sprinkle
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -190,9 +189,56 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprinkle
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby DSL based software provisioning tool
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/sprinkle/actors/capistrano_spec.rb
+- spec/sprinkle/actors/local_spec.rb
+- spec/sprinkle/configurable_spec.rb
+- spec/sprinkle/deployment_spec.rb
+- spec/sprinkle/extensions/array_spec.rb
+- spec/sprinkle/extensions/string_spec.rb
+- spec/sprinkle/installers/apt_spec.rb
+- spec/sprinkle/installers/bsd_port_spec.rb
+- spec/sprinkle/installers/freebsd_pkg_spec.rb
+- spec/sprinkle/installers/freebsd_portinstall_spec.rb
+- spec/sprinkle/installers/gem_spec.rb
+- spec/sprinkle/installers/installer_spec.rb
+- spec/sprinkle/installers/mac_port_spec.rb
+- spec/sprinkle/installers/noop_spec.rb
+- spec/sprinkle/installers/openbsd_pkg_spec.rb
+- spec/sprinkle/installers/opensolaris_pkg_spec.rb
+- spec/sprinkle/installers/push_text_spec.rb
+- spec/sprinkle/installers/rake_spec.rb
+- spec/sprinkle/installers/rpm_spec.rb
+- spec/sprinkle/installers/source_spec.rb
+- spec/sprinkle/installers/transfer_spec.rb
+- spec/sprinkle/installers/yum_spec.rb
+- spec/sprinkle/package_spec.rb
+- spec/sprinkle/policy_spec.rb
+- spec/sprinkle/script_spec.rb
+- spec/sprinkle/sequence_spec.rb
+- spec/sprinkle/sprinkle_spec.rb
+- spec/sprinkle/verify_spec.rb
+- examples/packages/build_essential.rb
+- examples/packages/databases/mysql.rb
+- examples/packages/databases/sqlite3.rb
+- examples/packages/phusion.rb
+- examples/packages/ruby/rails.rb
+- examples/packages/ruby/ruby.rb
+- examples/packages/ruby/rubygems.rb
+- examples/packages/scm/git.rb
+- examples/packages/scm/subversion.rb
+- examples/packages/servers/apache.rb
+- examples/rails/deploy.rb
+- examples/rails/packages/database.rb
+- examples/rails/packages/essential.rb
+- examples/rails/packages/rails.rb
+- examples/rails/packages/scm.rb
+- examples/rails/packages/search.rb
+- examples/rails/packages/server.rb
+- examples/rails/rails.rb
+- examples/sprinkle/sprinkle.rb