sprinkle 0.7.4 → 0.7.5

data/lib/sprinkle/installers/npm.rb

@@ -1,41 +1,42 @@
 module Sprinkle
-  	module Installers
-      # = Npm package Installed
-      #
-      # Installs an npm module
-      #
-      # == Example Usage
-      #
-      #   package :magic_beans do
-      #     npm 'grunt'
-      #   end
-      #
-      #   verify { has_npm 'grunt' }
-      class Npm < Installer
+  module Installers
+    # = Npm package Installed
+    #
+    # Installs an npm module
+    #
+    # == Example Usage
+    #
+    #   package :magic_beans do
+    #     npm 'grunt'
+    #   end
+    #
+    #   verify { has_npm 'grunt' }
+    class Npm < Installer
 
-        attr_accessor :package_name
+      attr_accessor :package_name
 
-        api do
-          def npm(package, &block)
-            install Npm.new(self, package, &block)
-          end
+      api do
+        def npm(package, &block)
+          install Npm.new(self, package, &block)
         end
+      end
 
-        verify_api do
-          def has_npm(package)
-            @commands << "npm --global list | grep \"#{package}@\""
-          end
+      verify_api do
+        def has_npm(package)
+          @commands << "npm --global list | grep \"#{package}@\""
         end
+      end
 
-        def initialize(parent, package_name, &block) #:nodoc:
-          super parent, &block
-          @package_name = package_name
-        end
+      def initialize(parent, package_name, &block) #:nodoc:
+        super parent, &block
+        @package_name = package_name
+      end
+
+    protected
 
-        protected
-          def install_commands #:nodoc:
-            "npm install --global #{@package_name}"
-          end
+      def install_commands #:nodoc:
+        "npm install --global #{@package_name}"
+      end
 
     end
   end

data/lib/sprinkle/installers/source.rb

@@ -88,7 +88,7 @@ module Sprinkle
 
     class Source < Installer
       attr_accessor :source #:nodoc:
-      
+
       api do
         def source(source, options = {}, &block)
           recommends :build_essential # Ubuntu/Debian
@@ -171,15 +171,15 @@ module Sprinkle
         end
 
       protected
-      
+
         def with_log(cmd, stage)
           "#{cmd} > #{@package.name}-#{stage}.log 2>&1"
         end
-      
+
         def in_build_dir(cmd)
           "bash -c 'cd #{build_dir} && #{cmd}'"
         end
-      
+
         def pre_commands(stage) #:nodoc:
           dress @pre[stage] || [], :pre, stage
         end
@@ -187,7 +187,7 @@ module Sprinkle
         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.
@@ -195,7 +195,7 @@ module Sprinkle
           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'" }
+          flatten(commands).collect { |command| "bash -c '#{chdir}#{command} >> #{@package.name}-#{stage}.log 2>&1'" }
         end
 
       private

data/lib/sprinkle/installers/user.rb

@@ -1,7 +1,7 @@
 module Sprinkle
   module Installers
     # The user installer add users.  You may pass :flags as an option.
-    # 
+    #
     # == Example Usage
     #
     #   package :users do
@@ -12,13 +12,13 @@ module Sprinkle
     #     end
     #   end
     class User < Installer
-      
+
       api do
         def add_user(username, options={},  &block)
           install User.new(self, username, options, &block)
         end
       end
-      
+
       verify_api do
         def has_user(user, opts = {})
           if opts[:in_group]
@@ -34,14 +34,15 @@ module Sprinkle
         @username = username
       end
 
-      protected 
-      
+    protected
+
       def install_commands #:nodoc:
         noninteractive = " --gecos ,,,"
         flags = @options[:flags] || ""
         flags << noninteractive unless flags =~ /--gecos/
-        "adduser #{flags} #{@username}"
+        "#{sudo_cmd}adduser #{flags.strip} #{@username}"
       end
+
     end
   end
 end

data/lib/sprinkle/package.rb

@@ -20,7 +20,7 @@ module Sprinkle
   # 'ruby' being availble. Pretty simple, right?
   #
   # <b>Note:</b> Defining a package does not INSTALL it. To install a
-  # package, you must require it in a Sprinkle::Policy block. 
+  # package, you must require it in a Sprinkle::Policy block.
   #
   # == Pre-Requirements
   #
@@ -53,11 +53,11 @@ module Sprinkle
   #
   # == Verifications
   #
-  # Most of the time its important to know whether the software you're 
+  # Most of the time its important to know whether the software you're
   # attempting to install was installed successfully or not. For this,
   # Sprinkle provides verifications. Verifications are one or more blocks
   # which define rules with which Sprinkle can check if it installed
-  # the package successfully. If these verification blocks fail, then 
+  # the package successfully. If these verification blocks fail, then
   # Sprinkle will gracefully stop the entire process. An example below:
   #
   #   package :rubygems do
@@ -89,9 +89,9 @@ module Sprinkle
   #
   # The :provides option allows you to reference this package either by :sqlite3
   # or by :database. But whereas the package name is unique, multiple packages may
-  # share the same provision. If this is the case, when running Sprinkle, the 
+  # share the same provision. If this is the case, when running Sprinkle, the
   # script will ask you which provision you want to install. At this time, you
-  # can only install one. 
+  # can only install one.
   #
   # == Meta-Packages
   #
@@ -107,7 +107,7 @@ module Sprinkle
   # FIXME: Should probably document recommendations.
   #++
   module Package
-    
+
     PACKAGES = PackageRepository.new
 
     def package(name, metadata = {}, &block)
@@ -117,16 +117,16 @@ module Sprinkle
     end
 
     class Package #:nodoc:
