rubber 2.15.2 → 2.16.0

data/.travis.yml

@@ -12,6 +12,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
   - ruby-head
   - jruby-18mode
   - jruby-19mode
@@ -30,6 +31,8 @@ matrix:
       gemfile: Gemfile.1.8.7
     - rvm: 2.1
       gemfile: Gemfile.1.8.7
+    - rvm: 2.2
+      gemfile: Gemfile.1.8.7
     - rvm: ruby-head
       gemfile: Gemfile.1.8.7
     - rvm: jruby-18mode
@@ -46,7 +49,6 @@ matrix:
     - rvm: 1.8.7
     - rvm: 1.9.2
     - rvm: jruby-18mode
-    - rvm: jruby-head
     - rvm: ruby-head
 
 # script: bundle exec rspec spec

data/CHANGELOG

@@ -1,3 +1,21 @@
+2.16.0 (02/23/2015)
+
+New Features:
+============
+
+[base, core] Added an option to make debugging net-ssh issues much easier. <ae96cfa>
+
+Improvements:
+============
+
+[core] Default to VMXNET 3 Ethernet driver for vSphere. <853fba6>
+
+Bug Fixes:
+=========
+
+[core] Fixed a compatibility issue with net-ssh 2.9.2. <246dbb5>
+
+
 2.15.2 (01/20/2015)
 
 Improvements:

data/lib/rubber/cloud/vsphere.rb

@@ -87,8 +87,8 @@ module Rubber
         # just start fresh and guarantee everything works as intended.
         server.interfaces.each(&:destroy)
 
-        server.interfaces.create(:network => env.public_network_name) if host_env.public_nic
-        server.interfaces.create(:network => env.private_network_name) if host_env.private_nic
+        server.interfaces.create(:network => env.public_network_name, :type => 'VirtualVmxnet3') if host_env.public_nic
+        server.interfaces.create(:network => env.private_network_name, :type => 'VirtualVmxnet3') if host_env.private_nic
 
         vm_ref = compute_provider.send(:get_vm_ref, server.id)
         vm_ref.CustomizeVM_Task(:spec => customization_spec(instance_alias, nics))

data/lib/rubber/recipes/rubber.rb

@@ -121,6 +121,15 @@ namespace :rubber do
     # 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)
+
+    # Starting with net-ssh 2.9.2, net-ssh will block on a password prompt if a nil password is supplied.  This
+    # breaks our discovery and retry logic.  To return to the old behavior, we can set set the number of password
+    # prompts to 0.  We handle password prompts directly ourselves, using Capistrano's helpers, so this is a
+    # safe thing to do.
+    ssh_options[:number_of_password_prompts] = 0
+
+    # Set the net-ssh log level.
+    ssh_options[:verbose] = fetch(:ssh_log_level, :warn)
   end
 
 

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.15.2'.freeze
+  VERSION = '2.16.0'.freeze
 end

data/templates/base/config/deploy.rb

@@ -25,6 +25,11 @@ set :password, nil
 # This way exposed services (mongrel) aren't running as a privileged user
 set :use_sudo, true
 
+# If you're having troubles connecting to your server, uncommenting this
+# line will give you more verbose logging output from net-ssh, which will
+# make debugging the problem much easier.
+#set :ssh_log_level, :debug
+
 # How many old releases should be kept around when running "cleanup" task
 set :keep_releases, 3
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -732,7 +732,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2995328333689113757
+      hash: 3842651331565498107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -741,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2995328333689113757
+      hash: 3842651331565498107
 requirements: []
 rubyforge_project: rubber
 rubygems_version: 1.8.23.2