ec2launcher 1.0.15 → 1.0.16

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.16
+
+* Added support for custom paths to ruby, gem, chef-client and knife executables.
+
 ## 1.0.15
 
 * Fixed problem setting up ephemeral drives.

data/README.md

@@ -10,3 +10,7 @@ All contributions are welcome: ideas, patches, documentation, bug reports, compl
 
 * If you think you found a bug, you probably did. Feel free to create an issue here on GitHub. Also, when filing, please make sure you're familiar with [necolas's guidelines](https://github.com/necolas/issue-guidelines). See https://github.com/StudyBlue/ec2launcher/issues to review existing issues or to create a new issue.
 * If you want to send patches, the best way is to fork this repo and send us a pull request.
+
+# Support
+
+[ec2launcher Google Groups](http://groups.google.com/group/ec2launcher-user)

data/lib/ec2launcher.rb

@@ -430,6 +430,19 @@ module EC2Launcher
       dirs
     end
 
+    # Builds the path to an executable.
+    def build_path(instance_path, executable, default_path)
+      app_path = default_path
+      unless instance_path.nil?
+        if instance_path =~ /#{executable}$/
+          app_path = instance_path
+        else
+          app_path = File.join(instance_path, executable)
+        end
+      end
+      app_path
+    end
+
     # Searches for the most recent AMI matching the criteria.
     #
     # @param [String] arch system archicture, `i386` or `x86_64`
@@ -734,6 +747,11 @@ module EC2Launcher
         'gems' => gems,
         'packages' => packages
       }
+      setup_json["gem_path"] = build_path(@environment.gem_path, "gem", "/usr/bin/gem")
+      setup_json["ruby_path"] = build_path(@environment.ruby_path, "ruby", "/usr/bin/ruby")
+      setup_json["chef_path"] = build_path(@environment.chef_path, "chef-client", "/usr/bin/chef-client")
+      setup_json["knife_path"] = build_path(@environment.knife_path, "knife", "/usr/bin/knife")
+
       unless @application.block_devices.nil? || @application.block_devices.empty?
         setup_json['block_devices'] = @application.block_devices
       end
@@ -783,9 +801,9 @@ module EC2Launcher
       user_data += "\nchmod +x /tmp/setup.rb"
       # user_data += "\nrm -f /tmp/setup.rb.gz.base64"
 
-      user_data += "\n/tmp/setup.rb -e #{@environment.name} -a #{@application.name} -h #{fqdn} /tmp/setup.json > /var/log/cloud-startup.log"
+      user_data += "\n#{setup_json['ruby_path']} /tmp/setup.rb -e #{@environment.name} -a #{@application.name} -h #{fqdn} /tmp/setup.json"
       user_data += " -c #{@options.clone_host}" unless @options.clone_host.nil?
-      # user_data += "\nrm -f /tmp/runurl /tmp/setup.rb"
+      user_data += " 2>&1 > /var/log/cloud-startup.log"
 
       # Add extra requested commands to the launch sequence
       @options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }

data/lib/ec2launcher/dsl/config.rb

@@ -3,7 +3,7 @@
 #
 module EC2Launcher
   module DSL
-  class ConfigDSL
+    class ConfigDSL
       attr_reader :config
 
       def config(&block)
@@ -32,6 +32,11 @@ config do
 end
 }.gsub(/^ /, '')
       
+      def initialize()
+        @environments = []
+        @applications = []
+      end
+
       def environments(*environments)
         if environments.empty?
           @environments
@@ -73,6 +78,38 @@ end
           @config_manager = config_manager[0]
         end
       end
+
+      def gem_path(*gem_path)
+        if gem_path.empty?
+          @gem_path
+        else
+          @gem_path = gem_path[0]
+        end
+      end
+
+      def ruby_path(*ruby_path)
+        if ruby_path.empty?
+          @ruby_path
+        else
+          @ruby_path = ruby_path[0]
+        end
+      end
+
+      def chef_path(*chef_path)
+        if chef_path.empty?
+          @chef_path
+        else
+          @chef_path = chef_path[0]
+        end
+      end
+
+      def knife_path(*knife_path)
+        if knife_path.empty?
+          @knife_path
+        else
+          @knife_path = knife_path[0]
+        end
+      end
     end
   end
 end

data/lib/ec2launcher/dsl/environment.rb

@@ -110,6 +110,38 @@ module EC2Launcher
 				end
 			end
 
+      def gem_path(*gem_path)
+        if gem_path.empty?
+          @gem_path
+        else
+          @gem_path = gem_path[0]
+        end
+      end
+
+      def ruby_path(*ruby_path)
+        if ruby_path.empty?
+          @ruby_path
+        else
+          @ruby_path = ruby_path[0]
+        end
+      end
+
+      def chef_path(*chef_path)
+        if chef_path.empty?
+          @chef_path
+        else
+          @chef_path = chef_path[0]
+        end
+      end
+
+      def knife_path(*knife_path)
+        if knife_path.empty?
+          @knife_path
+        else
+          @knife_path = knife_path[0]
+        end
+      end
+
 			def inherit(*inherit_type)
 				if inherit_type.empty?
 					@inherit_type
@@ -198,11 +230,15 @@ module EC2Launcher
 				@ami_name = other_env.ami_name unless other_env.ami_name.nil?
 				@aws_keyfile = other_env.aws_keyfile unless other_env.aws_keyfile.nil?
 				@availability_zone = other_env.availability_zone unless other_env.availability_zone.nil?
+				@chef_path = other_env.chef_path unless other_env.chef_path.nil?
 				@chef_server_url = other_env.chef_server_url unless other_env.chef_server_url.nil?
 				@chef_validation_pem_url = other_env.chef_validation_pem_url unless other_env.chef_validation_pem_url.nil?
 				@domain_name = other_env.domain_name unless other_env.domain_name.nil?
 				@email_notifications = other_env.email_notifications unless other_env.email_notifications.nil?
+				@gem_path = other_env.gem_path unless other_env.gem_path.nil?
 				@key_name = other_env.key_name unless other_env.key_name.nil?
+				@knife_path = other_env.knife_path unless other_env.knife_path.nil?
+				@ruby_path = other_env.ruby_path unless other_env.ruby_path.nil?
 				@subnet = other_env.subnet unless other_env.subnet.nil?
 				@short_name = other_env.short_name unless other_env.short_name.nil?
 		end

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

data/startup-scripts/setup.rb

@@ -82,14 +82,19 @@ setup_json_filename = ARGV[0]
 # Read the setup JSON file
 instance_data = JSON.parse(File.read(setup_json_filename))
 
+# Path to executables
+gem_path = instance_data["gem_path"]
+ruby_path = instance_data["ruby_path"]
+chef_path = instance_data["chef_path"]
+
 # Pre-install gems
 unless instance_data["gems"].nil?
-	instance_data["gems"].each {|gem_name| puts `/usr/bin/gem install --no-rdoc --no-ri #{gem_name}` }
+	instance_data["gems"].each {|gem_name| puts `#{gem_path} install --no-rdoc --no-ri #{gem_name}` }
 end
 
 # Pre-install packages
 unless instance_data["packages"].nil?
-	instance_data["packages"].each {|pkg_name| puts `yum install -y #{pkg_name}` }
+  puts `yum install #{instance_data["packages"].join(" ")} -y`
 end
 
 
@@ -143,12 +148,12 @@ File.open("/etc/chef/client.rb", 'a') { |f| f.write("node_name \"#{options.hostn
 # Setup Chef client
 puts "Connecting to Chef ..."
 `rm -f /etc/chef/client.pem`
-puts `chef-client`
+puts `#{chef_path}`
 
 # Retrieve secondary setup script and run it
 puts "Getting role setup script ..."
 puts `s3curl.pl --id startup #{SETUP_SCRIPT_URL} > /tmp/#{SETUP_SCRIPT} && chmod +x /tmp/#{SETUP_SCRIPT}`
-command = "/tmp/#{SETUP_SCRIPT} -a #{options.application} -e #{options.environ} -h #{options.hostname} #{setup_json_filename}"
+command = "#{ruby_path} /tmp/#{SETUP_SCRIPT} -a #{options.application} -e #{options.environ} -h #{options.hostname} #{setup_json_filename}"
 command += " -c #{options.clone_host}" unless options.clone_host.nil?
-command += " > /var/log/cloud-init.log"
+command += " 2>&1 > /var/log/cloud-init.log"
 run_command(command)

data/startup-scripts/setup_instance.rb

@@ -283,6 +283,10 @@ end
 # CHEF SETUP
 ##############################
 
+# Path to executables
+chef_path = instance_data["chef_path"]
+knife_path = instance_data["knife_path"]
+
 ##############################
 # Create knife configuration
 knife_config = <<EOF
@@ -306,14 +310,14 @@ end
 ##############################
 # Add roles
 instance_data["roles"].each do |role|
-  cmd = "knife node run_list add #{options.hostname} \"role[#{role}]\""
+  cmd = "#{knife_path} node run_list add #{options.hostname} \"role[#{role}]\""
   puts cmd
   puts `#{cmd}`
 end
 
 ##############################
 # Launch Chef
-IO.popen("chef-client") do |f|
+IO.popen(chef_path) do |f|
   while ! f.eof
     puts f.gets
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk