vagrant-hitch 0.1.2 → 0.1.3

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://www.rubygems.org'
 gem 'rake', :group => :test
 gemspec :path => '.'

data/Gemfile.lock

@@ -1,37 +1,37 @@
 PATH
   remote: .
   specs:
-    vagrant-hitch (0.1.0)
+    vagrant-hitch (0.1.2)
       backports
       deep_merge
       vagrant
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://www.rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    backports (2.8.2)
-    childprocess (0.3.7)
-      ffi (~> 1.0, >= 1.0.6)
+    backports (3.1.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     deep_merge (1.0.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
-    ffi (1.3.1)
-    i18n (0.6.1)
-    json (1.5.4)
+    ffi (1.4.0)
+    i18n (0.6.4)
+    json (1.5.5)
     log4r (1.1.10)
     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)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     vagrant (1.0.6)
       archive-tar-minitar (= 0.5.2)
       childprocess (~> 0.3.1)

data/Rakefile

@@ -25,6 +25,8 @@ end
 desc "set up all ruby environments"
 namespace :bootstrap do
   task :all_rubies do
+    system("rvm use 1.8.7-p370; bundle install")
+    system("rvm use 1.9.3-p194; bundle install")
   end
 end
 

data/lib/vagrant-hitch.rb

@@ -2,7 +2,6 @@ require 'yaml'
 require 'vagrant'
 require 'backports'
 require 'deep_merge'
-require 'pry'
 
 module VagrantHitch
   def self.validate(cfdir)

data/spec/hitch_spec.rb

@@ -1,5 +1,4 @@
 require 'tmpdir'
-require 'ap'
 
 require File.join(File.dirname(__FILE__),'..','/lib/vagrant-hitch')
 describe 'Hash' do
@@ -51,21 +50,23 @@ describe VagrantHitch do
 
     context 'single vagrant box configuration' do
       let(:vagrant_env) { ::Vagrant::Environment.new(:cwd => @tempdir) }
+      let(:test1) { vagrant_env.vms[:test1] }
+      let(:test2) { vagrant_env.vms[:test2] }
 
       it 'should configure cpu' do
-        vagrant_env.vms_ordered.first.config.vm.customizations.should include(["modifyvm", :id, "--cpus", "2"])
+        test1.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"])
+        test1.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")
+        test1.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"}]])
+        test1.config.vm.networks.should include([:hostonly, ["10.10.10.10", {:netmask=>"255.255.255.0"}]])
       end
 
       it 'should have dns' do
@@ -73,18 +74,18 @@ describe VagrantHitch do
       end
 
       it 'should have a provisioner' do
-        vagrant_env.vms_ordered.first.config.vm.provisioners.first.provisioner.should eql(Vagrant::Provisioners::Puppet)
+        test1.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,
+        test1.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(
+        test1.config.vm.shared_folders.should have(3).items
+        test1.config.vm.shared_folders.should include(
           "webapp"=> {:guestpath=>"/opt/www/", :hostpath=>"./", :create=>"true",
                       :owner=>"vagrant", :group=>nil, :nfs=>false,
                       :transient=>false, :extra=>nil},
@@ -99,6 +100,9 @@ describe VagrantHitch do
 
     context 'property merging' do
       let(:vagrant_env) { ::Vagrant::Environment.new(:cwd => @tempdir) }
+      let(:test1) { vagrant_env.vms[:test1] }
+      let(:test2) { vagrant_env.vms[:test2] }
+
       it 'should create a vagrant environment' do
         vagrant_env.should_not be_nil
       end
@@ -109,7 +113,7 @@ describe VagrantHitch do
       end
 
       it 'should merge the default provisioner settings properly' do
-        puppet_provisioner = vagrant_env.vms_ordered.first.config.vm.provisioners.first
+        puppet_provisioner = test1.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")
@@ -117,7 +121,7 @@ describe VagrantHitch do
       end
 
       it 'should configure multiple provisioners' do
-        vagrant_env.vms_ordered.last.config.vm.provisioners.should have(2).items
+        test2.config.vm.provisioners.should have(2).items
       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.2"
+  gem.version       = "0.1.3"
 end

metadata

@@ -1,89 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vagrant-hitch
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Aziz Shamim
 - James Fryman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: backports
   prerelease: false
-  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
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: deep_merge
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 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
@@ -105,27 +106,36 @@ files:
 - 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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