Addition of Ruby 2.2 and 2.3 #69
Conversation
.travis.yml
Outdated
| @@ -10,5 +10,9 @@ matrix: | |||
| env: PUPPET_GEM_VERSION="~> 3.0" | |||
| - rvm: 2.1.8 | |||
| env: PUPPET_GEM_VERSION="~> 3.0" | |||
| - rvm: 2.2.5 | |||
| env: PUPPET_GEM_VERSION="~> 4.0" | |||
| - rvm: 2.3.0 | |||
There was a problem hiding this comment.
It was announced that the new AIO would use ruby 2.3.1, would use that version here.
manifests/init.pp
Outdated
| @@ -140,6 +140,18 @@ | |||
| warning('Packages for Ruby 2.1 are not available from default repositories.') | |||
| } | |||
| } | |||
| /^2\.2.*$/:{ | |||
There was a problem hiding this comment.
if the regex is meant to match 2.2.* then it should be /^2\.2\..*$/
There was a problem hiding this comment.
This copies the same structure as 2.1 above it. Should they all be changed?
There was a problem hiding this comment.
Looks like. Cause the current regex would also match 2.20.0, which is the not what you want.
There was a problem hiding this comment.
That means there should also be checks to ensure that 2.2.1 does a thing and 2.20.1 does not do that thing.
There was a problem hiding this comment.
Added a better regex across the board.
manifests/init.pp
Outdated
| warning('Packages for Ruby 2.2 are not available from default repositories.') | ||
| } | ||
| } | ||
| /^2\.3.*$/:{ |
tests/ruby2.3.pp
Outdated
| @@ -0,0 +1,4 @@ | |||
| class{'ruby': | |||
| @@ -654,6 +654,68 @@ | |||
| } | |||
| end | |||
|
|
|||
| describe 'with ruby 2.2 with switch' do | |||
There was a problem hiding this comment.
spec tests are missing Ubuntu testing which is referenced in the manifest.
There was a problem hiding this comment.
It seems Travis fails quite catastrophically on Puppet 4.x and Rubies 2.2 and 2.3. Not sure where to go from here.
There was a problem hiding this comment.
Technically you won't need to spec test against ruby 2.2 or 2.3 on Puppet 4 yet because it still uses 2.1 internally I believe.
…larger than expected
|
I'm unsure how to proceed here to get the Puppet 4.x / Ruby 2.3 tests passing at all. I presumed I needed to add to the travis file because otherwise we can't test under that ruby, but maybe that doesn't matter. |
|
Just because you are installing ruby 2.2 and 2.3 it doesn't mean you need your module to pass tests for ruby 2.2 and 2.3. |
|
True, so I can remove those travis tests and all will be well? |
|
Yep. In theory anyway. :) |
|
There we go. Passing test suite |
| @@ -119,27 +119,39 @@ | |||
| } | |||
| default:{ | |||
| case $version { | |||
| /^1\.8.*$/:{ | |||
| /^1\.8(\..*)*$/:{ | |||
There was a problem hiding this comment.
since we don't use those match groups somewhere else we could simply leave them out
suggested: /^1\.8\..*$/
There was a problem hiding this comment.
That implies that there will always be a '.' after the minor version. That's not always been the case afaik?
There was a problem hiding this comment.
As far as I know ruby devs are following semantic versioning which I think will always result in a version of the format $major.$minor.$patch.
But I just realized debian package names either contain two or three digits (e.g. ruby1.9.1, ruby2.1). Therefore your solution might be more logical for most users.
| $real_ruby_package = "${ruby::params::ruby_package}1.8" | ||
| if ! $suppress_warnings and versioncmp($::operatingsystemrelease, '14.04') >= 0 { | ||
| warning('Packages for Ruby 1.8 are not available from default repositories.') | ||
| } | ||
| } | ||
| /^1\.9.*$/:{ | ||
| /^1\.9(\..*)*$/:{ |
There was a problem hiding this comment.
Again, I'd be more inclined to change the other files to match what's currently in my PR - dev.pp is the only other place this happens.
|
You should also add Ubuntu 16.04 to the supported operating systems in metadata.json |
|
Not entirely sure why the tests are suddenly failing :\ |
|
1.9.3 removed because deps no longer build |
This PR adds Rubies 2.2 and 2.3.