vagrant-puppet-install 2.7.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6278410fd5571374a78f0d9d3df000067fe16ae2
-  data.tar.gz: e53c78bd89cbe5e9b25ea6dc87f1ad851f0f58f2
+  metadata.gz: c6f07f33f3b11dddced68140c3699678635861ce
+  data.tar.gz: 2cc0a91c05b3a58b85c5bef1ddb8f61746db77c7
 SHA512:
-  metadata.gz: 7e769244db972e41338de621546933df3b4169afa1fb30cc914db65634ea0f9f26cea83880681d71c6b768b6ca17a8b64381078ae87fa2cfa3002aa852bcd049
-  data.tar.gz: 69e594cf65587973de5dc8ae6a260f10987c0796a8a087811297d2f4c5638663637f383c7b8fb61142e2c9ea3783d7bb873577fb84244145d872b48ea43c33f0
+  metadata.gz: 73810232072cc4e09263f8960391b647b55da24aa985c69a58392811efa1a4d9a77d46fd0d9df9f9bab3ba89c4ecd35c2aa90864e76b89ec79b20aaa1f34d94a
+  data.tar.gz: 23b663ff0a03b9b1fddce08498c0c0177c75fabecbb7557c1994cc65aea417ff734bda8af0e8c7643bafb942fd8b826d988eb1b1b5b6cca12dd08b22c3b6a26f

data/.travis.yml

@@ -1,6 +1,5 @@
 rvm:
-  - 2.0.0
   - 2.1.0
 bundler_args: --jobs 7 --without=acceptance
 script:
-  - bundle exec rake test:unit
+  - bundle exec rake test:unit

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', ref: 'bb22a37ed1989403e25e889d913b512090a5737f'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.4'
 end
 
 group :acceptance do
@@ -16,7 +16,7 @@ group :acceptance do
 end
 
 group :docs do
-  gem "yard", "~> 0.8.5"
-  gem "redcarpet", "~> 2.2.2"
-  gem "github-markup", "~> 0.7.5"
+  gem 'yard', '~> 0.8.5'
+  gem 'redcarpet', '~> 2.2.2'
+  gem 'github-markup', '~> 0.7.5'
 end

data/README.md

@@ -1,9 +1,15 @@
 # vagrant-puppet-install
 
