ec2launcher 1.3.8 → 1.3.9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.9
+
+* More cleanup to terminator code.
+
 ## 1.3.8
 
 * Make terminator code more threadsafe.

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

data/lib/ec2launcher/terminator.rb

@@ -14,7 +14,7 @@ module EC2Launcher
     include AWSInitializer
     include BackoffRunner
 
-    def initialize()
+    def initialize(config_directory, environment_name)
       @log = Logger.new 'ec2launcher'
       log_output = Outputter.stdout
       log_output.formatter = PatternFormatter.new :pattern => "%m"
@@ -23,7 +23,7 @@ module EC2Launcher
       ##############################
       # Load configuration data
       ##############################
-      config_wrapper = ConfigWrapper.new(options.directory)
+      config_wrapper = ConfigWrapper.new(config_directory)
 
       @config = config_wrapper.config
       @environments = config_wrapper.environments
@@ -31,11 +31,11 @@ module EC2Launcher
       ##############################
       # ENVIRONMENT
       ##############################
-      unless @environments.has_key? options.environ
-        @log.fatal "Environment not found: #{options.environ}"
+      unless @environments.has_key? environment_name
+        @log.fatal "Environment not found: #{environment_name}"
         exit 2
       end
-      @environment = @environments[options.environ]
+      @environment = @environments[environment_name]
     end
 
     # Terminates a given server instance.

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk