vagrant-puppet-install 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e4e297ff4fde97096077f301620439726631d0
-  data.tar.gz: 5020d278996330741966371405742c8e39d99cd7
+  metadata.gz: 4dee61f9b859f1d3a0b467baaf994f839fb80396
+  data.tar.gz: 316a1af6e9c13a12e074015610b7e205cfa1cd3e
 SHA512:
-  metadata.gz: c3eb7a2276f286d74d4a2e06a7c1819225f273f232105ac3182cb34964b0e87d8695d9124a033b7a1f3bd92535fb3e842c841f195a3fa90980eae66206847908
-  data.tar.gz: bf58dd73d1ac9f5bd06e15c46d8ce405232e28d1d8ed938a686c23402ff85fe12088f7510f42b056e0ec8fb35ceb04d6b3fd4ce7c6772ba31b5edccbd4e44196
+  metadata.gz: b643bab4e57e910682bae767ceb6134a4bbf863061771efabca7d50227e631d52936bbaf4796643c14538505ded4afd5c3e05d2833e1308b64c2cc9433343ab5
+  data.tar.gz: 7459621aa80cd4038b11917fa654fe3d421d8b719ab90846e012e1f25c8210fcdcd2273750adc4ccac4be200e4751e10f241f8678bdd87300baecbee7028decd

data/.travis.yml

@@ -1,5 +1,11 @@
+sudo: required
 rvm:
-  - 2.2.5
-bundler_args: --jobs 7 --without=acceptance
+  - 2.4.1
+before_install:
+  - gem install bundler
+  - bundle install
+  - docker pull petems/centos-7-docker-vagrant-insecure-key
 script:
+  - bundle exec rake validate
   - bundle exec rake test:unit
+  - bundle exec rake test:docker_acceptance

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
+## [v6.0.0](https://github.com/petems/vagrant-puppet-install/tree/v6.0.0) (2019-04-07)
+[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v5.0.0...v6.0.0)
 
+**Closed issues:**
+
+- '4.9.10' is not a valid version of Puppet [\#56](https://github.com/petems/vagrant-puppet-install/issues/56)
+- Incorrect install script used for default\_install\_url when version is latest [\#55](https://github.com/petems/vagrant-puppet-install/issues/55)
+
+**Merged pull requests:**
+
+- Add support for Puppet 6 [\#61](https://github.com/petems/vagrant-puppet-install/pull/61) ([dhoppe](https://github.com/dhoppe))
+- Bump version to 5.0.1 [\#59](https://github.com/petems/vagrant-puppet-install/pull/59) ([petems](https://github.com/petems))
+- Fixes Travis config [\#58](https://github.com/petems/vagrant-puppet-install/pull/58) ([petems](https://github.com/petems))
+- Fixes security issues detected by Github [\#57](https://github.com/petems/vagrant-puppet-install/pull/57) ([petems](https://github.com/petems))
 
 ## [v5.0.0](https://github.com/petems/vagrant-puppet-install/tree/v5.0.0) (2017-07-11)
 [Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v4.1.0...v5.0.0)

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-puppet-install (6.0.0)
+    vagrant-puppet-install (6.0.1)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -18,6 +18,13 @@ begin
 rescue LoadError
 end
 
+desc 'Validate ruby files'
+task :validate do
+  Dir['test/**/*.rb', 'lib/**/*.rb'].each do |ruby_file|
+    sh "ruby -c #{ruby_file}" unless ruby_file =~ %r{spec/fixtures}
+  end
+end
+
 namespace :test do
   RSpec::Core::RakeTask.new(:unit) do |t|
     t.pattern = 'test/unit/**/*_spec.rb'
@@ -58,6 +65,19 @@ namespace :test do
       end
     end
   end
+
+  desc 'Run docker acceptance test - Used in CI'
+  task :docker_acceptance do |_t, args|
+    puts '=================================================================='
+    puts "Running acceptance tests against Docker provider..."
+    puts '=================================================================='
+
+    Dir.chdir("test/acceptance/docker") do
+      system('vagrant destroy -f')
+      system("vagrant up --provider=docker --provision")
+      system('vagrant destroy -f')
+    end
+  end
 end
 
 task default: 'test:unit'

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

@@ -65,7 +65,7 @@ module VagrantPlugins
           else
             if @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^6\..+/)
               'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_6_agent.sh'
-            if @machine.config.puppet_install.puppet_version.match(/^5\..+/)
+            elsif @machine.config.puppet_install.puppet_version.match(/^5\..+/)
               'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_5_agent.sh'
             elsif @machine.config.puppet_install.puppet_version.match(/^4\..+/)
               'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_agent.sh'

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PuppetInstall
-    VERSION = '6.0.0'.freeze
+    VERSION = '6.0.1'.freeze
   end
 end

data/test/acceptance/docker/Vagrantfile

@@ -0,0 +1,22 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# plugins don't seem to be auto-loaded from the bundle
+require 'vagrant-puppet-install'
+
+Vagrant.configure('2') do |config|
+  config.puppet_install.puppet_version = :latest
+
+  config.vm.provider "docker" do |d|
+    d.image   = "petems/centos-7-docker-vagrant-insecure-key"
+    d.name    = "vagrant-puppet-install-centos-7"
+    d.has_ssh = true
+  end
+
+  config.ssh.username = "vagrant"
+
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
+    puppet.manifest_file  = 'base.pp'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppet-install
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Seth Chisamore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,6 +111,7 @@ files:
 - locales/en.yml
 - test/acceptance/aws/Vagrantfile
 - test/acceptance/digital_ocean/Vagrantfile
+- test/acceptance/docker/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/environments/vagrant/manifests/site.pp
@@ -148,6 +149,7 @@ summary: A Vagrant plugin that ensures the desired version of Puppet is installe
 test_files:
 - test/acceptance/aws/Vagrantfile
 - test/acceptance/digital_ocean/Vagrantfile
+- test/acceptance/docker/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/environments/vagrant/manifests/site.pp