landrush 1.1.0.beta.2 → 1.1.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f28bf5fa282162cba9dc132f50560eb81c75d9
-  data.tar.gz: 25859eb10f91b1c228f8c4b0e80db1a6f27b664f
+  metadata.gz: d77ecf53a2c01d7b970262ad962f581b5f3b44c4
+  data.tar.gz: ea67610f89e99e4a7b39610a2f154eb932ce25e3
 SHA512:
-  metadata.gz: b407b73d6ad43a9c40407d31e2512526180044f82705d7434476f8e22be53cec32ec8748edb4ef63890355365917eb1a5290dfc1016ae026da7784ff12cc3f7e
-  data.tar.gz: db40198c92d2efc3933ca00e9339ceba69c7f607d5118a438d0d2c9614ba2a183914ce3f26b5c028515d60e936fd6b132ef19698218732fa773f2b94678dae07
+  metadata.gz: 66834fc6e32258479ac9121bd7cee33ed7f177b6ffd2300866523f0263391991c048db3e136eb087a96f922915ffb6688793d0b87f148a8a58458a6c752977a7
+  data.tar.gz: 091535496355c49f29dc937c3e3617cf5b955ac7046217df7c4a1aabb36e560f704e55894e77b0bf2c26d99aa25c4dd6aa13b6996a1a7f23346a499ee15631a1

data/lib/landrush/action/setup.rb

@@ -100,7 +100,7 @@ module Landrush
       # machine.config.vm.networks is an array of two elements. The first containing the type as symbol, the second is a
       # hash containing other config data which varies between types
       def static_private_network_ip
-        # select all staticlly defined private network ip
+        # select all statically defined private network ip
         private_networks = machine.config.vm.networks.select {|network| :private_network == network[0] && !network[1][:ip].nil?}
                                   .map {|network| network[1][:ip]}
         if machine.config.landrush.host_ip_address.nil?

data/lib/landrush/cap/host/darwin/configure_visibility_on_host.rb

@@ -5,8 +5,9 @@ module Landrush
         class << self
           attr_writer :sudo, :config_dir
 
-          def configure_visibility_on_host(env, *_args)
+          def configure_visibility_on_host(env, _ip, tld)
             @env = env
+            @tld = tld
             if contents_match?
               info 'Host DNS resolver config looks good.'
             else
@@ -38,7 +39,7 @@ module Landrush
           end
 
           def config_file
-            config_dir.join(@env.vagrantfile.config.landrush.tld)
+            config_dir.join(@tld)
           end
 
           def contents_match?

data/lib/landrush/cap/host/linux/configure_visibility_on_host.rb

@@ -4,12 +4,13 @@ module Landrush
       class ConfigureVisibilityOnHost
         class << self
           def configure_visibility_on_host(env, ip, tld)
-            env[:host].capability(:install_dnsmasq) unless env[:host].capability(:dnsmasq_installed)
-            env[:host].capability(:create_dnsmasq_config, ip, tld)
-            env[:host].capability(:restart_dnsmasq)
-          rescue Vagrant::Errors::CapabilityNotFound
-            env[:ui].info('Unable to automatically configure your host. Check the documentation for manual ' \
-              'instructions to configure the visibility on the host.')
+            env.host.capability(:install_dnsmasq) unless env.host.capability(:dnsmasq_installed)
+            env.host.capability(:create_dnsmasq_config, ip, tld)
+            env.host.capability(:restart_dnsmasq)
+          rescue Vagrant::Errors::CapabilityNotFound => e
+            env.ui.info("Your host was detected as '#{e.extra_data[:cap]}' for which the host capability " \
+            "'#{e.extra_data[:cap]}' is not available.")
+            env.ui.info('Check the documentation for the manual instructions to configure the visibility on the host.')
           end
         end
       end

data/lib/landrush/cap/host/windows/configure_visibility_on_host.rb

@@ -31,14 +31,14 @@ module Landrush
 
             unless wired_autoconfig_service_running?
               info('starting \'Wired AutoConfig\' service')
-              if self.class.admin_mode?
+              if admin_mode?
                 `net start dot3svc`
               else
                 require 'win32ole'
                 shell = WIN32OLE.new('Shell.Application')
                 shell.ShellExecute('net', 'start dot3svc', nil, 'runas', 1)
               end
-              service_has_started = self.retry(tries: 5, sleep: 1) do
+              service_has_started = Landrush::Util::Retry.retry(tries: 5, sleep: 1) do
                 wired_autoconfig_service_running?
               end
               unless service_has_started
@@ -144,7 +144,7 @@ module Landrush
           end
 
           def info(msg)
-            @env[:ui].info("[landrush] #{msg}") unless @env.nil?
+            @env.ui.info("[landrush] #{msg}") unless @env.nil?
           end
 
           def wired_autoconfig_service_running?

data/lib/landrush/util/retry.rb

@@ -1,7 +1,7 @@
 module Landrush
   module Util
-    module Retry
-      def retry(opts=nil)
+    class Retry
+      def self.retry(opts=nil)
         opts = {tries: 1}.merge(opts || {})
         n = 0
         while n < opts[:tries]

data/lib/landrush/version.rb

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

data/test/landrush/cap/host/darwin/configure_visibility_on_host_test.rb

@@ -23,7 +23,7 @@ module Landrush
               # also disable 'sudo'
               ConfigureVisibilityOnHost.stubs(:sudo).returns('')
 
-              ConfigureVisibilityOnHost.configure_visibility_on_host(env)
+              ConfigureVisibilityOnHost.configure_visibility_on_host(env, '42.42.42.42', 'vagrant.test')
 
               Dir["#{dir}/*"].empty?.must_equal false
               File.exist?(File.join(dir, 'vagrant.test')).must_equal true
@@ -41,8 +41,7 @@ module Landrush
               # also disable 'sudo'
               ConfigureVisibilityOnHost.stubs(:sudo).returns('')
 
-              env.vagrantfile.config.landrush.tld = 'foo.bar'
-              ConfigureVisibilityOnHost.configure_visibility_on_host(env)
+              ConfigureVisibilityOnHost.configure_visibility_on_host(env, '42.42.42.42', 'foo.bar')
 
               Dir["#{dir}/*"].empty?.must_equal false
               File.exist?(File.join(dir, 'foo.bar')).must_equal true

data/test/landrush/cap/host/linux/configure_visibility_on_host_test.rb

@@ -22,7 +22,7 @@ module Landrush
             skip('Only supported on Linux') unless Vagrant::Util::Platform.linux?
             File.exist?(TEST_CONFIG).must_equal false
 
-            Landrush::Cap::Linux::ConfigureVisibilityOnHost.configure_visibility_on_host(fake_environment, TEST_IP, TEST_TLD)
+            Landrush::Cap::Linux::ConfigureVisibilityOnHost.configure_visibility_on_host(Vagrant::Environment.new, TEST_IP, TEST_TLD)
 
             File.exist?(TEST_CONFIG).must_equal true
             Pathname(TEST_CONFIG).read.must_equal CONFIG

data/test/landrush/util/rety_test.rb

@@ -1,20 +1,12 @@
 require_relative '../../test_helper'
 
-class DummyClass
-  include Landrush::Util::Retry
-end
-
 module Landrush
   module Util
     describe Retry do
-      before do
-        @dummy = DummyClass.new
-      end
-
       describe 'retry' do
         it 'retries the provided block up to the specified count' do
           retries = 0
-          result = @dummy.retry(tries: 2) do
+          result = Retry.retry(tries: 2) do
             retries += 1
             false
           end
@@ -24,7 +16,7 @@ module Landrush
 
         it 'does not retry if \'true\' is returned' do
           retries = 0
-          result = @dummy.retry(tries: 2) do
+          result = Retry.retry(tries: 2) do
             retries += 1
             true
           end
@@ -35,7 +27,7 @@ module Landrush
         it 'does sleep between executions if requested' do
           retries = 0
           t1 = Time.now
-          result = @dummy.retry(tries: 1, sleep: 1) do
+          result = Retry.retry(tries: 1, sleep: 1) do
             retries += 1
             false
           end

data/test/test_helper.rb

@@ -31,8 +31,7 @@ end
 def fake_environment(options = {enabled: true})
   # For the home_path we want the base Vagrant directory
   vagrant_test_home = Pathname(Landrush::Server.working_dir).parent.parent
-  env = Vagrant::Environment.new
-  {machine: fake_machine(options), host: env.host, ui: FakeUI.new, home_path: vagrant_test_home}
+  {machine: fake_machine(options), ui: FakeUI.new, home_path: vagrant_test_home}
 end
 
 class FakeUI

metadata

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