-[![Gem Version](https://badge.fury.io/rb/vagrant-puppet-install.png)](http://badge.fury.io/rb/vagrant-puppet-install)
-[![Build Status](https://travis-ci.org/petems/vagrant-puppet-install.png?branch=master)](https://travis-ci.org/petems/vagrant-puppet-install)
-[![Dependency Status](https://gemnasium.com/petems/vagrant-puppet-install.png)](https://gemnasium.com/petems/vagrant-puppet-install)
-[![Code Climate](https://codeclimate.com/github/petems/vagrant-puppet-install.png)](https://codeclimate.com/github/petems/vagrant-puppet-install)
+[![Gem Version](http://img.shields.io/gem/v/vagrant-puppet-install.svg)][gem]
+[![Build Status](http://img.shields.io/travis/petems/vagrant-puppet-install.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/petems/vagrant-puppet-install.svg)][gemnasium]
+[![Code Climate](http://img.shields.io/codeclimate/github/petems/vagrant-puppet-install.svg)][codeclimate]
+
+[gem]: https://rubygems.org/gems/vagrant-puppet-install
+[travis]: http://travis-ci.org/petems/vagrant-puppet-install
+[gemnasium]: https://gemnasium.com/petems/vagrant-puppet-install
+[codeclimate]: https://codeclimate.com/github/petems/vagrant-puppet-install
+
 
 A Vagrant plugin that ensures the desired version of Puppet is installed via the
 Puppet Labs package repo. This proves very useful when using Vagrant
@@ -35,7 +41,9 @@ $ vagrant plugin install vagrant-puppet-install
 The Puppet Install Vagrant plugin automatically hooks into the Vagrant provisioning
 middleware. You specify the version of the `puppet-common` package you want
 installed using the `puppet_install.puppet_version` config key. The version string
-should be a valid Puppet release (ie. `2.7.11`, `3.0.*`, etc.).
+should be a valid Puppet release (ie. `2.7.11`, `3.7.4`, etc.).
+
+The Puppet version is validated against the RubyGems API, so you can use gem syntax to give a [pessimistic version constraint](http://guides.rubygems.org/patterns/#pessimistic-version-constraint) such as `~> 2.7` which will return the latest version of the 2.7.*.
 
 Install the latest version of Puppet:
 

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

@@ -62,7 +62,11 @@ module VagrantPlugins
           if windows_guest?
             # No Windows Version yet
           else
-            'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet.sh'
+            if ( @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^4\..+/) )
+              'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_agent.sh'
+            else
+              'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet.sh'
+            end
           end
         end
 

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

@@ -19,6 +19,9 @@ module VagrantPlugins
         elsif @puppet_version.to_s == 'latest'
           # resolve `latest` to a real version
           @puppet_version = retrieve_latest_puppet_version
+        elsif valid_puppet_version?(puppet_version)
+          # allows for pessimistic version constraint
+          @puppet_version = retrieve_latest_puppet_version(puppet_version)
         end
         @install_url = nil if @install_url == UNSET_VALUE
       end
@@ -48,9 +51,9 @@ A list of valid versions can be found at: http://docs.puppetlabs.com/release_not
       private
 
       # Query RubyGems.org's Ruby API and retrive the latest version of Puppet.
-      def retrieve_latest_puppet_version
+      def retrieve_latest_puppet_version(version = nil)
         available_gems =
-          dependency_installer.find_gems_with_sources(puppet_gem_dependency)
+          dependency_installer.find_gems_with_sources(puppet_gem_dependency(version))
         spec, _source =
         if available_gems.respond_to?(:last)
           # DependencyInstaller sorts the results such that the last one is

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

@@ -1,7 +1,3 @@
-if Vagrant::VERSION < '1.1.0'
-  fail 'The Vagrant Puppet Install plugin is only compatible with Vagrant 1.1+'
-end
-
 module VagrantPlugins
   module PuppetInstall
     class Plugin < Vagrant.plugin('2')
@@ -11,6 +7,31 @@ module VagrantPlugins
       via the Puppet Labs package repos.
       DESC
 
+      VAGRANT_VERSION_REQUIREMENT = '>= 1.1.0'
+
+      # Returns true if the Vagrant version fulfills the requirements
+      #
+      # @param requirements [String, Array<String>] the version requirement
+      # @return [Boolean]
+      def self.check_vagrant_version(*requirements)
+        Gem::Requirement.new(*requirements).satisfied_by?(
+          Gem::Version.new(Vagrant::VERSION))
+      end
+
+      # Verifies that the Vagrant version fulfills the requirements
+      #
+      # @raise [VagrantPlugins::ProxyConf::VagrantVersionError] if this plugin
+      # is incompatible with the Vagrant version
+      def self.check_vagrant_version!
+        unless check_vagrant_version(VAGRANT_VERSION_REQUIREMENT)
+          msg = I18n.t(
+            'vagrant-puppet_install.errors.vagrant_version',
+            requirement: VAGRANT_VERSION_REQUIREMENT.inspect)
+          $stderr.puts msg
+          fail msg
+        end
+      end
+
       action_hook(:install_puppet, Plugin::ALL_ACTIONS) do |hook|
         require_relative 'action/install_puppet'
         hook.after(Vagrant::Action::Builtin::Provision, Action::InstallPuppet)

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PuppetInstall
-    VERSION = "2.7.0"
+    VERSION = "3.0.0"
   end
-end
+end

data/locales/en.yml

@@ -6,3 +6,6 @@ en:
     download:
       downloading: "Downloading or copying install.sh..."
       interrupted: "Install.sh download was interrupted. Exiting."
+    errors:
+      vagrant_version: |-
+        vagrant-omnibus plugin requires Vagrant version %{requirement}

data/test/acceptance/virtualbox/Vagrantfile

@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
   config.vm.define :ubuntu do |ubuntu|
     ubuntu.puppet_install.puppet_version = '3.6.1'
 
-    ubuntu.vm.box = "chef/ubuntu-12.04"
+    ubuntu.vm.box = "puppetlabs/ubuntu-12.04-64-nocm"
 
     ubuntu.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
@@ -20,9 +20,24 @@ Vagrant.configure("2") do |config|
 
   end
 
+  config.vm.define :gh6 do |gh6|
+    gh6.puppet_install.puppet_version = '2.7.23'
+
+    gh6.vm.box = "puppetlabs/ubuntu-12.04-64-nocm"
+    gh6.vm.provision "shell", inline: "puppet --version"
+
+    gh6.vm.provision :puppet do |puppet|
+      puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
+      puppet.manifest_file  = "base.pp"
+    end
+
+    gh6.vm.provision "shell", inline: "puppet --version"
+
+  end
+
   config.vm.define :centos do |centos|
     centos.puppet_install.puppet_version = :latest
-    centos.vm.box = "chef/centos-6.5"
+    centos.vm.box = "puppetlabs/centos-6.6-64-nocm"
 
     centos.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
@@ -36,7 +51,7 @@ Vagrant.configure("2") do |config|
   config.vm.define :new_install_url do |new_install_url|
     new_install_url.puppet_install.puppet_version = :latest
     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"
+    new_install_url.vm.box = "puppetlabs/centos-6.6-64-nocm"
 
     new_install_url.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
@@ -50,7 +65,7 @@ Vagrant.configure("2") do |config|
   config.vm.define :new_install_path do |new_install_path|
     new_install_path.puppet_install.puppet_version = :latest
     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"
+    new_install_path.vm.box = "puppetlabs/centos-6.6-64-nocm"
 
     new_install_path.vm.provision :puppet do |puppet|
       puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)

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

@@ -36,6 +36,10 @@ describe VagrantPlugins::PuppetInstall::Config do
           description: 'valid puppet version string',
           valid: true
         },
+        '~> 2.7' => {
+          description: 'valid puppet version string',
+          valid: true
+        },
         '9.9.9' => {
           description: 'invalid puppet version string',
           valid: false

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

@@ -0,0 +1,82 @@
+require_relative '../spec_helper'
+
+describe VagrantPlugins::PuppetInstall::Plugin do
+
+  context 'action hooks' do
+    let(:hook) { double(append: true, prepend: true) }
+    let(:fake_class) { Class.new }
+
+    it 'should hook InstallPuppet before Provision' do
+      stub_const('VagrantPlugins::PuppetInstall::Action::InstallPuppet', fake_class)
+      hook_proc = described_class.components.action_hooks[:__all_actions__][0]
+      hook = double
+      expect(hook).to receive(:after).with(Vagrant::Action::Builtin::Provision, VagrantPlugins::PuppetInstall::Action::InstallPuppet)
+      hook_proc.call(hook)
+    end
+  end
+
+  it 'should define a config of type :puppet' do
+    default_config = described_class.components.configs[:top].to_hash[:"puppet_install"]
+    expect(default_config).to be(VagrantPlugins::PuppetInstall::Config)
+  end
+
+  describe '.check_vagrant_version' do
+    before :each do
+      stub_const('Vagrant::VERSION', '1.2.3')
+    end
+
+    it 'accepts single String argument' do
+      expect(described_class.check_vagrant_version('~> 1.1')).to be_true
+      expect(described_class.check_vagrant_version('1.2')).to be_false
+    end
+
+    it 'accepts an Array argument' do
+      expect(described_class.check_vagrant_version(['>= 1.1', '< 1.3.0.beta'])).to be_true
+      expect(described_class.check_vagrant_version(['>= 1.3'])).to be_false
+    end
+
+    it 'accepts multiple arguments' do
+      expect(described_class.check_vagrant_version('>= 1.0', '<= 1.3')).to be_true
+      expect(described_class.check_vagrant_version('~> 1.2', '>= 1.2.5')).to be_false
+    end
+  end
+
+  describe '.check_vagrant_version!' do
+    subject { described_class.check_vagrant_version! }
+    let(:requirement) { '>= 1.1.0' }
+    let(:err_msg) { /requires Vagrant version #{Regexp.escape(requirement.inspect)}/ }
+
+    before :each do
+      stub_const(
+        'VagrantPlugins::ProxyConf::Plugin::VAGRANT_VERSION_REQUIREMENT',
+        requirement)
+      stub_const('Vagrant::VERSION', vagrant_version)
+      $stderr.stub(:puts)
+    end
+
+    context 'on too old Vagrant version' do
+      let(:vagrant_version) { '1.0.9' }
+      it 'raises error' do
+        expect { subject }.to raise_error(err_msg)
+      end
+      it 'warns as stderr' do
+        $stderr.should_receive(:puts).with(err_msg)
+        expect { subject }.to raise_error(err_msg)
+      end
+    end
+
+    context 'on exact required Vagrant version' do
+      let(:vagrant_version) { '1.1.0' }
+      it 'does not raise' do
+        expect { subject }.not_to raise_error
+      end
+    end
+
+    context 'on newer Vagrant version' do
+      let(:vagrant_version) { '1.3.5' }
+      it 'does not raise' do
+        expect { subject }.not_to raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppet-install
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Seth Chisamore
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.0
 description: A Vagrant plugin that ensures the desired version of Puppet is installed
@@ -78,11 +78,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -102,6 +102,7 @@ files:
 - test/support/puppet_install_script/shell_install.sh
 - test/unit/spec_helper.rb
 - test/unit/vagrant-puppet-install/config_spec.rb
+- test/unit/vagrant-puppet-install/plugin_spec.rb
 - vagrant-puppet-install.gemspec
 homepage: https://github.com/patcon/vagrant-puppet-install
 licenses:
@@ -113,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that ensures the desired version of Puppet is installed
@@ -137,4 +138,5 @@ test_files:
 - test/support/puppet_install_script/shell_install.sh
 - test/unit/spec_helper.rb
 - test/unit/vagrant-puppet-install/config_spec.rb
+- test/unit/vagrant-puppet-install/plugin_spec.rb
 has_rdoc: