ec2-instance-manager 0.3.0 → 0.3.1

data/README.rdoc

@@ -2,13 +2,22 @@
 
 Simple EC2 Instance Manager that is able to work with multiple AWS accounts (in config.yml). See config.yml.sample.
 
-Create a "config.yml" in the current directory and run "ec2_instance_manager". You can launch & terminate instances, assign public IP's and
-attach volumes.
+Create a "config.yml" in the current directory and run "ec2_instance_manager". You can launch & terminate instances, create whole launch plans, start all launch plan groups or start an individual launch plan group, assign public IP's and attach volumes.
 
 Run ec2-instance-manager --help for options and commands.
 
 This gem should be considered ALPHA! More features to come...
 
+== Installation
+
+sudo gem install amazon-ec2
+
+sudo gem install ec2-instance-manager (Gemcutter)
+
+or
+
+sudo gem install okiess-ec2-instance-manager (Github)
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/ec2-instance-manager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2-instance-manager}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Kiessler"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-17}
   s.default_executable = %q{ec2-instance-manager}
   s.description = %q{Launches EC2 instances for multiple AWS accounts}
   s.email = %q{kiessler@inceedo.com}
@@ -51,11 +51,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<amazon-ec2>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
+      s.add_dependency(%q<amazon-ec2>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
+    s.add_dependency(%q<amazon-ec2>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

data/lib/ec2-instance-manager/ec2_instance_manager.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/output'
 
 class Ec2InstanceManager
   include Status, Launch, Output
-  VERSION = '0.3'
+  VERSION = '0.3.1'
   
   attr_reader :config, :customer_key, :options
 
@@ -30,6 +30,11 @@ class Ec2InstanceManager
       opts.on( '-l', '--start-launch-plan', 'Starts a launch plan under a config key' ) do
         options[:start_launch_plan] = true
       end
+      
+      options[:group] = nil
+      opts.on( '-g', '--group LAUNCH_GROUP_NAME', 'Starts a launch plan group under a config key' ) do |group|
+        options[:group] = group
+      end
 
       options[:config] = nil
       opts.on( '-c', '--config CONFIG_KEY', 'Sets the config key' ) do |key|
@@ -67,7 +72,7 @@ class Ec2InstanceManager
   end
 
   def run
-    puts "EC2 Instance Manager #{VERSION}"
+    puts white("EC2 Instance Manager #{VERSION}")
     puts
     unless options[:config]
       puts "Which customer config do you want to use? (#{config.keys.join(", ")})"

data/lib/ec2-instance-manager/launch.rb

@@ -14,8 +14,8 @@ module Launch
     instance_state = nil
     while(instance_state != 'running')
       instance_state, dns_name = get_instance_state(instance_id)
-      puts "=> Checking for running state... #{instance_state}"
-      puts "=> Public DNS: #{dns_name}" if instance_state == 'running'
+      puts "=> Checking for running state... #{output_running_state(instance_state)}"
+      puts "=> Public DNS: #{white(dns_name)}" if instance_state == 'running'
       sleep 10 unless instance_state == 'running'
     end
 
@@ -49,15 +49,14 @@ module Launch
     instances = get_running_instances_list
     if instances and instances.any?
       puts
-      puts red("Warning: Terminating all instances: #{instances.join(", ")}")
-      puts red("Please cancel within the next 5 seconds...")
+      cancel_message(instances)
       sleep 5
       ec2.terminate_instances(:instance_id => instances)
       puts
-      puts "All instances are going to terminate now."
+      puts white("All instances are going to terminate now.")
     else
       puts
-      puts "No running instances."
+      puts white("No running instances.")
     end
   end
 
@@ -66,22 +65,39 @@ module Launch
     puts
     puts "Your Launch Plan:"
     if config[@customer_key]["launch_plan"] and config[@customer_key]["launch_plan"].any?
-      config[@customer_key]["launch_plan"].keys.sort.each do |launch_plan_group|
-        puts
-        puts "Group: #{launch_plan_group}"
-        if config[@customer_key]["launch_plan"][launch_plan_group] and config[@customer_key]["launch_plan"][launch_plan_group].any?
-          config[@customer_key]["launch_plan"][launch_plan_group].keys.each do |ami_id|
-            puts "#{ami_id} => #{config[@customer_key]["launch_plan"][launch_plan_group][ami_id]} Instances to launch"
-            ami_ids_to_launch << [ami_id, config[@customer_key]["launch_plan"][launch_plan_group][ami_id]]
+      
+      launch_plan_groups = config[@customer_key]["launch_plan"].keys.sort
+      
+      if self.options[:group]
+        puts 
+        puts "Existing groups: #{launch_plan_groups.join(", ")}"
+        if launch_plan_groups.include?(self.options[:group])
+          puts "Targeted Group: #{self.options[:group]}"
+          config[@customer_key]["launch_plan"][self.options[:group]].each do |ami_id|
+            puts "#{ami_id[0]} => #{ami_id[1]} Instances to launch"
+            ami_ids_to_launch << [ami_id[0], ami_id[1]]
           end
         else
-          puts "No Ami Id's to launch defined."
+          puts white("Targeted Launch plan group '#{self.options[:group]}' not found.")
+        end
+      else
+        launch_plan_groups.each do |launch_plan_group|
+          puts
+          puts "Group: #{launch_plan_group}"
+          if config[@customer_key]["launch_plan"][launch_plan_group] and config[@customer_key]["launch_plan"][launch_plan_group].any?
+            config[@customer_key]["launch_plan"][launch_plan_group].keys.each do |ami_id|
+              puts "#{ami_id} => #{config[@customer_key]["launch_plan"][launch_plan_group][ami_id]} Instances to launch"
+              ami_ids_to_launch << [ami_id, config[@customer_key]["launch_plan"][launch_plan_group][ami_id]]
+            end
+          else
+            puts white("No Ami Id's to launch defined.")
+          end
         end
       end
       
       puts
       puts red("Warning: Now launching your plan...")
-      puts red("Please cancel within the next 5 seconds...")
+      puts red("Please cancel within the next 5 seconds if this isn't want you want...")
       puts
       sleep 5
       
@@ -92,9 +108,9 @@ module Launch
         }
       end
 
-      puts "All instances are launching now..."
+      puts white("All instances are launching now...")
     else
-      puts "No launch groups defined."
+      puts white("No launch plan groups defined.")
     end
   end
   

data/lib/ec2-instance-manager/output.rb

@@ -2,7 +2,7 @@ module Output
   def output_running_state(running_state)
     if running_state == 'running'
       green(running_state)
-    elsif running_state == 'terminated'
+    elsif running_state == 'terminated' or running_state == 'shutting-down'
       red(running_state)
     elsif running_state == 'pending'
       yellow(running_state)
@@ -11,6 +11,11 @@ module Output
     end
   end
   
+  def cancel_message(instances)
+    puts red("Warning: Terminating all instances: #{instances.join(", ")}")
+    puts red("Please cancel within the next 5 seconds if this isn't want you want...")
+  end
+  
   def green(str)
     "\033[32m#{str}\033[0m" 
   end
@@ -22,4 +27,8 @@ module Output
   def yellow(str)
     "\033[33m#{str}\033[0m"
   end
+  
+  def white(str)
+    "\033[1m#{str}\033[0m"
+  end
 end

data/lib/ec2-instance-manager/status.rb

@@ -9,9 +9,9 @@ module Status
   def display_ami_ids(owner_id = nil)
     result = ec2.describe_images(:owner_id => owner_id || config[@customer_key]['amazon_account_number'])
     if result and result["imagesSet"]
-      result["imagesSet"]["item"].each {|image| puts "#{image["imageId"]} - #{image["imageLocation"]}"}
+      result["imagesSet"]["item"].each {|image| puts "#{white(image["imageId"])} - #{image["imageLocation"]}"}
     else
-      puts "No images."
+      puts white("No images.")
     end
   end
   
@@ -23,10 +23,10 @@ module Status
         ami_id = item["instancesSet"]["item"].first["imageId"]
         running_state = item["instancesSet"]["item"].first["instanceState"]["name"]
         dns_name = item["instancesSet"]["item"].first["dnsName"]
-        puts "Instance Id: #{instance_id} - #{output_running_state(running_state)} (AMI Id: #{ami_id}) #{dns_name}"
+        puts "Instance Id: #{white(instance_id)} - #{output_running_state(running_state)} (AMI Id: #{white(ami_id)}) #{dns_name}"
       end
     else
-      puts "No instances."
+      puts white("No instances.")
     end
   end
     
@@ -34,10 +34,10 @@ module Status
     result = ec2.describe_addresses
     if result and result["addressesSet"]
       result["addressesSet"]["item"].each do |ip|
-        puts "#{ip["publicIp"]} => #{ip["instanceId"].nil? ? 'unassigned' : ip["instanceId"]}"
+        puts "#{white(ip["publicIp"])} => #{ip["instanceId"].nil? ? 'unassigned' : ip["instanceId"]}"
       end
     else
-      puts "No addresses."
+      puts white("No addresses.")
     end
   end
 
@@ -49,10 +49,10 @@ module Status
         if vol["attachmentSet"]
           instance_id = vol["attachmentSet"]["item"].first["instanceId"]
         end
-        puts "#{vol["volumeId"]} (Size: #{vol["size"]} / Zone: #{vol["availabilityZone"]}) - #{vol["status"]} => #{instance_id.nil? ? 'unassigned' : instance_id}"
+        puts "#{white(vol["volumeId"])} (Size: #{vol["size"]} / Zone: #{vol["availabilityZone"]}) - #{vol["status"]} => #{instance_id.nil? ? 'unassigned' : instance_id}"
       end
     else
-      puts "No volumes."
+      puts white("No volumes.")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ec2-instance-manager
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +02:00
+date: 2009-10-17 00:00:00 +02:00
 default_executable: ec2-instance-manager
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: amazon-ec2
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   type: :development