vagrant-hitch 0.1.1 → 0.1.2

data/lib/vagrant-hitch.rb

@@ -87,7 +87,7 @@ module VagrantHitch
   def self.setup_provisioners(profile, node_config, config, config_dir)
     # Setup Shell provisioner
     if node_config.has_key?('shell')
-      node_config.deep_merge!(@shell_provisioner_defaults) if !@shell_provisioner_defaults.nil?
+      node_config.deep_merge(@shell_provisioner_defaults) if !@shell_provisioner_defaults.nil?
       config.vm.provision :shell do |shell|
         shell.inline = node_config['shell']['inline'] if node_config['shell'].has_key?('inline')
         shell.args   = node_config['shell']['args'] if node_config['shell'].has_key?('args')
@@ -98,7 +98,7 @@ module VagrantHitch
     # Setup Puppet Provisioner
     if node_config.has_key?('puppet')
       # Import any defaults set by the Puppet Provisioner
-      node_config.deep_merge!(@puppet_provisioner_defaults) if !@puppet_provisioner_defaults.nil?
+      node_config.deep_merge(@puppet_provisioner_defaults) if !@puppet_provisioner_defaults.nil?
 
       config.vm.provision :puppet do |puppet|
         puppet.module_path    = node_config['puppet']['modules']
@@ -125,7 +125,7 @@ module VagrantHitch
     # Setup Chef Provisioner
     if node_config.has_key?('chef')
       # Import any defaults set by the Chef Provisioner
-      node_config.deep_merge!(@chef_provisioner_defaults) if !@chef_provisioner_defaults.nil?
+      node_config.deep_merge(@chef_provisioner_defaults) if !@chef_provisioner_defaults.nil?
 
       config.vm.provision :chef_solo do |chef|
         chef.log_level      = node_config['chef']['log_level'].to_sym
@@ -139,7 +139,7 @@ module VagrantHitch
     # Setup Puppet Server Provisioner
     if node_config.has_key?('puppet_server')
       # Import any defaults set by the Puppet Server Provisioner
-      node_config.deep_merge!(@puppet_server_provisioner_defaults) if !@puppet_server_provisioner_defaults.nil?
+      node_config.deep_merge(@puppet_server_provisioner_defaults) if !@puppet_server_provisioner_defaults.nil?
 
       config.vm.provision :puppet_server do |puppet|
         puppet.puppet_server = node_config['puppet_server']['server']

data/spec/hitch_spec.rb

@@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__),'..','/lib/vagrant-hitch')
 describe 'Hash' do
   let(:a) { {:string => "a", :array => [ 0,1,2 ], :hash => { :one => '1', :two => '2' } } }
   let(:b) { {:string => "b", :array => [ 3,4,5 ], :hash => { :three => '3', :four => '4' } } }
-  let(:ab) { {:string => "b", :array => [0,1,2,3,4,5 ], :hash => {:one => '1', :two => '2', :three => '3', :four => '4' } } }
+  let(:ab) { {:string => "a", :array => [0,1,2,3,4,5 ], :hash => {:one => '1', :two => '2', :three => '3', :four => '4' } } }
 
   it 'Hashes should have deep merge available' do
     a.should respond_to(:deep_merge)
@@ -13,7 +13,7 @@ describe 'Hash' do
   end
 
   it 'merges should work as expected' do
-    a.deep_merge!(b).should eql(ab)
+    a.deep_merge(b).should eql(ab)
   end
 end
 

data/vagrant-hitch.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "vagrant-hitch"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.1"
+  gem.version       = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hitch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: