vagrant-vsphere 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a231dfcaaf57127cede0935e62278c1ae717766
-  data.tar.gz: 3ad278c2ac87efa2ab9512f4d74de409f3a77a4d
+  metadata.gz: a02c9f4ac97953016ac3fac92a14e7efbcc5b673
+  data.tar.gz: 038f06bf972ccfcd6692b642b91f3922b8d9a618
 SHA512:
-  metadata.gz: 1994fa10f6089e1fe7d8b467309d4eac536e4ce8ac5dd36b6a5d96c3150788c82884e83c572d4319438a0c47b684fe49c4839b8e05a1116980e9c054d80f3585
-  data.tar.gz: 3c77272430482f123001170f8ec34e31b338247620bcacd0ca2ae320f3ba3dc7d416c0a3685004854960f59bef3b6187b1854ea70331bc1d9d6570b327269546
+  metadata.gz: 347b867ae7551d99311daab235e410ff51e372aabdedd5c2e5c83418050e43dee02c4d516d5c91b74e6ae22bd50d1ed8c80f96882ee22bd3c411df4d91b80c06
+  data.tar.gz: 93e5f3aef54aa2f63a861767469500a2b8219edfbd3296bbf42a8dbb447f0554df347dcaf5b7589a7739a6237109b04c99e0bc9058e53751039adf0298558f22

data/.gitignore

@@ -3,4 +3,5 @@
 Vagrantfile
 pkg/*
 *.box
-Gemfile.lock
+Gemfile.lock
+/vendor/

data/Gemfile

@@ -8,6 +8,6 @@ group :development do
   # Vagrant environment itself using `vagrant plugin`.
 
 ruby "2.0.0"
-gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.5.0'
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.3'
 
 end

data/README.md

@@ -1,20 +1,20 @@
 # Vagrant vSphere Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.5+ plugin that adds a [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
+This is a [Vagrant](http://www.vagrantup.com) 1.6.3+ plugin that adds a [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
 provider to Vagrant, allowing Vagrant to control and provision machines using VMware. New machines are created from virtual machines or templates which must be configured prior to using using this provider.
 
 This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi) Ruby interface to the vSphere API.
 
 ## Requirements
-* Vagrant 1.5+
+* Vagrant 1.6.3+
 * VMware + vSphere API
 * Ruby 1.9+
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**0.8.5**
+**0.9.0**
 
-vagrant-vsphere (0.8.5) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (0.9.0) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -165,7 +165,9 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * Use root resource pool when cloning from template [#63: matt-richardson:support-resource-pools-on-vsphere-standard-edition](https://github.com/nsidc/vagrant-vsphere/pull/63)
 * 0.8.5
   * fixed synced folders to work with WinRM communicator [#72 10thmagnitude:master](https://github.com/nsidc/vagrant-vsphere/pull/72)
-
+* 0.9.0
+  * increases Vagrant requirements to 1.6.3+
+  * Supports differentiating between SSH/WinRM communicator [#67 marnovdm:feature/waiting-for-winrm](https://github.com/nsidc/vagrant-vsphere/pull/67)
 
 
 

data/lib/vSphere/util/machine_helpers.rb

@@ -3,7 +3,12 @@ module VagrantPlugins
     module Util
       module MachineHelpers
         def wait_for_ssh(env)
-          env[:ui].info(I18n.t("vsphere.waiting_for_ssh"))
+          if not env[:machine].config.vm.communicator.nil? and env[:machine].config.vm.communicator == :winrm
+            env[:ui].info(I18n.t("vsphere.waiting_for_winrm"))
+          else
+            env[:ui].info(I18n.t("vsphere.waiting_for_ssh"))
+          end
+          
           while true                        
             break if env[:machine].communicate.ready?
             sleep 5

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.8.5'
+    VERSION = '0.9.0'
   end
 end

data/locales/en.yml

@@ -18,6 +18,8 @@ en:
       The VM is not running
     waiting_for_ssh: |-
       Waiting for SSH to become available...
+    waiting_for_winrm: |-
+      Waiting for WinRM to become available...
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
 

data/spec/spec_helper.rb

@@ -52,7 +52,7 @@ RSpec.configure do |config|
         :proxy_host => nil,
         :proxy_port => nil)
     vm_config = double(
-      :vm => double('config_vm', :synced_folders => [], :provisioners => [], :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
+      :vm => double('config_vm', :synced_folders => [], :provisioners => [], :communicator => nil, :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
       :validate => []
     )
     @app = double 'app', :call => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrew Grauch