capistrano-different-password 0.0.1 → 0.0.2

data/README.md

@@ -18,8 +18,9 @@ Or install it yourself as:
 
 ## Usage
 
-#capfile
+*capfile*
 
+```ruby
 require 'capistrano-different-password'
 
 set :user,'user'
@@ -27,6 +28,13 @@ set :password,"PasSworD"
 
 role :admin,"127.0.0.1","127.0.0.2",["127.0.0.3","DifferentPasSwOrd"]
 
+task :sometask,role: :admin do
+  run 'date'
+end
+```
+
+cap sometask
+
 ## Contributing
 
 1. Fork it

data/lib/capistrano-different-password.rb

@@ -1,69 +1,71 @@
 require "capistrano-different-password/version"
 
-class ::Capistrano::ServerDefinition
-  attr_reader :password
-  def initialize(server, options={})
-    if server.is_a? Array
-      @password = server[1]
-      server = server[0]
-    end
-    @user, @host, @port = server.match(/^(?:([^;,:=]+)@|)(.*?)(?::(\d+)|)$/)[1,3]
+module ::Capistrano
+  class ServerDefinition
+    attr_reader :password
+    def initialize(server, options={})
+      if server.is_a? Array
+        @password = server[1]
+        server = server[0]
+      end
+      @user, @host, @port = server.match(/^(?:([^;,:=]+)@|)(.*?)(?::(\d+)|)$/)[1,3]
 
-    @options = options.dup
-    user_opt, port_opt = @options.delete(:user), @options.delete(:port)
+      @options = options.dup
+      user_opt, port_opt = @options.delete(:user), @options.delete(:port)
 
-    @user ||= user_opt
-    @port ||= port_opt
+      @user ||= user_opt
+      @port ||= port_opt
 
-    @port = @port.to_i if @port
+      @port = @port.to_i if @port
+    end
   end
-end
 
-class ::Capistrano::SSH
-  def self.connection_strategy(server, options={}, &block)
-    methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
-    password_value = nil
+  class SSH
+    def self.connection_strategy(server, options={}, &block)
+      methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
+      password_value = nil
 
-    # construct the hash of ssh options that should be passed more-or-less
-    # directly to Net::SSH. This will be the general ssh options, merged with
-    # the server-specific ssh-options.
-    ssh_options = (options[:ssh_options] || {}).merge(server.options[:ssh_options] || {})
+      # construct the hash of ssh options that should be passed more-or-less
+      # directly to Net::SSH. This will be the general ssh options, merged with
+      # the server-specific ssh-options.
+      ssh_options = (options[:ssh_options] || {}).merge(server.options[:ssh_options] || {})
 
-    # load any SSH configuration files that were specified in the SSH options. This
-    # will load from ~/.ssh/config and /etc/ssh_config by default (see Net::SSH
-    # for details). Merge the explicitly given ssh_options over the top of the info
-    # from the config file.
-    ssh_options = Net::SSH.configuration_for(server.host, ssh_options.fetch(:config, true)).merge(ssh_options)
+      # load any SSH configuration files that were specified in the SSH options. This
+      # will load from ~/.ssh/config and /etc/ssh_config by default (see Net::SSH
+      # for details). Merge the explicitly given ssh_options over the top of the info
+      # from the config file.
+      ssh_options = Net::SSH.configuration_for(server.host, ssh_options.fetch(:config, true)).merge(ssh_options)
 
-    # Once we've loaded the config, we don't need Net::SSH to do it again.
-    ssh_options[:config] = false
+      # Once we've loaded the config, we don't need Net::SSH to do it again.
+      ssh_options[:config] = false
 
-    ssh_options[:verbose] = :debug if options[:verbose] && options[:verbose] > 0
+      ssh_options[:verbose] = :debug if options[:verbose] && options[:verbose] > 0
 
-    user = server.user || options[:user] || ssh_options[:username] ||
-      ssh_options[:user] || ServerDefinition.default_user
-    port = server.port || options[:port] || ssh_options[:port]
+      user = server.user || options[:user] || ssh_options[:username] ||
+        ssh_options[:user] || ServerDefinition.default_user
+      port = server.port || options[:port] || ssh_options[:port]
 
-    # the .ssh/config file might have changed the host-name on us
-    host = ssh_options.fetch(:host_name, server.host) 
+      # the .ssh/config file might have changed the host-name on us
+      host = ssh_options.fetch(:host_name, server.host) 
 
-    ssh_options[:port] = port if port
+      ssh_options[:port] = port if port
 
-    # delete these, since we've determined which username to use by this point
-    ssh_options.delete(:username)
-    ssh_options.delete(:user)
+      # delete these, since we've determined which username to use by this point
+      ssh_options.delete(:username)
+      ssh_options.delete(:user)
 
-    begin
-      connection_options = ssh_options.merge(
-        :password => password_value,
-        :auth_methods => ssh_options[:auth_methods] || methods.shift
-      )
+      begin
+        connection_options = ssh_options.merge(
+          :password => password_value,
+          :auth_methods => ssh_options[:auth_methods] || methods.shift
+        )
 
-      yield host, user, connection_options
-    rescue Net::SSH::AuthenticationFailed
-      raise if methods.empty? || ssh_options[:auth_methods]
-      password_value = server.password || options[:password]
-      retry
+        yield host, user, connection_options
+      rescue Net::SSH::AuthenticationFailed
+        raise if methods.empty? || ssh_options[:auth_methods]
+        password_value = server.password || options[:password]
+        retry
+      end
     end
   end
 end

data/lib/capistrano-different-password/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Different
     module Password
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-different-password
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies: []
 description: This gem make you can use different password with capistrano.
 email:
@@ -51,4 +51,3 @@ signing_key:
 specification_version: 3
 summary: This gem make you can use different password with capistrano.
 test_files: []
-has_rdoc: