sprinkle 0.5.2 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   push_text was escaping & and / when it should not be
+
+    *Stefano Diem Benatti*
+
 *   Sprinkle `sudo_cmd` and Capistrino should work together instead of getting in each others way
     
     When using the capistrano actor `sudo_cmd` will now use the capistrano
@@ -13,3 +17,19 @@
 *   verify of local actor was never returning false so installers would never be executed
 
     *Edgars Beigarts*
+
+*   Capistrano actor now defaults to loading "Capfile" not "deploy" when no block is given.
+    If for some reason you just have a 'deploy' file in your root folder you
+    should `capify .` your setup and move your deploy.rb file into the config
+    folder.  Or you can provide a block with `recipe 'deploy'` to force the
+    old behavior.
+    
+    *Josh Goebel*
+    
+*   Capistrano actor now uses the configured setting of `run_method`, instead of always sudo.
+    The default Capistrano setup prefers sudo, so nothing should change for 
+    most users.  If you want to NOT use sudo to run commands you can set 
+    `use_sudo` or `run_method` accordingly in your capistrano recipes:
+    `set :use_sudo, false` or `set :run_method, :run`
+    
+    *Michael Nigh*

data/lib/sprinkle/actors/capistrano.rb

@@ -30,16 +30,16 @@ module Sprinkle
         def @config.recipes(script)
           _sprinkle_actor.recipes(script)
         end
-        
+
         if block
           @config.instance_eval &block
         else
-          @config.load 'deploy' # normally in the config directory for rails
+          @config.load "Capfile" if File.exist?("Capfile")
         end
       end
       
       def sudo?
-        @config.fetch(:run_method, :sudo) == :sudo
+        @config.fetch(:run_method, :run) == :sudo
       end
       
       def sudo_command
@@ -49,7 +49,7 @@ module Sprinkle
       # Determines if there are any servers for the given roles
       def servers_for_role?(roles)
         roles=Array(roles)
-        roles.any? { |r| @config.roles.keys.include? (r) }
+        roles.any? { |r| @config.roles.keys.include?(r) }
       end
       
 
@@ -97,7 +97,7 @@ module Sprinkle
         @log_recorder = log_recorder = Sprinkle::Utility::LogRecorder.new
         commands = commands.map {|x| rewrite_command(x)}
         define_task(name, roles) do
-          via = fetch(:run_method, :sudo)
+          via = fetch(:run_method, :run)
           commands.each do |command|
             if command == :TRANSFER
               opts.reverse_merge!(:recursive => true)
@@ -108,9 +108,9 @@ module Sprinkle
             else
               # this reset the log
               log_recorder.reset command
-              invoke_command(command, {:via => via}) do |c,s,d| 
-                # record the stream and data
-                log_recorder.log(s, d)
+              invoke_command(command, {:via => via}) do |ch, stream, out|
+                ::Capistrano::Configuration.default_io_proc.call(ch, stream, out) if Sprinkle::OPTIONS[:verbose]
+                log_recorder.log(stream, out)
               end
             end
           end
@@ -123,7 +123,7 @@ module Sprinkle
         # rip out any double sudos from the beginning of the command
         def rewrite_command(cmd)
           return cmd if cmd.is_a?(Symbol)
-          via = @config.fetch(:run_method, :sudo)
+          via = @config.fetch(:run_method, :run)
           if via == :sudo and cmd =~ /^#{sudo_command}/
             cmd.gsub(/^#{sudo_command}\s?/,"")
           else

data/lib/sprinkle/actors/dummy.rb

@@ -19,7 +19,7 @@ module Sprinkle
       # Determines if there are any servers for the given roles
       def servers_for_role?(roles)
         roles=Array(roles)
-        roles.any? { |r| @roles.keys.include? (r) }
+        roles.any? { |r| @roles.keys.include?(r) }
       end
       
       def install(installer, roles, opts={})

data/lib/sprinkle/actors/ssh.rb

@@ -43,7 +43,7 @@ module Sprinkle
       
       def initialize(options = {}, &block) #:nodoc:
         @options = options.update(:user => 'root')
-        @roles = {}.with_indifferent_access
+        @roles = {}
         @connection_cache = SSHConnectionCache.new
         self.instance_eval &block if block
         raise "You must define at least a single role." if @roles.empty?

data/lib/sprinkle/extensions/attributes.rb

@@ -0,0 +1,56 @@
+module Sprinkle
+  module Attributes
+    extend ActiveSupport::Concern
+    
+    included do
+      attr_accessor :delivery
+    end
+    
+    def defaults(deployment)
+      defaults = deployment.defaults[self.class.name.split(/::/).last.downcase.to_sym]
+      self.set_defaults(&defaults) if defaults
+      @delivery = deployment.style
+    end
+    
+    def set_defaults(&block)
+      before = @options
+      @options = {}
+      self.instance_eval(&block) if block
+      @options = before.reverse_merge(@options)
+    end
+    
+    private 
+    
+    def read_from_package(m)
+      @package.send(m) if @package.respond_to?(m)
+    end
+    
+    def option?(sym)
+      !!@options[sym]
+    end
+    
+    module ClassMethods
+      
+      def attributes(*list)
+        list.each do |a|
+          define_method a do |*val|
+            val=nil if val.empty?
+            val ? @options[a] = val.first : @options[a] || read_from_package(a)
+          end
+        end
+      end
+      
+      def multi_attributes(*list)
+        list.each do |a|
+          define_method a do |*val|
+            val = val.try(:first)
+            return @options[a] unless val
+            @options[a]||=[]
+            val.is_a?(Array) ? @options[a] += val : @options[a] << val
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/sprinkle/installers/apt.rb

@@ -31,6 +31,8 @@ module Sprinkle
         super parent, *packages, &block
         @options.reverse_merge!(:dependencies_only => false)
       end
+      
+      attributes :dependencies_only
 
       auto_api
       
@@ -44,8 +46,8 @@ module Sprinkle
 
         def install_commands #:nodoc:
           command = @options[:dependencies_only] ? 'build-dep' : 'install'
-          noninteractive = "env DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive"
-          "#{noninteractive} #{sudo_cmd}apt-get --force-yes -qyu #{command} #{@packages.join(' ')}"
+          noninteractive = "#{sudo_cmd}env DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive"
+          "#{noninteractive} apt-get --force-yes -qyu #{command} #{@packages.join(' ')}"
         end
 
     end

data/lib/sprinkle/installers/binary.rb

@@ -29,13 +29,13 @@ module Sprinkle
         raise 'No installation area defined' unless @options[:prefix]
         raise 'No archive download area defined' unless @options[:archives]
 
-        [ "mkdir -p #{@options[:prefix].first}",
-          "mkdir -p #{@options[:archives].first}" ]
+        [ "mkdir -p #{@options[:prefix]}",
+          "mkdir -p #{@options[:archives]}" ]
       end
 
       def install_commands #:nodoc:
-        commands = [ "bash -c 'wget -cq --directory-prefix=#{@options[:archives].first} #{@binary_archive}'" ]
-        commands << "bash -c \"cd #{@options[:prefix].first} && #{extract_command} '#{@options[:archives].first}/#{archive_name}'\""
+        commands = [ "bash -c 'wget -cq --directory-prefix=#{@options[:archives]} #{@binary_archive}'" ]
+        commands << "bash -c \"cd #{@options[:prefix]} && #{extract_command} '#{@options[:archives]}/#{archive_name}'\""
       end
 
       def archive_name #:nodoc:

data/lib/sprinkle/installers/gem.rb

@@ -41,14 +41,8 @@ module Sprinkle
         super parent, options, &block
         @gem = gem
       end
-
-      def source(location = nil) #:nodoc:
-        # package defines an installer called source so here we specify a method directly
-        # rather than rely on the automatic options processing since packages' method missing
-        # won't be run
-        return @options[:source] unless location
-        @options[:source] = location
-      end
+      
+      attributes :source, :repository, :http_proxy, :build_flags, :version
 
       protected
 

data/lib/sprinkle/installers/installer.rb

@@ -51,7 +51,8 @@ module Sprinkle
     # or post :install. If this is the case, it will be documented on
     # the installation method's corresponding documentation page. 
     class Installer
-      include Sprinkle::Configurable
+      include Sprinkle::Attributes      
+      
       attr_accessor :delivery, :package, :options, :pre, :post #:nodoc:
 
       def initialize(package, options = {}, &block) #:nodoc:
@@ -60,6 +61,8 @@ module Sprinkle
         @pre = {}; @post = {}
         self.instance_eval(&block) if block
       end
+            
+      attributes :prefix, :archives, :builds
       
       class << self
         def subclasses
@@ -67,7 +70,7 @@ module Sprinkle
         end
         
         def api(&block)
-          Sprinkle::Package::Package.class_eval &block
+          Sprinkle::Package::Package.add_api &block
         end
         
         def verify_api(&block)
@@ -88,19 +91,36 @@ module Sprinkle
       end
 
       def escape_shell_arg(str)
-        str.gsub("'", "'\\\\''").gsub("/", "\\\\/").gsub("\n", '\n').gsub('&', '\\\&')
+        str.gsub("'", "'\\\\''").gsub("\n", '\n')
       end
 
-      def pre(stage, *commands)
+      def pre(stage, *commands, &block)
         @pre[stage] ||= []
         @pre[stage] += commands
-        @pre[stage] += [yield] if block_given?
+        @pre[stage] += commands_from_block(block)
       end
 
-      def post(stage, *commands)
+      def post(stage, *commands, &block)
         @post[stage] ||= []
         @post[stage] += commands
-        @post[stage] += [yield] if block_given?
+        @post[stage] += commands_from_block(block) 
+      end
+      
+      def commands_from_block(block)
+        return [] unless block
+        out = nil
+        diff = @package.with_private_install_queue do
+          out = block.call
+        end
+        diff.empty? ? out : diff.map {|x| x.install_sequence }
+      end
+      
+      def method_missing(method, *args, &block)
+        if package.class.installer_methods.include?(method)
+          @package.send(method, *args, &block)
+        else
+          super(method, *args, &block)
+        end
       end
       
       def per_host?
@@ -113,8 +133,6 @@ module Sprinkle
       def announce; end
 
       def process(roles) #:nodoc:
-        assert_delivery
-
         if logger.debug?
           sequence = install_sequence; sequence = sequence.join('; ') if sequence.is_a? Array
           logger.debug "#{@package.name} install sequence: #{sequence} for roles: #{roles}\n"

data/lib/sprinkle/installers/replace_text.rb

@@ -45,8 +45,12 @@ module Sprinkle
 
       protected
       
+        def escape_sed_arg(s)
+          escape_shell_arg(s).gsub("/", "\\\\/").gsub('&', '\\\&')
+        end
+      
         def install_commands #:nodoc:
-          "#{sudo_cmd}sed -i 's/#{escape_shell_arg(@regex)}/#{escape_shell_arg(@text)}/g' #{@path}"
+          "#{sudo_cmd}sed -i 's/#{escape_sed_arg(@regex)}/#{escape_sed_arg(@text)}/g' #{@path}"
         end
 
     end

data/lib/sprinkle/installers/runner.rb

@@ -22,6 +22,10 @@ module Sprinkle
           options = cmds.extract_options!
           install Runner.new(self, cmds, options, &block)
         end
+        
+        def noop(&block)
+          install Runner.new(self, "echo noop", &block)
+        end
       end
       
       attr_accessor :cmds #:nodoc:

data/lib/sprinkle/installers/source.rb

@@ -90,6 +90,9 @@ module Sprinkle
         @source = source
       end
       
+      multi_attributes :enable, :disable, :with, :without, :option, 
+        :custom_install
+      
       def install_sequence #:nodoc:
         prepare + download + extract + configure + build + install
       end
@@ -107,23 +110,23 @@ module Sprinkle
           raise 'No build area defined' unless @options[:builds]
           raise 'No source download area defined' unless @options[:archives]
 
-          [ "mkdir -p #{@options[:prefix].first}",
-            "mkdir -p #{@options[:builds].first}",
-            "mkdir -p #{@options[:archives].first}" ]
+          [ "mkdir -p #{@options[:prefix]}",
+            "mkdir -p #{@options[:builds]}",
+            "mkdir -p #{@options[:archives]}" ]
         end
 
         def download_commands #:nodoc:
-          [ "wget -cq -O '#{@options[:archives].first}/#{archive_name}' #{@source}" ]
+          [ "wget -cq -O '#{@options[:archives]}/#{archive_name}' #{@source}" ]
         end
 
         def extract_commands #:nodoc:
-          [ "bash -c 'cd #{@options[:builds].first} && #{extract_command} #{@options[:archives].first}/#{archive_name}'" ]
+          [ "bash -c 'cd #{@options[:builds]} && #{extract_command} #{@options[:archives]}/#{archive_name}'" ]
         end
 
         def configure_commands #:nodoc:
           return [] if custom_install?
 
-          command = "bash -c 'cd #{build_dir} && ./configure --prefix=#{@options[:prefix].first} "
+          command = "bash -c 'cd #{build_dir} && ./configure --prefix=#{@options[:prefix]} "
 
           extras = {
             :enable  => '--enable', :disable => '--disable',
@@ -152,21 +155,33 @@ module Sprinkle
 
         # REVISIT: must be better processing of custom install commands somehow? use splat operator?
         def custom_install_commands #:nodoc:
-          dress @options[:custom_install], :install
+          dress @options[:custom_install], nil, :install
         end
 
       protected
+      
+        def pre_commands(stage) #:nodoc:
+          dress @pre[stage] || [], :pre, stage
+        end
+
+        def post_commands(stage) #:nodoc:
+          dress @post[stage] || [], :post, stage
+        end
+      
 
         # dress is overriden from the base Sprinkle::Installers::Installer class so that the command changes
         # directory to the build directory first. Also, the result of the command is logged.
-        def dress(commands, stage)
-          commands.collect { |command| "bash -c 'cd #{build_dir} && #{command} >> #{@package.name}-#{stage}.log 2>&1'" }
+        def dress(commands, pre_or_post, stage)
+          chdir = "cd #{build_dir} && "
+          chdir = "" if [:prepare, :download].include?(stage)
+          chdir = "" if stage == :extract and pre_or_post == :pre
+          commands.collect { |command| "bash -c '#{chdir}#{command} >> #{@package.name}-#{stage}.log 2>&1'" }
         end
 
       private
 
         def create_options(key, prefix) #:nodoc:
-          @options[key].first.inject('') { |m, option| m << "#{prefix}-#{option} "; m }
+          @options[key].inject('') { |m, option| m << "#{prefix}-#{option} "; m }
         end
 
         def extract_command #:nodoc:
@@ -195,7 +210,7 @@ module Sprinkle
         end
 
         def build_dir #:nodoc:
-          "#{@options[:builds].first}/#{options[:custom_dir] || base_dir}"
+          "#{@options[:builds]}/#{options[:custom_dir] || base_dir}"
         end
 
         def base_dir #:nodoc:

data/lib/sprinkle/installers/transfer.rb

@@ -158,8 +158,6 @@ module Sprinkle
       end
 
       def process(roles) #:nodoc:
-        assert_delivery
-
         logger.debug "transfer: #{@source} -> #{@destination} for roles: #{roles}\n"
 
         return if Sprinkle::OPTIONS[:testing]

data/lib/sprinkle/installers/user.rb

@@ -29,16 +29,19 @@ module Sprinkle
           end
         end
       end
-      
+
       def initialize(package, username, options = {}, &block) #:nodoc:
         super package, options, &block
         @username = username
       end
-      
+
       protected 
       
       def install_commands #:nodoc:
-        "adduser #{@options[:flags]} #{@username}"
+        noninteractive = "--gecos ,,,"
+        flags = @options[:flags] || ""
+        flags << noninteractive unless flags =~ /--gecos/
+        "adduser #{flags} #{@username}"
       end
     end
   end

data/lib/sprinkle/package.rb

@@ -106,9 +106,17 @@ module Sprinkle
     end
 
     class Package #:nodoc:
-      # include ArbitraryOptions
       attr_accessor :name, :provides, :installers, :verifications
       attr_accessor :args, :opts
+      cattr_reader :installer_methods
+      @@installer_methods = []
+      
+      def self.add_api(&block)
+        before = self.instance_methods
+        self.class_eval &block
+        added = self.instance_methods - before
+        @@installer_methods += added.map(&:to_sym)
+      end
 
       def initialize(name, metadata = {}, &block)
         raise 'No package name supplied' unless name
@@ -166,10 +174,6 @@ module Sprinkle
         raise ContextError, "Cannot call get inside a package, must be inside an Installer block"
       end
       
-      def noop(&block)
-        install Sprinkle::Installers::Runner.new(self, "echo noop", &block)
-      end
-                  
       # meta installer
       # TODO - fix to be atomic
       def push_file(file, options ={}, &block)
@@ -249,6 +253,19 @@ module Sprinkle
       end
 
       def to_s; @name; end
+        
+      # allow an installer to request a private install queue from the package
+      # for example to allow pre and post hooks to have their own installers that
+      # do not mess with the packages installer list
+      # 
+      # returns: the private queue
+      def with_private_install_queue()
+        b = @installers
+        @installers = private_queue =[]
+        yield
+        @installers = b
+        private_queue
+      end
       
     protected
       
@@ -256,7 +273,7 @@ module Sprinkle
         @installers << i
         i
       end
-
+      
     private
       
       def add_dependencies(packages, kind)

data/lib/sprinkle/verify.rb

@@ -59,7 +59,7 @@ module Sprinkle
   #     verify { has_magic_beans('ranch') }
   #   end
   class Verify
-    include Sprinkle::Configurable
+    include Sprinkle::Attributes
     attr_accessor :package, :description, :commands #:nodoc:
     
     class <<self
@@ -69,6 +69,8 @@ module Sprinkle
       end
     end
     
+    attributes :padding
+    
     def initialize(package, description = '', &block) #:nodoc:
       raise 'Verify requires a block.' unless block
       
@@ -82,8 +84,6 @@ module Sprinkle
     end
     
     def process(roles, pre = false) #:nodoc:
-      assert_delivery
-      
       description = @description.empty? ? " (#{@package.name})" : @description
       
       if logger.debug?

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.5.2"
+  Version = "0.6.0"
 end

data/spec/sprinkle/actors/capistrano_spec.rb

@@ -55,7 +55,7 @@ describe Sprinkle::Actors::Capistrano do
       end
 
       it 'should evaluate the block against the actor instance' do
-        @actor.loaded_recipes.should include('cool gear')
+        @actor.loaded_recipes.should == ['cool gear']
       end
 
     end
@@ -63,7 +63,8 @@ describe Sprinkle::Actors::Capistrano do
     describe 'without a block' do
 
       it 'should automatically load the default capistrano configuration' do
-        @cap.should_receive(:load).with('deploy').and_return
+        File.stub!(:exist?).with("Capfile").and_return true
+        @cap.should_receive(:load).with('Capfile').and_return
       end
 
       after do
@@ -77,15 +78,13 @@ describe Sprinkle::Actors::Capistrano do
   describe 'recipes' do
 
     it 'should add the recipe location to an internal store' do
-      @cap = create_cap do
-        recipes 'deploy'
-      end
+      @cap = create_cap { recipes "deploy" }
       @cap.loaded_recipes.should == [ @recipes ]
     end
 
     it 'should load the given recipe' do
       @cap.should_receive(:load).with(@recipes).and_return
-      create_cap
+      @cap = create_cap { recipes "deploy" }
     end
 
   end
@@ -131,6 +130,7 @@ describe Sprinkle::Actors::Capistrano do
       # pretend the package or installer has also added sudo
       @commands =["sudo op1"]
       @cap.stub(:sudo_command).and_return("sudo")
+      @cap.config.stub!(:fetch).and_return(:sudo)
       @cap.unstub!(:run)
       @cap.config.should_receive(:invoke_command).with('op1', :via => :sudo).ordered.and_return
     end
@@ -205,12 +205,13 @@ describe Sprinkle::Actors::Capistrano do
       @cap.config.stub!(:invoke_command).and_return
     end
 
-    it 'should use sudo to invoke commands when so configured' do
-      @cap.config.should_receive(:invoke_command).with('op1', :via => :sudo).ordered.and_return
-      @cap.config.should_receive(:invoke_command).with('op2', :via => :sudo).ordered.and_return
+    it 'should run the supplied commands by default' do
+      @cap.config.should_receive(:invoke_command).with('op1', :via => :run).ordered.and_return
+      @cap.config.should_receive(:invoke_command).with('op2', :via => :run).ordered.and_return
     end
 
-    it 'should run the supplied commands' do
+    it 'should use sudo to invoke commands when so configured' do
+      @cap.config.set :run_method, :sudo
       @cap.config.should_receive(:invoke_command).with('op1', :via => :sudo).ordered.and_return
       @cap.config.should_receive(:invoke_command).with('op2', :via => :sudo).ordered.and_return
     end

data/spec/sprinkle/installers/apt_spec.rb

@@ -50,14 +50,14 @@ describe Sprinkle::Installers::Apt do
       @package = create_pkg "name", :use_sudo => true
       @installer = create_apt 'ruby'
       @install_commands = @installer.send :install_commands
-      @install_commands.should =~ /sudo apt-get/
+      @install_commands.should =~ /sudo env/
     end
     
     it 'should use sudo if installer specifies' do
       @package = create_pkg "name", :use_sudo => false
       @installer = create_apt 'ruby', :sudo => true
       @install_commands = @installer.send :install_commands
-      @install_commands.should =~ /sudo apt-get/
+      @install_commands.should =~ /sudo env/
     end
 
     it 'should invoke the apt installer for all specified packages' do

data/spec/sprinkle/installers/gem_spec.rb

@@ -9,7 +9,7 @@ describe Sprinkle::Installers::Gem do
   end
 
   def create_gem(gem, version = nil, options = {}, &block)
-    @package = mock(Sprinkle::Package, :name => gem, :version => version, :source => nil, :repository => nil)
+    @package = mock(Sprinkle::Package, :name => gem, :version => version)
     Sprinkle::Installers::Gem.new(@package, gem, options, &block)
   end
 

data/spec/sprinkle/installers/installer_spec.rb

@@ -42,19 +42,18 @@ describe Sprinkle::Installers::Installer do
 
       it 'should accept an optional block to customize installers defaults' do
         @installer = create_installer do; prefix '/usr/local'; end
-        @installer.prefix.first.should == '/usr/local'
+        @installer.prefix.should == '/usr/local'
       end
 
       it 'should override any deployment level defaults' do
         @installer = create_installer do; prefix '/usr/local'; end
         @installer.defaults(@deployment)
-        @installer.prefix.first.should == '/usr/local'
+        @installer.prefix.should == '/usr/local'
       end
     end
   end
 
   describe 'during configuration' do
-    # We just check to make sure it has the Sprinkle::Configurable method
     it 'should be configurable' do
       @installer.should respond_to(:defaults)
     end
@@ -126,41 +125,52 @@ describe Sprinkle::Installers::Installer do
     
     describe "with a pre command" do
       
-      def create_installer_with_pre_command(cmd="")
+      def create_installer_with_pre_command(cmd = nil, &block)
         installer = Sprinkle::Installers::Installer.new @package do
-          pre :install, cmd
+          pre :install, cmd if cmd
           
           def install_commands
             ["installer"]
           end          
         end
-        
+        installer.instance_eval &block if block
         installer.stub!(:puts).and_return
         installer.delivery = @delivery
         installer
       end
       before do
         @installer = create_installer_with_pre_command('run')
+        @package.stub!(:installers).and_return []
       end
       describe "string commands" do
         it "should insert the pre command for the specific package in the installation process" do
           @installer.send(:install_sequence).should == [ 'run', 'installer' ]
         end
-      end      
+      end
+      describe "block with their embeded installers" do
+        before(:each) do
+          @package = Package.new("package") do; end
+          @installer = create_installer_with_pre_command do
+            pre :install do
+              runner "b" do
+                pre(:install) { runner "a" }
+                post(:install) { runner "c" }
+              end
+            end
+          end
+        end
+        it "should properly execute pre and post blocks" do
+          @installer.send(:install_sequence).should == [ "a", "b", "c", 'installer' ]
+        end
+      end
       describe "blocks as commands" do
         before(:each) do          
-          @installer = Sprinkle::Installers::Installer.new @package do
+          @package = Package.new("package") do; end
+          @installer = create_installer_with_pre_command do
             pre :install do
               %w(a b c)
             end
-
-            def install_commands
-              ["installer"]
-            end          
           end
-
-          @installer.stub!(:puts).and_return
-          @installer.delivery = @delivery
         end
         it "should be able to store a block if it's the pre command" do
           @installer.send(:install_sequence).should == [ "a", "b", "c", 'installer' ]

data/spec/sprinkle/installers/push_text_spec.rb

@@ -89,6 +89,21 @@ MULTI
     end
   end
   
+  describe 'sending a string with special characters' do
+    
+    it "should not escape an ampersand" do
+      @installer = create_text "bob & lucy", "/dev/mind/the-day-after"
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == %q[/bin/echo -e 'bob & lucy' |tee -a /dev/mind/the-day-after]
+    end
+    
+    it "should not escape a slash" do
+      @installer = create_text "bob/lucy", "/dev/mind/the-day-after"
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == %q[/bin/echo -e 'bob/lucy' |tee -a /dev/mind/the-day-after]
+    end
+  end
+  
   describe 'sending a string with single quotes' do
     before do
       @installer = create_text "I'm a string with a single quote", "/dev/mind/the-day-after"

data/spec/sprinkle/installers/rpm_spec.rb

@@ -47,10 +47,6 @@ describe Sprinkle::Installers::Rpm do
       @installer.send(:install_sequence).should == [ 'op1', 'rpm -Uvh ruby', 'op2' ]
     end
 
-    it 'should install a specific version if defined' do
-      pending
-    end
-
   end
 
 end

data/spec/sprinkle/installers/source_spec.rb

@@ -76,35 +76,35 @@ describe Sprinkle::Installers::Source do
   describe 'customized configuration' do
 
     it 'should support specification of "enable" options' do
-      @installer.enable.first.should == %w( headers ssl deflate so )
+      @installer.enable.should == %w( headers ssl deflate so )
     end
 
     it 'should support specification of "disable" options' do
-      @installer.disable.first.should == %w( cache proxy rewrite )
+      @installer.disable.should == %w( cache proxy rewrite )
     end
 
     it 'should support specification of "with" options' do
-      @installer.with.first.should == %w( debug extras )
+      @installer.with.should == %w( debug extras )
     end
 
     it 'should support specification of "without" options' do
-      @installer.without.first.should == %w( fancyisms pandas )
+      @installer.without.should == %w( fancyisms pandas )
     end
 
     it 'should support specification of "option" options' do
-      @installer.option.first.should == %w( foo bar baz )
+      @installer.option.should == %w( foo bar baz )
     end
 
     it 'should support customized build area' do
-      @installer.prefix.first.should == '/usr/local'
+      @installer.prefix.should == '/usr/local'
     end
 
     it 'should support customized source area' do
-      @installer.archives.first.should == '/usr/local/archives'
+      @installer.archives.should == '/usr/local/archives'
     end
 
     it 'should support customized install area' do
-      @installer.builds.first.should == '/usr/local/builds'
+      @installer.builds.should == '/usr/local/builds'
     end
   end
 
@@ -285,9 +285,16 @@ describe Sprinkle::Installers::Source do
     it 'should run all pre-prepare commands' do
       @commands.each { |k, v| @installer.should_receive(:pre_commands).with(k).and_return(v) }
     end
+    
+    it "should be logged" do
+      pending
+    end
 
     it 'should be run relative to the source build area' do
-      @commands.each { |stage, command| @installer.send(:pre_commands, stage).first.should =~ %r{cd /usr/builds/ruby-1.8.6-p111} }
+      [:prepare, :download, :extract].each { |stage, command| 
+        @installer.send(:pre_commands, stage).first.should_not =~ %r{cd /usr/builds/ruby-1.8.6-p111} }
+      [:configure, :build, :install].each { |stage, command| 
+        @installer.send(:pre_commands, stage).first.should =~ %r{cd /usr/builds/ruby-1.8.6-p111} }
     end
 
     after do
@@ -318,7 +325,10 @@ describe Sprinkle::Installers::Source do
     end
 
     it 'should be run relative to the source build area' do
-      @commands.each { |stage, command| @installer.send(:post_commands, stage).first.should =~ %r{cd /usr/builds/ruby-1.8.6-p111} }
+      [:prepare, :download].each { |stage, command| 
+        @installer.send(:post_commands, stage).first.should_not =~ %r{cd /usr/builds/ruby-1.8.6-p111} }
+      [:extract, :configure, :build, :install].each { |stage, command| 
+        @installer.send(:post_commands, stage).first.should =~ %r{cd /usr/builds/ruby-1.8.6-p111} }
     end
 
     after do

data/spec/sprinkle/installers/user_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+
+describe Sprinkle::Installers::User do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'spec')
+    @user = "bob"
+  end
+
+  def create_user(name, options = {}, &block)
+    Sprinkle::Installers::User.new "spec", name, options, &block
+  end
+
+  describe 'during installation' do
+    
+    it "should invoke add user" do
+      @installer = create_user 'bob'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == "adduser --gecos ,,, bob"
+    end
+    
+    it "should use actual gecos options if passed" do
+      @installer = create_user 'bob', :flags => "--gecos bob,,,"
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == "adduser --gecos bob,,, bob"
+    end
+
+  end
+
+end

data/spec/sprinkle/verify_spec.rb

@@ -140,17 +140,6 @@ describe Sprinkle::Verify do
     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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -169,15 +169,13 @@ files:
 - 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/errors/pretty_failure.rb
 - lib/sprinkle/errors/remote_command_failure.rb
 - lib/sprinkle/errors/transfer_failure.rb
-- lib/sprinkle/extensions/arbitrary_options.rb
 - lib/sprinkle/extensions/array.rb
+- lib/sprinkle/extensions/attributes.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
@@ -235,7 +233,6 @@ files:
 - spec/sprinkle/actors/capistrano_spec.rb
 - spec/sprinkle/actors/local_spec.rb
 - spec/sprinkle/actors/ssh_spec.rb
-- spec/sprinkle/configurable_spec.rb
 - spec/sprinkle/deployment_spec.rb
 - spec/sprinkle/extensions/array_spec.rb
 - spec/sprinkle/extensions/string_spec.rb
@@ -261,6 +258,7 @@ files:
 - spec/sprinkle/installers/source_spec.rb
 - spec/sprinkle/installers/thor_spec.rb
 - spec/sprinkle/installers/transfer_spec.rb
+- spec/sprinkle/installers/user_spec.rb
 - spec/sprinkle/installers/yum_spec.rb
 - spec/sprinkle/installers/zypper_spec.rb
 - spec/sprinkle/package_spec.rb
@@ -300,7 +298,6 @@ test_files:
 - spec/sprinkle/actors/capistrano_spec.rb
 - spec/sprinkle/actors/local_spec.rb
 - spec/sprinkle/actors/ssh_spec.rb
-- spec/sprinkle/configurable_spec.rb
 - spec/sprinkle/deployment_spec.rb
 - spec/sprinkle/extensions/array_spec.rb
 - spec/sprinkle/extensions/string_spec.rb
@@ -326,6 +323,7 @@ test_files:
 - spec/sprinkle/installers/source_spec.rb
 - spec/sprinkle/installers/thor_spec.rb
 - spec/sprinkle/installers/transfer_spec.rb
+- spec/sprinkle/installers/user_spec.rb
 - spec/sprinkle/installers/yum_spec.rb
 - spec/sprinkle/installers/zypper_spec.rb
 - spec/sprinkle/package_spec.rb

data/lib/sprinkle/configurable.rb

@@ -1,32 +0,0 @@
-module Sprinkle
-  #--
-  # TODO: Possible documentation?
-  #++
-  module Configurable #:nodoc:
-    attr_accessor :delivery
-    
-    def defaults(deployment)
-      defaults = deployment.defaults[self.class.name.split(/::/).last.downcase.to_sym]
-      self.instance_eval(&defaults) if defaults
-      @delivery = deployment.style
-    end
-    
-    def assert_delivery
-      raise 'Unknown command delivery target' unless @delivery
-    end
-    
-    def method_missing(sym, *args, &block)
-      unless args.empty? # mutate if not set
-        @options ||= {}
-        @options[sym] = args unless @options[sym]
-      end
-
-      @options[sym] || @package.send(sym, *args, &block) # try the parents options if unknown
-    end
-    
-    # both nil and false should return false
-    def option?(sym)
-      !!@options[sym]
-    end
-  end
-end

data/lib/sprinkle/extensions/arbitrary_options.rb

@@ -1,10 +0,0 @@
-module ArbitraryOptions #:nodoc:
-  def self.included(base)
-    base.alias_method_chain :method_missing, :arbitrary_options
-  end
-  
-  def method_missing_with_arbitrary_options(sym, *args, &block)
-    self.class.dsl_accessor sym
-    send(sym, *args, &block)
-  end
-end

data/lib/sprinkle/extensions/dsl_accessor.rb

@@ -1,15 +0,0 @@
-class Module #:nodoc:
-  def dsl_accessor(*symbols)
-    symbols.each do |sym|
-      class_eval %{
-        def #{sym}(*val)
-          if val.empty?
-            @#{sym}
-          else
-            @#{sym} = val.size == 1 ? val[0] : val
-          end
-        end
-      }
-    end
-  end
-end

data/spec/sprinkle/configurable_spec.rb

@@ -1,47 +0,0 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
-
-describe Sprinkle::Configurable do
-  module MyPrefix
-    class Configurable
-      include Sprinkle::Configurable
-    end
-  end
-  
-  before do
-    @configurable = MyPrefix::Configurable.new
-    @default = Proc.new { }
-    @defaults = { :configurable => @default }
-    @deployment = Object.new
-    @deployment.stub!(:defaults).and_return(@defaults)
-    @deployment.stub!(:style)
-  end
-
-  it 'should be configurable via external defaults' do
-    @configurable.should respond_to(:defaults)
-  end
-
-  it 'should select the defaults for the particular concrete installer class' do
-    @deployment.should_receive(:defaults).and_return(@defaults)
-    @defaults.should_receive(:[]).with(:configurable).and_return(@default)
-  end
-
-  it 'should configure the installer delivery mechansim' do
-    @configurable.should_receive(:instance_eval)
-  end
-
-  it 'should maintain an options hash set arbitrarily via method missing' do
-    @configurable.instance_eval do
-      hsv 'gts'
-    end
-    @configurable.hsv.first.should == 'gts'
-  end
-  
-  it 'should allow the delivery instance variable to be accessed' do
-    @configurable.delivery = "string"
-    @configurable.instance_variable_get(:@delivery).should eql("string")
-  end
-
-  after do
-    @configurable.defaults(@deployment)
-  end
-end