Remove hard dependency on Ruby2.0 and add support for 2.x

Author: Gao Han

bin/codedeploy-agent

@@ -1,5 +1,3 @@
-#!/usr/bin/ruby2.0
-
 # 1.9 adds realpath to resolve symlinks; 1.8 doesn't
 # have this method, so we add it so we get resolved symlinks
 # and compatibility
@@ -16,7 +14,7 @@ end
 # This is required so that the agent can run without requiring an init script
 # if installed as a gem
 
-agent_dir = "/opt/codedeploy-agent"
+agent_dir = File.join(File.dirname(__FILE__), "..")
 $:.unshift "#{agent_dir}/lib"
 
 require 'instance_agent'
@@ -26,9 +24,15 @@ include GLI::App
 
 program_desc 'AWS CodeDeploy Agent'
 
+conf_default_dir = "/etc/codedeploy-agent/conf/codedeployagent.yml"
+conf_repo_dir = "#{agent_dir}/conf/codedeployagent.yml"
 desc 'Path to agent config file'
-default_value '/etc/codedeploy-agent/conf/codedeployagent.yml'
-arg_name '/etc/codedeploy-agent/conf/codedeployagent.yml'
+if File.file?(conf_default_dir)
+  default_value conf_default_dir
+else
+  default_value conf_repo_dir
+end
+arg_name "conf_dir"
 flag [:config_file,:config_file]
 
 desc 'start the AWS CodeDeploy agent'

bin/start-wrapper

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+arg = ARGV[0]
+ruby_versions = ["2.3", "2.2", "2.1", "2.0"]
+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}
+
+if (actual_ruby_version <=> left_bound) > -1 && (actual_ruby_version <=> right_bound) < 1
+  exec("ruby #{File.join(File.expand_path(File.dirname(__FILE__)), "/codedeploy-agent")} #{arg}")
+end
+
+ruby_versions.each do |i|
+  ruby_dir = "/usr/bin/ruby#{i}"
+  if File.file?(ruby_dir)
+    exec("#{ruby_dir} #{File.join(File.expand_path(File.dirname(__FILE__)), "/codedeploy-agent")} #{arg}")
+  end
+end
+
+puts "No supported ruby version found. Code Deploy Host Agent suuports Ruby version of 2.0.x to 2.3.x."
+exit(1)

init.d/codedeploy-agent

@@ -27,7 +27,7 @@ prog="codedeploy-agent"
 USER=""
 AGENT_ROOT="/opt/codedeploy-agent/"
 INSTALLER="/opt/codedeploy-agent/bin/install"
-BIN="/opt/codedeploy-agent/bin/codedeploy-agent"
+BIN="/opt/codedeploy-agent/bin/start-wrapper"
 
 start() {
         echo -n $"Starting $prog:"

init.d/codedeploy-agent.service

@@ -3,8 +3,8 @@ Description=AWS CodeDeploy Host Agent
 
 [Service]
 Type=forking
-ExecStart=/bin/sh -a -c '[ -f /etc/profile ] && source /etc/profile; /opt/codedeploy-agent/bin/codedeploy-agent start'
-ExecStop=/opt/codedeploy-agent/bin/codedeploy-agent stop
+ExecStart=/bin/sh -a -c '[ -f /etc/profile ] && source /etc/profile; /opt/codedeploy-agent/bin/start-wrapper start'
+ExecStop=/opt/codedeploy-agent/bin/start-wrapper stop
 RemainAfterExit=no
 # Comment out the following line to run the agent as the codedeploy user
 # Note: The user must first exist on the system