vagrant-hitch 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,17 +1,19 @@
 PATH
   remote: .
   specs:
-    vagrant-hitch (0.0.9)
+    vagrant-hitch (0.1.0)
       backports
+      deep_merge
       vagrant
 
 GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    backports (2.7.1)
+    backports (2.8.2)
     childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
+    deep_merge (1.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.3.1)
@@ -21,6 +23,7 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.2.2)
+    rake (10.0.3)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -43,5 +46,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
   rspec
   vagrant-hitch!

data/Rakefile

@@ -3,6 +3,8 @@ require 'rspec/core/rake_task'
 
 task :default => [:test]
 
+task :spec => :test
+
 desc "run all functional specs in this ruby environment"
 RSpec::Core::RakeTask.new(:test) do |t|
   t.pattern = 'spec/*_spec.rb'
@@ -17,7 +19,7 @@ end
 
 desc "run the specs through all the supported rubies"
 task :rubies do
-  system("rvm 1.8.7-p370,1.9.3-p194 do rake spec")
+  system("rvm 1.8.7-p370,1.9.3-p194 do rake test")
 end
 
 desc "set up all ruby environments"

data/example/config/nodes.yml

@@ -1,8 +1,14 @@
 default: &default
+  cpu_count: 2
+  memory_size: 512
   vbox: vbox-name
   orgname: vagrant.test
   puppet:
     manifest_file: site.pp
+  mounts:
+    webapp:
+      host: ./
+      guest: /opt/www/
   ports:
     http:
       host: 10080
@@ -10,15 +16,35 @@ default: &default
     https:
       host: 10443
       guest: 443
-    mysql:
-      host: 13310
-      guest: 3306
-    tomcat:
-      host: 18080
-      guest: 8080
 default_app: &default_app
 web_default: &web_default
 test1:
   <<: *default
+  # Mounts do not merge, they only override because YAML anchors don't merge
+  ip: 10.10.10.10
+  puppet:
+    manifest_file: test1.pp
+  mounts:
+    webapp:
+      host: ./
+      guest: /opt/www/
+    database:
+      host: ./
+      guest: /opt/mysql/database
+  # Ports do not merge, they only override because YAML anchors don't merge
+  ports:
+    mysql:
+      host: 13310
+      guest: 3306
 test2:
   <<: *default
+  shell:
+  puppet:
+  ports:
+    tomcat:
+      host: 18080
+      guest: 8080
+  mounts:
+    tomcat:
+      host: ./
+      guest: /opt/tomcat/webapp

data/example/config/provisioner_shell.yml

@@ -0,0 +1,4 @@
+shell:
+  path: '../script/example.sh'
+  inline: "echo $1 > /vagrant/test"
+  args: "'write this to a file'"

data/example/script/example.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "This is a test of the shell provisioner running a script"

data/lib/vagrant-hitch.rb

@@ -1,7 +1,8 @@
 require 'yaml'
 require 'vagrant'
 require 'backports'
-require File.join(File.dirname(__FILE__),'deep_merge')
+require 'deep_merge'
+require 'pry'
 
 module VagrantHitch
   def self.validate(cfdir)
@@ -11,6 +12,181 @@ module VagrantHitch
     end
   end
 
