sprinkle 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Add support for specifying the Net::SSH keys property
+
+    *Chris Kimpton*
+
 *   push_text was escaping & and / when it should not be
 
     *Stefano Diem Benatti*

data/lib/sprinkle/actors/ssh.rb

@@ -16,6 +16,18 @@ module Sprinkle
     #   end
     #
     #
+    # == Use ssh key file
+    #
+    #   deployment do
+    #     delivery :ssh do
+    #       user "sprinkle"
+    #       keys "/path/to/ssh/key/file" # passed directly to Net::SSH as :keys option
+    #
+    #       role :app, "app.myserver.com"
+    #     end
+    #   end
+    #
+    #
     # == Working thru a gateway
     #
     # If you're behind a firewall and need to use a SSH gateway that's fine.
@@ -87,6 +99,10 @@ module Sprinkle
         @options[:password] = password
       end
 
+      def keys(keys)
+        @options[:keys] = keys
+      end
+
       # Set this to true to prepend 'sudo' to every command.
       def use_sudo(value=true)
         @options[:use_sudo] = value
@@ -175,7 +191,7 @@ module Sprinkle
             if res != 0 
               fail=SSHCommandFailure.new
               fail.details = @log_recorder.hash.merge(:hosts => host)
-              raise fail, "#{cmd} failed with error code #{res[:code]}"
+              raise fail
             end
           end
           true
@@ -243,7 +259,7 @@ module Sprinkle
           if @gateway
             gateway.ssh(host, @options[:user])
           else
-            @connection_cache.start(host, @options[:user],:password => @options[:password])
+            @connection_cache.start(host, @options[:user],:password => @options[:password], :keys => @options[:keys])
           end
         end        
         

data/lib/sprinkle/installers/user.rb

@@ -38,7 +38,7 @@ module Sprinkle
       protected 
       
       def install_commands #:nodoc:
-        noninteractive = "--gecos ,,,"
+        noninteractive = " --gecos ,,,"
         flags = @options[:flags] || ""
         flags << noninteractive unless flags =~ /--gecos/
         "adduser #{flags} #{@username}"

data/lib/sprinkle/verifiers/executable.rb

@@ -30,6 +30,7 @@ module Sprinkle
         else
           @commands << "[ -n \"`echo \\`which #{path}\\``\" ]"
         end
+        @commands << "which #{path}"
       end
 
       # Same as has_executable but with checking for e certain version number.

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/installers/user_spec.rb

@@ -16,7 +16,13 @@ describe Sprinkle::Installers::User do
     it "should invoke add user" do
       @installer = create_user 'bob'
       @install_commands = @installer.send :install_commands
-      @install_commands.should == "adduser --gecos ,,, bob"
+      @install_commands.should == "adduser  --gecos ,,, bob"
+    end
+    
+    it "should merge flags" do
+      @installer = create_user 'bob', :flags => "-x"
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == "adduser -x --gecos ,,, bob"
     end
     
     it "should use actual gecos options if passed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec