vagrant-hitch 0.0.3 → 0.0.4

data/lib/vagrant-hitch.rb

@@ -107,6 +107,31 @@ module VagrantHitch
             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 = node_config['hostname']
+
+              # Setup Puppet Graphing
+              if node_config['puppet_server']['options'].include?('--graph')
+                begin
+                  graph_dir = File.join(config_dir,'..','graph')
+                  [graph_dir, "#{graph_dir}/#{node_config['hostname']}"].each { |d| Dir.mkdir(d) if !File.directory?(d) }
+                  node_config['puppet_server']['options'] << "--graphdir=/vagrant/graph/#{node_config['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

data/spec/hitch_spec.rb

@@ -1,3 +1,5 @@
+require 'tmpdir'
+
 require File.join(File.dirname(__FILE__),'..','/lib/vagrant-hitch')
 describe VagrantHitch do
   it 'should return a proc' do
@@ -12,7 +14,29 @@ describe VagrantHitch 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'))
+  context "with a valid Vagrantfile" do
+    # set up Vagrantfile
+    before(:all) do
+      rootdir = File.join(File.dirname(__FILE__),'..')
+      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)
+    end
+
+    # clean up the temporary directory
+    after(:all) do
+    end
+
+    it 'should not include the default node information' do
+      output = Array.new
+      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")
+    end
   end
 end

data/vagrant-hitch.gemspec

@@ -15,5 +15,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.0.3"
+  gem.version       = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hitch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Creates and use a data driven vagrant environment