+  def self.setup_dns(profile, node_config, config)
+    # Vagrant-DNS Support
+    if node_config['dns']
+      if node_config['dns']['tld']
+        config.dns.tld = node_config['dns']['tld']
+      end
+
+      if node_config['dns']['patterns']
+        config.dns.patterns = node_config['dns']['patterns']
+      end
+    end
+  end
+
+  def self.setup_vbox(profile, node_config, config)
+    config.vm.box = node_config['vbox']
+    config.vm.box_url = node_config['vbox_url']
+  end
+
+  def self.setup_hostname(profile, node_config, config)
+    # Setup VBox
+    # Configure Hostname
+    hostname = node_config.has_key?('orgname') ? "#{profile.to_s}.#{node_config['orgname']}" : "#{profile.to_s}.vagrant"
+    config.vm.host_name = hostname
+  end
+
+  def self.setup_cpu(profile, node_config, config)
+    # Configure CPU
+    config.vm.customize ["modifyvm", :id, "--cpus", node_config['cpu_count'].to_s] if node_config.has_key?('cpu_count')
+  end
+
+  def self.setup_memory(profile, node_config, config)
+    # Configure Memory
+    config.vm.customize ["modifyvm", :id, "--memory", node_config['memory_size'].to_s] if node_config.has_key?('memory_size')
+  end
+
+  def self.setup_network(profile, node_config, config)
+    # Configure Network
+    if node_config.has_key?('ip')
+      netmask = node_config.has_key?('netmask') ? node_config['netmask'] : '255.255.255.0'
+      config.vm.network :hostonly, node_config['ip'], :netmask => netmask
+    end
+  end
+
+  def self.setup_guest(profile, node_config, config)
+    if node_config.has_key?('guest')
+      config.vm.guest = node_config['guest']
+    end
+  end
+
+  def self.setup_ports(profile, node_config, config)
+    # Configure any host-based port forwards
+    if node_config.has_key?('ports')
+      node_config['ports'].each { |k,v| config.vm.forward_port(v['guest'], v['host']) }
+    end
+  end
+
+  def self.setup_winrm(profile, node_config, config)
+    # WinRM specific Configuration
+    if node_config.has_key?('winrm')
+      config.winrm.username = node_config['winrm']['username']
+      config.winrm.password = node_config['winrm']['password']
+      config.winrm.timeout = node_config['winrm']['timeout'] || 1800
+    end
+  end
+
+  def self.setup_mounts(profile, node_config, config)
+    # custom mounts
+    if node_config.has_key?('mounts')
+      node_config['mounts'].each { |desc, mount| config.vm.share_folder("#{desc}","#{mount['guest']}","#{mount['host']}", :create => 'true', :owner => mount.has_key?('owner') ? mount['owner'] : 'vagrant') }
+    end
+  end
+
+  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?
+      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')
+        shell.path   = node_config['shell']['path'] if node_config['shell'].has_key?('path')
+      end
+    end
+
+    # 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?
+
+      config.vm.provision :puppet do |puppet|
+        puppet.module_path    = node_config['puppet']['modules']
+        puppet.manifests_path = node_config['puppet']['manifests_path']
+        puppet.manifest_file  =
+          node_config['puppet'].has_key?('manifest_file') ? node_config['puppet']['manifest_file'] : "#{profile.to_s}.pp"
+
+        # Setup Puppet Graphing
+        if node_config['puppet']['options'].include?('--graph')
+          begin
+            graph_dir = File.join(config_dir,'..','graph')
+            [graph_dir, "#{graph_dir}/#{config.vm.host_name}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
+            node_config['puppet']['options'] << "--graphdir=/vagrant/graph/#{config.vm.host_name}"
+          rescue => e
+            puts "Unable to create Puppet Graph Directory: #{e}"
+          end
+        end
+
+        # Puppet Options must be the last option to ensure any additions are included
+        puppet.options = node_config['puppet']['options'].join(' ')
+      end
+    end
+
+    # 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?
+
+      config.vm.provision :chef_solo do |chef|
+        chef.log_level      = node_config['chef']['log_level'].to_sym
+        chef.cookbooks_path = node_config['chef']['cookbooks_path']
+        chef.roles_path     = node_config['chef']['roles_path']
+        chef.data_bags_path = node_config['chef']['data_bags_path']
+        node_config['chef']['roles'].each { |role| chef.add_role(role) }
+      end
+    end
+
+    # 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?
+
+      config.vm.provision :puppet_server do |puppet|
+        puppet.puppet_server = node_config['puppet_server']['server']
+        puppet.puppet_node = config.vm.host_name
+
+        # Setup Puppet Graphing
+        if node_config['puppet_server']['options'].include?('--graph')
+          begin
+            graph_dir = File.join(config_dir,'..','graph')
+            [graph_dir, "#{graph_dir}/#{config.vm.host_name}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
+            node_config['puppet_server']['options'] << "--graphdir=/vagrant/graph/#{config.vm.host_name}"
+          rescue => e
+            puts "Unable to create Puppet Graph Directory: #{e}"
+          end
+        end
+
+        # Puppet Options must be the last option to ensure any additions are included
+        puppet.options = node_config['puppet_server']['options'].join(' ')
+      end
+    end
+
+  end
+
+  def self.configure_node(profile, node_config, config, config_dir)
+    # Bail out if it is one of our special 'ignore' config blocks
+    config.vm.define profile do |config|
+      # Setup the environment
+      self.setup_dns(profile, node_config, config)
+      self.setup_vbox(profile, node_config, config)
+
+      # set up the server
+      self.setup_hostname(profile, node_config, config)
+      self.setup_cpu(profile, node_config, config)
+      self.setup_memory(profile, node_config, config)
+      self.setup_network(profile, node_config, config)
+      self.setup_guest(profile, node_config, config)
+      self.setup_winrm(profile, node_config, config)
+
+      # set up the integrations
+      self.setup_ports(profile, node_config, config)
+      self.setup_mounts(profile, node_config, config)
+
+      # set up the provisioners
+      self.setup_provisioners(profile, node_config, config, config_dir)
+    end
+  end
+
   def self.up!(cfdir)
     self.validate(cfdir)
     return lambda do |config_dir, config|
@@ -18,7 +194,7 @@ module VagrantHitch
       begin
         profiles = YAML::load_file(File.join(config_dir,'nodes.yml'))
 
-        ['chef', 'puppet', 'puppet_server'].each do |type|
+        ['shell','chef','puppet','puppet_server'].each do |type|
           if File.exists?(File.join(config_dir, "provisioner_#{type}.yml"))
             provisioner_data = YAML::load_file(File.join(config_dir, "provisioner_#{type}.yml"))
             instance_variable_set("@" + type + "_provisioner_defaults", provisioner_data)
@@ -37,126 +213,9 @@ module VagrantHitch
         true if ignore_config.find_index { |ignore_key| p.include?(ignore_key) }
       end
 
+      # Set up each profile
       profiles.each do |profile, node_config|
-        # Bail out if it is one of our special 'ignore' config blocks
-        config.vm.define profile do |config|
-
-          # Vagrant-DNS Support
-          if node_config['dns']
-            if node_config['dns']['tld']
-              config.dns.tld = node_config['dns']['tld']
-            end
-
-            if node_config['dns']['patterns']
-              config.dns.patterns = node_config['dns']['patterns']
-            end
-          end
-
-          # Setup VBox
-          config.vm.box = node_config['vbox']
-          config.vm.box_url = node_config['vbox_url']
-
-          # Configure Hostname
-          hostname = node_config.has_key?('orgname') ? "#{profile.to_s}.#{node_config['orgname']}" : "#{profile.to_s}.vagrant"
-          config.vm.host_name = hostname
-
-          if node_config.has_key?('guest')
-            config.vm.guest = node_config['guest']
-          end
-
-          # WinRM specific Configuration
-          if node_config.has_key?('winrm')
-            config.winrm.username = node_config['winrm']['username']
-            config.winrm.password = node_config['winrm']['password']
-            config.winrm.timeout = node_config['winrm']['timeout'] || 1800
-          end
-
-          # Configure memory and CPU
-          config.vm.customize ["modifyvm", :id, "--memory", node_config['memory_size'].to_s] if node_config.has_key?('memory_size')
-          config.vm.customize ["modifyvm", :id, "--cpus", node_config['cpu_count'].to_s] if node_config.has_key?('cpu_count')
-
-          # Configure Network
-          if node_config.has_key?('ip')
-            netmask = node_config.has_key?('netmask') ? node_config['netmask'] : '255.255.255.0'
-            config.vm.network :hostonly, node_config['ip'], :netmask => netmask
-          end
-
-          # Configure any host-based port forwards
-          if node_config.has_key?('ports')
-            node_config['ports'].each { |k,v| config.vm.forward_port(v['guest'], v['host']) }
-          end
-
-          # custom mounts
-          if node_config.has_key?('mounts')
-            node_config['mounts'].each { |desc, mount| config.vm.share_folder("#{desc}","#{mount['guest']}","#{mount['host']}", :create => 'true', :owner => mount.has_key?('owner') ? mount['owner'] : 'vagrant') }
-          end
-
-          # 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?
-
-            config.vm.provision :puppet do |puppet|
-              puppet.module_path    = node_config['puppet']['modules']
-              puppet.manifests_path = node_config['puppet']['manifests_path']
-              puppet.manifest_file  =
-                node_config['puppet'].has_key?('manifest_file') ? node_config['puppet']['manifest_file'] : "#{profile.to_s}.pp"
-
-              # Setup Puppet Graphing
-              if node_config['puppet']['options'].include?('--graph')
-                begin
-                  graph_dir = File.join(config_dir,'..','graph')
-                  [graph_dir, "#{graph_dir}/#{hostname}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
-                  node_config['puppet']['options'] << "--graphdir=/vagrant/graph/#{hostname}"
-                rescue => e
-                  puts "Unable to create Puppet Graph Directory: #{e}"
-                end
-              end
-
-              # Puppet Options must be the last option to ensure any additions are included
-              puppet.options = node_config['puppet']['options'].join(' ')
-            end
-          end
-
-          # 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?
-
-            config.vm.provision :puppet_server do |puppet|
-              puppet.puppet_server = node_config['puppet_server']['server']
-              puppet.puppet_node = hostname
-
-              # Setup Puppet Graphing
-              if node_config['puppet_server']['options'].include?('--graph')
-                begin
-                  graph_dir = File.join(config_dir,'..','graph')
-                  [graph_dir, "#{graph_dir}/#{hostname}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
-                  node_config['puppet_server']['options'] << "--graphdir=/vagrant/graph/#{hostname}"
-                rescue => e
-                  puts "Unable to create Puppet Graph Directory: #{e}"
-                end
-              end
-
-              # Puppet Options must be the last option to ensure any additions are included
-              puppet.options = node_config['puppet_server']['options'].join(' ')
-            end
-          end
-
-          # 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?
-
-            config.vm.provision :chef_solo do |chef|
-              chef.log_level      = node_config['chef']['log_level'].to_sym
-              chef.cookbooks_path = node_config['chef']['cookbooks_path']
-              chef.roles_path     = node_config['chef']['roles_path']
-              chef.data_bags_path = node_config['chef']['data_bags_path']
-              node_config['chef']['roles'].each { |role| chef.add_role(role) }
-            end
-          end
-        end
+        self.configure_node(profile, node_config, config, config_dir)
       end
     end.curry[cfdir]
   end

data/spec/hitch_spec.rb

@@ -1,6 +1,22 @@
 require 'tmpdir'
+require 'ap'
 
 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' } } }
+
+  it 'Hashes should have deep merge available' do
+    a.should respond_to(:deep_merge)
+    a.should respond_to(:deep_merge!)
+  end
+
+  it 'merges should work as expected' do
+    a.deep_merge!(b).should eql(ab)
+  end
+end
+
 describe VagrantHitch do
   it 'should return a proc' do
     VagrantHitch.up!('.').should be_a(Proc)
@@ -14,26 +30,100 @@ describe VagrantHitch do
     expect { VagrantHitch.up!('somepath') }.to raise_error
   end
 
+
   context "with a valid Vagrantfile" do
     # set up Vagrantfile
     before(:all) do
       rootdir = File.join(File.dirname(__FILE__),'..')
-      tempdir = Dir.tmpdir
+      @tempdir = Dir.tmpdir
       vagrantfile = <<-HERE.gsub(/^ {6}/, '')
         require '#{rootdir}/lib/vagrant_init.rb'
         Vagrant::Config.run &VagrantHitch.up!(File.join('#{rootdir}','example','config'))
       HERE
       # create new Vagrantfile in ../tmp
-      File.open(File.join(tempdir,"Vagrantfile"), "w") {|f| f.write(vagrantfile) }
-      Dir.chdir(tempdir)
+      File.open(File.join(@tempdir,"Vagrantfile"), "w") {|f| f.write(vagrantfile) }
+      Dir.chdir(@tempdir)
     end
 
     # clean up the temporary directory
     after(:all) do
     end
 
+    context 'single vagrant box configuration' do
+      let(:vagrant_env) { ::Vagrant::Environment.new(:cwd => @tempdir) }
+
+      it 'should configure cpu' do
+        vagrant_env.vms_ordered.first.config.vm.customizations.should include(["modifyvm", :id, "--cpus", "2"])
+      end
+
+      it 'should configure memory' do
+        vagrant_env.vms_ordered.first.config.vm.customizations.should include(["modifyvm", :id, "--memory", "512"])
+      end
+
+      it 'should have a hostname' do
+        vagrant_env.vms_ordered.first.config.vm.host_name.should eql("test1.vagrant.test")
+      end
+
+      it 'should have a network' do
+        vagrant_env.vms_ordered.first.config.vm.networks.should include([:hostonly, ["10.10.10.10", {:netmask=>"255.255.255.0"}]])
+      end
+
+      it 'should have dns' do
+        pending("what does config.dns.tld and config.dns.patterns provide?")
+      end
+
+      it 'should have a provisioner' do
+        vagrant_env.vms_ordered.first.config.vm.provisioners.first.provisioner.should eql(Vagrant::Provisioners::Puppet)
+      end
+
+      it 'should have network ports forward' do
+        vagrant_env.vms_ordered.first.config.vm.forwarded_ports.should include({:name=>"ssh", :guestport=>22,
+                                                                                :hostport=>2222, :protocol=>:tcp,
+                                                                                :adapter=>1, :auto=>true})
+      end
+
+      it 'should mounted folders' do
+        vagrant_env.vms_ordered.first.config.vm.shared_folders.should have(3).items
+        vagrant_env.vms_ordered.first.config.vm.shared_folders.should include(
+          "webapp"=> {:guestpath=>"/opt/www/", :hostpath=>"./", :create=>"true",
+                      :owner=>"vagrant", :group=>nil, :nfs=>false,
+                      :transient=>false, :extra=>nil},
+          "database"=> {:guestpath=>"/opt/mysql/database", :hostpath=>"./",
+                      :create=>"true", :owner=>"vagrant", :group=>nil,
+                      :nfs=>false, :transient=>false, :extra=>nil},
+          "v-root"=> {:guestpath=>"/vagrant", :hostpath=>".", :create=>false, :owner=>nil, :group=>nil, :nfs=>false,
+                      :transient=>false, :extra=>nil}
+          )
+      end
+    end
+
+    context 'property merging' do
+      let(:vagrant_env) { ::Vagrant::Environment.new(:cwd => @tempdir) }
+      it 'should create a vagrant environment' do
+        vagrant_env.should_not be_nil
+      end
+
+      it 'should merge the default mounts properly' do
+        pending "this feature either uses YAML anchors or code-based 'default' merge"
+        #vagrant_env.vms_ordered.first.config.vm.shared_folders.should have(3).items
+      end
+
+      it 'should merge the default provisioner settings properly' do
+        puppet_provisioner = vagrant_env.vms_ordered.first.config.vm.provisioners.first
+        puppet_provisioner.provisioner.should eql(Vagrant::Provisioners::Puppet)
+        puppet_provisioner.config.module_path.should have(2).items
+        puppet_provisioner.config.manifests_path.should eql("../manifests")
+        puppet_provisioner.config.manifest_file.should eql("test1.pp")
+      end
+
+      it 'should configure multiple provisioners' do
+        vagrant_env.vms_ordered.last.config.vm.provisioners.should have(2).items
+      end
+    end
+
     it 'should not include the default node information' do
       output = Array.new
+      # should this be fixed to test the environment instead of output from a piped command?
       IO.popen("vagrant status") { |io| output = io.readlines.collect { |l| l.chomp } }
       output.should include("test1                    not created","test2                    not created")
       output.should_not include("default                  not created")

data/vagrant-hitch.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "vagrant"
   gem.add_dependency "backports"
+  gem.add_dependency "deep_merge"
   gem.add_development_dependency "rspec"
 
   gem.files         = `git ls-files`.split($\)
@@ -16,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.0"
+  gem.version       = "0.1.1"
 end

metadata

@@ -1,76 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-hitch
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Aziz Shamim
 - James Fryman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: vagrant
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: backports
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creates and use a data driven vagrant environment
-email: 
+email:
 - azizshamim@gmail.com
 - james@frymanet.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -84,43 +97,35 @@ files:
 - example/config/provisioner_chef.yml
 - example/config/provisioner_puppet.yml
 - example/config/provisioner_puppet_server.yml
-- lib/deep_merge.rb
+- example/config/provisioner_shell.yml
+- example/script/example.sh
 - lib/vagrant-hitch.rb
 - lib/vagrant_init.rb
 - spec/hitch_spec.rb
 - vagrant-hitch.gemspec
 homepage: https://github.com/fup/vagrant-hitch
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Creates and use a data driven vagrant environment
-test_files: 
+test_files:
 - spec/hitch_spec.rb

data/lib/deep_merge.rb

@@ -1,26 +0,0 @@
-#MONKEYPATCHTHATHASH!
-class ::Hash
-  def deep_merge(hash)
-    
-  end
-
-  def deep_merge!(second)
-    deep_safe_merge(self,second)
-  end
-
-  private
-  def deep_safe_merge(source_hash, new_hash)
-    source_hash.merge!(new_hash) do |key, old, new|
-      if new.respond_to?(:blank) && new.blank?
-          old
-      elsif (old.kind_of?(Hash) and new.kind_of?(Hash))
-          deep_safe_merge(old, new)
-      elsif (old.kind_of?(Array) and new.kind_of?(Array))
-          old.concat(new).uniq
-      else
-          new
-      end
-    end
-  end
-
-end