vagrant-puppet-install 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ad0388b5d74099abab471358cd265018ed6755
-  data.tar.gz: 8dc1380f5b877af48f7b01bc8ce57866071205d3
+  metadata.gz: 736eaea9ebef8dc64fa71ac2aec11d04b5f0a7af
+  data.tar.gz: cee07e33b748975251d25a47360c9763f12da82d
 SHA512:
-  metadata.gz: b36a925d100c275c3386309f96494ac2102697aba0989ed18a2dc56e3fbf96f668d17851dc7a4589e8e84844b796db52172448d3c523f2cfd992cb490c79f41b
-  data.tar.gz: 13894480fe4620767b61058157a9d7f9d9e8047c7d928f4af6fbad970ef7ba17d68f78c6b463c36362efe579d512430c86e7968e43de9c022e33a1ae3f058fd7
+  metadata.gz: 9a731ba03aee1753593a568474b61141d5a0d98dccc62ae9781d59f3f8cdb03eb18b3f1265cad54413aa67b9c1b83c5f15d363ed56a63bbc600d3595ddca6883
+  data.tar.gz: 95add6b967ba8afc1d61e889e5b596f33c33092d7936d667ba54b7b667dc5fafd057ca4981d40cde43d7a3c7cb3dfe21d1863e34dd001af6e2392f76970a9ffb

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.6.3"
 end
 
 group :acceptance do

data/lib/vagrant-puppet-install/action/install_puppet.rb

@@ -23,7 +23,7 @@ module VagrantPlugins
           return unless @machine.communicate.ready? && provision_enabled?(env)
 
           # Perform delayed validation
-          @machine.config.puppet.validate!(@machine)
+          @machine.config.puppet_install.validate!(@machine)
 
           desired_version = @machine.config.puppet_install.puppet_version
           unless desired_version.nil?

data/lib/vagrant-puppet-install/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PuppetInstall
-    VERSION = "2.5.0"
+    VERSION = "2.6.0"
   end
 end

data/test/acceptance/virtualbox/Vagrantfile

@@ -9,8 +9,7 @@ Vagrant.configure("2") do |config|
   config.vm.define :ubuntu do |ubuntu|
     ubuntu.puppet_install.puppet_version = '3.6.1'
 
-    ubuntu.vm.box = "precise64"
-    ubuntu.vm.box_url = "http://files.vagrantup.com/precise64.box"
+    ubuntu.vm.box = "chef/ubuntu-12.04"
 
     ubuntu.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
@@ -23,10 +22,9 @@ Vagrant.configure("2") do |config|
 
   config.vm.define :centos do |centos|
     centos.puppet_install.puppet_version = :latest
-    centos.vm.box = 'centos-64-x64-vbox4210-nocm'
-    centos.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
+    centos.vm.box = "chef/centos-6.5"
 
-    config.vm.provision :puppet do |puppet|
+    centos.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
       puppet.manifest_file  = "base.pp"
     end
@@ -37,11 +35,10 @@ Vagrant.configure("2") do |config|
 
   config.vm.define :new_install_url do |new_install_url|
     new_install_url.puppet_install.puppet_version = :latest
-    config.puppet_install.install_url = 'https://raw.githubusercontent.com/hashicorp/puppet-bootstrap/master/centos_6_x.sh'
-    new_install_url.vm.box = 'centos-64-x64-vbox4210-nocm'
-    new_install_url.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
+    new_install_url.puppet_install.install_url = 'https://raw.githubusercontent.com/hashicorp/puppet-bootstrap/master/centos_6_x.sh'
+    new_install_url.vm.box = "chef/centos-6.5"
 
-    config.vm.provision :puppet do |puppet|
+    new_install_url.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
       puppet.manifest_file  = "base.pp"
     end
@@ -52,11 +49,10 @@ Vagrant.configure("2") do |config|
 
   config.vm.define :new_install_path do |new_install_path|
     new_install_path.puppet_install.puppet_version = :latest
-    config.puppet_install.install_url = File.expand_path('../../support/puppet_install_script/centos_6_x.sh')
-    new_install_path.vm.box = 'centos-64-x64-vbox4210-nocm'
-    new_install_path.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
+    new_install_path.puppet_install.install_url = File.expand_path('../../support/puppet_install_script/shell_install.sh')
+    new_install_path.vm.box = "chef/centos-6.5"
 
-    config.vm.provision :puppet do |puppet|
+    new_install_path.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
       puppet.manifest_file  = "base.pp"
     end

data/test/support/puppet_install_script/{centos_6_x.sh → shell_install.sh}

@@ -2,20 +2,10 @@
 
 set -e
 
-echo "THIS IS RUNNING ON YOUR MACHINE!"
+echo "Spec test running now!"
 
 REPO_URL="http://yum.puppetlabs.com/el/6/products/i386/puppetlabs-release-6-7.noarch.rpm"
 
-if [ "$EUID" -ne "0" ]; then
-  echo "This script must be run as root." >&2
-  exit 1
-fi
-
-if which puppet > /dev/null 2>&1; then
-  echo "Puppet is already installed."
-  exit 0
-fi
-
 # Install puppet labs repo
 echo "Configuring PuppetLabs repo..."
 repo_path=$(mktemp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppet-install
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Seth Chisamore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ files:
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/manifests/base.pp
-- test/support/puppet_install_script/centos_6_x.sh
+- test/support/puppet_install_script/shell_install.sh
 - test/unit/spec_helper.rb
 - test/unit/vagrant-puppet-install/config_spec.rb
 - vagrant-puppet-install.gemspec
@@ -134,7 +134,7 @@ test_files:
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/manifests/base.pp
-- test/support/puppet_install_script/centos_6_x.sh
+- test/support/puppet_install_script/shell_install.sh
 - test/unit/spec_helper.rb
 - test/unit/vagrant-puppet-install/config_spec.rb
 has_rdoc: