Skip to content

Commit

Permalink
(SIMP-3466) Update to support facter 2.5 (#86)
Browse files Browse the repository at this point in the history
* (SIMP-3466) Update to support facter 2.5

This pulls in simp-rspec-puppet-facts 2.0.0 which is a breaking change
since all of the facts were updated.

SIMP-3466 #comment update to support facter 2.5

* bump puppetlabs_spec_helper

* pin to FIPS compatible bundler

* pin bundler version in travis

* need to remove bundler via RVM

* need to install global Bundler via RVM

* typing is hard

* Added reasoning behind bundler pinning
  • Loading branch information
trevor-vaughan authored and lnemsick-simp committed Aug 1, 2017
1 parent 6b4f3fe commit fb3fb2f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -y rpm
- rm Gemfile.lock || true
- rvm @global do gem uninstall bundler -a -x
- rvm @global do gem install bundler -v '~> 1.14.0'
bundler_args: "--without development --path .vendor"
notifications:
email: false
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 4.0.0 / 2017-07-31
* Pinned bundler to '~> 1.14.0' to allow building on FIPS-enabled systems
* Updated to simp-rspec-puppet-facts 2.0.0

### 3.7.1 / 2017-07-20
* Fixed bug in `:changelog_annotation` task
* `:test` now uses `:metadata_lint` instead of `:metadata`
Expand Down
2 changes: 1 addition & 1 deletion lib/simp/rake/helpers/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ module Simp; end
module Simp::Rake; end

class Simp::Rake::Helpers
VERSION = '3.7.1'
VERSION = '4.0.0'
end
11 changes: 7 additions & 4 deletions simp-rake-helpers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@ Gem::Specification.new do |s|
# gem dependencies
# for the published gem
# ensure the gem is built out of versioned files
s.add_runtime_dependency 'bundler', '~> 1.0'

# Bundler is limited for support in FIPS enabled systems
# 1.15 reverted the FIPS changes but it is still in progress
s.add_runtime_dependency 'bundler', '~> 1.14.0'
s.add_runtime_dependency 'rake', '>= 10.0', '< 13.0'
s.add_runtime_dependency 'coderay', '~> 1.0'
s.add_runtime_dependency 'puppet', '>= 3.0'
s.add_runtime_dependency 'puppet', '>= 3.0', '< 6.0'
s.add_runtime_dependency 'puppet-lint', '>= 1.0', '< 3.0'
s.add_runtime_dependency 'puppetlabs_spec_helper', '~> 1.0'
s.add_runtime_dependency 'puppetlabs_spec_helper', '~> 2.0'
s.add_runtime_dependency 'parallel', '~> 1.0'
s.add_runtime_dependency 'simp-rspec-puppet-facts', '~> 1.0'
s.add_runtime_dependency 'simp-rspec-puppet-facts', '~> 2.0'
s.add_runtime_dependency 'puppet-blacksmith', '~> 3.3'
s.add_runtime_dependency 'simp-beaker-helpers', '~> 1.0'
s.add_runtime_dependency 'parallel_tests', '~> 2.4'
Expand Down

0 comments on commit fb3fb2f

Please sign in to comment.