vagrant-hiera 0.3.0 → 0.3.2

data/example/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.9.3@vagrant-hiera --create

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

@@ -9,6 +9,7 @@ module VagrantHiera
         @puppet_version = '3.0.0-0.1rc3puppetlabs1'
         @hiera_puppet_version = '1.0.0-0.1rc1-1-g3e68ff0'
         @hiera_version = '1.0.0-0.1rc3'
+        @apt_opts = "-y --force-yes -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\""
       end
 
       def call(env)
@@ -32,7 +33,7 @@ module VagrantHiera
 
       def install_hiera
         @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_hiera')
-        @env[:vm].channel.sudo("apt-get -y --force-yes install hiera=#{@hiera_version}")
+        @env[:vm].channel.sudo("apt-get #{@apt_opts} install hiera=#{@hiera_version}")
       end
 
       def apt_repo_set?
@@ -44,7 +45,7 @@ module VagrantHiera
       def add_apt_repo
         @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.add_apt_repo')
         @env[:vm].channel.sudo("echo '#{@puppet_repo}' >> /etc/apt/sources.list")
-        @env[:vm].channel.sudo("apt-get -y --force-yes update")
+        @env[:vm].channel.sudo("apt-get update")
       end
 
       def puppet_installed?
@@ -55,8 +56,8 @@ module VagrantHiera
 
       def install_puppet
         @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_puppet')
-        @env[:vm].channel.sudo("apt-get -y --force-yes install puppet-common=#{@puppet_version}")
-        @env[:vm].channel.sudo("apt-get -y --force-yes install puppet=#{@puppet_version}")
+        @env[:vm].channel.sudo("apt-get #{@apt_opts} install puppet-common=#{@puppet_version}")
+        @env[:vm].channel.sudo("apt-get #{@apt_opts} install puppet=#{@puppet_version}")
       end
 
       def hiera_puppet_installed?
@@ -67,7 +68,7 @@ module VagrantHiera
 
       def install_hiera_puppet
         @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_hiera_puppet')
-        @env[:vm].channel.sudo("apt-get -y --force-yes install hiera-puppet=#{@hiera_puppet_version}")
+        @env[:vm].channel.sudo("apt-get #{@apt_opts} install hiera-puppet=#{@hiera_puppet_version}")
       end
 
       def create_shared_folders

data/lib/vagrant-hiera/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hiera
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hiera
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -39,6 +39,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/.rvmrc
 - example/Gemfile
 - example/Vagrantfile
 - example/configuration/hiera.yaml