vagrant-hiera 0.1.4 → 0.1.20

data/README.md

@@ -18,18 +18,10 @@ Or install it yourself as:
 
 ## Usage
 
-Create a [hiera.yaml](https://github.com/puppetlabs/hiera-puppet#module-user) file on your host with the datadir pointing to `/tmp/vagrant-hiera/data`
-
-    :json:
-      :datadir: /var/lib/hiera
-
 Add the following to your VagrantFile:
-
-    config.hiera.config_path = 'host/path/to/the/directory/that/contains/hiera.yaml'
-    config.hiera.config_file = 'hiera.yaml'
-    config.hiera.data_path   = 'host/path/to/hiera-data'
-
-And then...
+      config.hiera.config_path = 'path/to/directory/that/contains/configuration'
+      config.hiera.config_file = 'hiera.yaml'
+      config.hiera.data_path   = '/path/to/hiera-data'
 
 `vagrant up`
 

data/lib/vagrant-hiera/config.rb

@@ -8,19 +8,19 @@ module VagrantHiera
     attr_accessor :guest_data_path
 
     def guest_config_path
-      @guest_config_path.nil? ? (@guest_config_path = '/tmp/vagrant-hiera/config') : @guest_config_path
+      @guest_config_path.nil? ? (@guest_config_path = '/tmp/vagrant-hiera-config') : @guest_config_path
     end
 
     def guest_data_path
-      @guest_data_path.nil? ? (@guest_data_path = '/tmp/vagrant-hiera/data') : @guest_data_path
+      @guest_data_path.nil? ? (@guest_data_path = '/tmp/vagrant-hiera-data') : @guest_data_path
     end
 
     def config_path
-      File.expand_path(@config_path) rescue ''
+      File.absolute_path(@config_path)
     end
 
     def data_path
-      File.expand_path(@data_path) rescue ''
+      File.absolute_path(@data_path)
     end
 
     def set?
@@ -28,12 +28,12 @@ module VagrantHiera
     end
 
     def validate(env, errors)
-      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}")
+      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}"
+      #global_config.vm.share_folder("vagrant-hiera-config", guest_config_path, config_path)
+      #global_config.vm.share_folder("vagrant-hiera-data", guest_data_path, data_path)
     end
+
   end
 end

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

@@ -10,6 +10,7 @@ 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,6 +10,7 @@ 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
@@ -39,7 +40,6 @@ module VagrantHiera
 
       def create_symlink_to_hiera_config
         @env[:ui].info I18n.t('vagrant.plugins.hiera.middleware.setup.installing_hiera_config')
-        @env[:vm].channel.sudo("mkdir -p /etc/puppet")
         @env[:vm].channel.sudo("ln -fs #{@env[:vm].config.hiera.guest_config_path}/#{@env[:vm].config.hiera.config_file} /etc/puppet/hiera.yaml")
       end
     end

data/lib/vagrant-hiera/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hiera
-    VERSION = "0.1.4"
+    VERSION = "0.1.20"
   end
 end

metadata

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