vagrant-config_builder 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8f804b5113a9fae5ab9161daff63c371decd57
-  data.tar.gz: 7cc438b36c2c5ad9255a3bef2aa81c339cc68cf6
+  metadata.gz: ad642e21b08ad1ad7baf002cd01ec1167758a332
+  data.tar.gz: 8f473ceb06a835407c996de34a96c609ab8a0cc0
 SHA512:
-  metadata.gz: ef8a0b918542ed737a1544df01df943c9b5ef1a4d594500ba67baf282a2587bf44f2130ea51ae5b48762683902f7e88cc62667291bd5161e94b54f6021a0d351
-  data.tar.gz: fe7f55d729affe65bef07875cadb86c7573a9cf0485fa4b6920fe36fe511e297e82118f44330f4c2d220024ab0a883d8f0b1eccdd7a50c9cf60c04eeec7c752a
+  metadata.gz: 8cc9a6ba0eeb0dff69ff001b477b5e4473c072d29ca76f554840a630bdd6cd348df9562d80d645954ff846dbbb365bee82b55bd890b3104b6c62c0525822a443
+  data.tar.gz: ed2c49b370655683309dbffe8cabc7b38bb505ed68e4f92eda5e6a4722d43878a3294a37d50fbd03e5105f23fc39e5ec5e11cd937c99de5d1f7be095238fab17

data/CHANGELOG

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+0.10.1
+------
+
+2014-07-08
+
+This is a backwards bugfix release.
+
+  * Fixed an issue where VM definitions would end up with linked copies of an
+    array because cloning was not used.
+
+  * The `id` attribute can now be specified for `forwarded_port`.
+
 0.10.0
 ------
 

data/lib/config_builder/filter/roles.rb

@@ -134,7 +134,7 @@ class ConfigBuilder::Filter::Roles
       if (left[key] and right[key])
         retval[key] += left[key]
       elsif left[key]
-        retval[key] = left[key]
+        retval[key] = left[key].clone
       end
     end
 

data/lib/config_builder/model/network/forwarded_port.rb

@@ -15,8 +15,12 @@ class ConfigBuilder::Model::Network::ForwardedPort < ConfigBuilder::Model::Base
   #   @return [Boolean] Whether to automatically correct port collisions
   def_model_attribute :auto_correct
 
+  # @!attribute [rw] id
+  #   @return [String, nil] An optional name used to identify this port forward
+  def_model_attribute :id
+
   def initialize
-    @defaults = {:auto_correct => false}
+    @defaults = {:auto_correct => false, :id => nil}
   end
 
   def to_proc
@@ -25,7 +29,8 @@ class ConfigBuilder::Model::Network::ForwardedPort < ConfigBuilder::Model::Base
         :forwarded_port,
         :guest        => attr(:guest),
         :host         => attr(:host),
-        :auto_correct => attr(:auto_correct)
+        :auto_correct => attr(:auto_correct),
+        :id           => attr(:id),
       )
     end
   end

data/lib/config_builder/version.rb

@@ -1,3 +1,3 @@
 module ConfigBuilder
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/config_builder/filter/roles_spec.rb

@@ -35,6 +35,11 @@ describe ConfigBuilder::Filter::Roles do
           {'guest_path' => '/guest-3', 'host_path' => './host-3'},
           {'guest_path' => '/guest-4', 'host_path' => './host-4'},
         ],
+      },
+      'shared-networks' => {
+        'private_networks' => [
+          {'ip' => '1.2.3.4'}
+        ]
       }
     }
   end
@@ -183,11 +188,11 @@ describe ConfigBuilder::Filter::Roles do
       [
         {
           'name'  => 'master',
-          'roles' => ['shell-provisioner', 'potato-provisioner', 'folders-12', 'folders-34'],
+          'roles' => ['shell-provisioner', 'potato-provisioner', 'folders-12', 'folders-34', 'shared-networks'],
         },
         {
           'name' => 'agent',
-          'roles' => ['shell-provisioner', 'puppet-provisioner', 'folders-34'],
+          'roles' => ['shell-provisioner', 'puppet-provisioner', 'folders-34', 'shared-networks'],
         }
       ]
     end
@@ -251,6 +256,16 @@ describe ConfigBuilder::Filter::Roles do
         expect(vm['synced_folders']).to eq expected
       end
     end
+
+    context 'when modifying an array inherited from a role' do
+      before :each do
+        filtered_vms[0]['private_networks'].push 'ip' => '5.6.7.8'
+      end
+
+      it 'other VMs using that role are not affected' do
+        expect(filtered_vms[1]['private_networks']).to eq roles['shared-networks']['private_networks']
+      end
+    end
   end
 
   describe 'when a class references a non-existent role' do
@@ -259,14 +274,14 @@ describe ConfigBuilder::Filter::Roles do
         'vms' => [{'name' => 'master', 'roles' => 'nope'}],
         'roles' => {'yep' => {'box' => 'moxxi'}}
       }
+    end
 
-      before do
-        subject.set_config(dup(config))
-      end
+    before do
+      subject.set_config(dup(config))
+    end
 
-      it 'raises an error' do
-        expect { subject.run }.to raise_error, /Couldn't find role named .*nope.*/
-      end
+    it 'raises an error' do
+      expect { subject.run }.to raise_error(/^Requested role "nope" is not defined/)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-config_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -114,3 +114,4 @@ signing_key:
 specification_version: 4
 summary: Generate Vagrant configurations from arbitrary data
 test_files: []
+has_rdoc: true