Skip to content

Allow installations via Ruby 2.4.x #109

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

Closed
wants to merge 2 commits into from
Closed

Allow installations via Ruby 2.4.x #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9acced4
Allow installations via Ruby 2.4.x
pat Apr 28, 2017
90d6e9a
Update tests to run with ActiveSupport 5.1.0.
pat Apr 28, 2017
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
6 changes: 3 additions & 3 deletions bin/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ To use a HTTP proxy, specify --proxy followed by the proxy server
defined by http://hostname:port

This install script needs Ruby version 2.x installed as a prerequisite.
Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4 and 2.3.0.
Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3.0 and 2.4.0.
If multiple Ruby versions are installed, the default ruby version will be used.
If the default ruby version does not satisfy reqirement, the newest version will be used.
If you do not have a supported Ruby version installed, please install one of them first.
Expand All @@ -86,7 +86,7 @@ EOF
end

def supported_ruby_versions
['2.3', '2.2', '2.1', '2.0']
['2.4', '2.3', '2.2', '2.1', '2.0']
end

# check ruby version, only version 2.x works
Expand Down Expand Up @@ -163,7 +163,7 @@ EOF
# change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version
actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
left_bound = '2.0.0'.split('.').map{|s|s.to_i}
right_bound = '2.3.1'.split('.').map{|s|s.to_i}
right_bound = '2.4.1'.split('.').map{|s|s.to_i}
if (actual_ruby_version <=> left_bound) < 0
if(!@reexeced)
@log.info("The current Ruby version is not 2.x! Restarting the installer with #{ruby_interpreter_path}")
Expand Down
2 changes: 1 addition & 1 deletion test/instance_agent/agent/base_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class InstanceAgentBaseTest < InstanceAgentTestCase
@base.expects(:log).with { |v1, v2| v1.eql?(:error) && v2 =~ /Error during perform/ }
assert_nothing_raised { @base.run }
end

should 'back off on repeated exceptions' do
@base.stubs(:perform).raises Exception
@base.expects(:sleep).with(any_of(9, 10))
Expand Down