Merge pull request #4 from easybiblabs/bugfix/expand_path

Bugfix/expand path
easybiblabs · Nov 1, 2013 · 030d08d · 030d08d
2 parents 2f54f7b + 700f4ac
commit 030d08d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/bib-vagrant.gemspec b/bib-vagrant.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor', '>= 0.18.1'
   spec.add_dependency 'colored', '>= 1.2'
+  spec.add_dependency 'json'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

diff --git a/lib/bib/vagrant/config.rb b/lib/bib/vagrant/config.rb
@@ -44,10 +44,13 @@ def validate!(config)
 
         errors = []
         log_level = ['debug', 'info', 'warn', 'error', 'fatal']
+        bool = [TrueClass, FalseClass]
 
-        errors << "nfs: must be a boolean" unless [TrueClass, FalseClass].include?(config['nfs'].class)
-        errors << "gui: must be a boolean" unless [TrueClass, FalseClass].include?(config['gui'].class)
-        errors << "cookbook_path: does not exist" unless File.directory?(config['cookbook_path'])
+        cookbook_path = File.expand_path(config['cookbook_path'])
+
+        errors << "nfs: must be a boolean" unless bool.include?(config['nfs'].class)
+        errors << "gui: must be a boolean" unless bool.include?(config['gui'].class)
+        errors << "cookbook_path: does not exist" unless File.directory?(cookbook_path)
         errors << "chef_log_level: must be one of #{log_level.join}" unless log_level.include?(config['chef_log_level'])
 
         if !config['additional_json'].empty?

diff --git a/test/config_test.rb b/test/config_test.rb
@@ -50,7 +50,7 @@ def test_validate!
     }
 
     config["nfs"] = false
-    config["cookbook_path"] = @@fixture_dir
+    config["cookbook_path"] = '~/'
 
     assert(c.validate!(config))