ec2launcher 1.4.1 → 1.4.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.2
+
+* Remove requirement to provide environment name when terminating an instance.
+
 ## 1.4.1
 
 * Fixed typo.

data/bin/ec2launcher

@@ -27,7 +27,7 @@ if opt_parser.command == "init"
 
     puts "Successfully created #{opt_parser.location}"
 elsif opt_parser.command =~ /^term/
-    terminator = EC2Launcher::Terminator.new(opt_parser.options.directory, opt_parser.options.environ)
+    terminator = EC2Launcher::Terminator.new(opt_parser.options.directory)
     terminator.terminate(opt_parser.hostname, opt_parser.options.access_key, opt_parser.options.secret_key, opt_parser.options.snapshot_removal)
 elsif opt_parser.command == "launch"
     launcher = EC2Launcher::Launcher.new

data/lib/ec2launcher/init_options.rb

@@ -14,21 +14,55 @@ module EC2Launcher
     attr_reader :location
     attr_reader :hostname
 
-    SUB_COMMANDS = %w{init launch terminate term}
+    SUB_COMMANDS = %w{help init launch terminate}
 
-    def initialize
-      @opts = OptionParser.new do |opts|
-        opts.banner = "Usage: ec2launcher [COMMAND]
+    def global_options
+      OptionParser.new do |opts|
+        opts.banner = <<EOH
+SYNOPSIS
+  ec2launcher [global options] command [command options] [command arguments]
+
+COMMANDS
+  init        - Initialize a new environment/application repository.
+  launch      - Launch a new instance.
+  terminate   - Terminates an instance.
+
+EOH
+
+        opts.separator "Global options:"
 
-  where [COMMAND] is one of:
+        opts.on("--access-key KEY", String, "Amazon access key. Overrides AWS_ACCESS_KEY environment variable.") do |access_key|
+          @options.access_key = access_key
+        end
+
+        opts.on("--secret SECRET", String, "Amazon secret access key. Overrides AWS_SECRET_ACCESS_KEY environment variable.") do |secret|
+          @options.secret = secret
+        end
+
+        opts.on("-d", "--directory DIRECTORY", String, "Location of configuration directory. Defaults to current directory.") do |directory|
+          @options.directory = directory
+        end
 
-    init [LOCATION]             Initialize a repository in the specified directory.
-    launch [OPTIONS]            Launch a new instance.
-    terminate [name] [OPTIONS]  Terminates an instance.
+        opts.on_tail("-q", "--quiet", "Display as little information as possible.") do
+          @options.verbosity = :quiet
+        end
 
-  and [OPTIONS] include:
+        opts.on_tail("-v", "--verbose", "Display as much information as possible.") do
+          @options.verbosity = :verbose
+        end
 
-  "
+        # 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
+
+    def launch_options
+      OptionParser.new do |opts|
+        opts.banner = ""
         opts.separator "Query options:"
 
         opts.on("-l", "--list", "Show environments and applications.") do
@@ -44,7 +78,7 @@ module EC2Launcher
         end
 
         opts.separator ""
-        opts.separator "Required Launch options:"
+        opts.separator "Required launch options:"
 
         opts.on("-e", "--environment ENV", "The environment for the server.") do |env|
           @options.environ = env
@@ -74,18 +108,7 @@ module EC2Launcher
         end
 
         opts.separator ""
-        opts.separator "Termination options:"
-
-        opts.on("--[no-]snapshot-removal", "Remove EBS snapshots. Defaults to TRUE.") do |removal|
-          @options.snapshot_removal = removal
-        end
-
-        opts.separator ""
-        opts.separator "Overrides:"
-
-        opts.on("-d", "--directory DIRECTORY", String, "Location of configuration directory. Defaults to current directory.") do |directory|
-          @options.directory = directory
-        end
+        opts.separator "Launch overrides:"
 
         opts.on("-h", "--hostname NAME", String, "The name for the new server.") do |hostname|
           @options.hostname = hostname
@@ -110,47 +133,28 @@ module EC2Launcher
         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
+      end
+    end
 
-        opts.separator ""
-        opts.separator "AWS Security Options:"
-
-        opts.on("--access-key KEY", String, "Amazon access key. Overrides AWS_ACCESS_KEY environment variable.") do |access_key|
-          @options.access_key = access_key
-        end
-
-        opts.on("--secret SECRET", String, "Amazon secret access key. Overrides AWS_SECRET_ACCESS_KEY environment variable.") do |secret|
-          @options.secret = secret
-        end
-
-        opts.separator ""
-        opts.separator "Common options:"
-
-        opts.on_tail("-q", "--quiet", "Display as little information as possible.") do
-          @options.verbosity = :quiet
-        end
-
-        opts.on_tail("-v", "--verbose", "Display as much information as possible.") do
-          @options.verbosity = :verbose
+    def terminate_options
+      OptionParser.new do |opts|
+        opts.banner = ""
+        opts.separator "Termination options:"
+        opts.on("--[no-]snapshot-removal", "Remove EBS snapshots. Defaults to TRUE.") do |removal|
+          @options.snapshot_removal = removal
         end
-
-        # 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
 
