sprinkle 0.3.1 → 0.3.2

data/spec/sprinkle/installers/source_spec.rb

@@ -339,7 +339,7 @@ describe Sprinkle::Installers::Source do
 
     it 'should support zip archives' do
       @installer.source = 'blah.zip'
-      @extraction = 'unzip'
+      @extraction = 'unzip -o'
     end
 
     after do
@@ -347,25 +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
 
 end

data/spec/sprinkle/installers/zypper_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::Zypper do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_zypper(*packages, &block)
+    Sprinkle::Installers::Zypper.new(@package, *packages, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_zypper 'ruby'
+      @installer.packages.should == [ 'ruby' ]
+    end
+
+    it 'should accept an array of packages to install' do
+      @installer = create_zypper %w( gcc gdb g++ )
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
+    end
+
+    it 'should accept an argument list of packages to install' do
+      @installer = create_zypper "gcc", "gdb", "g++"
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
+    end
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_zypper 'ruby', 'rubygems' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the zypper installer for all specified packages' do
+      @install_commands.should =~ /zypper -n install -l -R ruby rubygems/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'zypper -n install -l -R ruby rubygems', 'op2' ]
+    end
+  end
+end

data/spec/sprinkle/package_spec.rb

@@ -160,6 +160,14 @@ CODE
       pkg.installers[0].class.should == Sprinkle::Installers::Source
       pkg.installers[1].class.should == Sprinkle::Installers::Gem
     end
+
+		it 'should optionally accept a runner installer' do
+			pkg = package @name do
+				runner 'obscure_installer_by_custom_cmd'
+			end
+			pkg.should respond_to(:runner)
+			pkg.installers.first.class.should == Sprinkle::Installers::Runner
+		end
   end
 
   describe 'with a source installer' do

data/spec/sprinkle/verify_spec.rb

@@ -8,35 +8,35 @@ describe Sprinkle::Verify do
       verify 'moo' do
         # Check a file exists
         has_file 'my_file.txt'
-        
+
         # Check that a file contains a substring
         file_contains 'my_file.txt', 'A sunny day on the lower east-side'
-        
+
         # Check a directory exists
         has_directory 'mydir'
-        
+
         # Check a symlink exists
         has_symlink 'mypointer'
-        
+
         # Check a symlink points to a certain file
         has_symlink 'mypointer', 'myfile'
-        
+
         # Check if an executable exists
         has_executable '/usr/bin/ruby'
-        
+
         # Check if a global executable exists (in PATH)
         has_executable 'rails'
-        
+
         # Check for a process
         has_process 'httpd'
-        
+
         # Check that ruby can include files
         ruby_can_load 'a', 'b', 'c'
-        
+
         # Check that a gem exists
         has_gem 'rails'
         has_gem 'rails', '2.1.0'
-        
+
         # Check for a certain RPM package
         has_rpm 'ntp'
       end
@@ -45,88 +45,87 @@ describe Sprinkle::Verify do
     @delivery = mock(Sprinkle::Deployment, :process => true)
     @verification.delivery = @delivery
   end
-  
+
   describe 'when created' do
     it 'should raise error without a block' do
       lambda { Verify.new(nil, '') }.should raise_error
     end
   end
-  
+
   describe 'with checks' do
     it 'should do a "test -f" on the has_file check' do
       @verification.commands.should include('test -f my_file.txt')
     end
-    
+
     it 'should do a grep to see if a file contains a text string' do
       @verification.commands.should include("grep 'A sunny day on the lower east-side' my_file.txt")
     end
-    
+
     it 'should do a "test -d" on the has_directory check' do
       @verification.commands.should include('test -d mydir')
     end
-    
+
     it 'should do a "test -L" to check something is a symbolic link' do
       @verification.commands.should include('test -L mypointer')
     end
-    
+
     it 'should do a test equality to check a symlink points to a specific file' do
       @verification.commands.should include("test 'myfile' = `readlink mypointer`")
     end
-    
+
     it 'should do a "test -x" to check for an executable' do
       @verification.commands.should include("test -x /usr/bin/ruby")
     end
-    
+
     it 'should test the "which" command to look for a global executable' do
       @verification.commands.should include('[ -n "`echo \`which rails\``" ]')
     end
-    
+
     it 'should test the process list to find a process' do
-      @verification.commands.should include("ps aux | grep 'httpd' | grep -v grep")
+      @verification.commands.should include("ps -C httpd")
     end
-    
+
     it 'should check if ruby can include a, b, c' do
       @verification.commands.should include("ruby -e \"require 'rubygems';require 'a';require 'b';require 'c'\"")
     end
-    
+
     it 'should check that a ruby gem is installed' do
