crafterm-sprinkle 0.2.0 → 0.2.1

data/CREDITS

@@ -17,3 +17,5 @@ Mitchell Hashimoto     (http://mitchellhashimoto.com)
 Ari Lerner             (http://www.citrusbyte.com)
 Jorgen Orehøj Erichsen (http://blog.erichsen.net)
 Joshua Sierles         (http://diluvia.net)
+Julian Russell         (http://github.com/plusplus)
+Dave (Gassto)          (http://github.com/gassto)

data/Manifest.txt

@@ -49,6 +49,11 @@ lib/sprinkle/installers/rake.rb
 lib/sprinkle/installers/rpm.rb
 lib/sprinkle/installers/source.rb
 lib/sprinkle/installers/yum.rb
+lib/sprinkle/installers/freebsd_pkg.rb
+lib/sprinkle/installers/openbsd_pkg.rb
+lib/sprinkle/installers/opensolaris_pkg.rb
+lib/sprinkle/installers/bsd_port.rb
+lib/sprinkle/installers/mac_port.rb
 lib/sprinkle/package.rb
 lib/sprinkle/policy.rb
 lib/sprinkle/script.rb
@@ -76,6 +81,10 @@ spec/sprinkle/installers/installer_spec.rb
 spec/sprinkle/installers/rpm_spec.rb
 spec/sprinkle/installers/yum_spec.rb
 spec/sprinkle/installers/source_spec.rb
+spec/sprinkle/installers/openbsd_pkg_spec.rb
+spec/sprinkle/installers/freebsd_pkg_spec.rb
+spec/sprinkle/installers/bsd_port_spec.rb
+spec/sprinkle/installers/mac_port_spec.rb
 spec/sprinkle/package_spec.rb
 spec/sprinkle/policy_spec.rb
 spec/sprinkle/script_spec.rb

data/README.txt

@@ -2,6 +2,9 @@
 
 http://redartisan.com/2008/5/27/sprinkle-intro
 http://github.com/crafterm/sprinkle
+http://github.com/benschwarz/passenger-stack
+http://www.vimeo.com/2888665
+http://redartisan.lighthouseapp.com/projects/25275-sprinkle/tickets
 
 == DESCRIPTION:
 
@@ -205,7 +208,7 @@ and Git (via source with dependencies from APT):
 
     end
 
-Please see the examples directory for more complete examples of Sprinkle deployment scripts.
+Please see the examples directory for more complete examples of Sprinkle deployment scripts, and also the Passenger Stack github page and video by Ben Schwarz (http://github.com/benschwarz/passenger-stack and http://www.vimeo.com/2888665 respectively).
 
 Sprinkle is a work in progress and I'm excited to hear if anyone finds it useful - please feel free to
 comment, ask any questions, or send in any ideas, patches, bugs. All most welcome.

data/config/hoe.rb

@@ -58,7 +58,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [ ['activesupport', '>= 2.0.2'], ['highline', '>= 1.4.0'], ['capistrano', '>= 2.2.0'] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [ ['activesupport', '>= 2.0.2'], ['highline', '>= 1.4.0'], ['capistrano', '>= 2.5.5'] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/examples/packages/databases/mysql.rb

@@ -5,9 +5,9 @@ end
 
 package :mysql_ruby_driver do
   description 'Ruby MySQL database driver'
-  gem 'mysql'
+  gem 'mysql' # :build_flags => "—with-mysql-config=/usr/local/mysql/bin/mysql_config"
   
   verify do
     ruby_can_load 'mysql'
   end
-end
+end

data/lib/sprinkle/installers/bsd_port.rb

@@ -0,0 +1,33 @@
+module Sprinkle
+  module Installers
+    # = OpenBSD and FreeBSD Port Installer
+    #
+    # The Port installer installs OpenBSD and FreeBSD ports.
+    # Before usage, the ports sytem must be installed and
+    # read on the target operating system.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans port.
+    #
+    #   package :magic_beans do
+    #     bsd_port 'magic/magic_beans'
+    #   end
+    #
+    class BsdPort < Installer
+      attr_accessor :port #:nodoc:
+
+      def initialize(parent, port, &block) #:nodoc:
+        super parent, &block
+        @port = port
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "sh -c 'cd /usr/ports/#{@port} && make BATCH=yes install clean'"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/freebsd_pkg.rb

@@ -0,0 +1,37 @@
+module Sprinkle
+  module Installers
+    # = FreeBSD Package Installer
+    #
+    # The Pkg package installer installs FreeBSD packages.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans package.
+    #
+    #   package :magic_beans do
+    #     freebsd_pkg 'magic_beans'
+    #   end
+    #
+    # You may also specify multiple packages as an array:
+    #
+    #   package :magic_beans do
+    #     freebsd_pkg %w(magic_beans magic_sauce)
+    #   end
+    class FreebsdPkg < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, packages, &block) #:nodoc:
+        super parent, &block
+        packages = [packages] unless packages.is_a? Array
+        @packages = packages
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "pkg_add -r #{@packages.join(' ')}"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/gem.rb

@@ -54,6 +54,7 @@ module Sprinkle
           cmd << " --source #{source}" if source
           cmd << " --install-dir #{repository}" if option?(:repository)
           cmd << " --no-rdoc --no-ri" unless option?(:build_docs)
+          cmd << " -- #{build_flags}" if option?(:build_flags)
           cmd
         end
         

data/lib/sprinkle/installers/mac_port.rb

@@ -0,0 +1,38 @@
+module Sprinkle
+  module Installers
+    # = Mac OS X Port Installer (macports)
+    #
+    # The Port installer installs macports ports.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans port.
+    #
+    #   package :magic_beans do
+    #     mac_port 'magic/magic_beans'
+    #   end
+    #
+    # == Notes
+    # Before MacPorts packages can be installed, the PATH
+    # environment variable probably has to be changed so
+    # capistrano can find the /opt/local/bin/port executable
+    #
+    # You must set PATH in ~/.ssh/environment on the remote
+    # system and enable 'PermitUserEnvironment yes' in /etc/sshd_config
+    class MacPort < Installer
+      attr_accessor :port #:nodoc:
+
+      def initialize(parent, port, &block) #:nodoc:
+        super parent, &block
+        @port = port
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "port install #{@port}"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/openbsd_pkg.rb

@@ -0,0 +1,47 @@
+module Sprinkle
+  module Installers
+    # = OpenBSD Package Installer
+    #
+    # The Pkg package installer installs OpenBSD packages.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans package.
+    #
+    #   package :magic_beans do
+    #     openbsd_pkg 'magic_beans'
+    #   end
+    #
+    # You may also specify multiple packages as an array:
+    #
+    #   package :magic_beans do
+    #     openbsd_pkg %w(magic_beans magic_sauce)
+    #   end
+    #
+    # == Notes
+    # Before OpenBSD packages can be installed, the PKG_PATH
+    # environment variable must be set.
+    #
+    # You must set PKG_PATH in ~/.ssh/environment on the remote
+    # system and enable 'PermitUserEnvironment yes' in /etc/ssh/sshd_config
+    # 
+    # For help on PKG_PATH see section 15.2.2 of the OpenBSD FAQ 
+    # (http://www.openbsd.org/faq/faq15.html)
+    class OpenbsdPkg < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, packages, &block) #:nodoc:
+        super parent, &block
+        packages = [packages] unless packages.is_a? Array
+        @packages = packages
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "pkg_add #{@packages.join(' ')}"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/opensolaris_pkg.rb

@@ -0,0 +1,43 @@
+module Sprinkle
+  module Installers
+    # = OpenSolaris Package Installer
+    #
+    # The Pkg package installer installs OpenSolaris packages.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans package.
+    #
+    #   package :magic_beans do
+    #     opensolaris_pkg 'magic_beans'
+    #   end
+    #
+    # You may also specify multiple packages as an array:
+    #
+    #   package :magic_beans do
+    #     opensolaris_pkg %w(magic_beans magic_sauce)
+    #   end
+    #
+    # == Note
+    # If you are using capistrano as the deployment method
+    # you will need to add the following lines to your deploy.rb
+    # set :sudo, 'pfexec'
+    # set :sudo_prompt, ''
+    class OpensolarisPkg < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, packages, &block) #:nodoc:
+        super parent, &block
+        packages = [packages] unless packages.is_a? Array
+        @packages = packages
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "pkg install #{@packages.join(' ')}"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/push_text.rb

@@ -0,0 +1,45 @@
+module Sprinkle
+  module Installers
+    # Beware, strange "installer" coming your way.
+    #
+    # = Text configuration installer
+    #
+    # This installer pushes simple configuration into a file.
+    # 
+    # == Example Usage
+    #
+    # Installing magic_beans into apache2.conf
+    #
+    #   package :magic_beans do
+    #     push_text 'magic_beans', '/etc/apache2/apache2.conf'
+    #   end
+    #
+    # If you user has access to 'sudo' and theres a file that requires
+    # priveledges, you can pass :sudo => true 
+    #
+    #   package :magic_beans do
+    #     push_text 'magic_beans', '/etc/apache2/apache2.conf', :sudo => true
+    #   end
+    #
+    # A special verify step exists for this very installer
+    # its known as file_contains, it will test that a file indeed
+    # contains a substring that you send it.
+    #
+    class PushText < Installer
+      attr_accessor :text, :path #:nodoc:
+
+      def initialize(parent, text, path, options={}, &block) #:nodoc:
+        super parent, options, &block
+        @text = text
+        @path = path
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "echo '#{@text}' |#{'sudo' if option?(:sudo)} tee -a #{@path}"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/yum.rb

@@ -29,7 +29,7 @@ module Sprinkle
       protected
 
         def install_commands #:nodoc:
-          "yum #{@packages.join(' ')} -y"
+          "yum install #{@packages.join(' ')} -y"
         end
 
     end

data/lib/sprinkle/package.rb

@@ -120,6 +120,26 @@ module Sprinkle
         self.instance_eval &block
       end
 
+      def freebsd_pkg(*names, &block)
+        @installer = Sprinkle::Installers::FreebsdPkg.new(self, *names, &block)
+      end
+      
+      def openbsd_pkg(*names, &block)
+        @installer = Sprinkle::Installers::OpenbsdPkg.new(self, *names, &block)
+      end
+      
+      def opensolaris_pkg(*names, &block)
+        @installer = Sprinkle::Installers::OpensolarisPkg.new(self, *names, &block)
+      end
+      
+      def bsd_port(port, &block)
+        @installer = Sprinkle::Installers::BsdPort.new(self, port, &block)
+      end
+      
+      def mac_port(port, &block)
+        @installer = Sprinkle::Installers::MacPort.new(self, port, &block)
+      end
+
       def apt(*names, &block)
         @installer = Sprinkle::Installers::Apt.new(self, *names, &block)
       end
@@ -150,6 +170,10 @@ module Sprinkle
         @installer = Sprinkle::Installers::Rake.new(self, name, options, &block)        
       end
       
+      def push_text(text, path, options = {}, &block)
+        @installer = Sprinkle::Installers::PushText.new(self, text, path, options, &block)
+      end
+      
       def verify(description = '', &block)
         @verifications << Sprinkle::Verify.new(self, description, &block)
       end

data/lib/sprinkle/verifiers/file.rb

@@ -8,6 +8,8 @@ module Sprinkle
     #
     #   verify { has_file '/etc/apache2/apache2.conf' }
     #
+    #   verify { file_contains '/etc/apache2/apache2.conf', 'mod_gzip'}
+    #
     module File
       Sprinkle::Verify.register(Sprinkle::Verifiers::File)
       
@@ -15,6 +17,10 @@ module Sprinkle
       def has_file(path)
         @commands << "test -f #{path}"
       end
+      
+      def file_contains(path, text)
+        @commands << "grep '#{text}' #{path}"
+      end
     end
   end
 end

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/installers/bsd_port_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::BsdPort do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_port(ports, &block)
+    Sprinkle::Installers::BsdPort.new(@package, ports, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_port 'lang/ruby'
+      @installer.port.should == 'lang/ruby'
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_port 'lang/ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the port installer for all specified packages' do
+      @install_commands.should =~ /cd \/usr\/ports\/lang\/ruby && make BATCH=yes install clean/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'sh -c \'cd /usr/ports/lang/ruby && make BATCH=yes install clean\'', 'op2' ]
+    end
+
+  end
+
+end

data/spec/sprinkle/installers/freebsd_pkg_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::FreebsdPkg do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_pkg(pkgs, &block)
+    Sprinkle::Installers::FreebsdPkg.new(@package, pkgs, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_pkg 'ruby'
+      @installer.packages.should == [ 'ruby' ]
+    end
+
+    it 'should accept an array of packages to install' do
+      @installer = create_pkg %w( gcc gdb g++ )
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_pkg 'ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the freebsd_pkg installer for all specified packages' do
+      @install_commands.should =~ /pkg_add -r ruby/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'pkg_add -r ruby', 'op2' ]
+    end
+
+    it 'should install a specific version if defined'
+
+  end
+
+end

data/spec/sprinkle/installers/gem_spec.rb

@@ -5,7 +5,7 @@ describe Sprinkle::Installers::Gem do
   before do
     @gem = 'rails'
     @version = '2.0.2'
-    @options = { :source => 'http://gems.github.com/', :repository => '/tmp/gems' }
+    @options = { :source => 'http://gems.github.com/', :repository => '/tmp/gems', :build_flags => '--build_flag=foo' }
   end
 
   def create_gem(gem, version = nil, options = {}, &block)
@@ -34,6 +34,10 @@ describe Sprinkle::Installers::Gem do
     it 'should optionally store the repository location where gems are to be installed' do
       @installer.repository.should == @options[:repository]
     end
+    
+    it 'should optionally store the build flags' do
+      @installer.build_flags.should == @options[:build_flags]
+    end
 
   end
 
@@ -70,6 +74,18 @@ describe Sprinkle::Installers::Gem do
 
     end
     
+    describe 'with build flags' do
+      
+      before do
+        @installer = create_gem @gem, nil, :build_flags => '--option=foo'
+      end
+      
+      it 'should install with defined build flags' do
+        @installer.send(:install_commands).should == "gem install #{@gem} --no-rdoc --no-ri -- --option=foo"
+      end
+      
+    end
+    
   end
 
 end

data/spec/sprinkle/installers/mac_port_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::MacPort do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_port(ports, &block)
+    Sprinkle::Installers::MacPort.new(@package, ports, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_port 'ruby'
+      @installer.port.should == 'ruby'
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_port 'ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the port installer for all specified packages' do
+      @install_commands.should =~ /port install ruby/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'port install ruby', 'op2' ]
+    end
+
+  end
+
+end

data/spec/sprinkle/installers/openbsd_pkg_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::OpenbsdPkg do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_pkg(pkgs, &block)
+    Sprinkle::Installers::OpenbsdPkg.new(@package, pkgs, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_pkg 'ruby'
+      @installer.packages.should == [ 'ruby' ]
+    end
+
+    it 'should accept an array of packages to install' do
+      @installer = create_pkg %w( gcc gdb g++ )
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_pkg 'ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the freebsd_pkg installer for all specified packages' do
+      @install_commands.should =~ /pkg_add ruby/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'pkg_add ruby', 'op2' ]
+    end
+
+    it 'should install a specific version if defined'
+
+  end
+
+end

data/spec/sprinkle/installers/opensolaris_pkg_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::OpensolarisPkg do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_pkg(pkgs, &block)
+    Sprinkle::Installers::OpensolarisPkg.new(@package, pkgs, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_pkg 'ruby'
+      @installer.packages.should == [ 'ruby' ]
+    end
+
+    it 'should accept an array of packages to install' do
+      @installer = create_pkg %w( gcc gdb g++ )
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_pkg 'ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the freebsd_pkg installer for all specified packages' do
+      @install_commands.should =~ /pkg install ruby/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'pkg install ruby', 'op2' ]
+    end
+
+    it 'should install a specific version if defined'
+
+  end
+
+end

data/spec/sprinkle/installers/push_text_spec.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::PushText do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+    @options = {:sudo => true}
+  end
+
+  def create_text(text, path, options={}, &block)
+    Sprinkle::Installers::PushText.new(@package, text, path, options, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_text 'crazy-configuration-methods', '/etc/doomed/file.conf'
+      @installer.text.should == 'crazy-configuration-methods'
+      @installer.path.should == '/etc/doomed/file.conf'
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_text 'another-hair-brained-idea', '/dev/mind/late-night' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the push text installer for all specified packages' do
+      @install_commands.should =~ /echo 'another-hair-brained-idea' | tee -a \/dev\/mind\/late-night/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', "echo 'another-hair-brained-idea' | tee -a /dev/mind/late-night", 'op2' ]
+    end
+
+  end
+  
+  describe 'running with sudo' do
+    before do
+      @installer = create_text "I'm a special user", "/dev/mind/the-day-after", :sudo => true
+      @install_commands = @installer.send :install_commands
+    end
+    
+    it "should invoke the push installer with sudo" do
+      @install_commands.should =~ /echo 'I\'m a special user' | sudo tee -a \/dev\/mind\/the-day-after/
+    end
+  end
+
+end

data/spec/sprinkle/installers/yum_spec.rb

@@ -35,11 +35,11 @@ describe Sprinkle::Installers::Yum do
     end
 
     it 'should invoke the rpm installer for all specified packages' do
-      @install_commands.should =~ /yum ruby -y/
+      @install_commands.should =~ /yum install ruby -y/
     end
 
     it 'should automatically insert pre/post commands for the specified package' do
-      @installer.send(:install_sequence).should == [ 'op1', 'yum ruby -y', 'op2' ]
+      @installer.send(:install_sequence).should == [ 'op1', 'yum install ruby -y', 'op2' ]
     end
 
     it 'should install a specific version if defined'

data/spec/sprinkle/verify_spec.rb

@@ -9,6 +9,9 @@ describe Sprinkle::Verify 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'
         
@@ -51,6 +54,10 @@ describe Sprinkle::Verify 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

data/sprinkle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter", "Mitchell Hashimoto"]
@@ -25,19 +25,21 @@ Gem::Specification.new do |s|
              "lib/sprinkle/extensions/string.rb", "lib/sprinkle/extensions/symbol.rb", "lib/sprinkle/installers/apt.rb",
              "lib/sprinkle/installers/deb.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/installers/yum.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb",
-             "lib/sprinkle/verifiers/directory.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/verify.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "sprinkle.gemspec",
-              "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
+             "lib/sprinkle/installers/yum.rb", "lib/sprinkle/installers/freebsd_pkg.rb", "lib/sprinkle/installers/openbsd_pkg.rb",
+             "lib/sprinkle/installers/opensolaris_pkg.rb", "lib/sprinkle/installers/bsd_port.rb", "lib/sprinkle/installers/mac_port.rb", "lib/sprinkle/installers/push_text.rb", 
+             "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/verifiers/directory.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/verify.rb", "lib/sprinkle/version.rb",
+             "script/destroy", "script/generate", "sprinkle.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
               
   s.test_files = ["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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/rpm_spec.rb",
-                  "spec/sprinkle/installers/yum_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",
-                  "spec/sprinkle/installers/rake_spec.rb", "spec/sprinkle/verify_spec.rb"]
+                  "spec/sprinkle/installers/yum_spec.rb", "spec/sprinkle/installers/source_spec.rb", "spec/sprinkle/installers/freebsd_pkg_spec.rb",
+                  "spec/sprinkle/installers/openbsd_pkg_spec.rb", "spec/sprinkle/installers/opensolaris_pkg_spec.rb",
+                  "spec/sprinkle/installers/mac_port_spec.rb", "spec/sprinkle/installers/push_text_spec.rb", "spec/sprinkle/installers/bsd_port_spec.rb", "spec/sprinkle/policy_spec.rb",
+                  "spec/sprinkle/script_spec.rb", "spec/sprinkle/sprinkle_spec.rb", "spec/sprinkle/installers/rake_spec.rb", "spec/sprinkle/verify_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://sprinkle.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]
@@ -53,19 +55,19 @@ Gem::Specification.new do |s|
     if current_version >= 3 then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<highline>, [">= 1.4.0"])
-      s.add_runtime_dependency(%q<capistrano>, [">= 2.2.0"])
+      s.add_runtime_dependency(%q<capistrano>, [">= 2.5.5"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
       s.add_development_dependency(%q<echoe>, [">= 3.0.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_dependency(%q<highline>, [">= 1.4.0"])
-      s.add_dependency(%q<capistrano>, [">= 2.2.0"])
+      s.add_dependency(%q<capistrano>, [">= 2.5.5"])
       s.add_dependency(%q<hoe>, [">= 1.8.2"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.0.2"])
     s.add_dependency(%q<highline>, [">= 1.4.0"])
-    s.add_dependency(%q<capistrano>, [">= 2.2.0"])
+    s.add_dependency(%q<capistrano>, [">= 2.5.5"])
     s.add_dependency(%q<hoe>, [">= 1.8.2"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crafterm-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -15,6 +15,7 @@ default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -24,6 +25,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -33,15 +35,17 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 2.5.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -113,6 +117,12 @@ files:
 - lib/sprinkle/installers/rpm.rb
 - lib/sprinkle/installers/source.rb
 - lib/sprinkle/installers/yum.rb
+- lib/sprinkle/installers/freebsd_pkg.rb
+- lib/sprinkle/installers/openbsd_pkg.rb
+- lib/sprinkle/installers/opensolaris_pkg.rb
+- lib/sprinkle/installers/bsd_port.rb
+- lib/sprinkle/installers/mac_port.rb
+- lib/sprinkle/installers/push_text.rb
 - lib/sprinkle/package.rb
 - lib/sprinkle/policy.rb
 - lib/sprinkle/script.rb
@@ -172,7 +182,12 @@ test_files:
 - spec/sprinkle/installers/rpm_spec.rb
 - spec/sprinkle/installers/yum_spec.rb
 - spec/sprinkle/installers/source_spec.rb
-- spec/sprinkle/package_spec.rb
+- spec/sprinkle/installers/freebsd_pkg_spec.rb
+- spec/sprinkle/installers/openbsd_pkg_spec.rb
+- spec/sprinkle/installers/opensolaris_pkg_spec.rb
+- spec/sprinkle/installers/mac_port_spec.rb
+- spec/sprinkle/installers/push_text_spec.rb
+- spec/sprinkle/installers/bsd_port_spec.rb
 - spec/sprinkle/policy_spec.rb
 - spec/sprinkle/script_spec.rb
 - spec/sprinkle/sprinkle_spec.rb

data/spec/sprinkle/package_spec.rb

@@ -1,422 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Sprinkle::Package do
-  include Sprinkle::Package
-
-  before do
-    @name = :package_name
-    @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
-  
-  # More of Mitchell's meta-programming to dry up specs.
-  def create_package_with_blank_verify(n = 1)
-    eval(<<CODE)
-    @pkg = package @name do
-      gem 'gem'
-      #{"verify 'stuff happens' do; end\n" * n}
-    end
-CODE
-  end
-
-  describe 'when created' do
-
-    it 'should be invalid without a block descriptor' do
-      lambda { package @name }.should raise_error
-    end
-
-    it 'should be invalid without a name' do
-      lambda { package nil, &@empty }.should raise_error
-      lambda { package @name, &@empty }.should_not raise_error
-    end
-
-    it 'should optionally accept a description' do
-      pkg = package @name do
-        description 'my package description'
-      end
-      pkg.description.should == 'my package description'
-    end
-
-    it 'should optionally accept a version' do
-      pkg = package @name do
-        version '2.0.2'
-      end
-      pkg.version.should == '2.0.2'
-    end
-
-    it 'should optionally accept an installer' do
-      pkg = package @name do
-        gem 'rails'
-      end
-      pkg.installer.should_not be_nil
-    end
-
-    it 'should optionally accept dependencies' do
-      pkg = package @name do
-        requires :webserver, :database
-      end
-      pkg.dependencies.should == [:webserver, :database]
-    end
-
-    it 'should optionally accept recommended dependencies' do
-      pkg = package @name do
-        recommends :webserver, :database
-      end
-      pkg.recommends.should == [:webserver, :database]
-    end
-
-    it 'should optionally define a virtual package implementation' do
-      pkg = package @name, :provides => :database do; end
-      pkg.provides.should == :database
-    end
-
-    it 'should be able to represent itself as a string' do
-      pkg = package @name do; end
-      pkg.to_s.should == @name
-    end
-
-  end
-
-  describe 'helper method' do
-
-    it 'should added new packages to the global package hash' do
-      pkg = package @name do; end
-      Sprinkle::Package::PACKAGES[@name].should == pkg
-    end
-
-    it 'should add the new package to the provides list if specified' do
-      pkg = package @name, :provides => :database do; end
-      Sprinkle::Package::PACKAGES[:database].last.should == pkg
-    end
-
-  end
-
-  describe 'installer configuration' do
-
-    it 'should optionally accept an apt installer' do
-      pkg = package @name do
-        apt %w( deb1 deb2 )
-      end
-      pkg.should respond_to(:apt)
-      pkg.installer.class.should == Sprinkle::Installers::Apt
-    end
-
-    it 'should optionally accept an rpm installer' do
-      pkg = package @name do
-        rpm %w( rpm1 rpm2 )
-      end
-      pkg.should respond_to(:rpm)
-      pkg.installer.class.should == Sprinkle::Installers::Rpm
-    end
-
-    it 'should optionally accept a gem installer' do
-      pkg = package @name do
-        gem 'gem'
-      end
-      pkg.should respond_to(:gem)
-      pkg.installer.class.should == Sprinkle::Installers::Gem
-    end
-
-    it 'should optionally accept a source installer' do
-      pkg = package @name do
-        source 'archive'
-      end
-      pkg.should respond_to(:source)
-      pkg.installer.class.should == Sprinkle::Installers::Source
-    end
-
-  end
-
-  describe 'with a source installer' do
-
-    it 'should optionally accept a block containing customisations' do
-      pkg = package @name do
-        source 'archive' do; end
-      end
-      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
-        source 'archive'
-      end
-      pkg.recommends.should include(:build_essential)
-    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
-
-    it 'should automatically add a rubygems recommendation' do
-      pkg = package @name do
-        gem 'gem'
-      end
-      pkg.recommends.should include(:rubygems)
-    end
-    
-    it 'should forward block to installer superclass' do
-      check_block_forwarding_on(:gem)
-    end
-
-  end
-
-  describe 'when processing' do
-
-    before do
-      @deployment = mock(Sprinkle::Deployment)
-      @roles = [ :app, :db ]
-      @installer = mock(Sprinkle::Installers::Installer, :defaults => true, :process => true)
-      @package = package @name do; end
-    end
-
-    describe 'with an installer' do
-
-      before do
-        @package.installer = @installer
-      end
-
-      it 'should configure itself against the deployment context' do
-        @installer.should_receive(:defaults).with(@deployment).and_return
-      end
-
-      it 'should request the installer to process itself' do
-        @installer.should_receive(:process).with(@roles).and_return
-      end
-
-      after do
-        @package.process(@deployment, @roles)
-      end
-    end
-
-    describe 'without an installer' do
-
-      it 'should not request the installer to process if the package is a metapackage' do
-        @installer.should_not_receive(:process)
-        @package.process(@deployment, @roles)
-      end
-
-    end
-    
-    describe 'with verifications' do
-      before do
-        @pkg = create_package_with_blank_verify(3)
-        @pkg.installer = @installer
-        @installer.stub!(:defaults)
-        @installer.stub!(:process)
-      end
-      
-      describe 'with forcing' do
-        before do
-          # Being explicit
-          Sprinkle::OPTIONS[:force] = true
-        end
-        
-        it 'should process verifications only once' do
-          @pkg.should_receive(:process_verifications).once
-          @pkg.process(@deployment, @roles)
-        end
-        
-        after do
-          # Being explicit
-          Sprinkle::OPTIONS[:force] = false
-        end
-      end
-      
-      describe 'without forcing' do
-        before do
-          # Being explicit
-          Sprinkle::OPTIONS[:force] = false
-        end
-        
-        it 'should process verifications twice' do
-          @pkg.should_receive(:process_verifications).once.with(@deployment, @roles, true).and_raise(Sprinkle::VerificationFailed.new(@pkg, ''))
-          @pkg.should_receive(:process_verifications).once.with(@deployment, @roles).and_raise(Sprinkle::VerificationFailed.new(@pkg, ''))
-        end
-        
-        it 'should continue with installation if pre-verification fails' do
-          @pkg.should_receive(:process_verifications).twice.and_raise(Sprinkle::VerificationFailed.new(@pkg, ''))
-          @installer.should_receive(:defaults)
-          @installer.should_receive(:process)
-        end
-        
-        it 'should only process verifications once and should not process installer if verifications succeed' do
-          @pkg.should_receive(:process_verifications).once.and_return(nil)
-          @installer.should_not_receive(:defaults)
-          @installer.should_not_receive(:process)
-        end
-        
-        after do
-          begin
-            @pkg.process(@deployment, @roles)
-          rescue Sprinkle::VerificationFailed => e; end
-        end
-      end
-    end
-
-  end
-  
-  describe 'when processing verifications' do
-    before do
-      @deployment = mock(Sprinkle::Deployment)
-      @roles = [ :app, :db ]
-      @installer = mock(Sprinkle::Installers::Installer, :defaults => true, :process => true)
-      @pkg = create_package_with_blank_verify(3)
-      @pkg.installer = @installer
-      @installer.stub!(:defaults)
-      @installer.stub!(:process)
-      @logger = mock(ActiveSupport::BufferedLogger, :debug => true, :debug? => true)
-      @logger.stub!(:info)
-    end
-    
-    it 'should request _each_ verification to configure itself against the deployment context' do
-      @pkg.verifications.each do |v|
-        v.should_receive(:defaults).with(@deployment).once
-        v.stub!(:process)
-      end
-    end
-
-    it 'should request _each_ verification to process' do
-      @pkg.verifications.each do |v|
-        v.stub!(:defaults)
-        v.should_receive(:process).with(@roles).once
-      end
-    end
-    
-    it 'should enter a log info event to notify user whats happening' do
-      @pkg.verifications.each do |v|
-        v.stub!(:defaults)
-        v.stub!(:process)
-      end
-      
-      @pkg.should_receive(:logger).once.and_return(@logger)
-    end
-    
-    after do
-      @pkg.process_verifications(@deployment, @roles)
-    end
-  end
-
-  describe 'hierarchies' do
-
-    before do
-      @a = package :a do; requires :b; end
-      @b = package :b do; requires :c; end
-      @c = package :c do; recommends :d; end
-      @d = package :d do; end
-    end
-
-    it 'should be able to return a dependency hierarchy tree' do
-      @a.tree.flatten.should == [ @d, @c, @b, @a ]
-      @b.tree.flatten.should == [ @d, @c, @b ]
-      @c.tree.flatten.should == [ @d, @c ]
-      @d.tree.flatten.should == [ @d ]
-    end
-
-    describe 'with missing recommendations' do
-
-      before do
-        @d.recommends :e
-      end
-
-      it 'should ignore missing recommendations' do
-        @d.tree.flatten.should == [ @d ]
-      end
-
-    end
-
-    it 'should optionally accept a block to call upon item in the tree during hierarchy traversal' do
-      @count = 0
-      @a.tree do
-        @count += 1
-      end
-      @count.should == 3
-    end
-
-    it 'should maintain a depth count of how deep the hierarchy is' do
-      @b.should_receive(:tree).with(2).and_return([@b])
-      @a.tree do; end
-    end
-
-  end
-
-  describe 'with missing dependencies' do
-
-    before do
-      @pkg = package @name do
-        gem 'gem'
-        requires :missing
-      end
-    end
-
-    it 'should raise an error if a package is missing' do
-      lambda { @pkg.tree }.should raise_error
-    end
-
-  end
-  
-  describe 'with verifications' do    
-    it 'should create a Sprinkle::Verification object for the verify block' do
-      Sprinkle::Verify.should_receive(:new).once
-      
-      create_package_with_blank_verify
-    end
-    
-    it 'should create multiple Sprinkle::Verification objects for multiple verify blocks' do
-      Sprinkle::Verify.should_receive(:new).twice
-      
-      create_package_with_blank_verify(2)
-    end
-    
-    it 'should add each Sprinkle::Verificaton object to the @verifications array' do
-      @pkg = create_package_with_blank_verify(3)
-      @pkg.verifications.length.should eql(3)
-    end
-    
-    it 'should initialize Sprinkle::Verification with the package name, description, and block' do
-      Sprinkle::Verify.should_receive(:new) do |pkg, desc|
-        pkg.name.should eql(@name)
-        desc.should eql('stuff happens')
-      end
-      
-      # We do a should_not raise_error because if a block was NOT passed, an error
-      # is raised. This is specced in verification_spec.rb
-      lambda { create_package_with_blank_verify }.should_not raise_error
-    end
-  end
-
-end