vagrant-hiera 0.1.31 → 0.2.1

data/lib/vagrant-hiera/config.rb

@@ -16,11 +16,11 @@ module VagrantHiera
     end
 
     def config_path
-      File.expand_path(@config_path)
+      File.expand_path(@config_path) rescue ''
     end
 
     def data_path
-      File.expand_path(@data_path)
+      File.expand_path(@data_path) rescue ''
     end
 
     def set?
@@ -28,9 +28,12 @@ module VagrantHiera
     end
 
     def validate(env, errors)
-      config_file = File.join("#{config_path}", "#{config_file}")
-      errors.add("#{File.new(config_file).absolute_path} does not exist.") unless File.exists? config_file
-      errors.add("#{File.new(data_path).absolute_path} does not exist.") unless File.exists? "#{data_path}"
+      errors.add("Config path can not be empty") if config_path.empty?
+      errors.add("Config file can not be empty") if config_file.empty?
+      errors.add("Data path can not be empty") if data_path.empty?
+      config = File.join("#{config_path}", "#{config_file}")
+      errors.add("#{config} does not exist.") unless File.exists?(config)
+      errors.add("#{data_path} does not exist.") unless File.exists?("#{data_path}")
     end
   end
 end

data/lib/vagrant-hiera/middleware/prepare.rb

@@ -10,7 +10,6 @@ module VagrantHiera
       def call(env)
         @env = env
         if @env[:vm].config.hiera.set?
-          @env[:vm].config.hiera.validate(@env, nil)
           create_shared_folders
         end
         @app.call(env)

data/lib/vagrant-hiera/middleware/setup.rb

@@ -10,7 +10,6 @@ module VagrantHiera
       def call(env)
         @env = env
         if @env[:vm].config.hiera.set?
-          @env[:vm].config.hiera.validate(@env, nil)
           install_puppet_hiera unless puppet_hiera_installed?
           create_shared_folders
           create_symlink_to_hiera_config

data/lib/vagrant-hiera/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hiera
-    VERSION = "0.1.31"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hiera
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant