vagrant-puppet-install 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1714c4fa2a0a40e41eecb530b086576bd7008080
-  data.tar.gz: d0aa33d7b496d32b93eb354707818e72e95a5e24
+  metadata.gz: d1874b00e959ee871af563b0a45f504405e224be
+  data.tar.gz: 94d2181462355d6299a3f9cfb00d2865dfad1c4b
 SHA512:
-  metadata.gz: f992ae7dc9facca472110f059f81fc836c8d2eb934ff78de283ed93a7ecf13408d11d5c28c81425aca8f69421cb3a2258164848f4084d9d004c4b32834fc2283
-  data.tar.gz: 736a0b20eda0e016f0678359b9740f6a5aaedc9aa54882359a9811e441aa7caa82f0d32496563046c800746038e289ac990324e564eb9b455421cd23ca5a1150
+  metadata.gz: dedbb24b6f68eb721390f3beaf3eaae96f02c1c0b813c5e8f7b321b1606fc73ab26de960bbf0d94a100ec0e94b966e77f1030b477bde0d3aa7ef07522ddce7e6
+  data.tar.gz: a7af7b576100abc6c951f87cce33c1e7900ecc6ffea51ad5bfee03d35b917164eca454896005f042aef7fd5bf4ce2d1ae244cc56a1c93ff4807b61f0cbbfca6e

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [v4.0.1](https://github.com/petems/vagrant-puppet-install/tree/v4.0.1) (2016-04-04)
+
+[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v4.0.0...v4.0.1)
+
+**Closed issues:**
+
+- Machine is force to shutdown and destroyed after puppet is installed [\#42](https://github.com/petems/vagrant-puppet-install/issues/42)
+
+- How to install the latest available version of puppet? [\#41](https://github.com/petems/vagrant-puppet-install/issues/41)
+
+**Merged pull requests:**
+
+- Adds acceptance test for Fedora 23 [\#47](https://github.com/petems/vagrant-puppet-install/pull/47) ([petems](https://github.com/petems))
+
+- Fixes Vagrant on Puppet \> 4 for acceptance [\#45](https://github.com/petems/vagrant-puppet-install/pull/45) ([petems](https://github.com/petems))
+
+- Rubocop fixes [\#44](https://github.com/petems/vagrant-puppet-install/pull/44) ([petems](https://github.com/petems))
+
+- Fixes unlink code to work on Windows machines [\#43](https://github.com/petems/vagrant-puppet-install/pull/43) ([petems](https://github.com/petems))
+
 ## [v4.0.0](https://github.com/petems/vagrant-puppet-install/tree/v4.0.0) (2016-01-25)
 
 [Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v3.1.0...v4.0.0)

data/README.md

@@ -45,6 +45,20 @@ should be a valid Puppet release (ie. `2.7.11`, `3.7.4`, etc.).
 
 The Puppet version is validated against the RubyGems API. So as long as the version you give is [listed there](https://rubygems.org/gems/puppet/versions/), it will allow you to install.
 
+You may wish to disable this validation. This could be useful if you've got limited bandwidth on a bad internet connection or you're on a proxy, or your specifying a version that won't match against the RubyGems API (such as a custom patched version of Puppet).
+
+If you wish to disable this validation you can disable it like so:
+
+```ruby
+Vagrant.configure("2") do |config|
+
+  config.puppet_install.validate_version = false
+
+  ...
+
+end
+```
+
 Install the latest version of Puppet:
 
 ```ruby

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

@@ -5,11 +5,12 @@ require 'vagrant'
 module VagrantPlugins
   module PuppetInstall
     class Config < Vagrant.plugin('2', :config)
-      attr_accessor :puppet_version, :install_url
+      attr_accessor :puppet_version, :install_url, :validate_version
 
       def initialize
         @puppet_version = UNSET_VALUE
         @install_url = UNSET_VALUE
+        @validate_version = UNSET_VALUE
         @logger = Log4r::Logger.new('vagrantplugins::puppet_install::config')
       end
 
@@ -20,6 +21,7 @@ module VagrantPlugins
           # resolve `latest` to a real version
           @puppet_version = retrieve_latest_puppet_version
         end
+        @validate_version = nil if @validate_version == UNSET_VALUE
         @install_url = nil if @install_url == UNSET_VALUE
       end
 
@@ -27,13 +29,17 @@ module VagrantPlugins
         finalize!
         errors = []
 
-        if !puppet_version.nil? && !valid_puppet_version?(puppet_version)
-          msg = <<-EOH
-'#{puppet_version}' is not a valid version of Puppet.
+        if falsey?(validate_version)
+          @logger.debug("Not validating version due to validate_version being false")
+        else
+          if !puppet_version.nil? && !valid_puppet_version?(puppet_version)
+            msg = <<-EOH
+            '#{ puppet_version }' is not a valid version of Puppet.
 
-A list of valid versions can be found at: http://docs.puppetlabs.com/release_notes/
-          EOH
-          errors << msg
+            A list of valid versions can be found at: http://docs.puppetlabs.com/release_notes/
+            EOH
+            errors << msg
+          end
         end
 
         if errors.any?
@@ -90,6 +96,10 @@ A list of valid versions can be found at: http://docs.puppetlabs.com/release_not
       def puppet_gem_dependency(version = nil)
         Gem::Dependency.new('puppet', version)
       end
+
+      def falsey?(falsey_value)
+        true if [false,:false,'false'].include?(falsey_value)
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PuppetInstall
-    VERSION = '4.0.1'.freeze
+    VERSION = '4.1.0'.freeze
   end
 end

data/locales/en.yml

@@ -8,4 +8,4 @@ en:
       interrupted: "Install.sh download was interrupted. Exiting."
     errors:
       vagrant_version: |-
-        vagrant-omnibus plugin requires Vagrant version %{requirement}
+        vagrant-omnibus plugin requires Vagrant version %{requirement}

data/test/acceptance/virtualbox/Vagrantfile

@@ -61,6 +61,33 @@ Vagrant.configure('2') do |config|
     fedora_384.vm.provision 'shell', inline: 'puppet --version'
   end
 
+  config.vm.define :debian_jessie_372 do |debian_jessie_372|
+    debian_jessie_372.vm.box = "debian/jessie64"
+    debian_jessie_372.puppet_install.puppet_version = '3.7.2'
+
+    debian_jessie_372.vm.provision :puppet do |puppet|
+      puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
+      puppet.environment = "vagrant"
+    end
+
+    debian_jessie_372.vm.provision 'shell', inline: 'puppet --version'
+  end
+
+  config.vm.define :validate_version_false do |validate_version_false|
+    validate_version_false.puppet_install.puppet_version = '9.9.9'
+    validate_version_false.puppet_install.validate_version = false
+
+    validate_version_false.puppet_install.install_url = File.expand_path('../../support/puppet_install_script/shell_install.sh')
+    validate_version_false.vm.box = "puppetlabs/centos-6.6-64-nocm"
+
+    validate_version_false.vm.provision :puppet do |puppet|
+      puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
+      puppet.manifest_file  = "base.pp"
+    end
+
+    validate_version_false.vm.provision "shell", inline: "puppet --version"
+  end
+
   config.vm.define :trusty_ubuntu_box do |trusty_ubuntu_box|
     trusty_ubuntu_box.puppet_install.puppet_version = :latest
     trusty_ubuntu_box.puppet_install.install_url = 'https://gist.githubusercontent.com/petems/6723c2eedb9d32d7ad97/raw/990ff448f6430aa015e208668a3cecb3f1db0d4b/purge_old_install_new.sh'

data/test/unit/vagrant-puppet-install/config_spec.rb

@@ -8,6 +8,7 @@ describe VagrantPlugins::PuppetInstall::Config do
     instance.tap do |o|
       o.puppet_version = puppet_version if defined?(puppet_version)
       o.install_url = install_url if defined?(install_url)
+      o.validate_version = validate_version if defined?(validate_version)
       o.finalize!
     end
   end
@@ -15,6 +16,7 @@ describe VagrantPlugins::PuppetInstall::Config do
   describe 'defaults' do
     its(:puppet_version) { should be_nil }
     its(:install_url) { should be_nil }
+    its(:validate_version) { should be_nil}
   end
 
   describe 'resolving `:latest` to a real Puppet version' do
@@ -70,5 +72,37 @@ describe VagrantPlugins::PuppetInstall::Config do
         expect { subject.validate!(machine) }.to_not raise_error
       end
     end # describe not specified puppet_version validation
+
+    describe 'validate_version set to false should not raise error' do
+      {
+        false => {
+          description: 'Boolean false'
+        },
+        'false' => {
+          description: 'String false'
+        },
+        :false => {
+          description: ':false'
+        },
+      }.each_pair do |falsey, opts|
+        context "#{opts[:description]}" do
+          let(:validate_version) { falsey }
+          let(:puppet_version) { '9.9.9' }
+
+          it 'passes' do
+            expect { subject.validate!(machine) }.to_not raise_error
+          end
+        end
+      end
+    end # describe validate_version set to false should not raise error
+
+    describe 'validate_version set to true with an invalid version should not raise error' do
+      let(:validate_version) { true }
+      let(:puppet_version) { '9.9.9' }
+
+      it 'fails' do
+        expect { subject.validate!(machine) }.to raise_error
+      end
+    end # validate_version set to true with an invalid version should not raise error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppet-install
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Seth Chisamore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler