sprinkle 0.7.3 → 0.7.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sprinkle (0.7.2)
+    sprinkle (0.7.3)
       activesupport (>= 2.0.2)
       capistrano (>= 2.5.5)
       erubis (>= 2.7.0)

data/bin/sprinkle

@@ -28,7 +28,7 @@ parser = OptionParser.new do |opts|
 Sprinkle
 ========
 
-http://github.com/crafterm/sprinkle
+http://github.com/sprinkle-tool/sprinkle
 
 Sprinkle is a software provisioning tool you can use to build remote servers with. eg. to
 install a Rails or Merb stack on a brand new slice directly after its been created. It uses

data/lib/sprinkle/actors/ssh.rb

@@ -11,6 +11,7 @@ module Sprinkle
     #     delivery :ssh do
     #       user "rails"
     #       password "leetz"
+    #       port 2222
     #
     #       role :app, "app.myserver.com"
     #     end
@@ -46,7 +47,7 @@ module Sprinkle
       end
             
       def initialize(options = {}, &block) #:nodoc:
-        @options = options.update(:user => 'root')
+        @options = options.update(:user => 'root', :port => 22)
         @roles = {}
         self.instance_eval &block if block
         raise "You must define at least a single role." if @roles.empty?
@@ -90,6 +91,11 @@ module Sprinkle
         @options[:password] = password
       end
 
+      # Set the SSH port
+      def port(port)
+        @options[:port] = port
+      end
+
       def keys(keys)
         @options[:keys] = keys
       end
@@ -231,7 +237,7 @@ module Sprinkle
         end
         
         def ssh_session(host) #:nodoc:
-          connections.start(host, @options[:user], @options.slice(:password, :keys))
+          connections.start(host, @options[:user], @options.slice(:password, :keys, :port))
         end       
 
         def reconnect(host) #:nodoc:

data/lib/sprinkle/installers/deb.rb

@@ -1,7 +1,7 @@
 module Sprinkle
   module Installers
     # The Deb installer installs deb packages sourced from a remote URL
-    # 
+    #
     # == Example Usage
     #
     # Installing the magic_beans deb.
@@ -22,13 +22,13 @@ module Sprinkle
 
         def install_commands #:nodoc:
           [
-					"wget -cq --directory-prefix=/tmp #{@packages.join(' ')}", 
-					"dpkg -i #{@packages.collect{|p| "/tmp/#{package_name(p)}"}.join(" ")}"
-					]
+            "wget -cq --directory-prefix=/tmp #{@packages.join(' ')}",
+            "dpkg -i #{@packages.collect{|p| "/tmp/#{package_name(p)}"}.join(" ")}"
+          ]
         end
-        
+
       private
-      
+
         def package_name(url)
           url.split('/').last
         end

data/lib/sprinkle/installers/file.rb

@@ -87,12 +87,12 @@ module Sprinkle
       end
 
       def setup_source
-        file=Tempfile.new(@package.name.to_s)
-        file.print(@contents)
-        file.close
-        @sourcepath = file.path
+        @file=Tempfile.new(@package.name.to_s)
+        @file.print(@contents)
+        @file.close
+        @sourcepath = @file.path
       end
 
     end
   end
-end
+end

data/lib/sprinkle/installers/npm.rb

@@ -3,7 +3,7 @@ module Sprinkle
       # = Npm package Installed
       #
       # Installs an npm module
-      # 
+      #
       # == Example Usage
       #
       #   package :magic_beans do
@@ -11,32 +11,32 @@ module Sprinkle
       #   end
       #
       #   verify { has_npm 'grunt' }
-  		class Npm < Installer
-        
-  			attr_accessor :package_name
-        
+      class Npm < Installer
+
+        attr_accessor :package_name
+
         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
         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
-  				def install_commands #:nodoc:
-  					"npm install --global #{@package_name}"
-  				end
+        protected
+          def install_commands #:nodoc:
+            "npm install --global #{@package_name}"
+          end
 
