vagrant-puppet-install 4.0.0 → 4.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fd581140ef127f0b1d8eff44dc9b236909c05c2e
4
- data.tar.gz: c47a647457d7aba371af6396c0b9129e1f4a1220
3
+ metadata.gz: 1714c4fa2a0a40e41eecb530b086576bd7008080
4
+ data.tar.gz: d0aa33d7b496d32b93eb354707818e72e95a5e24
5
5
  SHA512:
6
- metadata.gz: 198797655bef1dca1f251eb261dffa21feb0e0b1e1453d177118c760b05c617b178d99ac7d5d1b25a8cb5e9cd2e3b2ffbac14cfa8a98dd93acb89f131ff90dac
7
- data.tar.gz: e744df7b94828d4dd8eeefd36d2077091b2256c7f3112b10bf15774d5ab1a528eb543ce178f23d203e53ce3f6b5ed5e67469c3f6ce1326b40476bfab6a6f265b
6
+ metadata.gz: f992ae7dc9facca472110f059f81fc836c8d2eb934ff78de283ed93a7ecf13408d11d5c28c81425aca8f69421cb3a2258164848f4084d9d004c4b32834fc2283
7
+ data.tar.gz: 736a0b20eda0e016f0678359b9740f6a5aaedc9aa54882359a9811e441aa7caa82f0d32496563046c800746038e289ac990324e564eb9b455421cd23ca5a1150
data/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # Change Log
2
2
 
3
+ ## [v4.0.0](https://github.com/petems/vagrant-puppet-install/tree/v4.0.0) (2016-01-25)
4
+
5
+ [Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v3.1.0...v4.0.0)
6
+
7
+ **Closed issues:**
8
+
9
+ - Empty puppet\_version gives error. [\#38](https://github.com/petems/vagrant-puppet-install/issues/38)
10
+
11
+ **Merged pull requests:**
12
+
13
+ - Removes pessimistic reference from docs [\#40](https://github.com/petems/vagrant-puppet-install/pull/40) ([petems](https://github.com/petems))
14
+
15
+ - Fix nil errors [\#39](https://github.com/petems/vagrant-puppet-install/pull/39) ([petems](https://github.com/petems))
16
+
3
17
  ## [v3.1.0](https://github.com/petems/vagrant-puppet-install/tree/v3.1.0) (2016-01-21)
4
18
 
5
19
  [Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v3.0.0...v3.1.0)
data/Gemfile CHANGED
@@ -13,6 +13,7 @@ group :acceptance do
13
13
  gem 'vagrant-digitalocean', '~> 0.5.3'
14
14
  gem 'vagrant-aws', '~> 0.4.0'
15
15
  gem 'vagrant-rackspace', '~> 0.1.4'
16
+ gem 'vagrant-vbguest', '~> 0.11.0'
16
17
  end
17
18
 
18
19
  group :docs do
data/Rakefile CHANGED
@@ -7,16 +7,14 @@ require 'yard'
7
7
  YARD::Rake::YardocTask.new
8
8
 
9
9
  namespace :test do
10
-
11
10
  RSpec::Core::RakeTask.new(:unit) do |t|
12
- t.pattern = "test/unit/**/*_spec.rb"
11
+ t.pattern = 'test/unit/**/*_spec.rb'
13
12
  end
14
13
 
15
- desc "Run acceptance tests..these actually launch Vagrant sessions."
16
- task :acceptance, :provider do |t, args|
17
-
14
+ desc 'Run acceptance tests..these actually launch Vagrant sessions.'
15
+ task :acceptance, :provider do |_t, args|
18
16
  # ensure all required dummy boxen are installed
19
- %w{ aws rackspace }.each do |provider|
17
+ %w( aws rackspace ).each do |provider|
20
18
  unless system("vagrant box list | grep 'dummy\s*(#{provider})' &>/dev/null")
21
19
  system("vagrant box add dummy https://github.com/mitchellh/vagrant-#{provider}/raw/master/dummy.box")
22
20
  end
@@ -26,7 +24,7 @@ namespace :test do
26
24
  system('vagrant box add digital_ocean https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box')
27
25
  end
28
26
 
29
- all_providers = Dir["test/acceptance/*"].map{|dir| File.basename(File.expand_path(dir))}
27
+ all_providers = Dir['test/acceptance/*'].map { |dir| File.basename(File.expand_path(dir)) }
30
28
 
31
29
  # If a provider wasn't passed to the task run acceptance tests against
32
30
  # ALL THE PROVIDERS!
@@ -37,17 +35,17 @@ namespace :test do
37
35
  end
38
36
 
39
37
  providers.each do |provider|
40
- puts "=================================================================="
38
+ puts '=================================================================='
41
39
  puts "Running acceptance tests against '#{provider}' provider..."
42
- puts "=================================================================="
40
+ puts '=================================================================='
43
41
 
44
42
  Dir.chdir("test/acceptance/#{provider}") do
45
- system("vagrant destroy -f")
43
+ system('vagrant destroy -f')
46
44
  system("vagrant up --provider=#{provider} --provision")
47
- system("vagrant destroy -f")
45
+ system('vagrant destroy -f')
48
46
  end
49
47
  end
50
48
  end
51
49
  end
52
50
 
53
- task :default => "test:unit"
51
+ task default: 'test:unit'
@@ -7,7 +7,6 @@ module VagrantPlugins
7
7
  module PuppetInstall
8
8
  module Action
9
9
  class InstallPuppet
10
-
11
10
  def initialize(app, env)
12
11
  @app = app
13
12
  @logger =
@@ -64,7 +63,7 @@ module VagrantPlugins
64
63
  elsif windows_guest?
65
64
  # No Windows Version yet
66
65
  else
67
- if ( @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^4\..+/) )
66
+ if @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^4\..+/)
68
67
  'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_agent.sh'
69
68
  else
70
69
  'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet.sh'
@@ -136,7 +135,7 @@ module VagrantPlugins
136
135
  #
137
136
  def fetch_or_create_install_script(env)
138
137
  @script_tmp_path =
139
- env[:tmp_path].join("#{Time.now.to_i.to_s}-#{install_script_name}")
138
+ env[:tmp_path].join("#{Time.now.to_i}-#{install_script_name}")
140
139
 
141
140
  @logger.info("Generating install script at: #{@script_tmp_path}")
142
141
 
@@ -171,9 +170,20 @@ module VagrantPlugins
171
170
  end
172
171
  end
173
172
 
174
- def recover(env)
173
+ def recover(_env)
175
174
  if @script_tmp_path && File.exist?(@script_tmp_path)
176
- File.unlink(@script_tmp_path)
175
+ # Try extra hard to unlink the file so that it reliably works
176
+ # on Windows hosts as well, see:
177
+ # http://alx.github.io/2009/01/27/ruby-wundows-unlink.html
178
+ file_deleted = false
179
+ until file_deleted
180
+ begin
181
+ File.unlink(@script_tmp_path)
182
+ file_deleted = true
183
+ rescue Errno::EACCES
184
+ @logger.debug("failed to unlink #{@script_tmp_path}. retry...")
185
+ end
186
+ end
177
187
  end
178
188
  end
179
189
  end
@@ -23,13 +23,13 @@ module VagrantPlugins
23
23
  @install_url = nil if @install_url == UNSET_VALUE
24
24
  end
25
25
 
26
- def validate!(machine)
26
+ def validate!(_machine)
27
27
  finalize!
28
28
  errors = []
29
29
 
30
30
  if !puppet_version.nil? && !valid_puppet_version?(puppet_version)
31
31
  msg = <<-EOH
32
- '#{ puppet_version }' is not a valid version of Puppet.
32
+ '#{puppet_version}' is not a valid version of Puppet.
33
33
 
34
34
  A list of valid versions can be found at: http://docs.puppetlabs.com/release_notes/
35
35
  EOH
@@ -38,10 +38,10 @@ A list of valid versions can be found at: http://docs.puppetlabs.com/release_not
38
38
 
39
39
  if errors.any?
40
40
  rendered_errors = Vagrant::Util::TemplateRenderer.render(
41
- 'config/validation_failed',
42
- errors: { 'vagrant-puppet-install' => errors }
43
- )
44
- fail Vagrant::Errors::ConfigInvalid, errors: rendered_errors
41
+ 'config/validation_failed',
42
+ errors: { 'vagrant-puppet-install' => errors }
43
+ )
44
+ raise Vagrant::Errors::ConfigInvalid, errors: rendered_errors
45
45
  end
46
46
  end
47
47
 
@@ -52,18 +52,18 @@ A list of valid versions can be found at: http://docs.puppetlabs.com/release_not
52
52
  available_gems =
53
53
  dependency_installer.find_gems_with_sources(puppet_gem_dependency)
54
54
  spec, _source =
55
- if available_gems.respond_to?(:last)
56
- # DependencyInstaller sorts the results such that the last one is
57
- # always the one it considers best.
58
- spec_with_source = available_gems.last
59
- spec_with_source
60
- else
61
- # Rubygems 2.0 returns a Gem::Available set, which is a
62
- # collection of AvailableSet::Tuple structs
63
- available_gems.pick_best!
64
- best_gem = available_gems.set.first
65
- best_gem && [best_gem.spec, best_gem.source]
66
- end
55
+ if available_gems.respond_to?(:last)
56
+ # DependencyInstaller sorts the results such that the last one is
57
+ # always the one it considers best.
58
+ spec_with_source = available_gems.last
59
+ spec_with_source
60
+ else
61
+ # Rubygems 2.0 returns a Gem::Available set, which is a
62
+ # collection of AvailableSet::Tuple structs
63
+ available_gems.pick_best!
64
+ best_gem = available_gems.set.first
65
+ best_gem && [best_gem.spec, best_gem.source]
66
+ end
67
67
 
68
68
  spec && spec.version.to_s
69
69
  end
@@ -7,7 +7,7 @@ module VagrantPlugins
7
7
  via the Puppet Labs package repos.
8
8
  DESC
9
9
 
10
- VAGRANT_VERSION_REQUIREMENT = '>= 1.1.0'
10
+ VAGRANT_VERSION_REQUIREMENT = '>= 1.1.0'.freeze
11
11
 
12
12
  # Returns true if the Vagrant version fulfills the requirements
13
13
  #
@@ -28,7 +28,7 @@ module VagrantPlugins
28
28
  'vagrant-puppet_install.errors.vagrant_version',
29
29
  requirement: VAGRANT_VERSION_REQUIREMENT.inspect)
30
30
  $stderr.puts msg
31
- fail msg
31
+ raise msg
32
32
  end
33
33
  end
34
34
 
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module PuppetInstall
3
- VERSION = "4.0.0"
3
+ VERSION = '4.0.1'.freeze
4
4
  end
5
5
  end
@@ -5,26 +5,25 @@
5
5
  require 'vagrant-puppet-install'
6
6
  require 'vagrant-aws'
7
7
 
8
- Vagrant.configure("2") do |config|
8
+ Vagrant.configure('2') do |config|
9
9
  config.puppet_install.puppet_version = '3.4.2'
10
10
 
11
- config.vm.box = "dummy"
11
+ config.vm.box = 'dummy'
12
12
  config.vm.provider :aws do |aws, override|
13
13
  aws.access_key_id = ENV['DEV_AWS_ACCESS_KEY_ID']
14
14
  aws.secret_access_key = ENV['DEV_AWS_SECRET_ACCESS_KEY']
15
15
  aws.keypair_name = ENV['USER']
16
16
 
17
- aws.instance_type = "m1.large"
18
- aws.ami = "ami-2efa9d47" # Ubuntu 12.04 LTS 64-bit instance root store
19
- aws.ssh_username = "ubuntu"
17
+ aws.instance_type = 'm1.large'
18
+ aws.ami = 'ami-2efa9d47' # Ubuntu 12.04 LTS 64-bit instance root store
19
+ aws.ssh_username = 'ubuntu'
20
20
 
21
- override.ssh.username = "ubuntu"
22
- override.ssh.private_key_path = "~/.ssh/id_rsa"
21
+ override.ssh.username = 'ubuntu'
22
+ override.ssh.private_key_path = '~/.ssh/id_rsa'
23
23
  end
24
24
 
25
25
  config.vm.provision :puppet do |puppet|
26
26
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
27
- puppet.manifest_file = "base.pp"
27
+ puppet.manifest_file = 'base.pp'
28
28
  end
29
-
30
29
  end
@@ -18,6 +18,6 @@ Vagrant.configure('2') do |config|
18
18
 
19
19
  config.vm.provision :puppet do |puppet|
20
20
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
21
- puppet.manifest_file = "base.pp"
21
+ puppet.manifest_file = 'base.pp'
22
22
  end
23
- end
23
+ end
@@ -5,24 +5,23 @@
5
5
  require 'vagrant-puppet-install'
6
6
  require 'vagrant-rackspace'
7
7
 
8
- Vagrant.configure("2") do |config|
8
+ Vagrant.configure('2') do |config|
9
9
  config.puppet_install.puppet_version = '3.4.2'
10
10
 
11
- config.vm.box = "dummy"
11
+ config.vm.box = 'dummy'
12
12
  config.vm.provider :rackspace do |rackspace|
13
13
  rackspace.username = ENV['DEV_RACKSPACE_USERNAME']
14
14
  rackspace.api_key = ENV['DEV_RACKSPACE_API_KEY']
15
15
  rackspace.flavor = /512MB/
16
16
  rackspace.image = /Ubuntu 12.04/
17
- rackspace.public_key_path = "~/.ssh/id_rsa.pub"
18
- # TODO - switch this to the `override.ssh.private_key_path` syntax once
17
+ rackspace.public_key_path = '~/.ssh/id_rsa.pub'
18
+ # TODO: - switch this to the `override.ssh.private_key_path` syntax once
19
19
  # `vagrant-rackspace` is updated.
20
- config.ssh.private_key_path = "~/.ssh/id_rsa"
20
+ config.ssh.private_key_path = '~/.ssh/id_rsa'
21
21
  end
22
22
 
23
23
  config.vm.provision :puppet do |puppet|
24
24
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
25
- puppet.manifest_file = "base.pp"
25
+ puppet.manifest_file = 'base.pp'
26
26
  end
27
-
28
27
  end
@@ -3,97 +3,140 @@
3
3
 
4
4
  # plugins don't seem to be auto-loaded from the bundle
5
5
  require 'vagrant-puppet-install'
6
+ require 'vagrant-vbguest'
6
7
 
7
- Vagrant.configure("2") do |config|
8
-
8
+ Vagrant.configure('2') do |config|
9
9
  config.vm.define :no_config_set do |no_config_set|