-      @verification.commands.should include("sudo gem list | grep -e '^rails (.*.*)$'")
-      @verification.commands.should include("sudo gem list | grep -e '^rails (.*2\\.1\\.0.*)$'")
+      @verification.commands.should include("sudo gem list 'rails' --installed --version '2.1.0' > /dev/null")
     end
-    
+
     it 'should check that an RPM is installed' do
       @verification.commands.should include("rpm -qa | grep ntp")
     end
   end
-  
+
   describe 'with configurations' do
     # Make sure it includes Sprinkle::Configurable
     it 'should respond to configurable methods' do
       @verification.should respond_to(:defaults)
     end
-    
+
     it 'should default padding option to 4' do
       @verification.padding.should eql(4)
     end
   end
-  
+
   describe 'with process' do
     it 'should raise an error when no delivery mechanism is set' do
       @verification.instance_variable_set(:@delivery, nil)
       lambda { @verification.process([]) }.should raise_error
     end
-    
+
     describe 'when not testing' do
       before do
         # To be explicit
         Sprinkle::OPTIONS[:testing] = false
       end
-      
+
       it 'should call process on the delivery with the correct parameters' do
         @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|
@@ -135,13 +134,13 @@ describe Sprinkle::Verify do
         end
       end
     end
-    
+
     describe 'when testing' do
       before do
         Sprinkle::OPTIONS[:testing] = true
         @logger = mock(ActiveSupport::BufferedLogger, :debug => true, :debug? => true)
       end
-      
+
       it 'should not call process on the delivery' do
         @delivery.should_not_receive(:process)
       end
@@ -149,26 +148,26 @@ describe Sprinkle::Verify do
       it 'should print the install sequence to the console' do
         @verification.should_receive(:logger).twice.and_return(@logger)
       end
-      
+
       after do
         @verification.process([:app])
         Sprinkle::OPTIONS[:testing] = false
       end
     end
   end
-  
+
   describe 'with registering new verification modules' do
     module MyModule
       def rawr; end
     end
-    
+
     it 'should not respond to rawr initially' do
       @verification.should_not respond_to(:rawr)
     end
-    
+
     it 'should respond to rawr after registering the module' do
       Sprinkle::Verify.register(MyModule)
       @verification.should respond_to(:rawr)
     end
   end
-end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,49 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 +13:00
+date: 2010-12-11 00:00:00 +11:00
 default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: capistrano
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 5
+        - 5
         version: 2.5.5
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: Ruby DSL based software provisioning tool
 email: crafterm@redartisan.com
 executables: 
@@ -110,6 +140,7 @@ files:
 - lib/sprinkle/installers/freebsd_pkg.rb
 - lib/sprinkle/installers/freebsd_portinstall.rb
 - lib/sprinkle/installers/gem.rb
+- lib/sprinkle/installers/install_package.rb
 - lib/sprinkle/installers/installer.rb
 - lib/sprinkle/installers/mac_port.rb
 - lib/sprinkle/installers/noop.rb
@@ -117,16 +148,23 @@ files:
 - lib/sprinkle/installers/opensolaris_pkg.rb
 - lib/sprinkle/installers/push_text.rb
 - lib/sprinkle/installers/rake.rb
+- lib/sprinkle/installers/replace_text.rb
 - lib/sprinkle/installers/rpm.rb
+- lib/sprinkle/installers/runner.rb
+- lib/sprinkle/installers/smart.rb
 - lib/sprinkle/installers/source.rb
 - lib/sprinkle/installers/transfer.rb
+- lib/sprinkle/installers/user.rb
 - lib/sprinkle/installers/yum.rb
+- lib/sprinkle/installers/zypper.rb
 - lib/sprinkle/package.rb
 - lib/sprinkle/policy.rb
 - lib/sprinkle/script.rb
+- lib/sprinkle/verifiers/apt.rb
 - lib/sprinkle/verifiers/directory.rb
 - lib/sprinkle/verifiers/executable.rb
 - lib/sprinkle/verifiers/file.rb
+- lib/sprinkle/verifiers/package.rb
 - lib/sprinkle/verifiers/process.rb
 - lib/sprinkle/verifiers/rpm.rb
 - lib/sprinkle/verifiers/ruby.rb
@@ -155,16 +193,20 @@ files:
 - 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/sprinkle_spec.rb
 - spec/sprinkle/verify_spec.rb
 - TODO
+- spec/sprinkle/sequence_spec.rb
 has_rdoc: true
 homepage: http://github.com/crafterm/sprinkle
 licenses: []
@@ -175,21 +217,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sprinkle
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby DSL based software provisioning tool
@@ -213,10 +261,13 @@ test_files:
 - 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