vagrant-vmware-esxi 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dcbc0face9e5a7ebbfcfd749b15d83b1f42b2ea
-  data.tar.gz: dddf553b0781d7f60907b6d5c474d8b22778907f
+  metadata.gz: fa5be0972c6fc2aa80766d013513c1757f2eb820
+  data.tar.gz: 021ae3179d9224e2e4ed4f022aaf3fa0e9859fda
 SHA512:
-  metadata.gz: 1bd9c80da6a1f44c3cfb70bdca1f35c05d0c5f0caa81d4fbcbbacb55913c087027203b3f6c29f4a282b4a73bb225de467b8a724d4f64c89075873102a8eac3fd
-  data.tar.gz: f9c74b17cc5d35fb3be15c03039a56d793fe611ce477d4f457ba88a659aabf013ff3b2845e30ae5b68b03e0900417c95599584e363088e65bf5669c5f5268de1
+  metadata.gz: 56f0fd113b96775f1d12d62cbb4e2e92ad785a6e2e8f9a33545e9b9d58365e38940a4760b6f6852bb95b76d6d8b585ca5a3fb8bfea6fe855910d43f6caeedcfc
+  data.tar.gz: 4bc844a4097b5d24aea8f54cac7ee8f745e00efbaf8bb648356a958d11ada85ee67035f25c532f619fd4e785d67cbad472632e3a11833ceedde89846836b5b33

data/README.md

@@ -284,6 +284,8 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 2.4.1 Change/Fix output of 'vagrant address' when a single machine is configured or specifed.
+
 * 2.4.0 Add support for 'vagrant address', output ip address of guest.
         Fix, exit 1 on vagrant up if unable to reach "running" state.
         Some code cleanup.

data/lib/vagrant-vmware-esxi/action.rb

@@ -81,7 +81,13 @@ module VagrantPlugins
       def self.action_address
         Vagrant::Action::Builder.new.tap do |b|
           b.use SetESXiPassword
-          b.use Address
+          b.use Address, false
+        end
+      end
+      def self.action_address_multi
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use SetESXiPassword
+          b.use Address, true
         end
       end
 

data/lib/vagrant-vmware-esxi/action/address.rb

@@ -6,9 +6,10 @@ module VagrantPlugins
     module Action
       # This action will print the IP address
       class Address
-        def initialize(app, _env)
+        def initialize(app, _env, multi)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::address')
+          @multi = multi
         end
 
         def call(env)
@@ -23,14 +24,17 @@ module VagrantPlugins
           machine = env[:machine]
           config = env[:machine].provider_config
 
-          # return IP if it's known.
+          # return nil if machine is down.
           return nil if machine.state.id != :running
 
           ssh_info = machine.ssh_info
           return nil if !ssh_info
 
-          env[:ui].info ssh_info[:host]
-
+          if @multi == true
+            env[:ui].info ssh_info[:host]
+          else
+            puts ssh_info[:host]
+          end
         end
       end
     end

data/lib/vagrant-vmware-esxi/command.rb

@@ -1,3 +1,5 @@
+require 'optparse'
+
 module VagrantPlugins
   module ESXi
 
@@ -6,8 +8,14 @@ module VagrantPlugins
           "Snapshot additional information."
       end
       def execute
-        with_target_vms(nil, :provider => "vmware_esxi") do |vm|
-          vm.action(:snapshot_info)
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant snapshot-info [name]"
+        end
+
+        argv = parse_options(opts)
+
+        with_target_vms(argv) do |machine|
+          machine.action(:snapshot_info)
         end
       end
     end
@@ -17,12 +25,29 @@ module VagrantPlugins
           "outputs the IP address of a guest."
       end
       def execute
-        with_target_vms(nil, :provider => "vmware_esxi") do |vm|
-          vm.action(:address)
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant address [name]"
+        end
+
+        argv = parse_options(opts)
+
+        # Count total number of vms to print the IP
+        totalvms = 0
+        with_target_vms(argv) do
+          totalvms += 1
+        end
+
+        if argv.length == 1 or totalvms == 1
+          with_target_vms(argv, {:single_target=>true}) do |machine|
+            machine.action(:address)
+          end
+        else
+          with_target_vms(argv) do |machine|
+            machine.action(:address_multi)
+          end
         end
       end
     end
 
-
   end
 end

data/lib/vagrant-vmware-esxi/version.rb

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
     $vagrant_vmware_esxi_version = VERSION
   end
 end

data/vagrant-vmware-esxi.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/vagrant-vmware-esxi/version', __FILE__)
 Gem::Specification.new do |s|
   s.name            = 'vagrant-vmware-esxi'
   s.version         = VagrantPlugins::ESXi::VERSION
-  s.date            = '2018-07-23'
+  s.date            = '2018-08-02'
   s.summary         = 'Vagrant ESXi provider plugin'
   s.description     = 'A Vagrant plugin that adds a VMware ESXi provider support'
   s.authors         = ['Jonathan Senkerik']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jonathan Senkerik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n