10
- no_config_set.vm.box = "ubuntu/trusty64"
11
- no_config_set.vm.provision "shell", inline: "echo 'Should still work with no puppet plugin enabled'"
10
+ no_config_set.vm.box = 'ubuntu/trusty64'
11
+ no_config_set.vm.provision 'shell', inline: "echo 'Should still work with no puppet plugin enabled'"
12
+ end
13
+
14
+ config.vm.define :trusty_latest do |trusty_latest|
15
+ trusty_latest.puppet_install.puppet_version = :latest
16
+
17
+ trusty_latest.vm.box = 'ubuntu/trusty64'
18
+
19
+ trusty_latest.vm.provision :puppet do |puppet|
20
+ puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
21
+ puppet.environment = 'vagrant'
22
+ end
23
+
24
+ trusty_latest.vm.provision 'shell', inline: 'puppet --version'
25
+ end
26
+
27
+ config.vm.define :trusty_361 do |trusty_361|
28
+ trusty_361.puppet_install.puppet_version = '3.6.1'
29
+
30
+ trusty_361.vm.box = 'ubuntu/trusty64'
31
+
32
+ trusty_361.vm.provision :puppet do |puppet|
33
+ puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
34
+ puppet.environment = 'vagrant'
35
+ end
36
+
37
+ trusty_361.vm.provision 'shell', inline: 'puppet --version'
38
+ end
39
+
40
+ config.vm.define :fedora_23 do |fedora_23|
41
+ fedora_23.vm.box = "fedora/23-cloud-base"
42
+ fedora_23.puppet_install.puppet_version = :latest
43
+
44
+ fedora_23.vm.provision :puppet do |puppet|
45
+ puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
46
+ puppet.environment = "vagrant"
47
+ end
48
+
49
+ fedora_23.vm.provision 'shell', inline: 'puppet --version'
50
+ end
51
+
52
+ config.vm.define :fedora_384 do |fedora_384|
53
+ fedora_384.vm.box = "fedora/23-cloud-base"
54
+ fedora_384.puppet_install.puppet_version = '3.8.4'
55
+
56
+ fedora_384.vm.provision :puppet do |puppet|
57
+ puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
58
+ puppet.environment = "vagrant"
59
+ end
60
+
61
+ fedora_384.vm.provision 'shell', inline: 'puppet --version'
12
62
  end
13
63
 
14
64
  config.vm.define :trusty_ubuntu_box do |trusty_ubuntu_box|
15
65
  trusty_ubuntu_box.puppet_install.puppet_version = :latest
16
66
  trusty_ubuntu_box.puppet_install.install_url = 'https://gist.githubusercontent.com/petems/6723c2eedb9d32d7ad97/raw/990ff448f6430aa015e208668a3cecb3f1db0d4b/purge_old_install_new.sh'
17
67
 
18
- trusty_ubuntu_box.vm.box = "ubuntu/trusty64"
68
+ trusty_ubuntu_box.vm.box = 'ubuntu/trusty64'
19
69
 
20
70
  trusty_ubuntu_box.vm.provision :puppet do |puppet|
21
71
  puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
22
- puppet.environment = "vagrant"
72
+ puppet.environment = 'vagrant'
23
73
  end
24
74
 
25
- trusty_ubuntu_box.vm.provision "shell", inline: "puppet --version"
26
-
75
+ trusty_ubuntu_box.vm.provision 'shell', inline: 'puppet --version'
27
76
  end
28
77
 
29
78
  config.vm.define :ubuntu do |ubuntu|
30
79
  ubuntu.puppet_install.puppet_version = '3.6.1'
31
80
 
32
- ubuntu.vm.box = "puppetlabs/ubuntu-12.04-64-nocm"
81
+ ubuntu.vm.box = 'puppetlabs/ubuntu-12.04-64-nocm'
33
82
 
34
83
  ubuntu.vm.provision :puppet do |puppet|
35
84
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
36
- puppet.manifest_file = "base.pp"
85
+ puppet.manifest_file = 'base.pp'
37
86
  end
38
87
 
39
- ubuntu.vm.provision "shell", inline: "puppet --version"
40
-
88
+ ubuntu.vm.provision 'shell', inline: 'puppet --version'
41
89
  end
42
90
 
43
91
  config.vm.define :gh6 do |gh6|
44
92
  gh6.puppet_install.puppet_version = '2.7.23'
45
93
 
46
- gh6.vm.box = "puppetlabs/ubuntu-12.04-64-nocm"
47
- gh6.vm.provision "shell", inline: "puppet --version"
94
+ gh6.vm.box = 'puppetlabs/ubuntu-12.04-64-nocm'
95
+ gh6.vm.provision 'shell', inline: 'puppet --version'
48
96
 
49
97
  gh6.vm.provision :puppet do |puppet|
50
98
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
51
- puppet.manifest_file = "base.pp"
99
+ puppet.manifest_file = 'base.pp'
52
100
  end
53
101
 
54
- gh6.vm.provision "shell", inline: "puppet --version"
55
-
102
+ gh6.vm.provision 'shell', inline: 'puppet --version'
56
103
  end
57
104
 
58
105
  config.vm.define :centos do |centos|
59
106
  centos.puppet_install.puppet_version = :latest
60
- centos.vm.box = "puppetlabs/centos-6.6-64-nocm"
107
+ centos.vm.box = 'puppetlabs/centos-6.6-64-nocm'
61
108
 
62
109
  centos.vm.provision :puppet do |puppet|
63
- puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
64
- puppet.manifest_file = "base.pp"
110
+ puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
111
+ puppet.environment = "vagrant"
65
112
  end
66
113
 
67
- centos.vm.provision "shell", inline: "puppet --version"
68
-
114
+ centos.vm.provision 'shell', inline: 'puppet --version'
69
115
  end
70
116
 
71
117
  config.vm.define :new_install_url do |new_install_url|
72
118
  new_install_url.puppet_install.puppet_version = :latest
73
119
  new_install_url.puppet_install.install_url = 'https://raw.githubusercontent.com/hashicorp/puppet-bootstrap/master/centos_6_x.sh'
74
- new_install_url.vm.box = "puppetlabs/centos-6.6-64-nocm"
120
+ new_install_url.vm.box = 'puppetlabs/centos-6.6-64-nocm'
75
121
 
76
122
  new_install_url.vm.provision :puppet do |puppet|
77
- puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
78
- puppet.manifest_file = "base.pp"
123
+ puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
124
+ puppet.environment = "vagrant"
79
125
  end
80
126
 
81
- new_install_url.vm.provision "shell", inline: "puppet --version"
82
-
127
+ new_install_url.vm.provision 'shell', inline: 'puppet --version'
83
128
  end
84
129
 
85
130
  config.vm.define :new_install_path do |new_install_path|
86
131
  new_install_path.puppet_install.puppet_version = :latest
87
132
  new_install_path.puppet_install.install_url = File.expand_path('../../support/puppet_install_script/shell_install.sh')
88
- new_install_path.vm.box = "puppetlabs/centos-6.6-64-nocm"
133
+ new_install_path.vm.box = 'puppetlabs/centos-6.6-64-nocm'
89
134
 
90
135
  new_install_path.vm.provision :puppet do |puppet|
91
136
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
92
- puppet.manifest_file = "base.pp"
137
+ puppet.manifest_file = 'base.pp'
93
138
  end
94
139
 
95
- new_install_path.vm.provision "shell", inline: "puppet --version"
96
-
140
+ new_install_path.vm.provision 'shell', inline: 'puppet --version'
97
141
  end
98
-
99
142
  end
@@ -20,6 +20,6 @@ RSpec.configure do |config|
20
20
 
21
21
  # specify metadata with symobls only (ie no '=> true' required)
22
22
  config.treat_symbols_as_metadata_keys_with_true_values = true
23
- config.filter_run :focus => true
23
+ config.filter_run focus: true
24
24
  config.run_all_when_everything_filtered = true
25
25
  end
@@ -23,7 +23,7 @@ describe VagrantPlugins::PuppetInstall::Config do
23
23
  its(:puppet_version) { should match(/\d*\.\d*\.\d*/) }
24
24
  end
25
25
 
26
- describe 'validate' do
26
+ describe 'validate' do
27
27
  it 'should be no-op' do
28
28
  expect(subject.validate(machine)).to eq('VagrantPlugins::PuppetInstall::Config' => [])
29
29
  end
@@ -70,7 +70,5 @@ describe VagrantPlugins::PuppetInstall::Config do
70
70
  expect { subject.validate!(machine) }.to_not raise_error
71
71
  end
72
72
  end # describe not specified puppet_version validation
73
-
74
73
  end
75
-
76
74
  end
@@ -1,7 +1,6 @@
1
1
  require_relative '../spec_helper'
2
2
 
3
3
  describe VagrantPlugins::PuppetInstall::Plugin do
4
-
5
4
  context 'action hooks' do
6
5
  let(:hook) { double(append: true, prepend: true) }
7
6
  let(:fake_class) { Class.new }
@@ -16,7 +15,7 @@ describe VagrantPlugins::PuppetInstall::Plugin do
16
15
  end
17
16
 
18
17
  it 'should define a config of type :puppet' do
19
- default_config = described_class.components.configs[:top].to_hash[:"puppet_install"]
18
+ default_config = described_class.components.configs[:top].to_hash[:puppet_install]
20
19
  expect(default_config).to be(VagrantPlugins::PuppetInstall::Config)
21
20
  end
22
21
 
@@ -79,4 +78,4 @@ describe VagrantPlugins::PuppetInstall::Plugin do
79
78
  end
80
79
  end
81
80
  end
82
- end
81
+ end
@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
  require 'vagrant-puppet-install/version'
5
5
 
6
6
  Gem::Specification.new do |spec|
7
- spec.name = "vagrant-puppet-install"
7
+ spec.name = 'vagrant-puppet-install'
8
8
  spec.version = VagrantPlugins::PuppetInstall::VERSION
9
- spec.authors = ["Seth Chisamore", "Patrick Connolly", "Peter Souter"]
10
- spec.email = ["schisamo@opscode.com", "patrick@myplanetdigital.com", "p.morsou@gmail.com"]
11
- spec.description = %q{A Vagrant plugin that ensures the desired version of Puppet is installed via the Puppet Labs package repos.}
9
+ spec.authors = ['Seth Chisamore', 'Patrick Connolly', 'Peter Souter']
10
+ spec.email = ['schisamo@opscode.com', 'patrick@myplanetdigital.com', 'p.morsou@gmail.com']
11
+ spec.description = 'A Vagrant plugin that ensures the desired version of Puppet is installed via the Puppet Labs package repos.'
12
12
  spec.summary = spec.description
13
- spec.homepage = "https://github.com/patcon/vagrant-puppet-install"
14
- spec.license = "Apache 2.0"
13
+ spec.homepage = 'https://github.com/patcon/vagrant-puppet-install'
14
+ spec.license = 'Apache 2.0'
15
15
 
16
- spec.files = `git ls-files`.split($/)
16
+ spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
17
17
  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
- spec.require_paths = ["lib"]
19
+ spec.require_paths = ['lib']
20
20
 
21
- spec.add_development_dependency "bundler", "~> 1.3"
22
- spec.add_development_dependency "rake", "~> 10.1.1"
23
- spec.add_development_dependency "rspec", "~> 2.14.1"
24
- spec.add_development_dependency "rubocop", "~> 0.17.0"
25
- spec.add_development_dependency "pry"
21
+ spec.add_development_dependency 'bundler', '~> 1.3'
22
+ spec.add_development_dependency 'rake', '~> 10.1.1'
23
+ spec.add_development_dependency 'rspec', '~> 2.14.1'
24
+ spec.add_development_dependency 'rubocop', '~> 0.17.0'
25
+ spec.add_development_dependency 'pry'
26
26
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-puppet-install
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0
4
+ version: 4.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Seth Chisamore
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2016-01-25 00:00:00.000000000 Z
13
+ date: 2016-04-04 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
139
139
  version: '0'
140
140
  requirements: []
141
141
  rubyforge_project:
142
- rubygems_version: 2.5.1
142
+ rubygems_version: 2.6.1
143
143
  signing_key:
144
144
  specification_version: 4
145
145
  summary: A Vagrant plugin that ensures the desired version of Puppet is installed