sprinkle 0.2.1 → 0.2.2

data/Manifest.txt

@@ -42,18 +42,19 @@ 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/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,15 +77,18 @@ 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/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/installers/yum_spec.rb
 spec/sprinkle/package_spec.rb
 spec/sprinkle/policy_spec.rb
 spec/sprinkle/script_spec.rb

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/package.rb

@@ -237,6 +237,8 @@ module Sprinkle
 
         @dependencies.each do |dep|
           package = PACKAGES[dep]
+          package = select_package(dep, package) if package.is_a? Array
+          
           raise "Package definition not found for key: #{dep}" unless package
           block.call(self, package, depth) if block
           packages << package.tree(depth + 1, &block)
@@ -249,6 +251,22 @@ module Sprinkle
 
       private
 
+        def select_package(name, packages)
+          if packages.size <= 1
+            package = packages.first
+          else
+            package = choose do |menu|
+              menu.prompt = "Multiple choices exist for virtual package #{name}"
+              menu.choices *packages.collect(&:to_s)
+            end
+            package = Sprinkle::Package::PACKAGES[package]
+          end
+
+          cloud_info "Selecting #{package.to_s} for virtual package #{name}"
+
+          package
+        end
+
         def meta_package?
           @installer == nil
         end

data/lib/sprinkle/version.rb

@@ -2,7 +2,7 @@ module Sprinkle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   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/rake_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::Rake do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'spec')
+  end
+
+  def create_rake(names, options = {}, &block)
+    Sprinkle::Installers::Rake.new(@package, names, options, &block)
+  end
+
+  describe 'during installation' do
+
+    it 'should invoke the rake executer for all specified tasks' do
+      @installer = create_rake 'spec'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should =~ /rake spec/
+    end
+
+    it 'should invoke the rake executer for all specified tasks' do
+      @installer = create_rake 'spec', :rakefile => '/some/Rakefile'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == "rake -f /some/Rakefile spec"
+    end
+
+  end
+
+end

data/spec/sprinkle/package_spec.rb

@@ -374,6 +374,19 @@ CODE
 
   end
 
+  describe 'virtual package dependencies' do
+    before do
+      @a = package :a do; requires :virtual ; end
+      @v1 = package :v1, :provides => :virtual do; end
+      @v2 = package :v2, :provides => :virtual do; end
+    end
+    
+    it 'should select package for an array' do
+      @a.should_receive(:select_package).with(:virtual, [@v1,@v2]).and_return(@v1)
+      @a.tree do; end
+    end
+  end
+
   describe 'with missing dependencies' do
 
     before do

data/sprinkle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter", "Mitchell Hashimoto"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 +11:00
+date: 2009-03-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,18 +108,19 @@ files:
 - 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/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
@@ -142,15 +143,18 @@ files:
 - 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/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/installers/yum_spec.rb
 - spec/sprinkle/package_spec.rb
 - spec/sprinkle/policy_spec.rb
 - spec/sprinkle/script_spec.rb