jemmyw-sprinkle 0.2.3 → 0.2.4

data/Manifest.txt

@@ -43,6 +43,7 @@ lib/sprinkle/extensions/string.rb
 lib/sprinkle/extensions/symbol.rb
 lib/sprinkle/installers/apt.rb
 lib/sprinkle/installers/bsd_port.rb
+lib/sprinkle/installers/config.rb
 lib/sprinkle/installers/deb.rb
 lib/sprinkle/installers/freebsd_pkg.rb
 lib/sprinkle/installers/gem.rb
@@ -56,6 +57,7 @@ lib/sprinkle/installers/rpm.rb
 lib/sprinkle/installers/source.rb
 lib/sprinkle/installers/yum.rb
 lib/sprinkle/installers/custom.rb
+lib/sprinkle/installers/pear.rb
 lib/sprinkle/package.rb
 lib/sprinkle/policy.rb
 lib/sprinkle/script.rb
@@ -67,6 +69,7 @@ lib/sprinkle/verifiers/process.rb
 lib/sprinkle/verifiers/ruby.rb
 lib/sprinkle/verifiers/symlink.rb
 lib/sprinkle/verifiers/user.rb
+lib/sprinkle/verifiers/pear.rb
 lib/sprinkle/verify.rb
 lib/sprinkle/version.rb
 script/destroy
@@ -93,6 +96,7 @@ spec/sprinkle/installers/rpm_spec.rb
 spec/sprinkle/installers/source_spec.rb
 spec/sprinkle/installers/yum_spec.rb
 spec/sprinkle/installers/custom_spec.rb
+spec/sprinkle/installers/pear_spec.rb
 spec/sprinkle/package_spec.rb
 spec/sprinkle/policy_spec.rb
 spec/sprinkle/script_spec.rb

data/lib/sprinkle/installers/pear.rb

@@ -0,0 +1,25 @@
+module Sprinkle
+  module Installers
+    # = Pear Package Installer
+    #
+    class Pear < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, *packages, &block) #:nodoc:
+        packages.flatten!
+
+        options.update(packages.pop) if packages.last.is_a?(Hash)
+
+        super parent, options, &block
+
+        @packages = packages
+      end
+
+      protected
+
+      def install_commands #:nodoc:
+        "pear install #{@packages.join(' ')}"
+      end
+    end
+  end
+end

data/lib/sprinkle/package.rb

@@ -176,7 +176,15 @@ module Sprinkle
       end
       
       def custom(command, &block)
-        @installer = Sprinkle::Installers::Custom.new(self, command, &block)
+        @operations <<  Sprinkle::Installers::Custom.new(self, command, &block)
+      end
+
+      def pear(*names, &block)
+        @operations <<  Sprinkle::Installers::Pear.new(self, *names, &block)
+      end
+
+      def config(&block)
+        @operations << Sprinkle::Installers::Config.new(self, &block)
       end
       
       def verify(description = '', &block)

data/lib/sprinkle/verifiers/pear.rb

@@ -0,0 +1,15 @@
+module Sprinkle
+  module Verifiers
+    # = Dpkg Verifiers
+    #
+    # This verifier checks if a dpkg package is installed
+    module Pear
+      Sprinkle::Verify.register(Sprinkle::Verifiers::Pear)
+
+      def has_pear(name, version = nil)
+        version = version.nil? ? '' : version.gsub('.', '\.')
+        @commands << "pear list --allchannels 2>&1 | grep -e '^#{name}\\s*#{version}.*$'"
+      end
+    end
+  end
+end

data/lib/sprinkle/verifiers/user.rb

@@ -4,7 +4,7 @@ module Sprinkle
       Sprinkle::Verify.register(Sprinkle::Verifiers::User)
 
       def has_user(name)
-        @commands << "cat /etc/passwd | grep -q ^#{name}"
+        @commands << "cat /etc/passwd | grep -e '^#{name}'"
       end
     end
   end

data/spec/sprinkle/installers/pear_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::Pear do
+  before do
+    @pear = 'Log'
+    @pear2 = 'Test'
+  end
+
+  describe 'with one package' do
+    before do
+      @package = mock(Sprinkle::Package, :name => 'pear test', :source => nil, :repository => nil)
+      @installer = Sprinkle::Installers::Pear.new(@package, @pear)
+    end
+
+    it 'should accept a single package to install' do
+      @installer.packages.should == [@pear]
+    end
+  end
+
+  describe 'with two packages' do
+        before do
+      @package = mock(Sprinkle::Package, :name => 'pear test', :source => nil, :repository => nil)
+      @installer = Sprinkle::Installers::Pear.new(@package, @pear, @pear2)
+    end
+
+    it 'should accept two packages to install' do
+      @installer.packages.should == [@pear, @pear2]
+    end
+  end
+
+  describe 'during installation' do
+    before do
+      @package = mock(Sprinkle::Package, :name => 'pear test', :source => nil, :repository => nil)
+      @installer = Sprinkle::Installers::Pear.new(@package, @pear, @pear2) do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+    end
+
+    it 'should invoke the pear installer for the specified package' do
+      @installer.send(:install_commands).should == "pear install Log Test"
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', "pear install #{@pear} #{@pear2}", 'op2']
+    end
+  end
+end

data/spec/sprinkle/package_spec.rb

@@ -12,12 +12,14 @@ describe Sprinkle::Package do
   # 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)
+  def check_block_forwarding_on(installer, args = 'archive')
+    args = [args] unless args.is_a?(Array)
+
     eval(<<CODE, binding, __FILE__, __LINE__)
     pre_count = 0
     lambda {
       pkg = package @name do
-        #{installer} 'archive' do
+        #{installer}(*args) do
           pre :install, 'preOp'
         end
       end
@@ -110,6 +112,14 @@ CODE
   end
 
   describe 'installer configuration' do
+    it 'should optionally accept a pear installer' do
+      pkg = package @name do
+        pear %w( pear1 pear2 )
+      end
+
+      pkg.should respond_to(:pear)
+      pkg.operations.last.should be_a(Sprinkle::Installers::Pear)
+    end
 
     it 'should optionally accept an apt installer' do
       pkg = package @name do
@@ -195,12 +205,24 @@ CODE
 
   end
 
+  describe 'with a config installer' do
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:config, [])
+    end
+  end
+
   describe 'with a custom installer' do
     it 'should forward block to installer superclass' do
       check_block_forwarding_on(:custom)
     end
   end
 
+  describe 'with a pear installer' do
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:pear)
+    end
+  end
+
   describe 'when processing' do
 
     before do

data/spec/sprinkle/verify_spec.rb

@@ -102,7 +102,7 @@ describe Sprinkle::Verify do
     end
 
     it 'should check that a user is in passwd' do
-      @verification.commands.should include('cat /etc/passwd | grep -q ^deployer')
+      @verification.commands.should include('cat /etc/passwd | grep -e \'^deployer\'')
     end
 
     it 'should check that a pear package is installed' do

data/sprinkle.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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/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/README", "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", "lib/sprinkle.rb", "lib/sprinkle/actors/actors.rb", "lib/sprinkle/actors/capistrano.rb", "lib/sprinkle/actors/local.rb", "lib/sprinkle/actors/ssh.rb", "lib/sprinkle/actors/vlad.rb", "lib/sprinkle/configurable.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/bsd_port.rb", "lib/sprinkle/installers/deb.rb", "lib/sprinkle/installers/freebsd_pkg.rb", "lib/sprinkle/installers/gem.rb", "lib/sprinkle/installers/installer.rb", "lib/sprinkle/installers/mac_port.rb", "lib/sprinkle/installers/openbsd_pkg.rb", "lib/sprinkle/installers/opensolaris_pkg.rb", "lib/sprinkle/installers/push_text.rb", "lib/sprinkle/installers/rake.rb", "lib/sprinkle/installers/rpm.rb", "lib/sprinkle/installers/source.rb", "lib/sprinkle/installers/yum.rb", "lib/sprinkle/installers/custom.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/verifiers/directory.rb", "lib/sprinkle/verifiers/dpkg.rb", "lib/sprinkle/verifiers/executable.rb", "lib/sprinkle/verifiers/file.rb", "lib/sprinkle/verifiers/process.rb", "lib/sprinkle/verifiers/ruby.rb", "lib/sprinkle/verifiers/symlink.rb", "lib/sprinkle/verifiers/user.rb", "lib/sprinkle/verify.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/mac_port_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/yum_spec.rb", "spec/sprinkle/installers/custom_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"]
+  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "bin/sprinkle", "config/hoe.rb", "config/requirements.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/README", "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", "lib/sprinkle.rb", "lib/sprinkle/actors/actors.rb", "lib/sprinkle/actors/capistrano.rb", "lib/sprinkle/actors/local.rb", "lib/sprinkle/actors/ssh.rb", "lib/sprinkle/actors/vlad.rb", "lib/sprinkle/configurable.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/bsd_port.rb", "lib/sprinkle/installers/deb.rb", "lib/sprinkle/installers/freebsd_pkg.rb", "lib/sprinkle/installers/gem.rb", "lib/sprinkle/installers/installer.rb", "lib/sprinkle/installers/mac_port.rb", "lib/sprinkle/installers/openbsd_pkg.rb", "lib/sprinkle/installers/opensolaris_pkg.rb", "lib/sprinkle/installers/push_text.rb", "lib/sprinkle/installers/rake.rb", "lib/sprinkle/installers/rpm.rb", "lib/sprinkle/installers/source.rb", "lib/sprinkle/installers/yum.rb", "lib/sprinkle/installers/custom.rb", "lib/sprinkle/installers/pear.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/verifiers/directory.rb", "lib/sprinkle/verifiers/dpkg.rb", "lib/sprinkle/verifiers/executable.rb", "lib/sprinkle/verifiers/file.rb", "lib/sprinkle/verifiers/process.rb", "lib/sprinkle/verifiers/ruby.rb", "lib/sprinkle/verifiers/symlink.rb", "lib/sprinkle/verifiers/user.rb", "lib/sprinkle/verifiers/pear.rb", "lib/sprinkle/verify.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/mac_port_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/yum_spec.rb", "spec/sprinkle/installers/custom_spec.rb", "spec/sprinkle/installers/pear_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"]
   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: jemmyw-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -122,6 +122,7 @@ files:
 - lib/sprinkle/installers/source.rb
 - lib/sprinkle/installers/yum.rb
 - lib/sprinkle/installers/custom.rb
+- lib/sprinkle/installers/pear.rb
 - lib/sprinkle/package.rb
 - lib/sprinkle/policy.rb
 - lib/sprinkle/script.rb
@@ -133,6 +134,7 @@ files:
 - lib/sprinkle/verifiers/ruby.rb
 - lib/sprinkle/verifiers/symlink.rb
 - lib/sprinkle/verifiers/user.rb
+- lib/sprinkle/verifiers/pear.rb
 - lib/sprinkle/verify.rb
 - lib/sprinkle/version.rb
 - script/destroy
@@ -159,6 +161,7 @@ files:
 - spec/sprinkle/installers/source_spec.rb
 - spec/sprinkle/installers/yum_spec.rb
 - spec/sprinkle/installers/custom_spec.rb
+- spec/sprinkle/installers/pear_spec.rb
 - spec/sprinkle/package_spec.rb
 - spec/sprinkle/policy_spec.rb
 - spec/sprinkle/script_spec.rb