-  	end
-	end
+    end
+  end
 end

data/lib/sprinkle/installers/pear.rb

@@ -1,40 +1,39 @@
 module Sprinkle
-  	module Installers
-      # = Pear package installed
-      #
-      # Installs the specified pear package
-      # 
-      # == Example Usage
-      #
-      #   package :php_stuff do
-      #     pear 'PHP_Compat'
-      #     verify { has_pear 'PHP_Compat' }
-      #   end
-  		class Pear < Installer
-  			attr_accessor :package_name
-        
-        api do
-          def pear(package, &block)
-            install Pear.new(self, package, &block)
-          end
-        end
-        
-        verify_api do
-          def has_pear(package)
-            @commands << "pear list | grep \"#{package}\" | grep \"stable\""
-          end
+  module Installers
+    # = Pear package installed
+    #
+    # Installs the specified pear package
+    #
+    # == Example Usage
+    #
+    #   package :php_stuff do
+    #     pear 'PHP_Compat'
+    #     verify { has_pear 'PHP_Compat' }
+    #   end
+    class Pear < Installer
+      attr_accessor :package_name
+
+      api do
+        def pear(package, &block)
+          install Pear.new(self, package, &block)
         end
+      end
 
-  			def initialize(parent, package_name, &block) #:nodoc:
-  				super parent, &block
-  				@package_name = package_name
-  			end
+      verify_api do
+        def has_pear(package)
+          @commands << "pear list | grep \"#{package}\" | grep \"stable\""
+        end
+      end
 
-  			protected
-  				def install_commands #:nodoc:
-  					"pear install --alldeps #{@package_name}"
-  				end
+      def initialize(parent, package_name, &block) #:nodoc:
+        super parent, &block
+        @package_name = package_name
+      end
 
-  		end
-	end
+      protected
+        def install_commands #:nodoc:
+          "pear install --alldeps #{@package_name}"
+        end
+    end
+  end
 end

data/lib/sprinkle/installers/rpm.rb

@@ -3,7 +3,7 @@ module Sprinkle
     # = RPM Package Installer
     #
     # The RPM package installer installs RPM packages.
-    # 
+    #
     # == Example Usage
     #
     # Installing the magic_beans RPM. Its all the craze these days.
@@ -26,7 +26,7 @@ module Sprinkle
       # :call-seq:
       #   rpm(*packages)
       auto_api
-      
+
       verify_api do
         def has_rpm(package)
           @commands << "rpm -qa | grep #{package}"

data/lib/sprinkle/installers/source.rb

@@ -103,7 +103,7 @@ module Sprinkle
 
       multi_attributes :enable, :disable, :with, :without, :option,
         :custom_install
-      attributes :configure_command, :build_command, :install_command
+      attributes :configure_command, :build_command, :install_command, :custom_archive
 
       def install_sequence #:nodoc:
         prepare + download + extract + configure + build + install
@@ -220,11 +220,7 @@ module Sprinkle
         end
 
         def archive_name #:nodoc:
-          name = @source.split('/').last
-          if options[:custom_archive]
-            name = options[:custom_archive]
-            name = name.join if name.is_a? Array
-          end
+          name = options[:custom_archive] || @source.split('/').last
           raise "Unable to determine archive name for source: #{source}, please update code knowledge" unless name
           name
         end

data/lib/sprinkle/package.rb

@@ -118,7 +118,7 @@ module Sprinkle
 
     class Package #:nodoc:
       attr_accessor :name, :provides, :installers, :verifications
-      attr_accessor :args, :opts
+      attr_internal :args, :opts
       cattr_reader :installer_methods
       @@installer_methods = []
       
@@ -177,11 +177,11 @@ module Sprinkle
       end
 
       def args
-        @args ||= []
+        @_args ||= []
       end
       
       def opts
-        @opts ||= defaults.clone
+        @_opts ||= defaults.clone
       end
       
       class ContextError < StandardError #:nodoc:

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.7.3"
+  Version = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec