Skip to content
This repository was archived by the owner on Jun 5, 2020. It is now read-only.

add Puppet v4.x compatibility #91

Merged
hunner merged 1 commit into from
Mar 3, 2016
Merged

add Puppet v4.x compatibility #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 34 additions & 26 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,41 @@ language: ruby
bundler_args: --without development
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
sudo: false
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1.2

env:
matrix:
- PUPPET_GEM_VERSION="~> 3.3.0"
- PUPPET_GEM_VERSION="~> 3.4.0"
- PUPPET_GEM_VERSION="~> 3.5.0"
- PUPPET_GEM_VERSION="~> 3.6.0"
- PUPPET_GEM_VERSION="~> 3.7.0"
- PUPPET_GEM_VERSION="~> 3.8.0"
- PUPPET_GEM_VERSION="~> 3" PARSER="future"
- PUPPET_GEM_VERSION="~> 4.0.0"
- PUPPET_GEM_VERSION="~> 4.1.0"
- PUPPET_GEM_VERSION="~> 4.2.0"
- PUPPET_GEM_VERSION="~> 4"


matrix:
fast_finish: true
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.3.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.4.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.5.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.4.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.5.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.6.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.7.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.7.0"
allow_failures:
- rvm: 2.1.2
env: PUPPET_GEM_VERSION="~> 3.7.0"
exclude:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.0.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.1.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.2.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4"
- rvm: 2.1.2
env: PUPPET_GEM_VERSION="~> 3.3.0"
- rvm: 2.1.2
env: PUPPET_GEM_VERSION="~> 3.4.0"
notifications:
email: false
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
Class['passenger::config']
}

if type($include_build_tools) == 'string' {
if type3x($include_build_tools) == 'string' {

@mcary mcary Mar 1, 2016

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better to use is_string to avoid calling a deprecated function like type3x?

For example:

  if is_string($include_build_tools) {
  ...

@Phil-Friderici Phil-Friderici Mar 2, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that type3x will be supported much longer [1] than needed. If this should be a blocker, I will happily change it to use is_string() instead. Just drop me a line.

[1] https://github.com/puppetlabs/puppetlabs-stdlib#limitations

@hunner hunner Mar 3, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think type3x() or is_string() are going anywhere, though puppet 4 patterns don't need either of them. And either function is just one side of the same coin.

$include_build_tools_real = str2bool($include_build_tools)
} else {
$include_build_tools_real = $include_build_tools
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"dependencies": [
{"name":"puppetlabs/apache","version_requirement":">= 1.0.0 < 2.0.0"},
{"name":"puppetlabs/ruby","version_requirement":">= 0.1.0 < 2.0.0"},
{"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"},
{"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 5.0.0"},
{"name":"croddy/make","version_requirement":">= 0.0.5 < 2.0.0"},
{"name":"puppetlabs/gcc","version_requirement":">= 0.2.0 < 2.0.0"}
]
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
}
end

it should_not { contain_class('passenger::compile') }
it { should_not contain_class('passenger::compile')}
end

describe 'with include_build_tools' do
Expand Down
2 changes: 1 addition & 1 deletion templates/passenger-load.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LoadModule passenger_module <%= @mod_passenger_location %>
LoadModule passenger_module <%= scope.lookupvar('passenger::mod_passenger_location') %>