-    def parse(args)
-      @command = args.shift
-      unless SUB_COMMANDS.include?(@command)
-        puts "Missing command! " if @command.nil?
-        puts "Invalid command: #{@command}" unless @command.nil? || @command == "-?" || @command == "--help"
-        puts @opts
-        exit 1
-      end
+    def initialize
+      @global_options = global_options()
+      @subcommands = {
+        'launch' => launch_options(),
+        'terminate' => terminate_options()
+      }
+    end
 
+    def parse(args)
       @options = OpenStruct.new
       @options.list = false
       @options.show_defaults = false
@@ -175,6 +179,37 @@ module EC2Launcher
 
       @options.directory = "./"
 
+      # Parse global options
+      @global_options.order!
+
+      # Extract the request command
+      @command = ARGV.shift.downcase
+
+      unless SUB_COMMANDS.include?(@command)
+        puts "Missing command! " if @command.nil?
+        puts "Invalid command: #{@command}" unless @command.nil? || @command == "-?" || @command == "--help" || @command == "help"
+        puts @global_options
+        exit 1
+      end
+
+      if @command == "-?" || @command == "--help"
+        puts @global_options
+        exit 1
+      end
+
+      if @command == "help"
+        if ARGV.size >= 1 && SUB_COMMANDS.include?(ARGV[0])
+          puts @global_options
+          puts @subcommands[ARGV[0]]
+        else
+          puts @global_options
+        end
+        exit 1
+      end
+
+      # Parse sub command options
+      @subcommands[@command].order! if @subcommands.has_key?(@command)
+
       if @command == "init"
         unless args.length >= 1
           puts "Missing location!"
@@ -184,15 +219,6 @@ module EC2Launcher
         end
         @location = args[0]
       elsif @command =~ /^term/
-        @opts.parse!(args)
-
-        if @options.environ.nil?
-          puts "Missing a required parameter: --environment"
-          puts
-          help
-          exit 1
-        end
-
         unless args.length >= 1
           puts "Missing name of server!"
           puts
@@ -201,8 +227,6 @@ module EC2Launcher
         end
         @hostname = args[0]
       else
-        @opts.parse!(args)
-
         if (@options.environ.nil? || @options.application.nil?) && ! @options.list
           puts "Missing a required parameter: #{@options.environ.nil? ? '--environment' : '--application'}"
           puts

data/lib/ec2launcher/terminator.rb

@@ -14,7 +14,7 @@ module EC2Launcher
     include AWSInitializer
     include BackoffRunner
 
-    def initialize(config_directory, environment_name)
+    def initialize(config_directory)
       @log = Logger.new 'ec2launcher'
       log_output = Outputter.stdout
       log_output.formatter = PatternFormatter.new :pattern => "%m"
@@ -27,15 +27,6 @@ module EC2Launcher
 
       @config = config_wrapper.config
       @environments = config_wrapper.environments
-
-      ##############################
-      # ENVIRONMENT
-      ##############################
-      unless @environments.has_key? environment_name
-        @log.fatal "Environment not found: #{environment_name}"
-        exit 2
-      end
-      @environment = @environments[environment_name]
     end
 
     # Terminates a given server instance.
@@ -50,12 +41,6 @@ module EC2Launcher
       ##############################
       initialize_aws(access_key, secret)
       ec2 = AWS::EC2.new
-      
-      ##############################
-      # Create Route53 connection
-      ##############################
-      aws_route53 = AWS::Route53.new if @environment.route53_zone_id
-      route53 = EC2Launcher::Route53.new(aws_route53, @environment.route53_zone_id, @log)
 
       ##############################
       # Find instance
@@ -72,6 +57,27 @@ module EC2Launcher
       end # memoize
 
       if instance
+        environment_name = nil
+        AWS.memoize do
+          environment_name = instance.tags["environment"].strip
+        end
+
+        ##############################
+        # ENVIRONMENT
+        ##############################
+        unless @environments.has_key? environment_name
+          @log.fatal "Environment not found: '#{environment_name}'"
+          exit 2
+        end
+        @environment = @environments[environment_name]
+
+        ##############################
+        # Create Route53 connection
+        ##############################
+        aws_route53 = nil
+        aws_route53 = AWS::Route53.new if @environment.route53_zone_id
+        route53 = EC2Launcher::Route53.new(aws_route53, @environment.route53_zone_id, @log)
+
         # Remove EBS snapshots
         AWS.memoize do
           remove_snapshots(ec2, instance) if snapshot_removal
@@ -103,14 +109,14 @@ module EC2Launcher
       volumes = instance.block_device_mappings.values
 
       # Iterate over over volumes to find snapshots
-      @log.info("  Searching for snapshots...")
+      @log.info("Searching for snapshots...")
       snapshots = []
       volumes.each do |vol|
         volume_snaps = ec2.snapshots.filter("volume-id", vol.volume.id)
         volume_snaps.each {|volume_snapshot| snaphots << volume_snapshot }
       end
 
-      @log.info("  Deleting #{snapshots.size} snapshots...")
+      @log.info("Deleting #{snapshots.size} snapshots...")
       snapshots.each {|snap| snap.delete }
     end
   end

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk