ec2launcher 1.5.1 → 1.5.2

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 1.5.2
+
+* Use local copies of runurl, setup.rb and setup_instance.rb instead of pulling them down from GitHub every time.
+* Fixed CLI help.
+
 ## 1.5.1
 
-* Change order for processing environment aliases.
+* Fixed bug with processing environment aliases.
 
 ## 1.5.0
 

data/lib/ec2launcher/defaults.rb

@@ -6,7 +6,4 @@ module EC2Launcher
 
   AVAILABILITY_ZONES = %w{us-east-1a us-east-1b us-east-1c us-east-1d}
   INSTANCE_TYPES = %w{m1.small m1.medium m1.large m1.xlarge t1.micro m2.xlarge m2.2xlarge m2.4xlarge c1.medium c1.xlarge cc1.4xlarge cg1.4xlarge}
-
-  RUN_URL_SCRIPT = "https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/runurl"
-  SETUP_SCRIPT = "https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/setup.rb"
 end

data/lib/ec2launcher/init_options.rb

@@ -23,6 +23,7 @@ SYNOPSIS
   ec2launcher [global options] command [command options] [command arguments]
 
 COMMANDS
+  help        - Get information about a command.
   init        - Initialize a new environment/application repository.
   launch      - Launch a new instance.
   terminate   - Terminates an instance.
@@ -133,6 +134,16 @@ EOH
         opts.on("--volume-size SIZE", Integer, "EBS volume size in GB. Defaults to #{EC2Launcher::DEFAULT_VOLUME_SIZE} GB") do |volume_size|
           @options.volume_size = volume_size
         end
+
+        opts.separator ""
+        opts.separator "Miscellaneous:"
+
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail("-?", "--help", "Show this message") do
+          puts opts
+          exit
+        end    
       end
     end
 
@@ -143,6 +154,16 @@ EOH
         opts.on("--[no-]snapshot-removal", "Remove EBS snapshots. Defaults to TRUE.") do |removal|
           @options.snapshot_removal = removal
         end
+
+        opts.separator ""
+        opts.separator "Miscellaneous:"
+
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail("-?", "--help", "Show this message") do
+          puts opts
+          exit
+        end    
       end
     end
 
@@ -180,13 +201,24 @@ EOH
       @options.directory = "./"
 
       # Parse global options
-      @global_options.order!
+      begin
+        @global_options.order!
+      rescue OptionParser::InvalidOption
+        puts "Missing command!"
+        puts @global_options
+        exit 1
+      end
+
+      if ARGV.size < 1
+        puts @global_options
+        exit 1
+      end
 
       # Extract the request command
       @command = ARGV.shift.downcase
 
       unless SUB_COMMANDS.include?(@command)
-        puts "Missing command! " if @command.nil?
+        puts "Missing command!" if @command.nil?
         puts "Invalid command: #{@command}" unless @command.nil? || @command == "-?" || @command == "--help" || @command == "help"
         puts @global_options
         exit 1
@@ -208,7 +240,13 @@ EOH
       end
 
       # Parse sub command options
-      @subcommands[@command].order! if @subcommands.has_key?(@command)
+      begin
+        @subcommands[@command].order! if @subcommands.has_key?(@command)
+      rescue OptionParser::InvalidOption
+        puts "Invalid option!"
+        puts @global_options
+        exit 1
+      end
 
       if @command == "init"
         unless args.length >= 1

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -41,8 +41,12 @@ module EC2Launcher
     include BackoffRunner
 
     def initialize()
+      spec = Gem::Specification.find_by_name("ec2launcher")
+      @gem_install_dir = spec.gem_dir
+      @startup_scripts_dir = File.join(@gem_install_dir, "startup-scripts")
       @run_url_script_cache = nil
       @setup_script_cache = nil
+      @setup_instance_script_cache = nil
 
       @log = Logger.new 'ec2launcher'
       log_output = Outputter.stdout
@@ -682,6 +686,11 @@ module EC2Launcher
       cmd
     end
 
+    def load_and_encode_file(base_path, filename)
+      pathname = File.join(base_path, filename)
+      `cat #{pathname} |gzip -f |base64`
+    end
+
     # Builds the launch scripts that should run on the new instance.
     #
     # launch_options = {
@@ -763,13 +772,15 @@ EOF
 
       unless @options.skip_setup
         if @run_url_script_cache.nil?
-          puts "Downloading runurl script from #{RUN_URL_SCRIPT}"
-          @run_url_script_cache = `curl -s #{RUN_URL_SCRIPT} |gzip -f |base64`
+          @run_url_script_cache = load_and_encode_file(@startup_scripts_dir, "runurl")
         end
 
         if @setup_script_cache.nil?
-          puts "Downloading setup script from #{SETUP_SCRIPT}"
-          @setup_script_cache = `curl -s #{SETUP_SCRIPT} |gzip -f |base64`
+          @setup_script_cache = load_and_encode_file(@startup_scripts_dir, "setup.rb")
+        end
+
+        if @setup_instance_script_cache.nil?
+          @setup_instance_script_cache = load_and_encode_file(@startup_scripts_dir, "setup_instance.rb")
         end
 
         # runurl script
@@ -777,18 +788,26 @@ EOF
         user_data += @run_url_script_cache
         user_data += "End-Of-Message"
 
-        # setup script
+        # setup scripts
         user_data += "\ncat > /tmp/setup.rb.gz.base64 <<End-Of-Message2\n"
         user_data += @setup_script_cache
         user_data += "End-Of-Message2"
 
+        user_data += "\ncat > /tmp/setup_instance.rb.gz.base64 <<End-Of-Message3\n"
+        user_data += @setup_instance_script_cache
+        user_data += "End-Of-Message3"
+
         user_data += "\nbase64 -d /tmp/runurl.gz.base64 | gunzip > /tmp/runurl"
         user_data += "\nchmod +x /tmp/runurl"
-        # user_data += "\nrm -f /tmp/runurl.gz.base64"
+        user_data += "\nrm -f /tmp/runurl.gz.base64"
 
         user_data += "\nbase64 -d /tmp/setup.rb.gz.base64 | gunzip > /tmp/setup.rb"
         user_data += "\nchmod +x /tmp/setup.rb"
-        # user_data += "\nrm -f /tmp/setup.rb.gz.base64"
+        user_data += "\nrm -f /tmp/setup.rb.gz.base64"
+
+        user_data += "\nbase64 -d /tmp/setup_instance.rb.gz.base64 | gunzip > /tmp/setup_instance.rb"
+        user_data += "\nchmod +x /tmp/setup_instance.rb"
+        user_data += "\nrm -f /tmp/setup_instance.rb.gz.base64"
 
         user_data += "\ngem install ec2launcher --no-ri --no-rdoc"
 

data/startup-scripts/setup.rb

@@ -10,7 +10,6 @@ require 'json'
 require 'ec2launcher'
 
 SETUP_SCRIPT = "setup_instance.rb"
-SETUP_SCRIPT_URL = "https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts//#{SETUP_SCRIPT}"
 
 class InitOptions
 	def initialize
@@ -153,8 +152,7 @@ puts "Connecting to Chef ..."
 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}`
+puts "Launching role setup script ..."
 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 += " 2>&1 > /var/log/cloud-init.log"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors: