landrush 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b816d63e7e9441bd34bb0d97719d670a43f0317e
-  data.tar.gz: 249cc9e68031d224c9e2d6481bfdba8e1b358caa
+  metadata.gz: 77840884a0bd9fc62d5a5b0278d1d49e5523eebd
+  data.tar.gz: d632602974b03a8b775e452fb38052202ddd476d
 SHA512:
-  metadata.gz: c50874304397ffc4493155201de0907920ccfcb4a488e53365c6e411d7fbb04aed798aeecd71c505b9a243b5a49f36b7050dc47722a7c5394c4ee4ec052459fe
-  data.tar.gz: 7c884db92b63aedc15a74b26aa84cc8d790c68dc77e34406ccead1bc73e9a44051060e3ec3b9458b3348914c24dba28e55296d203c30b798f93ee1e340f8cd72
+  metadata.gz: 1104136bab10696f6ba984fdb97f146cdfa36a99b828a143cf233077a1e3aa064d3c9ab9e3e957ef5d92be8c4af0f9f8743e30a86f5e8cd8c1d55d7d625fbec7
+  data.tar.gz: c13584093a97de4e183ddca489e56c43d7143ad97c955eac0ab768b7b6c659ae4b6db5f49253150b5e477cc44ab8dec59692938818ea2d81ff4c190d52c6216c

data/.rubocop_todo.yml

@@ -21,6 +21,7 @@ Metrics/AbcSize:
   Max: 36
   Exclude:
     - 'lib/landrush/command.rb'
+    - 'lib/landrush/cap/guest/all/read_host_visible_ip_address.rb'
 
 # Offense count: 1
 # Configuration parameters: CountComments.

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.1] - 2016-08-07
+
+- Issue [#241](https://github.com/vagrant-landrush/landrush/issues/241) - Action::Teardown is not called for providers other than VirtualBox
+- Issue [#239](https://github.com/vagrant-landrush/landrush/issues/239) - Add support for HyperV 
+- Issue [#237](https://github.com/vagrant-landrush/landrush/issues/237) - Landrush::Server.ensure_ruby_on_path should not be using File.join
+- Issue [#236](https://github.com/vagrant-landrush/landrush/issues/236) - Explicitly call landrush_ip_installed and landrush_ip_install 
+
 ## [1.1.0] - 2016-08-05
 
 - Issue [#234](https://github.com/vagrant-landrush/landrush/issues/234) - sed command in RestartDnsmasq for redhat hosts does insert 127.0.0.1
@@ -41,6 +48,7 @@
 ## [0.16.0] - 2015-01-18
 - Added: Support for IN::PTR records (#98)
 
+[1.1.1]: https://github.com/phinze/landrush/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/phinze/landrush/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/phinze/landrush/compare/v0.19.0...v1.0.0
 [0.19.0]: https://github.com/phinze/landrush/compare/v0.18.0...v0.19.0

data/lib/landrush/action/common.rb

@@ -6,6 +6,7 @@ module Landrush
         'VagrantPlugins::ProviderLibvirt::Provider'    => :libvirt,
         'HashiCorp::VagrantVMwarefusion::Provider'     => :vmware_fusion,
         'VagrantPlugins::Parallels::Provider'          => :parallels,
+        'VagrantPlugins::HyperV::Provider'             => :hyperv,
         'Landrush::FakeProvider'                       => :fake_provider
       }.freeze
 

data/lib/landrush/cap/guest/all/read_host_visible_ip_address.rb

@@ -17,6 +17,8 @@ module Landrush
         def self.read_host_visible_ip_address(machine)
           @machine = machine
 
+          @machine.guest.capability(:landrush_ip_install) unless @machine.guest.capability(:landrush_ip_installed)
+
           addr      = nil
           addresses = machine.guest.capability(:landrush_ip_get)
 

data/lib/landrush/plugin.rb

@@ -18,19 +18,24 @@ module Landrush
       require_relative 'action/install_prerequisites'
       require_relative 'action/redirect_dns'
 
+      # Hooks for VirtualBox and HyperV providers
       hook.before(VagrantPlugins::ProviderVirtualBox::Action::Network, pre_boot_actions)
+      hook.before(VagrantPlugins::HyperV::Action::WaitForIPAddress, pre_boot_actions)
       hook.after(Vagrant::Action::Builtin::WaitForCommunicator, post_boot_actions)
 
+      # Hooks for Libvirt provider
       if defined?(VagrantPlugins::ProviderLibvirt)
         hook.after(VagrantPlugins::ProviderLibvirt::Action::CreateNetworks, pre_boot_actions)
         hook.after(VagrantPlugins::ProviderLibvirt::Action::WaitTillUp, post_boot_actions)
       end
 
+      # Hooks for VMWarefusion provider
       if defined?(HashiCorp::VagrantVMwarefusion)
         hook.before(HashiCorp::VagrantVMwarefusion::Action::Network, pre_boot_actions)
         hook.after(HashiCorp::VagrantVMwarefusion::Action::WaitForCommunicator, post_boot_actions)
       end
 
+      # Hooks for Parallels provider
       if defined?(VagrantPlugins::Parallels)
         hook.before(VagrantPlugins::Parallels::Action::Network, pre_boot_actions)
       end
@@ -55,7 +60,7 @@ module Landrush
     landrush_teardown = lambda do |hook|
       require_relative 'action/common'
       require_relative 'action/teardown'
-      hook.after(Vagrant::Action::Builtin::GracefulHalt, Action::Teardown)
+      hook.append(Action::Teardown)
     end
 
     action_hook 'landrush_teardown', :machine_action_halt, &landrush_teardown

data/lib/landrush/server.rb

@@ -274,7 +274,13 @@ module Landrush
       vagrant_binary = Vagrant::Util::Which.which('vagrant')
       vagrant_binary = File.realpath(vagrant_binary) if File.symlink?(vagrant_binary)
       # in a Vagrant installation the Ruby executable is in ../embedded/bin relative to the vagrant executable
-      embedded_bin_dir = File.join(File.dirname(File.dirname(vagrant_binary)), 'embedded', 'bin')
+      # we don't use File.join here, since even on Cygwin we want a Windows path - see https://github.com/vagrant-landrush/landrush/issues/237
+      if Vagrant::Util::Platform.windows?
+        separator = '\\'
+      else
+        separator = '/'
+      end
+      embedded_bin_dir = File.dirname(File.dirname(vagrant_binary)) + separator + 'embedded' + separator + 'bin'
       ENV['PATH'] = embedded_bin_dir + File::PATH_SEPARATOR + ENV['PATH'] if File.exist?(embedded_bin_dir)
     end
 

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/test/landrush/cap/guest/all/read_host_visible_ip_address_test.rb

@@ -14,6 +14,7 @@ module Landrush
         before do
           # TODO: Is there a way to only unstub it for read_host_visible_ip_address?
           machine.guest.unstub(:capability)
+          machine.guest.stubs(:capability).with(:landrush_ip_installed).returns(true)
           machine.guest.stubs(:capability).with(:landrush_ip_get).returns(fake_addresses)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns