vagrant-hiera 0.3.5 → 0.4.0

data/lib/vagrant-hiera/config.rb

@@ -8,10 +8,10 @@ module VagrantHiera
     attr_accessor :guest_data_path
 
     attr_accessor :puppet_apt_source
+    attr_accessor :apt_opts
     attr_accessor :puppet_version
     attr_accessor :hiera_puppet_version
     attr_accessor :hiera_version
-    attr_accessor :apt_opts
 
     def guest_config_path
       @guest_config_path.nil? ? (@guest_config_path = '/tmp/vagrant-hiera/config') : @guest_config_path
@@ -22,23 +22,23 @@ module VagrantHiera
     end
 
     def puppet_apt_source
-      @puppet_apt_source.nil? ? (@puppet_apt_source = 'deb http://apt.puppetlabs.com/ lucid devel main') : @puppet_apt_source
+      @puppet_apt_source.nil? ? (@puppet_apt_source = 'deb http://apt.puppetlabs.com/ stable main') : @puppet_apt_source
+    end
+
+    def apt_opts
+      @apt_opts.nil? ? (@apt_opts = '-y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"') : @apt_opts
     end
 
     def puppet_version
-      @puppet_version.nil? ? (@puppet_version = '3.0.0-0.1rc5puppetlabs1') : @puppet_version
+      @puppet_version.nil? ? (@puppet_version = '3.0.0-1puppetlabs1') : @puppet_version
     end
 
     def hiera_puppet_version
-      @hiera_puppet_version.nil? ? (@hiera_puppet_version = '1.0.0-0.1rc3') : @hiera_puppet_version
+      @hiera_puppet_version
     end
 
     def hiera_version
-      @hiera_version.nil? ? (@hiera_version = '1.0.0-0.1rc4') : @hiera_version
-    end
-
-    def apt_opts
-      @apt_opts.nil? ? (@apt_opts = '-y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"') : @apt_opts
+      @hiera_version.nil? ? (@hiera_version = '1.0.0-1puppetlabs2') : @hiera_version
     end
 
     def config_path
@@ -53,15 +53,20 @@ module VagrantHiera
       config_path || config_file || data_path
     end
 
+    def install_puppet_heira?
+      puppet_version.to_i < 3
+    end
+
     def validate(env, errors)
+      return unless set?
+
       errors.add("Config path can not be empty.") if config_path.nil?
       errors.add("Config file can not be empty.") if config_file.nil?
       errors.add("Data path can not be empty.") if data_path.nil?
-      errors.add("Puppet apt source can not be empty.") if puppet_apt_source.nil?
       errors.add("Puppet version path can not be empty.") if puppet_version.nil?
-      errors.add("Hiera puppet version path can not be empty.") if hiera_puppet_version.nil?
-      errors.add("Hiera version path can not be empty.") if hiera_version.nil?
-      errors.add("Apt opts path can not be empty.") if apt_opts.nil?
+      errors.add("Puppet apt source can not be empty.") if puppet_apt_source.nil?
+      errors.add("Hiera puppet version can not be empty if puppet_version < 3.0.") if install_puppet_heira? && hiera_puppet_version.nil?
+      errors.add("Hiera version can not be empty.") if hiera_version.nil?
       config = File.join("#{config_path}", "#{config_file}")
       errors.add("Config file not found at '#{config}'.") unless File.exists?(config)
       errors.add("Data directory not found at '#{data_path}'.") unless File.exists?("#{data_path}")

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

@@ -2,6 +2,8 @@ module VagrantHiera
   module Middleware
 
     class Setup
+      APT_SOURCE_FILE = '/etc/apt/sources.list.d/puppetlabs.list'
+
       def initialize(app, env)
         @app = app
         @env = env
@@ -11,11 +13,11 @@ module VagrantHiera
         @config_path          = @env[:vm].config.hiera.config_path
         @data_path            = @env[:vm].config.hiera.data_path
         @config_file          = @env[:vm].config.hiera.config_file
-        @puppet_apt_source    = @env[:vm].config.hiera.puppet_apt_source
         @puppet_version       = @env[:vm].config.hiera.puppet_version
+        @puppet_apt_source    = @env[:vm].config.hiera.puppet_apt_source
+        @apt_opts             = @env[:vm].config.hiera.apt_opts
         @hiera_puppet_version = @env[:vm].config.hiera.hiera_puppet_version
         @hiera_version        = @env[:vm].config.hiera.hiera_version
-        @apt_opts             = @env[:vm].config.hiera.apt_opts
       end
 
       def call(env)
@@ -24,26 +26,18 @@ module VagrantHiera
           add_apt_repo unless apt_repo_set?
           install_puppet unless puppet_installed?
           install_hiera unless hiera_installed?
-          install_hiera_puppet unless hiera_puppet_installed?
+          if @env[:vm].config.hiera.install_puppet_heira?
+            install_hiera_puppet unless hiera_puppet_installed?
+          end
           create_shared_folders
           create_symlink_to_hiera_config
         end
         @app.call(env)
       end
 
-      def hiera_installed?
-        installed = ( @env[:vm].channel.execute("dpkg -l | grep puppet | grep #{@puppet_version}", :error_check => false) == 0 )
-        @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.hiera_installed') if installed
-        installed
-      end
-
-      def install_hiera
-        @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_hiera')
-        @env[:vm].channel.sudo("apt-get #{@apt_opts} install hiera=#{@hiera_version}")
-      end
-
       def apt_repo_set?
-        setup = ( @env[:vm].channel.execute("grep '#{@puppet_apt_source}' /etc/apt/sources.list", :error_check => false) == 0 )
+        cmd = "test -f #{APT_SOURCE_FILE} && grep '#{@puppet_apt_source}' #{APT_SOURCE_FILE}"
+        setup = ( @env[:vm].channel.execute(cmd, :error_check => false) == 0 )
         @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.apt_repo_set') if setup
         setup
       end
@@ -52,10 +46,21 @@ module VagrantHiera
         @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.add_apt_repo')
         @env[:vm].channel.sudo("wget http://apt.puppetlabs.com/puppetlabs-release-stable.deb")
         @env[:vm].channel.sudo("dpkg -i puppetlabs-release-stable.deb")
-        @env[:vm].channel.sudo("echo '#{@puppet_apt_source}' >> /etc/apt/sources.list.d/puppet.list")
+        @env[:vm].channel.sudo("echo '#{@puppet_apt_source}' >> #{APT_SOURCE_FILE}")
         @env[:vm].channel.sudo("apt-get update")
       end
 
+      def hiera_installed?
+        installed = ( @env[:vm].channel.execute("dpkg -l | grep puppet | grep #{@puppet_version}", :error_check => false) == 0 )
+        @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.hiera_installed') if installed
+        installed
+      end
+
+      def install_hiera
+        @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_hiera')
+        @env[:vm].channel.sudo("apt-get #{@apt_opts} install hiera=#{@hiera_version}")
+      end
+
       def puppet_installed?
         installed = ( @env[:vm].channel.execute("dpkg -l | grep puppet | grep #{@puppet_version}", :error_check => false) == 0 )
         @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.puppet_installed') if installed

data/lib/vagrant-hiera/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hiera
-    VERSION = "0.3.5"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hiera
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant