vagrant-hitch 0.0.2 → 0.0.3

data/.gitignore

@@ -2,3 +2,5 @@
 graph
 iso
 pkg
+*.gem
+tmp

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec :path => '.'

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    vagrant-hitch (0.0.2)
+      vagrant
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.1.5)
+    i18n (0.6.1)
+    json (1.5.4)
+    log4r (1.1.10)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.2.2)
+    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)
+    vagrant (1.0.5)
+      archive-tar-minitar (= 0.5.2)
+      childprocess (~> 0.3.1)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (~> 1.5.1)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec
+  vagrant-hitch!

data/example/config/nodes.yml

@@ -16,6 +16,8 @@ default: &default
     tomcat:
       host: 18080
       guest: 8080
+default_app: &default_app
+web_default: &web_default
 test1:
   <<: *default
 test2:

data/example/config/provisioner_chef.yml

@@ -1,6 +1,6 @@
 chef:
   log_level: 'debug'
   environment: "development"
-  base_roles:
+  roles:
     - base
     - vagrant

data/lib/vagrant-hitch.rb

@@ -29,11 +29,13 @@ module VagrantHitch
         exit
       end
 
-      # Ignore any and all YAML blocks with these keys.
+      # Ignore any and all YAML blocks with "default" in the key name
       # Typically, this should be used for any YAML anchors
       # that may be reused for other Vagrantbox definitions
       ignore_config = ['default']
-      ignore_config.each { |ignore_key| profiles.delete(ignore_key) }
+      profiles.delete_if do |profile, config|
+        true if ignore_config.find_index { |ignore_key| profile.include?(ignore_key) }
+      end
 
       profiles.each do |profile, node_config|
         # Bail out if it is one of our special 'ignore' config blocks
@@ -93,8 +95,8 @@ module VagrantHitch
               if node_config['puppet']['options'].include?('--graph')
                 begin
                   graph_dir = File.join(config_dir,'..','graph')
-                  [graph_dir, "#{graph_dir}/#{host_name}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
-                  node_config['puppet']['options'] << "--graphdir=/vagrant/graph/#{host_name}"
+                  [graph_dir, "#{graph_dir}/#{node_config['hostname']}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
+                  node_config['puppet']['options'] << "--graphdir=/vagrant/graph/#{node_config['hostname']}"
                 rescue => e
                   puts "Unable to create Puppet Graph Directory: #{e}"
                 end

data/spec/hitch_spec.rb

@@ -11,4 +11,8 @@ describe VagrantHitch do
   it 'should require a valid configuration path' do
     expect { VagrantHitch.up!('somepath') }.to raise_error
   end
+
+  it 'should return a correct status given a valid vagrantfile' do
+    Vagrant::Config.run &VagrantHitch.up!(File.join(File.dirname(__FILE__),'..','example','config'))
+  end
 end

data/vagrant-hitch.gemspec

@@ -8,11 +8,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/fup/vagrant-hitch"
 
   gem.add_dependency "vagrant"
+  gem.add_development_dependency "rspec"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "vagrant-hitch"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hitch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creates and use a data driven vagrant environment
 email:
 - azizshamim@gmail.com
@@ -38,6 +54,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.mkd
 - Rakefile