-      attr_accessor :name, :provides, :installers, :verifications
+      attr_accessor :name, :provides, :verifications
       attr_internal :args, :opts
       cattr_reader :installer_methods
       @@installer_methods = []
-      
+
       include Rendering
-      
+
       def self.add_api(&block)
         before = self.instance_methods
-        self.class_eval &block
+        self.class_eval(&block)
         added = self.instance_methods - before
         @@installer_methods += added.map(&:to_sym)
       end
@@ -141,33 +141,35 @@ module Sprinkle
         @recommends = []
         @optional = []
         @verifications = []
-        @installers = []
+        @install_queues ||= [[]]
         @block = block
+        @use_sudo = false
+        @version = nil
         # this should probably not be done twice
-        self.instance_eval &block
+        self.instance_eval(&block)
       end
-      
+
       def description(s=nil)
         s ? @description = s : @description
       end
-      
+
       def version(s=nil)
         s ? @version = s : @version
       end
-      
+
       def instance(*args)
         p=Package.new(name, @metadata) {}
         p.opts = defaults.merge(args.extract_options!)
         p.args = args
         p.instance_variable_set("@block", @block)
-        p.instance_eval &@block
+        p.instance_eval(&@block)
         p
       end
-      
+
       def sudo?
         @use_sudo
       end
-      
+
       def use_sudo(flag=true)
         @use_sudo = flag
       end
@@ -179,69 +181,69 @@ module Sprinkle
       def args
         @_args ||= []
       end
-      
+
       def opts
         @_opts ||= defaults.clone
       end
-      
+
       class ContextError < StandardError #:nodoc:
       end
-      
+
       def get(x)
         raise ContextError, "Cannot call get inside a package, must be inside an Installer block"
       end
-      
+
       # TODO - remove
       def push_file(file, options ={}, &block)
         ActiveSupport::Deprecation.warn("push_file is depreciated and will be removed in v0.9.  Use the new `file` installer instead.")
         raise "need content" unless options[:content]
         runner "#{"sudo " if sudo?}rm -f #{file}"
-        push_text options[:content], file, options, &block
+        push_text(options[:content], file, options, &block)
       end
-                  
+
       def verify(description = '', &block)
         @verifications << Sprinkle::Verify.new(self, description, &block)
       end
-      
+
       def process(deployment, roles)
         logger.info "  * #{name}"
         return if meta_package?
-        opts.each_with_index do |(k, v), index| 
+        opts.each_with_index do |(k, v), index|
           branch = (index == opts.size - 1) ? "└" : "├"
-          logger.debug "    #{branch}─ #{k}: #{v}" 
+          logger.debug "    #{branch}─ #{k}: #{v}"
         end
-        
+
         # Run a pre-test to see if the software is already installed. If so,
         # we can skip it, unless we have the force option turned on!
         unless @verifications.empty? || Sprinkle::OPTIONS[:force]
           begin
             process_verifications(deployment, roles, true)
-            
+
             logger.info "    --> already installed for roles: #{roles}"
             return
-          rescue Sprinkle::VerificationFailed => e
+          rescue Sprinkle::VerificationFailed
             # Continue
           end
         end
 
-        @installers.each do |installer|
+        installers.each do |installer|
           installer.defaults(deployment)
           installer.process(roles)
         end
-        
+
         process_verifications(deployment, roles)
         logger.info "    --> INSTALLED for roles: #{roles}"
       end
-      
+
       def process_verifications(deployment, roles, pre = false)
         return if @verifications.blank?
-        
+
         if pre
           logger.debug "--> Checking if #{self.name} is already installed for roles: #{roles}"
         else
           logger.debug "--> Verifying #{self.name} was properly installed for roles: #{roles}"
         end
-        
+
         @verifications.each do |v|
           v.defaults(deployment)
           v.process(roles)
@@ -259,11 +261,11 @@ module Sprinkle
       def optional(*packages)
         add_dependencies packages, :optional
       end
-      
+
       def dependencies
         @dependencies.map {|a,b| a }
       end
-      
+
       def tree(depth = 1, &block)
         packages = []
         packages << tree_for_packages(@recommends, :depth => depth, &block)
@@ -276,29 +278,31 @@ module Sprinkle
       def to_s
         "#{@name} #{@version}".strip
       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 =[]
+        @install_queues.push []
         yield
-        @installers = b
-        private_queue
+        @install_queues.pop
       end
-      
+
+      def installers
+        @install_queues.last
+      end
+
     protected
-      
+
       def install(i)
-        @installers << i
+        installers << i
         i
       end
-      
+
     private
-      
+
       def add_dependencies(packages, kind)
         opts = packages.extract_options!
         depends = instance_variable_get("@#{kind}")
@@ -307,7 +311,7 @@ module Sprinkle
         end
         depends.map {|a,b| a }
       end
-      
+
       def tree_for_packages(packages, opts={}, &block)
         depth = opts[:depth]
         tree = []
@@ -322,13 +326,13 @@ module Sprinkle
         end
         tree
       end
-      
+
         def cloud_info(message)
           logger.info(message) if Sprinkle::OPTIONS[:cloud] or logger.debug?
         end
 
         def meta_package?
-          @installers.blank?
+          installers.blank?
         end
     end
   end

data/lib/sprinkle/package/chooser.rb

@@ -1,12 +1,13 @@
 module Sprinkle::Package
   class Chooser #:nodoc:
+
     def self.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)
+          menu.choices( *packages.collect(&:to_s) )
         end
         package = Sprinkle::Package::PACKAGES.first(package)
       end
@@ -15,10 +16,10 @@ module Sprinkle::Package
 
       package
     end
-    
+
     def self.cloud_info(message)
       logger.info(message) if Sprinkle::OPTIONS[:cloud] or logger.debug?
     end
-    
+
   end
-end
+end