From f6dac790c14019924c834c7541ba9463b7e836a6 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Tue, 11 Dec 2018 10:42:13 +0000 Subject: [PATCH 1/3] (maint) constrain test-workaround for a puppet bug This was a workaround for a puppet bug long fixed. See PUP-8632 and PUP-9047. --- spec/acceptance/device_spec.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/acceptance/device_spec.rb b/spec/acceptance/device_spec.rb index 69302007..dc3463c2 100644 --- a/spec/acceptance/device_spec.rb +++ b/spec/acceptance/device_spec.rb @@ -12,7 +12,10 @@ end before(:all) do - FileUtils.mkdir_p(File.expand_path('~/.puppetlabs/opt/puppet/cache/devices/the_node/state')) + if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.3.0') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('5.4.0') + # work around https://tickets.puppetlabs.com/browse/PUP-8632 and https://tickets.puppetlabs.com/browse/PUP-9047 + FileUtils.mkdir_p(File.expand_path('~/.puppetlabs/opt/puppet/cache/devices/the_node/state')) + end end describe 'using `puppet resource`' do From e5c568eab96d39f1719d52a49d426eeb9423e8aa Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Tue, 11 Dec 2018 11:35:47 +0000 Subject: [PATCH 2/3] (maint) update travis for better coverage of in-flight puppet versions This adds cells for all currently active puppet development versions from git, and updates the utility cells to a more current ruby. PUP-9356 would have been detected earlier if we had had these cells in place. --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cc5590d..3c7a2284 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,9 @@ matrix: bundler: true directories: ~/.rvm before_install: rvm use jruby-9.1.9.0 --install --binary --fuzzy - - rvm: 2.4.3 + - rvm: 2.5.1 env: CHECK=rubocop - - rvm: 2.4.3 + - rvm: 2.5.1 env: CHECK=license_finder bundler_args: "" @@ -52,10 +52,18 @@ matrix: env: PUPPET_GEM_VERSION='~> 4.8.0' - rvm: 2.1.9 env: PUPPET_GEM_VERSION='~> 4.7.0' + - rvm: 2.5.1 + env: PUPPET_GEM_VERSION='~> 6' # 6.0, soon 6.1 + - rvm: 2.5.1 + env: PUPPET_GEM_VERSION='~> 6.0' - rvm: 2.5.1 env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#master' - rvm: 2.5.1 env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#6.0.x' + - rvm: 2.4.3 + env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#5.5.x' + - rvm: 2.1.9 + env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#4.10.x' notifications: hipchat: rooms: From e75756d1488498ceb4f893afc6991bad050ce3de Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Tue, 11 Dec 2018 16:06:06 +0000 Subject: [PATCH 3/3] (maint) Remove incorrect Development section from README --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 8deb3209..053f7e41 100644 --- a/README.md +++ b/README.md @@ -231,12 +231,6 @@ Future possibilities: * [Multiple Providers](https://tickets.puppetlabs.com/browse/PDK-530) * [Commands API](https://tickets.puppetlabs.com/browse/PDK-847) -## Development - -After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. - -To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org). - ## Contributing Bug reports and pull requests are welcome on GitHub at https://github.com/puppetlabs/puppet-resource_api.