landrush 1.2.0 → 1.3.0

data/test/landrush/parallel_store_use_test.rb

@@ -0,0 +1,50 @@
+require_relative '../test_helper'
+
+module Landrush
+  describe Store do
+    before do
+      @temp_file = Tempfile.new(%w[landrush_test_store .json])
+    end
+
+    after do
+      @temp_file.unlink
+    end
+
+    def parallel(thread_count = 10)
+      Timeout.timeout(5) do
+        (1..thread_count).map do |n|
+          Thread.new do
+            store = Store.new(@temp_file)
+            yield(store, n)
+          end
+        end.map(&:join)
+      end
+    end
+
+    describe 'parallel store use' do
+      it 'sets the key to the value and makes it available for getting' do
+        thread_count = 10
+        parallel(thread_count) do |store, n|
+          store.set("foo-#{n}", "bar-#{n}")
+          sleep 0.1
+          assert_equal(store.get("foo-#{n}"), "bar-#{n}")
+        end
+
+        store = Store.new(@temp_file)
+        (1..thread_count).each do |n|
+          assert_equal(store.get("foo-#{n}"), "bar-#{n}")
+        end
+      end
+
+      it 'lock timeout throws Vagrant error' do
+        file = File.open(@temp_file)
+        file.flock(File::LOCK_EX)
+
+        assert_raises Landrush::ConfigLockError do
+          store = Store.new(@temp_file)
+          store.set('foo', 'bar')
+        end
+      end
+    end
+  end
+end

data/test/landrush/server_test.rb

@@ -14,30 +14,19 @@ module Landrush
 
     def wait_for_port
       sleep 1 until begin
-                       TCPSocket.open('127.0.0.1', Server.port)
-                     rescue
-                       nil
-                     end
-    end
-
-    before do
-      @tmp_dir = Dir.mktmpdir('landrush-server-test-')
-      Server.working_dir = @tmp_dir
-      Server.gems_dir = gem_dir
-    end
-
-    after do
-      Server.stop
-      FileUtils.rm_rf(@tmp_dir) if File.exist?(@tmp_dir)
+                      TCPSocket.open('127.0.0.1', Server.port)
+                    rescue StandardError
+                      nil
+                    end
     end
 
     describe 'start/stop' do
       it 'starts and stops a daemon' do
         Server.start
-        Server.running?.must_equal true
+        Server.status.must_equal :running
 
         Server.stop
-        Server.running?.must_equal false
+        Server.status.must_equal :stopped
       end
 
       # FIXME: This test requires network access.

data/test/landrush/store_test.rb

@@ -3,7 +3,7 @@ require_relative '../test_helper'
 module Landrush
   describe Store do
     before do
-      @temp_file = Tempfile.new(%w(landrush_test_store .json))
+      @temp_file = Tempfile.new(%w[landrush_test_store .json])
       @store = Store.new(@temp_file)
     end
 
@@ -28,7 +28,7 @@ module Landrush
 
     describe 'get' do
       it 'returns nil for unset values' do
-        @store.get('notakey').must_equal nil
+        assert_nil @store.get('notakey')
       end
 
       it 'returns the latest set value (no caching)' do
@@ -37,7 +37,7 @@ module Landrush
         @store.set('foo', 'second')
         @store.get('foo').must_equal 'second'
         @store.delete('foo')
-        @store.get('foo').must_equal nil
+        assert_nil @store.get('foo')
       end
     end
 
@@ -49,7 +49,7 @@ module Landrush
 
         @store.delete('now')
 
-        @store.get('now').must_equal nil # you don't!
+        assert_nil @store.get('now')
       end
     end
 
@@ -59,8 +59,8 @@ module Landrush
 
         @store.find('foo.somehost.vagrant.test').must_equal 'somehost.vagrant.test'
         @store.find('bar.somehost.vagrant.test').must_equal 'somehost.vagrant.test'
-        @store.find('foo.otherhost.vagrant.test').must_equal nil
-        @store.find('host.vagrant.test').must_equal nil
+        assert_nil @store.find('foo.otherhost.vagrant.test')
+        assert_nil @store.find('host.vagrant.test')
       end
 
       it 'returns exact matches too' do
@@ -73,8 +73,8 @@ module Landrush
 
         @store.find('somehost').must_equal 'somehost.vagrant.test'
         @store.find('somehost.vagrant').must_equal 'somehost.vagrant.test'
-        @store.find('somehost.vagr').must_equal nil
-        @store.find('someh').must_equal nil
+        assert_nil @store.find('somehost.vagr')
+        assert_nil @store.find('someh')
       end
     end
 

data/test/landrush/util/dnsmasq_test.rb

@@ -0,0 +1,42 @@
+require_relative '../../test_helper'
+
+module Landrush
+  module Util
+    describe Dnsmasq do
+      MANAGED_DNSMASQ = '# Configuration file for NetworkManager.
+[main]
+dns=dnsmasq
+
+[logging]
+'.split('\n')
+
+      UNMANAGED_DNSMASQ = '# Configuration file for NetworkManager.
+[main]
+#dns=dnsmasq
+
+[logging]
+'.split('\n')
+
+      describe 'nm_managed?' do
+        it 'No NetworkManager config exists' do
+          File.expects(:exist?).returns(false)
+          Dnsmasq.nm_managed?.must_equal false
+        end
+
+        it 'NetworkManager manages dnsmasq' do
+          File.expects(:exist?).returns(true)
+          File.expects(:readlines).returns(MANAGED_DNSMASQ)
+
+          Dnsmasq.nm_managed?.must_equal true
+        end
+
+        it 'NetworkManager does not manage dnsmasq' do
+          File.expects(:exist?).returns(true)
+          File.expects(:readlines).returns(UNMANAGED_DNSMASQ)
+
+          Dnsmasq.nm_managed?.must_equal false
+        end
+      end
+    end
+  end
+end

data/test/support/create_fake_working_dir.rb

@@ -1,14 +1,15 @@
 module CreateFakeWorkingDirHooks
   def setup
     super
-    tempdir = Dir.mktmpdir('vagrant_landrush_test_working_dir-')
-    working_dir = File.join(tempdir, 'data', 'landrush')
+    @temp_dir = Dir.mktmpdir('vagrant_landrush_test_working_dir-')
+    working_dir = File.join(@temp_dir, 'data', 'landrush')
     FileUtils.mkpath working_dir
 
     # Make sure that for all tests where we use Landrush::Server the working directory
     # is set to a temp directory.
     # this gets deleted in DeleteFakeWorkingDirHooks
     Landrush::Server.working_dir = working_dir
+    Landrush::Server.gems_dir = gem_dir
   end
 end
 

data/test/support/delete_fake_working_dir.rb

@@ -1,7 +1,7 @@
 module DeleteFakeWorkingDirHooks
   def teardown
     super
-    Landrush::Server.working_dir.rmtree if Landrush::Server.working_dir.directory?
+    FileUtils.rm_rf(@temp_dir)
   end
 end
 

data/test/support/test_server_daemon.rb

@@ -31,7 +31,7 @@ module TestServerHooks
   def teardown
     super
     # Cleanup any stray server instances from tests
-    Landrush::Server.stop if Landrush::Server.running?
+    Landrush::Server.stop
     Landrush::Store.reset
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.push(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.push(File.expand_path('../lib', __dir__))
 
 require 'bundler/setup'
 require 'minitest/spec'
@@ -11,9 +11,10 @@ require 'landrush/cap/host/darwin/configure_visibility_on_host'
 require 'landrush/cap/host/windows/configure_visibility_on_host'
 require 'landrush/cap/host/linux/configure_visibility_on_host'
 require 'landrush/util/retry'
+require 'landrush/util/dnsmasq'
 
 require 'minitest/autorun'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 # Make sure to keep the numbering sequential here
 # Putting include/exclude out of order is kind of the point though ;)
@@ -105,14 +106,11 @@ end
 
 module Landrush
   class FakeProvider
-    def initialize(*args)
-    end
+    def initialize(*args); end
 
-    def _initialize(*args)
-    end
+    def _initialize(*args); end
 
-    def ssh_info
-    end
+    def ssh_info; end
 
     def state
       @state ||= Vagrant::MachineState.new('fake-state', 'fake-state', 'fake-state')

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: filelock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: landrush-ip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: landrush-ip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
 description: |
   Forget about IPs in Vagrant - Automated DNS for your VMs
 
@@ -95,6 +109,7 @@ files:
 - doc/vagrant_dns_without_landrush.svg
 - features/commands.feature
 - features/dns_resolution.feature
+- features/docker_provider.feature
 - features/landrush_ip.feature
 - features/step_definitions/landrush_custom_steps.rb
 - features/support/env.rb
@@ -116,6 +131,9 @@ files:
 - lib/landrush/cap/guest/suse/add_iptables_rule.rb
 - lib/landrush/cap/guest/suse/install_iptables.rb
 - lib/landrush/cap/guest/suse/iptables_installed.rb
+- lib/landrush/cap/host/arch/dnsmasq_installed.rb
+- lib/landrush/cap/host/arch/install_dnsmasq.rb
+- lib/landrush/cap/host/arch/restart_dnsmasq.rb
 - lib/landrush/cap/host/darwin/configure_visibility_on_host.rb
 - lib/landrush/cap/host/debian/dnsmasq_installed.rb
 - lib/landrush/cap/host/debian/host.rb
@@ -134,10 +152,12 @@ files:
 - lib/landrush/command.rb
 - lib/landrush/config.rb
 - lib/landrush/dependent_vms.rb
+- lib/landrush/dns_server.rb
 - lib/landrush/plugin.rb
 - lib/landrush/server.rb
 - lib/landrush/start_server.rb
 - lib/landrush/store.rb
+- lib/landrush/util/dnsmasq.rb
 - lib/landrush/util/path.rb
 - lib/landrush/util/process_helper.rb
 - lib/landrush/util/retry.rb
@@ -153,8 +173,10 @@ files:
 - test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
 - test/landrush/issues/255.rb
+- test/landrush/parallel_store_use_test.rb
 - test/landrush/server_test.rb
 - test/landrush/store_test.rb
+- test/landrush/util/dnsmasq_test.rb
 - test/landrush/util/rety_test.rb
 - test/support/clear_dependent_vms.rb
 - test/support/create_fake_working_dir.rb
@@ -181,13 +203,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: a vagrant plugin providing consistent DNS visible on host and guests
 test_files:
 - features/commands.feature
 - features/dns_resolution.feature
+- features/docker_provider.feature
 - features/landrush_ip.feature
 - features/step_definitions/landrush_custom_steps.rb
 - features/support/env.rb
@@ -202,8 +225,10 @@ test_files:
 - test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
 - test/landrush/issues/255.rb
+- test/landrush/parallel_store_use_test.rb
 - test/landrush/server_test.rb
 - test/landrush/store_test.rb
+- test/landrush/util/dnsmasq_test.rb
 - test/landrush/util/rety_test.rb
 - test/support/clear_dependent_vms.rb
 - test/support/create_fake_working_dir.rb