Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gemspec: fix repo url / Drop Puppet 4/5 tests #311

Merged
merged 3 commits into from
Jan 16, 2021
Merged

gemspec: fix repo url / Drop Puppet 4/5 tests #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea26ba6
gemspec: fix repo url
bastelfreak Jan 16, 2021
e29baeb
Drop Puppet 4/5 tests; Add Ruby 2.7 testing
bastelfreak Jan 16, 2021
bc13b17
cleanup Gemfile
bastelfreak Jan 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ script:
bundle exec cucumber -f progress
matrix:
include:
- rvm: 2.1.9
env: PUPPET_VERSION="~> 4.0" RUBYGEMS_VERSION=2.7.8
- rvm: 2.4.2
env: PUPPET_VERSION="~> 5.0"
- rvm: 2.5.7
- rvm: 2.5
env: PUPPET_VERSION="~> 6.0"
- rvm: 2.6
env: PUPPET_VERSION="~> 6.0"
- rvm: 2.7
env: PUPPET_VERSION="~> 6.0"
notifications:
email: false
Expand Down
20 changes: 3 additions & 17 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,14 @@ source 'https://rubygems.org/'

gemspec

def default_puppet_restriction
# Puppet 6 should be the default for Ruby 2.5+
# Puppet 5 should be the defualt for Ruby 2.4
Gem::Requirement.create('>= 2.5.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) ? '~> 6.0' : '~> 5.0'
end

def activesupport_restriction
# Active Support 6.x requires ruby 2.5.0+
Gem::Requirement.create('>= 2.5.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) ? '~> 6.0' : '~> 5.0'
end

group :development do
gem "aruba", '~> 0.6.2'
gem "cucumber", '~> 1.1'
gem "rspec-expectations", '~> 3.1.0'
gem "hiera-eyaml-plaintext"
gem "puppet", ENV['PUPPET_VERSION'] || default_puppet_restriction
gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
if RUBY_VERSION >= '2.5.0'
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
gem "activesupport", activesupport_restriction
end
gem "puppet", ENV['PUPPET_VERSION'] || '>= 7'
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
gem "activesupport"
end

group :test do
Expand Down
2 changes: 1 addition & 1 deletion hiera-eyaml.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
gem.author = "Tom Poulton"
gem.license = "MIT"

gem.homepage = "http://github.com/TomPoulton/hiera-eyaml"
gem.homepage = "https://github.com/voxpupuli/hiera-eyaml/"
gem.files = `git ls-files`.split($/).reject { |file| file =~ /^features.*$/ }
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
Expand Down