sprinkle 0.1.4 → 0.1.5

data/CREDITS

@@ -3,12 +3,14 @@
 Many thanks to the following people who have submitted ideas, patches, helped with testing
 and/or generally provided support to Sprinke, I really appreciate your help:
 
-Kristin Baumann  (http://crafterm.net/kristin/blog/)
-Ben Schwarz      (http://germanforblack.com/)
-Jim Freeze       (http://www.artima.com/rubycs/articles/ruby_as_dslP.html)
-Matthew Tanase   (http://www.slicehost.com)
-Jared Kuolt      (http://www.slicehost.com)
-Jamis Buck       (http://www.capify.org)
-Matt Allen       (http://blog.allen.com.au)
-Eric Hodel       (http://blog.segment7.net)
-Pete Yandell     (http://notahat.com)
+Kristin Baumann    (http://crafterm.net/kristin/blog/)
+Ben Schwarz        (http://germanforblack.com/)
+Jim Freeze         (http://www.artima.com/rubycs/articles/ruby_as_dslP.html)
+Matthew Tanase     (http://www.slicehost.com)
+Jared Kuolt        (http://www.slicehost.com)
+Jamis Buck         (http://www.capify.org)
+Matt Allen         (http://blog.allen.com.au)
+Eric Hodel         (http://blog.segment7.net)
+Pete Yandell       (http://notahat.com)
+Adam Meehan        (http://duckpunching.com)
+Mitchell Hashimoto (http://mitchellhashimoto.com)

data/Manifest.txt

@@ -4,7 +4,6 @@ MIT-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
-TODO
 bin/sprinkle
 config/hoe.rb
 config/requirements.rb
@@ -37,7 +36,6 @@ lib/sprinkle/installers/source.rb
 lib/sprinkle/package.rb
 lib/sprinkle/policy.rb
 lib/sprinkle/script.rb
-lib/sprinkle/sequence.rb
 lib/sprinkle/version.rb
 script/destroy
 script/generate
@@ -55,7 +53,6 @@ spec/sprinkle/installers/source_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
 sprinkle.gemspec
 tasks/deployment.rake

data/lib/sprinkle/installers/apt.rb

@@ -3,16 +3,21 @@ module Sprinkle
     class Apt < Installer
       attr_accessor :packages
 
-      def initialize(parent, packages, &block)
+      def initialize(parent, *packages, &block)
         super parent, &block
-        packages = [packages] unless packages.is_a? Array
+        packages.flatten!
+        
+        options = { :dependencies_only => false }
+        options.update(packages.pop) if packages.last.is_a?(Hash)
+        
+        @command = options[:dependencies_only] ? 'build-dep' : 'install'
         @packages = packages
       end
 
       protected
 
         def install_commands
-          "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu install #{@packages.join(' ')}"
+          "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu #{@command} #{@packages.join(' ')}"
         end
 
     end

data/lib/sprinkle/installers/source.rb

@@ -106,7 +106,7 @@ module Sprinkle
         end
 
         def build_dir
-          "#{@options[:builds]}/#{base_dir}"
+          "#{@options[:builds]}/#{options[:custom_dir] || base_dir}"
         end
 
         def base_dir
@@ -115,6 +115,7 @@ module Sprinkle
           end
           raise "Unknown base path for source archive: #{@source}, please update code knowledge"
         end
+        
     end
   end
 end

data/lib/sprinkle/package.rb

@@ -27,12 +27,12 @@ module Sprinkle
         self.instance_eval &block
       end
 
-      def apt(*names)
-        @installer = Sprinkle::Installers::Apt.new(self, *names)
+      def apt(*names, &block)
+        @installer = Sprinkle::Installers::Apt.new(self, *names, &block)
       end
 
-      def rpm(*names)
-        @installer = Sprinkle::Installers::Rpm.new(self, *names)
+      def rpm(*names, &block)
+        @installer = Sprinkle::Installers::Rpm.new(self, *names, &block)
       end
 
       def gem(name, options = {}, &block)

data/lib/sprinkle/version.rb

@@ -2,7 +2,7 @@ module Sprinkle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/sprinkle/installers/apt_spec.rb

@@ -6,8 +6,8 @@ describe Sprinkle::Installers::Apt do
     @package = mock(Sprinkle::Package, :name => 'package')
   end
 
-  def create_apt(debs, &block)
-    Sprinkle::Installers::Apt.new(@package, debs, &block)
+  def create_apt(*debs, &block)
+    Sprinkle::Installers::Apt.new(@package, *debs, &block)
   end
 
   describe 'when created' do
@@ -24,6 +24,15 @@ describe Sprinkle::Installers::Apt do
 
   end
 
+  describe 'when created for dependencies only install' do
+
+    it 'should remove options from packages list' do
+      @installer = create_apt 'ruby', :dependencies_only => true
+      @installer.packages.should == [ 'ruby' ]
+    end
+
+  end
+
   describe 'during installation' do
 
     before do
@@ -49,5 +58,17 @@ describe Sprinkle::Installers::Apt do
     it 'should install a specific version if defined'
 
   end
+  
+  describe 'during dependencies only installation' do
 
+    before do
+      @installer = create_apt 'ruby', :dependencies_only => true
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the apt installer with build-dep command for all specified packages' do
+      @install_commands.should =~ /apt-get -qyu build-dep ruby/
+    end
+    
+  end
 end

data/spec/sprinkle/installers/source_spec.rb

@@ -171,10 +171,10 @@ describe Sprinkle::Installers::Source do
         @installer.defaults(@deployment)
       end
 
-      it 'should store the custom insatll commands' do
+      it 'should store the custom install commands' do
         @installer.options[:custom_install].should == 'ruby setup.rb'
       end
-
+      
       it 'should identify as having a custom install command' do
         @installer.should be_custom_install
       end
@@ -188,12 +188,28 @@ describe Sprinkle::Installers::Source do
       end
 
       it 'should install the source using a custom installation command' do
-        @installer.send(:custom_install_commands).should == [ "bash -c 'cd /usr/builds/ruby-1.8.6-p111 && ruby setup.rb >> package-install.log 2>&1'" ]
+        @installer.send(:custom_install_commands).first.should =~ /ruby setup.rb/
       end
-
+      
       it 'should be run relative to the source build area' do
         @installer.send(:custom_install_commands).first.should =~ %r{cd /usr/builds/ruby-1.8.6-p111}
       end
+      
+      describe 'with a customized directory' do
+        
+        before do
+          @installer.options[:custom_dir] = 'test'
+        end
+        
+        it 'should install the source from the custom dir path' do
+          @installer.send(:custom_install_commands).first.should =~ /test/
+        end
+        
+        it 'should store the custom build dir path' do
+          @installer.options[:custom_dir].should == 'test'
+        end
+        
+      end
 
     end
 

data/spec/sprinkle/package_spec.rb

@@ -8,6 +8,24 @@ describe Sprinkle::Package do
     @empty = Proc.new { }
     @opts = { }
   end
+  
+  # Kind of a messy way to do this but it works and DRYs out
+  # the specs. Checks to make sure an installer is receiving
+  # the block passed to it throught the package block.
+  def check_block_forwarding_on(installer)
+    eval(<<CODE)
+    pre_count = 0
+    lambda {
+      pkg = package @name do
+        #{installer} 'archive' do
+          pre :install, 'preOp'
+        end
+      end
+      
+      pre_count = pkg.installer.instance_variable_get(:@pre)[:install].length
+    }.should change { pre_count }.by(1)
+CODE
+  end
 
   describe 'when created' do
 
@@ -126,6 +144,10 @@ describe Sprinkle::Package do
       pkg.should respond_to(:source)
       pkg.installer.class.should == Sprinkle::Installers::Source
     end
+    
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:source)
+    end
 
     it 'should automatically add a build essential recommendation' do
       pkg = package @name do
@@ -135,6 +157,18 @@ describe Sprinkle::Package do
     end
 
   end
+  
+  describe 'with an apt installer' do
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:apt)
+    end
+  end
+  
+  describe 'with an rpm installer' do
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:rpm)
+    end
+  end
 
   describe 'with an gem installer' do
 
@@ -144,6 +178,10 @@ describe Sprinkle::Package do
       end
       pkg.recommends.should include(:rubygems)
     end
+    
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:gem)
+    end
 
   end
 

data/sprinkle.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter"]
-  s.date = %q{2008-07-13}
+  s.date = %q{2008-07-16}
   s.default_executable = %q{sprinkle}
   s.description = %q{Ruby DSL based software provisioning tool}
   s.email = ["crafterm@redartisan.com"]
   s.executables = ["sprinkle"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "bin/sprinkle", "config/hoe.rb", "config/requirements.rb", "examples/merb/deploy.rb", "examples/rails/README", "examples/rails/deploy.rb", "examples/rails/packages/database.rb", "examples/rails/packages/essential.rb", "examples/rails/packages/rails.rb", "examples/rails/packages/search.rb", "examples/rails/packages/server.rb", "examples/rails/rails.rb", "examples/sprinkle/sprinkle.rb", "lib/sprinkle.rb", "lib/sprinkle/actors/capistrano.rb", "lib/sprinkle/actors/vlad.rb", "lib/sprinkle/deployment.rb", "lib/sprinkle/extensions/arbitrary_options.rb", "lib/sprinkle/extensions/array.rb", "lib/sprinkle/extensions/blank_slate.rb", "lib/sprinkle/extensions/dsl_accessor.rb", "lib/sprinkle/extensions/string.rb", "lib/sprinkle/extensions/symbol.rb", "lib/sprinkle/installers/apt.rb", "lib/sprinkle/installers/gem.rb", "lib/sprinkle/installers/installer.rb", "lib/sprinkle/installers/rake.rb", "lib/sprinkle/installers/rpm.rb", "lib/sprinkle/installers/source.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/sprinkle/actors/capistrano_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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/rpm_spec.rb", "spec/sprinkle/installers/source_spec.rb", "spec/sprinkle/package_spec.rb", "spec/sprinkle/policy_spec.rb", "spec/sprinkle/script_spec.rb", "spec/sprinkle/sprinkle_spec.rb", "sprinkle.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
+  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "bin/sprinkle", "config/hoe.rb", "config/requirements.rb", "examples/merb/deploy.rb", "examples/rails/README", "examples/rails/deploy.rb", "examples/rails/packages/database.rb", "examples/rails/packages/essential.rb", "examples/rails/packages/rails.rb", "examples/rails/packages/search.rb", "examples/rails/packages/server.rb", "examples/rails/rails.rb", "examples/sprinkle/sprinkle.rb", "lib/sprinkle.rb", "lib/sprinkle/actors/capistrano.rb", "lib/sprinkle/actors/vlad.rb", "lib/sprinkle/deployment.rb", "lib/sprinkle/extensions/arbitrary_options.rb", "lib/sprinkle/extensions/array.rb", "lib/sprinkle/extensions/blank_slate.rb", "lib/sprinkle/extensions/dsl_accessor.rb", "lib/sprinkle/extensions/string.rb", "lib/sprinkle/extensions/symbol.rb", "lib/sprinkle/installers/apt.rb", "lib/sprinkle/installers/gem.rb", "lib/sprinkle/installers/installer.rb", "lib/sprinkle/installers/rake.rb", "lib/sprinkle/installers/rpm.rb", "lib/sprinkle/installers/source.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/sprinkle/actors/capistrano_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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/rpm_spec.rb", "spec/sprinkle/installers/source_spec.rb", "spec/sprinkle/package_spec.rb", "spec/sprinkle/policy_spec.rb", "spec/sprinkle/script_spec.rb", "spec/sprinkle/sprinkle_spec.rb", "sprinkle.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://sprinkle.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-14 00:00:00 +10:00
+date: 2008-07-16 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO
 - bin/sprinkle
 - config/hoe.rb
 - config/requirements.rb
@@ -102,7 +101,6 @@ files:
 - lib/sprinkle/package.rb
 - lib/sprinkle/policy.rb
 - lib/sprinkle/script.rb
-- lib/sprinkle/sequence.rb
 - lib/sprinkle/version.rb
 - script/destroy
 - script/generate
@@ -120,7 +118,6 @@ files:
 - 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
 - sprinkle.gemspec
 - tasks/deployment.rake

data/TODO

@@ -1,56 +0,0 @@
-Version 0.1 plan
-================
-
-INSTALLER
-* Fix up apt so that we can handle it if it asks questions, or fail? Check with Ben
-* Support alternate gem package sources - DONE
-* MD5/SHA1 checking on the installation files?
-
-MISC
-* Growl support
-* Do a merb example
-* Fix up printing of output so that its nice and a bit more like ports - DONE
-  * print ports style output for stages (installing, configuring, etc...)
-* Add an option to print the hierarchy tree of packages to be installed only - DONE
-* BlankSlate - active support has one
-* CREDITS file - DONE
-* Get #!/usr/bin/env sprinkle working - DONE
-
-OPERATING SYSTEM
-* OS abstraction
-  * build essential on Ubuntu only for example
-
-TESTING
-* Test on a base system Ubuntu system - DONE
-* Multiple runs, check system that's partially installed - DONE
-* Resuming downloads with wget ok - DONE
-
-ERRORS
-* Need to think about handling errors nicely
-* Recovering from an error, and or successive runs of sprinkle
-  * store installed state on the remote server so we can skip installed packages?
-    * what about self healing things later? need to think about it
-
-DOCUMENTATION
-* Document the code somewhat, at least review that its all ok
-* Wiki
-* Home page somewhere? point to github
-* Blog post
-* Screencast - use that cool screenflow tool?
-
-Post Version 0.1 plan
-=====================
-
-CONFIGURATION
-* Think about it - talk to Lincoln and Ben
-* Use cap 2.3 send/download file helpers, might be useful somehow for transporting config files
-
-ACTOR
-* Investigate a pure net:ssh/gateway delivery mechanism, ie. without cap?
-* Generate a cap task file as output? not sure if people would be interested in this?
-  * use ruby2ruby to generate the file, nice :)
-
-MISC
-* Slicehost API support for creating a slice on the way
-  * active resource
-* SSH keys, have to deploy them somehow?

data/lib/sprinkle/sequence.rb

@@ -1,21 +0,0 @@
-module Sprinkle
-  class Sequence
-    attr_accessor :stages
-
-    def initialize(&block)
-      self.instance_eval &block if block
-    end
-
-    def method_missing(sym, *args, &block)
-      @stages ||= ActiveSupport::OrderedHash.new
-      @stages[sym] = block
-    end
-
-    def each(&block)
-      @stages.each do |section, commands|
-        block.call section, commands.call
-      end
-    end
-
-  end
-end

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