Merge pull request #145 from DavidS/improve-travis

Improve travis cells and testing

Author: da-ar

.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:

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.

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