rubber 2.12.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58f8521d2799967f45c6f1abaf6dcc9dad64686c
-  data.tar.gz: 38127a11309bcad6750f8d9a5090c759e75d612b
+  metadata.gz: 331df14a974871cbe3939df12e1ea37fe2d1b625
+  data.tar.gz: fe492705ec10139570c3d151720cc2ced3821730
 SHA512:
-  metadata.gz: 69f3f31d5194d6e80913b36a15dacd05366c55a8c89b0aa058c632c6e0200471e5a09d043f99f418199f9f413038440d93d494ad84d1ba006d0292b7bb34d616
-  data.tar.gz: 13fab7730fbf679659c4229e60fc1ae14a65c1c46e5a73ba00677c1480c94cacd92906ed0f0ba4909a0f4c69533a9365b69cda836e67b556fbd3c0a9b82a9639
+  metadata.gz: a1dbd4058e402bbecd5046810b8a464c54c15010ba6f543a8ccdfc1c285b9847254463be136db7aa8a1b1c9dc10d627a27618578fb1a0aa2ac32abcc50da6daa
+  data.tar.gz: 937f8764da1bd2a9681a954c06bb5cdc81506c896eedc577ff1a247e212fa257451b21472ffd2826992f401b6919a420641ca839258c5ba29a73b1298539d58a

data/CHANGELOG

@@ -1,3 +1,19 @@
+2.12.2 (08/26/2014)
+
+Improvements:
+============
+
+[core] Re-use established SSH connections. <f025bf7>
+[core] Terminate the initial_ssh_user connection when we're done with it. <8981cef>
+[passenger] Upgraded from Passenger 4.0.48 to 4.0.49. <053d97c>
+[passenger_nginx] Upgraded from Passenger 4.0.48 to 4.0.49. <053d97c>
+
+Bug Fixes:
+=========
+
+[core] Fixed an issue using password-based authentication with Capistrano. <c86e82d>
+
+
 2.12.1 (08/19/2014)
 
 Bug Fixes:

data/lib/capistrano/thread_safety_fix.rb

@@ -1,7 +1,7 @@
 require 'capistrano/configuration'
 
 # Overrides a method in Capistrano::Configurations::Connections that has multiple threads writing to a shared hash.
-# While that shared hash is a thread local variable, they the thread is passed as an argument, so all the connection
+# While that shared hash is a thread local variable, the thread is passed as an argument, so all the connection
 # threads are trying to update it at the same time.  This has been observed to cause problems where servers will end
 # up losing their connection objects, messing up all future SSH operations and eventually leading to an error about
 # calling a method on a nil object.
@@ -16,11 +16,9 @@ module Capistrano
     MUTEX = Mutex.new
 
     def safely_establish_connection_to(server, thread, failures=nil)
-      conn = connection_factory.connect_to(server)
-
       MUTEX.synchronize do
         thread[:sessions] ||= {}
-        thread[:sessions][server] ||= conn
+        thread[:sessions][server] ||= connection_factory.connect_to(server)
       end
     rescue Exception => err
       raise unless failures

data/lib/rubber/cloud/vsphere.rb

@@ -284,8 +284,6 @@ module Rubber
             :domain => env.domain,
             :hostName => RbVmomi::VIM::CustomizationFixedName.new(:name => instance_alias))
 
-        puts "Adapters: #{custom_adapter_mapping}"
-
         RbVmomi::VIM::CustomizationSpec.new(:identity => custom_prep,
                                             :globalIPSettings => custom_global_ip_settings,
                                             :nicSettingMap => custom_adapter_mapping)

data/lib/rubber/recipes/rubber.rb

@@ -112,6 +112,13 @@ namespace :rubber do
 
     ssh_options[:keys] = normalized_ssh_keys
     ssh_options[:timeout] = fetch(:ssh_timeout, 5)
+
+    # If we don't explicitly set :auth_methods to nil, they'll be populated with net-ssh's defaults, which don't
+    # work terribly well with Capistrano.  If we set it to nil, Capistrano will use its own defaults.  Moreover,
+    # Capistrano seems to have a bug whereby it will not allow password-based authentication unless its default
+    # auth_methods are used, so we're best off using that unless the methods have already been set explicitly by
+    # the Rubber user elsewhere.
+    ssh_options[:auth_methods] = nil unless ssh_options.has_key?(:auth_methods)
   end
 
 

data/lib/rubber/recipes/rubber/setup.rb

@@ -99,6 +99,12 @@ namespace :rubber do
       _ensure_key_file_present
       _allow_root_ssh
       _disable_password_based_ssh_login if cloud.should_disable_password_based_ssh_login?
+
+      # If the initial_ssh_user is different than the deploy user, we can terminate the SSH connection
+      # because from here on out we'll be connecting as the deploy user.
+      if initial_ssh_user != fetch(:user, nil)
+        teardown_connections_to(sessions.keys)
+      end
     rescue ConnectionError => e
       if e.message =~ /Net::SSH::AuthenticationFailed/
         logger.info "Can't connect as user #{initial_ssh_user} to #{ip}, assuming root allowed"

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.12.1'.freeze
+  VERSION = '2.12.2'.freeze
 end

data/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,4 +1,4 @@
-passenger_version: '1:4.0.48-1~`lsb_release -sc`1'
+passenger_version: '1:4.0.49-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

data/templates/passenger_nginx/config/rubber/rubber-passenger_nginx.yml

@@ -1,4 +1,4 @@
-passenger_version: '1:4.0.48-1~`lsb_release -sc`1'
+passenger_version: '1:4.0.49-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 nginx_log_dir: /mnt/nginx/logs
 passenger_listen_port: 7000

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement