kitchen-vagrant 0.7.3 → 0.7.4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.4 / 2013-03-28
+
+### Improvements
+
+* Drop `vagrant ssh -c` & communicate directly via SSH. ([@fnichol][])
+
+
 ## 0.7.3 / 2013-03-28
 
 ### Bug fixes

data/kitchen-vagrant.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'test-kitchen', '~> 1.0.0.alpha.1'
+  gem.add_dependency 'test-kitchen', '~> 1.0.0.alpha.2'
 
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'tailor'

data/lib/kitchen/driver/vagrant.rb

@@ -39,45 +39,40 @@ module Kitchen
       no_parallel_for :create, :destroy
 
       def create(state)
-        state[:hostname] = instance.name
-        create_vagrantfile(state)
+        create_vagrantfile
         run "vagrant up --no-provision"
-        info("Vagrant instance <#{state[:hostname]}> created.")
+        set_ssh_state(state)
+        info("Vagrant instance #{instance.to_str} created.")
       end
 
       def converge(state)
-        create_vagrantfile(state)
+        create_vagrantfile
         ssh_args = build_ssh_args(state)
         install_omnibus(ssh_args) if config[:require_chef_omnibus]
         run "vagrant provision"
       end
 
       def setup(state)
-        create_vagrantfile(state)
+        create_vagrantfile
         super
       end
 
       def verify(state)
-        create_vagrantfile(state)
+        create_vagrantfile
         super
       end
 
       def destroy(state)
         return if state[:hostname].nil?
 
-        create_vagrantfile(state)
+        create_vagrantfile
         @vagrantfile_created = false
         run "vagrant destroy -f"
         FileUtils.rm_rf(vagrant_root)
-        info("Vagrant instance <#{state[:hostname]}> destroyed.")
+        info("Vagrant instance #{instance.to_str} destroyed.")
         state.delete(:hostname)
       end
 
-      def login_command(state)
-        create_vagrantfile(state)
-        LoginCommand.new(%W{vagrant ssh}, :chdir => vagrant_root)
-      end
-
       def verify_dependencies
         check_vagrant_version
         check_berkshelf_plugin
@@ -88,10 +83,6 @@ module Kitchen
       WEBSITE = "http://downloads.vagrantup.com/"
       MIN_VER = "1.1.0"
 
-      def ssh(ssh_args, cmd)
-        run %{vagrant ssh --command '#{cmd}'}
-      end
-
       def run(cmd, options = {})
         cmd = "echo #{cmd}" if config[:dry_run]
         run_command(cmd, { :cwd => vagrant_root }.merge(options))
@@ -108,11 +99,11 @@ module Kitchen
         )
       end
 
-      def create_vagrantfile(state)
+      def create_vagrantfile
         return if @vagrantfile_created
 
         vagrantfile = File.join(vagrant_root, "Vagrantfile")
-        debug("Creating Vagrantfile for <#{state[:hostname]}> (#{vagrantfile})")
+        debug("Creating Vagrantfile for #{instance.to_str} (#{vagrantfile})")
         FileUtils.mkdir_p(vagrant_root)
         File.open(vagrantfile, "wb") { |f| f.write(creator.render) }
         @vagrantfile_created = true
@@ -122,6 +113,24 @@ module Kitchen
         Kitchen::Vagrant::VagrantfileCreator.new(instance, config)
       end
 
+      def set_ssh_state(state)
+        hash = vagrant_ssh_config
+
+        state[:hostname] = hash["HostName"]
+        state[:username] = hash["User"]
+        state[:ssh_key] = hash["IdentityFile"]
+        state[:port] = hash["Port"]
+      end
+
+      def vagrant_ssh_config
+        output = run("vagrant ssh-config", :live_stream => nil)
+        lines = output.split("\n").map do |line|
+          tokens = line.strip.partition(" ")
+          [tokens.first, tokens.last.gsub(/"/, '')]
+        end
+        Hash[lines]
+      end
+
       def vagrant_version
         version_string = silently_run("vagrant --version")
         version_string = version_string.chomp.split(" ").last

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "0.7.3"
+    VAGRANT_VERSION = "0.7.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.1
+        version: 1.0.0.alpha.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.1
+        version: 1.0.0.alpha.2
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -151733166854554987
+      hash: 1825624288279070212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -151733166854554987
+      hash: 1825624288279070212
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24