ec2launcher 1.6.0 → 1.6.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.1
+
+* Added option to force termination of an instance, even if the environment tag is missing.
+* Added block device configuration option to set block read-ahead values when setting up an EBS volume.
+
 ## 1.6.0
 
 * Added option to set block device read-ahead value.

data/bin/ec2launcher

@@ -28,7 +28,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)
-    terminator.terminate(opt_parser.hostname, opt_parser.options.access_key, opt_parser.options.secret_key, opt_parser.options.snapshot_removal)
+    terminator.terminate(opt_parser.hostname, opt_parser.options.access_key, opt_parser.options.secret_key, opt_parser.options.snapshot_removal, opt_parser.options.force)
 elsif opt_parser.command == "launch"
     launcher = EC2Launcher::Launcher.new
     launcher.launch(opt_parser.options)

data/lib/ec2launcher/init_options.rb

@@ -154,6 +154,9 @@ EOH
         opts.on("--[no-]snapshot-removal", "Remove EBS snapshots. Defaults to TRUE.") do |removal|
           @options.snapshot_removal = removal
         end
+        opts.on("-f", "--[no-]force", "Force termination even if missing environment. Defaults to FALSE.") do |force|
+          @options.force = true
+        end
 
         opts.separator ""
         opts.separator "Miscellaneous:"
@@ -195,6 +198,7 @@ EOH
       @options.volume_size = nil
 
       @options.snapshot_removal = true
+      @options.force = false
 
       @options.verbosity = :normal
 

data/lib/ec2launcher/terminator.rb

@@ -35,7 +35,8 @@ module EC2Launcher
     # @param[String] access_key Amazon IAM access key
     # @param[String] secret Amazon IAM secret key
     # @param[Boolean] snapshot_removal Remove EBS snapshots for EBS volumes attached to the instance.
-    def terminate(server_name, access_key, secret, snapshot_removal = true)
+    # @param[Boolean] force Force instance termination even if environment is not found.
+    def terminate(server_name, access_key, secret, snapshot_removal = true, force = false)
       ##############################
       # Initialize AWS and create EC2 connection
       ##############################
@@ -59,24 +60,31 @@ module EC2Launcher
       if instance
         environment_name = nil
         AWS.memoize do
-          environment_name = instance.tags["environment"].strip
+          environment_name = instance.tags["environment"].strip if instance.tags["environment"]
         end
 
         ##############################
         # ENVIRONMENT
         ##############################
-        unless @environments.has_key? environment_name
+        if environment_name.nil? && ! force
+          @log.fatal "No environment tag found for host. Use the --force option to override and terminate."
+          exit 3
+        end
+
+        if (! @environments.has_key?(environment_name)) && (! force)
           @log.fatal "Environment not found: '#{environment_name}'"
           exit 2
         end
-        @environment = @environments[environment_name]
+        @environment = @environments[environment_name] if 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)
+        if @environment && @environment.route53_zone_id
+          aws_route53 = AWS::Route53.new
+          route53 = EC2Launcher::Route53.new(aws_route53, @environment.route53_zone_id, @log)
+        end
 
         ##############################
         # EBS Volumes

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk