vagrant-hosts 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e9f58247879332b3031dceff8009a6e305642a
-  data.tar.gz: fdc56fdde18bceb36882a38c6a2511c238399806
+  metadata.gz: dcb44f6bea01ff90f2b53ea6f4e70a185eb1d9e7
+  data.tar.gz: 89e47f7c063126ed95a1428d5c9a731af03577aa
 SHA512:
-  metadata.gz: 7ed4b370ea69eb8192194357ccfd5dd2d8ff62faf8fa8e1683c53ba15aabfa4870d77d7635c36b110b728810318b6ebc8e248404153b9ade8b6684c8c063fbc0
-  data.tar.gz: 2250d47993c1bb57f64b6b8427a22b5e231835f8167454fc0c0b753f9f03c7c898257155b7d91622222c9010061e20bae35968f75ba03201f9f18c10ede06c28
+  metadata.gz: b5f02bcd8e452c89d4e5b8a8e191336bce48f1c9ed32b4d429fc7bd2313d67b9e4429650c4a9179f80fdc47bcaf672f8c4cff17d6dc4f868fb5f0acf5a7b3b82
+  data.tar.gz: def43babfd82b53a2080f26577a0ece85d42260eff2dba04ebc7b1e2f4e1b53c60a1f22b7f7ce6e81c7fe824dc45119c5043027462ccd72909831f23473b5207

data/.travis.yml

@@ -28,5 +28,7 @@ matrix:
       env: TEST_VAGRANT_VERSION=v1.9.8 BUNDLER_VERSION=1.16.1
     - rvm: 2.4.4
       env: TEST_VAGRANT_VERSION=v2.0.4 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=v2.1.1 BUNDLER_VERSION=1.16.1
     - rvm: 2.4.4
       env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.16.1

data/CHANGELOG

@@ -1,6 +1,20 @@
 CHANGELOG
 =========
 
+2.8.2
+-----
+
+2018-06-05
+
+This is a backwards compatible bugfix release.
+
+  * The `exports` and `imports` attributes of the hosts provisioner now
+    properly merge when a provisioner with the same name is definied in
+    multiple scopes (e.g. global, per-vm, per-provider).
+
+  * Added test coverage for Vagrant 2.1.
+
+
 2.8.1
 -----
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 require 'rubygems/version'
 
-vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.0.4'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.1.1'
 vagrant_version = nil
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to

data/lib/vagrant-hosts/config.rb

@@ -87,7 +87,19 @@ module VagrantHosts
     # @return [VagrantHosts::Config] The merged results
     def merge(other)
       result = super
-      result.instance_variable_set(:@hosts, self.hosts.dup + other.hosts.dup)
+
+      new_hosts = (self.hosts.dup + other.hosts.dup).uniq
+      result.instance_variable_set(:@hosts, new_hosts.to_a)
+
+      result.imports = (self.imports.dup + other.imports.dup).uniq
+
+      result.exports = {}
+      [self.exports, other.exports].each do |hash|
+        hash.each do |k, v|
+          result.exports[k] ||= []
+          result.exports[k] += v.dup
+        end
+      end
 
       result
     end

data/lib/vagrant-hosts/config_builder/1_x.rb

@@ -20,6 +20,20 @@ module VagrantHosts
       # @!attribute [rw] exports
       def_model_attribute :imports
 
+      # @private
+      def configure_exports(config, val)
+        val.each do |k, v|
+          config.exports[k] ||= []
+          config.exports[k] += v
+        end
+      end
+
+      # @private
+      def configure_imports(config, val)
+        config.imports += val
+        config.imports.uniq!
+      end
+
       # @private
       def configure_hosts(config, val)
         val.each do |(address, aliases)|

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '2.8.1'.freeze
+  VERSION = '2.8.2'.freeze
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 # Disable Vagrant autoloading so that other plugins defined in the Gemfile for
 # Acceptance tests are not loaded.

data/spec/unit/config_spec.rb

@@ -24,20 +24,50 @@ describe VagrantHosts::Config do
       expect(errors['Vagrant Hosts']).to eq []
     end
 
-    it 'can be merged' do
-      subject.add_host '127.0.0.1', ['local.server']
-      subject.finalize!
+    context 'when merging' do
+      let(:other) { described_class.new }
 
-      other = described_class.new
-      other.add_host '10.0.20.1', ['other.server']
-      other.finalize!
+      it 'combines hosts arrays' do
+        subject.add_host '127.0.0.1', ['local.server']
+        subject.finalize!
 
-      result = subject.merge(other)
+        other.add_host '127.0.0.1', ['some-alias']
+        other.add_host '10.0.20.1', ['other.server']
+        other.finalize!
 
-      expect(result.hosts).to eq [
-        ["127.0.0.1", ["local.server"]],
-        ["10.0.20.1", ["other.server"]]]
-    end
+        result = subject.merge(other)
+
+        expect(result.hosts).to eq [['127.0.0.1', ['local.server']],
+                                    ['127.0.0.1', ['some-alias']],
+                                    ['10.0.20.1', ['other.server']]]
+      end
+
+      it 'combines import arrays' do
+        subject.imports = ['foo', 'baz']
+        subject.finalize!
+
+        other.imports = ['foo', 'bar']
+        other.finalize!
 
+        result = subject.merge(other)
+
+        expect(result.imports).to eq ['foo', 'baz', 'bar']
+      end
+
+      it 'merges export hashes' do
+        subject.exports = {global: [["127.0.0.1", ["local.server"]]]}
+        subject.finalize!
+
+        other.exports = {global: [["127.0.0.1", ["test.server"]]],
+                         some_provider: [["127.0.0.1", ["some-alias"]]]}
+        other.finalize!
+
+        result = subject.merge(other)
+
+        expect(result.exports).to eq({global: [['127.0.0.1', ['local.server']],
+                                               ['127.0.0.1', ['test.server']]],
+                                      some_provider: [["127.0.0.1", ["some-alias"]]]})
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake