vagrant 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/vagrant/ssh.rb

@@ -42,6 +42,9 @@ module Vagrant
     # Opens an SSH connection to this environment's virtual machine and yields
     # a Net::SSH object which can be used to execute remote commands.
     def execute(opts={})
+      # Check the key permissions to avoid SSH hangs
+      check_key_permissions(env.config.ssh.private_key_path)
+
       Net::SSH.start(env.config.ssh.host,
                      env.config[:ssh][:username],
                      opts.merge( :port => port,

data/test/vagrant/ssh_test.rb

@@ -85,6 +85,14 @@ class SshTest < Test::Unit::TestCase
   context "executing ssh commands" do
     setup do
       mock_ssh
+      @ssh.stubs(:check_key_permissions)
+    end
+
+    should "check key permissions then attempt to start connection" do
+      seq = sequence("seq")
+      @ssh.expects(:check_key_permissions).with(@env.config.ssh.private_key_path).once.in_sequence(seq)
+      Net::SSH.expects(:start).once.in_sequence(seq)
+      @ssh.execute
     end
 
     should "call net::ssh.start with the proper names" do
@@ -123,6 +131,7 @@ class SshTest < Test::Unit::TestCase
   context "checking if host is up" do
     setup do
       mock_ssh
+      @ssh.stubs(:check_key_permissions)
     end
 
     should "return true if SSH connection works" do

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-05-21}
   s.default_executable = %q{vagrant}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -07:00
+date: 2010-05-21 00:00:00 -07:00
 default_executable: vagrant
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: virtualbox
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -30,12 +28,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
+  requirement: *id001
+  prerelease: false
+  name: virtualbox
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,12 +42,12 @@ dependencies:
         - 0
         - 19
         version: 2.0.19
+  requirement: *id002
+  prerelease: false
+  name: net-ssh
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: net-scp
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,12 +56,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+  requirement: *id003
+  prerelease: false
+  name: net-scp
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -72,12 +70,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
+  requirement: *id004
+  prerelease: false
+  name: json
   type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -86,12 +84,12 @@ dependencies:
         - 5
         - 2
         version: 0.5.2
+  requirement: *id005
+  prerelease: false
+  name: archive-tar-minitar
   type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mario
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -100,8 +98,10 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
+  requirement: *id006
+  prerelease: false
+  name: mario
   type: :runtime
-  version_requirements: *id006
 description: Vagrant is a tool for building and distributing virtualized development environments.
 email: 
 - mitchell.hashimoto@gmail.com