ec2launcher 1.1.2 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.2.0
+
+* Added support for terminating instances.
+
+## 1.1.3
+
+* Fixed typo with error handling in BackoffRunner.
+* Bumped required version of AWS SDK to support IAM Instance Profiles.
+* Fixed typo with IAM instance profile attribute name.
+
 ## 1.1.2
 
 * Added support for specifying an IAM Instance Profile through the environment and/or application.

data/bin/ec2launcher

@@ -5,7 +5,8 @@
 require 'erb'
 
 require 'ec2launcher'
-require "ec2launcher/init_options"
+require 'ec2launcher/init_options'
+require 'ec2launcher/terminator'
 
 opt_parser = EC2Launcher::InitOptions.new
 opt_parser.parse(ARGV)
@@ -25,9 +26,12 @@ if opt_parser.command == "init"
     File.open("config.rb", 'w') {|f| f.write(new_config_template.result)}
 
     puts "Successfully created #{opt_parser.location}"
+elsif opt_parser.command =~ /^term/
+    terminator = EC2Launcher::Terminator.new
+    terminator.terminate(opt_parser.hostname, opt_parser.options)
 elsif opt_parser.command == "launch"
-  launcher = EC2Launcher::Launcher.new
-  launcher.launch(opt_parser.options)
+    launcher = EC2Launcher::Launcher.new
+    launcher.launch(opt_parser.options)
 else
     opt_parser.help
     exit 1

data/ec2launcher.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = EC2Launcher::VERSION
 
-  gem.add_runtime_dependency "aws-sdk", [">= 1.5.0"]
+  gem.add_runtime_dependency "aws-sdk", [">= 1.6.6"]
   gem.add_runtime_dependency "log4r"
 end

data/lib/ec2launcher/aws_initializer.rb

@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'rubygems'
+require 'aws-sdk'
+
+module EC2Launcher
+  module AWSInitializer
+    # Initializes connections to the AWS SDK
+    #
+    def initialize_aws(access_key = nil, secret_key = nil)
+      aws_access_key = access_key
+      aws_access_key ||= ENV['AWS_ACCESS_KEY']
+
+      aws_secret_access_key = secret_key
+      aws_secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY']
+
+      if aws_access_key.nil? || aws_secret_access_key.nil?
+        abort("You MUST either set the AWS_ACCESS_KEY and AWS_SECRET_ACCESS_KEY environment variables or use the command line options.")
+      end
+
+      AWS.config({
+        :access_key_id => aws_access_key,
+        :secret_access_key => aws_secret_access_key
+      })
+    end
+  end
+end

data/lib/ec2launcher/backoff_runner.rb

@@ -28,7 +28,7 @@ module EC2Launcher
       rescue AWS::EC2::Errors::InstanceLimitExceeded
         puts "AWS::EC2::Errors::InstanceLimitExceeded ... aborting launch."
         return false
-      rescue StdError => bang
+      rescue Exception => bang
         print "Error for #{message}: #{bang}"
         return false
       end

data/lib/ec2launcher/dsl/environment.rb

@@ -22,6 +22,8 @@ module EC2Launcher
 			dsl_accessor :chef_validation_pem_url
 			dsl_accessor :domain_name
 			dsl_accessor :gem_path
+
+			# @since 1.1.2
 			dsl_accessor :iam_profile
 			dsl_accessor :inherit
 			dsl_accessor :key_name

data/lib/ec2launcher/init_options.rb

@@ -12,8 +12,9 @@ module EC2Launcher
     attr_reader :command
     attr_reader :options
     attr_reader :location
+    attr_reader :hostname
 
-    SUB_COMMANDS = %w{init launch}
+    SUB_COMMANDS = %w{init launch terminate term}
 
     def initialize
       @opts = OptionParser.new do |opts|
@@ -21,8 +22,9 @@ module EC2Launcher
 
   where [COMMAND] is one of:
 
-    init [LOCATION]   Initialize a repository in the specified directory.
-    launch [OPTIONS]  Launch a new instance.
+    init [LOCATION]             Initialize a repository in the specified directory.
+    launch [OPTIONS]            Launch a new instance.
+    terminate [name] [OPTIONS]  Terminates an instance.
 
   and [OPTIONS] include:
 
@@ -172,6 +174,14 @@ module EC2Launcher
           exit 1
         end
         @location = args[0]
+      elsif @command =~ /^term/
+        unless args.length >= 1
+          puts "Missing name of server!"
+          puts
+          help
+          exit 1
+        end
+        @hostname = args[0]
       else
         @opts.parse!(args)
 

data/lib/ec2launcher/terminator.rb

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'rubygems'
+require 'aws-sdk'
+require 'log4r'
+
+require 'ec2launcher/aws_initializer'
+require 'ec2launcher/backoff_runner'
+
+module EC2Launcher
+  class Terminator
+    include AWSInitializer
+    include BackoffRunner
+
+    def initialize()
+      @log = Logger.new 'ec2launcher'
+      log_output = Outputter.stdout
+      log_output.formatter = PatternFormatter.new :pattern => "%m"
+      @log.outputters = log_output
+    end
+
+    def terminate(server_name, options)
+      ##############################
+      # Initialize AWS and create EC2 connection
+      ##############################
+      initialize_aws(options.access_key, options.secret)
+      @ec2 = AWS::EC2.new
+      instance = nil
+      AWS.memoize do
+        instances = @ec2.instances.filter("tag:Name", server_name)
+        instances.each do |i|
+          unless i.status == :shutting_down || i.status == :terminated
+            instance = i
+            break
+          end # unless status
+        end # instance loop
+      end # memoize
+
+      if instance
+        @log.info("Terminating instance: #{server_name} [#{instance.instance_id}]")
+        instance.terminate
+        @log.info("Deleting node/client from Chef: #{server_name}")
+        node_result = `echo "Y" |knife node delete #{server_name}`
+        client_result = `echo "Y" |knife client delete #{server_name}`
+        @log.debug("Deleted Chef node: #{result}")
+        @log.debug("Deleted Chef client: #{result}")
+      else
+        @log.error("Unable to find instance: #{server_name}")
+      end
+    end
+  end
+end

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -14,6 +14,7 @@ require 'ec2launcher/dsl/config'
 require 'ec2launcher/dsl/application'
 require 'ec2launcher/dsl/environment'
 
+require 'ec2launcher/aws_initializer'
 require 'ec2launcher/backoff_runner'
 require 'ec2launcher/instance_paths_config'
 require 'ec2launcher/block_device_builder'
@@ -35,6 +36,7 @@ module EC2Launcher
   end
 
   class Launcher
+    include AWSInitializer
     include BackoffRunner
 
     def initialize()
@@ -101,7 +103,7 @@ module EC2Launcher
       ##############################
       # Initialize AWS and create EC2 connection
       ##############################
-      initialize_aws()
+      initialize_aws(@options.access_key, @options.secret)
       @ec2 = AWS::EC2.new
 
       ##############################
@@ -484,26 +486,6 @@ module EC2Launcher
       dns_name.nil? ? "n/a" : dns_name
     end
 
-    # Initializes connections to the AWS SDK
-    #
-    def initialize_aws()
-      aws_access_key = @options.access_key
-      aws_access_key ||= ENV['AWS_ACCESS_KEY']
-
-      aws_secret_access_key = @options.secret
-      aws_secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY']
-
-      if aws_access_key.nil? || aws_secret_access_key.nil?
-        abort("You MUST either set the AWS_ACCESS_KEY and AWS_SECRET_ACCESS_KEY environment variables or use the command line options.")
-      end
-
-      @log.info "Initializing AWS connection..."
-      AWS.config({
-        :access_key_id => aws_access_key,
-        :secret_access_key => aws_secret_access_key
-      })
-    end
-
     # Launches an EC2 instance.
     #
     # @param [String] FQDN for the new host.
@@ -535,7 +517,7 @@ module EC2Launcher
           launch_mapping[:block_device_mappings] = block_device_mappings
         end
 
-        launch_mapping[:iam_profile] = iam_profile if iam_profile
+        launch_mapping[:iam_instance_profile] = iam_profile if iam_profile
         launch_mapping[:subnet] = vpc_subnet if vpc_subnet
 
         new_instance = @ec2.instances.create(launch_mapping)

data/startup-scripts/setup_instance.rb

@@ -367,12 +367,18 @@ end
 # Launch Chef
 def run_chef_client(chef_path)
   result = 0
+  last_line = nil
   Open3.popen3(chef_path) do |stdin, stdout, stderr, wait_thr|
     stdout.each do |line|
+      last_line = line
       puts line
     end
     result = wait_thr.value if wait_thr
   end
+  if last_line =~ /[ ]ERROR[:][ ]/
+    result = -1
+  end
+
   result
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,7 @@ files:
 - ec2launcher.gemspec
 - lib/ec2launcher.rb
 - lib/ec2launcher/application_processor.rb
+- lib/ec2launcher/aws_initializer.rb
 - lib/ec2launcher/backoff_runner.rb
 - lib/ec2launcher/block_device_builder.rb
 - lib/ec2launcher/config_loader.rb
@@ -78,6 +79,7 @@ files:
 - lib/ec2launcher/init_options.rb
 - lib/ec2launcher/instance_paths_config.rb
 - lib/ec2launcher/security_group_handler.rb
+- lib/ec2launcher/terminator.rb
 - lib/ec2launcher/version.rb
 - startup-scripts/runurl
 - startup-scripts/setup.rb
@@ -107,3 +109,4 @@ signing_key:
 specification_version: 3
 summary: Tool to launch EC2 instances.
 test_files: []
+has_rdoc: