sprinkle 0.3.3 → 0.3.4

data/CREDITS

@@ -29,5 +29,6 @@ Chris Gaffney          (http://github.com/gaffneyc)
 Maxmpz                 (http://github.com/maxmpz)
 Geoff Garside          (http://geoffgarside.co.uk/)
 Oliver Kiessler        (http://inceedo.com)
+Nick Plante            (http://blog.zerosum.org)
 
-The transfer installer contains a piece of exception reporting code copied from the Chef library (http://wiki.opscode.com/display/chef/Home)
+The transfer installer contains a piece of exception reporting code copied from the Chef library (http://wiki.opscode.com/display/chef/Home)

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.rubyforge_project = 'sprinkle'
     gem.homepage = "http://github.com/crafterm/sprinkle"
     gem.authors = ["Marcus Crafter"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency("rspec", ">= 2.5")
     gem.add_dependency('activesupport', '>= 2.0.2')
     gem.add_dependency('highline', '>= 1.4.0')
     gem.add_dependency('capistrano', '>= 2.5.5')
@@ -27,16 +27,11 @@ task "inst"=>[:clobber, :build] do
   puts `gem install pkg/sprinkle-*.gem`
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  spec.rspec_opts = ['--backtrace']
+  # spec.rcov = true
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/sprinkle/configurable.rb

@@ -18,7 +18,7 @@ module Sprinkle
     def method_missing(sym, *args, &block)
       unless args.empty? # mutate if not set
         @options ||= {}
-        @options[sym] = *args unless @options[sym]
+        @options[sym] = args unless @options[sym]
       end
 
       @options[sym] || @package.send(sym, *args, &block) # try the parents options if unknown

data/lib/sprinkle/extensions/blank_slate.rb

@@ -1,5 +1,5 @@
 class BlankSlate #:nodoc:
-  instance_methods.each do |m| 
-    undef_method(m) unless %w( __send__ __id__ send class inspect instance_eval instance_variables ).include?(m)
+  instance_methods.each do |m|
+    undef_method(m) unless %w( __send__ __id__ send class inspect instance_eval instance_variables object_id ).include?(m.to_s)
   end
 end

data/lib/sprinkle/installers/binary.rb

@@ -18,13 +18,13 @@ module Sprinkle
         raise 'No installation area defined' unless @options[:prefix]
         raise 'No archive download area defined' unless @options[:archives]
 
-        [ "mkdir -p #{@options[:prefix]}",
-          "mkdir -p #{@options[:archives]}" ]
+        [ "mkdir -p #{@options[:prefix].first}",
+          "mkdir -p #{@options[:archives].first}" ]
       end
 
       def install_commands #:nodoc:
-        commands = [ "bash -c 'wget -cq --directory-prefix=#{@options[:archives]} #{@binary_archive}'" ]
-        commands << "bash -c 'cd #{@options[:prefix]} && #{extract_command} #{@options[:archives]}/#{@binary_archive.split("/").last}'"
+        commands = [ "bash -c 'wget -cq --directory-prefix=#{@options[:archives].first} #{@binary_archive}'" ]
+        commands << "bash -c 'cd #{@options[:prefix].first} && #{extract_command} #{@options[:archives].first}/#{@binary_archive.split("/").last}'"
       end
 
       def extract_command(archive_name = @binary_archive.split("/").last)

data/lib/sprinkle/installers/rake.rb

@@ -22,14 +22,14 @@ module Sprinkle
     class Rake < Installer
       def initialize(parent, commands, options = {}, &block) #:nodoc:
         super parent, options, &block
-        @commands = commands.to_a
+        @commands = commands
       end
 
       protected
 
         def install_commands #:nodoc:
           file = @options[:rakefile] ? "-f #{@options[:rakefile]} " : ""
-          "rake #{file}#{@commands.join(' ')}"
+          "rake #{file}#{@commands}"
         end
 
     end

data/lib/sprinkle/installers/source.rb

@@ -91,27 +91,27 @@ module Sprinkle
           raise 'No build area defined' unless @options[:builds]
           raise 'No source download area defined' unless @options[:archives]
 
-          [ "mkdir -p #{@options[:prefix]}",
-            "mkdir -p #{@options[:builds]}",
-            "mkdir -p #{@options[:archives]}" ]
+          [ "mkdir -p #{@options[:prefix].first}",
+            "mkdir -p #{@options[:builds].first}",
+            "mkdir -p #{@options[:archives].first}" ]
         end
 
         def download_commands #:nodoc:
           if File.exist? @source
-            [ "cp #{@source} #{@options[:archives]}/#{archive_name}" ]
+            [ "cp #{@source} #{@options[:archives].first}/#{archive_name}" ]
           else
-            [ "wget -cq --directory-prefix='#{@options[:archives]}' #{@source}" ]
+            [ "wget -cq --directory-prefix='#{@options[:archives].first}' #{@source}" ]
           end
         end
 
         def extract_commands #:nodoc:
-          [ "bash -c 'cd #{@options[:builds]} && #{extract_command} #{@options[:archives]}/#{archive_name}'" ]
+          [ "bash -c 'cd #{@options[:builds].first} && #{extract_command} #{@options[:archives].first}/#{archive_name}'" ]
         end
 
         def configure_commands #:nodoc:
           return [] if custom_install?
 
-          command = "bash -c 'cd #{build_dir} && ./configure --prefix=#{@options[:prefix]} "
+          command = "bash -c 'cd #{build_dir} && ./configure --prefix=#{@options[:prefix].first} "
 
           extras = {
             :enable  => '--enable', :disable => '--disable',
@@ -119,8 +119,8 @@ module Sprinkle
             :option  => '-',
           }
 
-          extras.inject(command) { |m, (k, v)| m << create_options(k, v) if options[k]; m }
-
+          extras.inject(command) { |m, (k, v)|  m << create_options(k, v) if options[k]; m }
+          
           [ command << " > #{@package.name}-configure.log 2>&1'" ]
         end
 
@@ -154,7 +154,7 @@ module Sprinkle
       private
 
         def create_options(key, prefix) #:nodoc:
-          @options[key].inject(' ') { |m, option| m << "#{prefix}-#{option} "; m }
+          @options[key].first.inject('') { |m, option| m << "#{prefix}-#{option} "; m }
         end
 
         def extract_command #:nodoc:
@@ -179,7 +179,7 @@ module Sprinkle
         end
 
         def build_dir #:nodoc:
-          "#{@options[:builds]}/#{options[:custom_dir] || base_dir}"
+          "#{@options[:builds].first}/#{options[:custom_dir] || base_dir}"
         end
 
         def base_dir #:nodoc:

data/spec/spec_helper.rb

@@ -1,11 +1,3 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'sprinkle'
 

data/spec/sprinkle/actors/capistrano_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Actors::Capistrano do
 

data/spec/sprinkle/actors/local_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Actors::Local do
 

data/spec/sprinkle/configurable_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Configurable do
   module MyPrefix
@@ -32,7 +32,7 @@ describe Sprinkle::Configurable do
     @configurable.instance_eval do
       hsv 'gts'
     end
-    @configurable.hsv.should == 'gts'
+    @configurable.hsv.first.should == 'gts'
   end
   
   it 'should allow the delivery instance variable to be accessed' do

data/spec/sprinkle/deployment_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Deployment do
   include Sprinkle::Deployment

data/spec/sprinkle/extensions/array_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Array, 'task name conversions' do
   

data/spec/sprinkle/extensions/string_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe String, 'task name conversions' do
   

data/spec/sprinkle/installers/apt_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Apt do
 
@@ -51,7 +51,9 @@ describe Sprinkle::Installers::Apt do
       @installer.send(:install_sequence).should == [ 'op1', %(env DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get --force-yes -qyu install ruby), 'op2' ]
     end
 
-    it 'should install a specific version if defined'
+    it 'should install a specific version if defined' do
+      pending
+    end
 
   end
   
@@ -67,4 +69,5 @@ describe Sprinkle::Installers::Apt do
     end
     
   end
+
 end

data/spec/sprinkle/installers/binary_spec.rb

@@ -0,0 +1,64 @@
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+
+describe Sprinkle::Installers::Binary do
+  include Sprinkle::Deployment
+
+  def create_context
+    binary = 'http://www.example.com/archive.tar.gz'
+
+    deployment = deployment do
+      delivery :capistrano
+      binary "http://www.example.com/archive.tar.gz" do
+        prefix   '/prefix/directory'
+        archives '/archives/directory'
+      end
+    end
+
+    installer = create_binary binary do
+      prefix   '/prefix/directory'
+      archives '/archives/directory'
+    end
+
+    installer.defaults(@deployment)
+    
+    [binary, deployment, installer]
+  end
+
+  def create_binary(binary, version = nil, &block)
+    @package = mock(Sprinkle::Package, :name => 'package', :version => version)
+    Sprinkle::Installers::Binary.new(@package, binary, &block)
+  end
+
+  describe "binary#prepare_commands" do
+    before do
+      @binary, @deployment, @installer = create_context
+    end
+    
+    it "should return mkdir command to create the prefix directory" do
+      @installer.send(:prepare_commands)[0].should == 'mkdir -p /prefix/directory'
+    end
+    it "should return mkdir command to create the archives directory" do
+      @installer.send(:prepare_commands)[1].should == 'mkdir -p /archives/directory'
+    end
+  end
+  
+  
+  describe "binary#install_commands" do
+    before do
+      @binary, @deployment, @installer = create_context
+    end
+    
+    it "should return a commands to place the binary in the correct archive directory" do
+      @installer.send(:install_commands)[0].should =~ /--directory-prefix=\/archives\/directory/
+    end
+    
+    it "should return a command to extract to the correct prefix folder" do
+      @installer.send(:install_commands)[1].should =~ /cd \/prefix\/directory/
+    end
+
+    it "should return a command to extract the right file in the right directory" do
+      @installer.send(:install_commands)[1].should =~ / \/archives\/directory\/archive.tar.gz/
+    end
+  end
+  
+end

data/spec/sprinkle/installers/bsd_port_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::BsdPort do
 

data/spec/sprinkle/installers/freebsd_pkg_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::FreebsdPkg do
 
@@ -42,7 +42,9 @@ describe Sprinkle::Installers::FreebsdPkg do
       @installer.send(:install_sequence).should == [ 'op1', 'pkg_add -r ruby', 'op2' ]
     end
 
-    it 'should install a specific version if defined'
+    it 'should install a specific version if defined' do
+      pending
+    end
 
   end
 

data/spec/sprinkle/installers/freebsd_portinstall_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::FreebsdPortinstall do
 

data/spec/sprinkle/installers/gem_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Gem do
 

data/spec/sprinkle/installers/installer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Installer do
   include Sprinkle::Deployment
@@ -41,13 +41,13 @@ describe Sprinkle::Installers::Installer do
 
       it 'should accept an optional block to customize installers defaults' do
         @installer = create_installer do; prefix '/usr/local'; end
-        @installer.prefix.should == '/usr/local'
+        @installer.prefix.first.should == '/usr/local'
       end
 
       it 'should override any deployment level defaults' do
         @installer = create_installer do; prefix '/usr/local'; end
         @installer.defaults(@deployment)
-        @installer.prefix.should == '/usr/local'
+        @installer.prefix.first.should == '/usr/local'
       end
     end
   end

data/spec/sprinkle/installers/mac_port_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::MacPort do
 

data/spec/sprinkle/installers/noop_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Noop do
 

data/spec/sprinkle/installers/openbsd_pkg_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::OpenbsdPkg do
 
@@ -42,7 +42,9 @@ describe Sprinkle::Installers::OpenbsdPkg do
       @installer.send(:install_sequence).should == [ 'op1', 'pkg_add ruby', 'op2' ]
     end
 
-    it 'should install a specific version if defined'
+    it 'should install a specific version if defined' do
+      pending
+    end
 
   end
 

data/spec/sprinkle/installers/opensolaris_pkg_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::OpensolarisPkg do
 
@@ -42,7 +42,9 @@ describe Sprinkle::Installers::OpensolarisPkg do
       @installer.send(:install_sequence).should == [ 'op1', 'pkg install ruby', 'op2' ]
     end
 
-    it 'should install a specific version if defined'
+    it 'should install a specific version if defined' do
+      pending
+    end
 
   end
 

data/spec/sprinkle/installers/push_text_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::PushText do
 

data/spec/sprinkle/installers/rake_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Rake do
 

data/spec/sprinkle/installers/replace_text_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::ReplaceText do
 

data/spec/sprinkle/installers/rpm_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Rpm do
 
@@ -42,8 +42,12 @@ describe Sprinkle::Installers::Rpm do
       @installer.send(:install_sequence).should == [ 'op1', 'rpm -Uvh ruby', 'op2' ]
     end
 
-    it 'should specify a non interactive mode to the apt installer'
-    it 'should install a specific version if defined'
+    it 'should specify a non interactive mode to the apt installer' do
+      pending
+    end
+    it 'should install a specific version if defined' do
+      pending
+    end
 
   end
 

data/spec/sprinkle/installers/runner_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Runner do
 

data/spec/sprinkle/installers/source_spec.rb

@@ -1,10 +1,12 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Source do
   include Sprinkle::Deployment
 
   before do
-    @source = 'ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p111.tar.gz'
+    @filename = "ruby-1.8.6-p111"
+    @tarball = "#{@filename}.tar.gz"
+    @source = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/#{@tarball}"
 
     @deployment = deployment do
       delivery :capistrano
@@ -24,7 +26,7 @@ describe Sprinkle::Installers::Source do
       disable %w( cache proxy rewrite )
 
       with %w( debug extras )
-      without %w( fancyisms )
+      without %w( fancyisms pandas )
 
       option %w( foo bar baz )
     end
@@ -34,6 +36,7 @@ describe Sprinkle::Installers::Source do
 
   def create_source(source, version = nil, &block)
     @package = mock(Sprinkle::Package, :name => 'package', :version => version)
+    
     Sprinkle::Installers::Source.new(@package, source, &block)
   end
 
@@ -70,101 +73,124 @@ describe Sprinkle::Installers::Source do
 
   end
 
-  describe  'customized configuration' do
+  describe 'customized configuration' do
 
     it 'should support specification of "enable" options' do
-      @installer.enable.should == %w( headers ssl deflate so )
+      @installer.enable.first.should == %w( headers ssl deflate so )
     end
 
     it 'should support specification of "disable" options' do
-      @installer.disable.should == %w( cache proxy rewrite )
+      @installer.disable.first.should == %w( cache proxy rewrite )
     end
 
     it 'should support specification of "with" options' do
-      @installer.with.should == %w( debug extras )
+      @installer.with.first.should == %w( debug extras )
     end
 
     it 'should support specification of "without" options' do
-      @installer.without.should == %w( fancyisms )
+      @installer.without.first.should == %w( fancyisms pandas )
     end
 
     it 'should support specification of "option" options' do
-      @installer.option.should == %w( foo bar baz )
+      @installer.option.first.should == %w( foo bar baz )
     end
 
     it 'should support customized build area' do
-      @installer.prefix.should == '/usr/local'
+      @installer.prefix.first.should == '/usr/local'
     end
 
     it 'should support customized source area' do
-      @installer.archives.should == '/usr/local/archives'
+      @installer.archives.first.should == '/usr/local/archives'
     end
 
     it 'should support customized install area' do
-      @installer.builds.should == '/usr/local/builds'
+      @installer.builds.first.should == '/usr/local/builds'
     end
-
   end
 
   describe 'during gnu source archive style installation' do
 
     it 'should prepare the build, installation and source archives area' do
-      @installer.should_receive(:prepare).and_return(
-        [
+      @installer.should_receive(:prepare).and_return []
+    end
+    
+    it "should prepare the build, installation and source archives area with correct paths" do
+      @installer.send(:prepare).should == 
+      [
          'mkdir -p /usr/local',
          'mkdir -p /usr/local/builds',
-         'mkdir -p /usr/local/archives'
-        ]
-      )
-
+         'mkdir -p /usr/local/archives' 
+      ]
     end
-
+    
     it 'should download the source archive' do
-      @installer.should_receive(:download).and_return(
+      @installer.should_receive(:download).and_return []
+    end
+
+    it 'should download the source archive to the correct path' do
+      @installer.send(:download).should == 
         [
          "wget -cq --directory-prefix='/usr/local/archives' #{@source}"
         ]
-      )
     end
-
+    
     it 'should extract the source archive' do
-      @installer.should_receive(:extract).and_return(
+      @installer.should_receive(:extract).and_return []
+    end
+
+    it 'should extract the source to the correct path' do
+      @installer.send(:extract).should ==
         [
-         "bash -c 'cd /usr/local/builds && tar xzf /usr/local/archives/ruby-1.8.6-p111.tar.gz"
+         "bash -c 'cd /usr/local/builds && tar xzf /usr/local/archives/ruby-1.8.6-p111.tar.gz'"
         ]
-      )
     end
 
     it 'should configure the source' do
+      @installer.should_receive(:configure).and_return []
+    end
+    
+    it 'should configure the source in the correct path and with the correct prefix and options' do
       enable  = %w( headers ssl deflate so ).inject([]) { |m, value| m << "--enable-#{value}"; m }
       disable = %w( cache proxy rewrite ).inject([]) { |m, value| m << "--disable-#{value}"; m }
 
       with    = %w( debug extras ).inject([]) { |m, value| m << "--with-#{value}"; m }
-      without = %w( fancyisms ).inject([]) { |m, value| m << "--without-#{value}"; m }
-
-      options = "#{enable.join(' ')} #{disable.join(' ')} #{with.join(' ')} #{without.join(' ')}"
-
-      @installer.should_receive(:build).and_return(
-        [
-         "bash -c 'cd /usr/local/builds && ./configure --prefix=/usr/local #{options} > #{@package.name}-configure.log 2>&1'"
-        ]
-      )
-    end
-
+      without = %w( fancyisms pandas ).inject([]) { |m, value| m << "--without-#{value}"; m }
+
+      option = %w( foo bar baz ).inject([]) { |m, value| m << "--#{value}"; m }
+
+      configure_command = @installer.send(:configure).first
+      
+      configure_command.should =~ %r{^bash -c 'cd /usr/local/builds/#{@filename} && ./configure --prefix=/usr/local}
+      configure_command.should =~ %r{ > #{@package.name}-configure.log 2>&1'$}
+      
+      # order of options is arbitrary in ruby 1.8 !
+      configure_command.should =~ /#{enable.join(' ')}/
+      configure_command.should =~ /#{disable.join(' ')}/
+      configure_command.should =~ /#{with.join(' ')}/
+      configure_command.should =~ /#{without.join(' ')}/
+      configure_command.should =~ /#{option.join(' ')}/
+    end
+    
     it 'should build the source' do
-      @installer.should_receive(:build).and_return(
+      @installer.should_receive(:build).and_return []
+    end
+    
+    it 'should build the source in the correct build path' do
+      @installer.send(:build).should ==
         [
-         "bash -c 'cd /usr/local/builds && make > #{@package.name}-build.log 2>&1'"
+         "bash -c 'cd /usr/local/builds/#{@filename} && make > #{@package.name}-build.log 2>&1'"
         ]
-      )
     end
 
     it 'should install the source' do
-      @installer.should_receive(:install).and_return(
+      @installer.should_receive(:install).and_return []
+    end
+
+    it 'should install the source from the correct build path' do
+      @installer.send(:install).should ==
         [
-         "bash -c 'cd /usr/local/builds && make install > #{@package.name}-install.log 2>&1'"
+         "bash -c 'cd /usr/local/builds/#{@filename} && make install > #{@package.name}-install.log 2>&1'"
         ]
-      )
     end
 
     describe 'with a custom archive definition' do
@@ -192,7 +218,7 @@ describe Sprinkle::Installers::Source do
       end
 
       it 'should store the custom install commands' do
-        @installer.options[:custom_install].should == 'ruby setup.rb'
+        @installer.options[:custom_install].first.should == 'ruby setup.rb'
       end
 
       it 'should identify as having a custom install command' do

data/spec/sprinkle/installers/transfer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 require 'tempfile'
 
 describe Sprinkle::Installers::Transfer do

data/spec/sprinkle/installers/yum_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Yum do
 
@@ -42,7 +42,9 @@ describe Sprinkle::Installers::Yum do
       @installer.send(:install_sequence).should == [ 'op1', 'yum install ruby -y', 'op2' ]
     end
 
-    it 'should install a specific version if defined'
+    it 'should install a specific version if defined' do
+      pending
+    end
 
   end
 

data/spec/sprinkle/installers/zypper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Zypper do
 

data/spec/sprinkle/package_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Package do
   include Sprinkle::Package

data/spec/sprinkle/policy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Policy do
   include Sprinkle::Policy
@@ -81,9 +81,15 @@ describe Sprinkle::Policy do
 
     describe 'containing package dependencies with versions' do
 
-      it 'should be invalid if the specified package does not exist'
-      it 'should ignore any packages of the same name that have other versions'
-      it 'should select the correct package version when applying'
+      it 'should be invalid if the specified package does not exist' do
+        pending
+      end
+      it 'should ignore any packages of the same name that have other versions' do
+        pending
+      end
+      it 'should select the correct package version when applying' do
+        pending
+      end
 
     end
 

data/spec/sprinkle/script_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Script, 'class' do
   

data/spec/sprinkle/sprinkle_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle do
 

data/spec/sprinkle/verify_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Verify do
   before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 +11:00
+date: 2011-05-10 00:00:00 +10:00
 default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -92,7 +91,6 @@ extra_rdoc_files:
 - README.markdown
 - TODO
 files: 
-- .gitignore
 - CREDITS
 - MIT-LICENSE
 - README.markdown
@@ -182,6 +180,7 @@ files:
 - spec/sprinkle/extensions/array_spec.rb
 - spec/sprinkle/extensions/string_spec.rb
 - spec/sprinkle/installers/apt_spec.rb
+- spec/sprinkle/installers/binary_spec.rb
 - spec/sprinkle/installers/bsd_port_spec.rb
 - spec/sprinkle/installers/freebsd_pkg_spec.rb
 - spec/sprinkle/installers/freebsd_portinstall_spec.rb
@@ -206,14 +205,13 @@ files:
 - spec/sprinkle/sprinkle_spec.rb
 - spec/sprinkle/verify_spec.rb
 - TODO
-- spec/sprinkle/sequence_spec.rb
 has_rdoc: true
 homepage: http://github.com/crafterm/sprinkle
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -237,59 +235,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprinkle
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby DSL based software provisioning tool
-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/replace_text_spec.rb
-- spec/sprinkle/installers/rpm_spec.rb
-- spec/sprinkle/installers/runner_spec.rb
-- spec/sprinkle/installers/source_spec.rb
-- spec/sprinkle/installers/transfer_spec.rb
-- spec/sprinkle/installers/yum_spec.rb
-- spec/sprinkle/installers/zypper_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
+test_files: []
+

data/.gitignore

@@ -1,6 +0,0 @@
-*.gem
-pkg
-.DS_Store
-.idea
-.*.swp
-sprinkle.gemspec

data/spec/sprinkle/sequence_spec.rb

@@ -1,44 +0,0 @@
-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