Skip to content

Commit cc23622

Browse files
ghoneycuttbmjen
authored andcommitted
Ruby231 (#166)
* Support Ruby 2.3.1 * Update bundler before install for CI testing * Allow tests to pass on Ruby 1.9.3 * Fix CI testing * Change license format to conform to SPDX and metadata-lint
1 parent 5938709 commit cc23622

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

.travis.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22
branches:
33
only:
44
- master
5+
56
language: ruby
6-
bundler_args: --without development
7+
8+
bundler_args: '--without development system_tests'
9+
10+
before_install:
11+
- 'gem update --system'
12+
- 'gem update bundler'
13+
714
script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
15+
816
matrix:
917
fast_finish: true
1018
include:
@@ -16,5 +24,8 @@ matrix:
1624
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
1725
- rvm: 2.1.6
1826
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
27+
- rvm: 2.3.1
28+
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
29+
1930
notifications:
2031
email: false

Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ end
1515

1616
gem 'puppet-lint', '>= 1.0.0'
1717
gem 'puppet-lint-unquoted_string-check', :require => false
18+
gem 'public_suffix', '1.4.6', :require => false if RUBY_VERSION <= '1.9.3'
19+
gem 'public_suffix', :require => false if RUBY_VERSION > '1.9.3'
20+
gem 'json', '<= 1.8' , :require => false if RUBY_VERSION < '2.0.0'
21+
gem 'json_pure', '<= 2.0.1' , :require => false if RUBY_VERSION < '2.0.0'
22+
gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
23+
gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9'
1824

1925
if RUBY_VERSION < '2.0'
2026
gem 'mime-types', '<3.0', :require => false

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.7.0",
44
"author": "Puppet Labs",
55
"summary": "Provides Puppet types and providers to manage Logical Resource Management (LVM) features.",
6-
"license": "GPLv2",
6+
"license": "GPL-2.0",
77
"source": "https://github.com/puppetlabs/puppetlabs-lvm",
88
"project_page": "https://github.com/puppetlabs/puppetlabs-lvm",
99
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES/component/11456/",

0 commit comments

Comments
 (0)