okiess-ec2-instance-manager 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/bin/{ec2_instance_manager → ec2-instance-manager}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/ec2_instance_manager'
+require File.dirname(__FILE__) + '/../lib/ec2-instance-manager'
 
 # Create and run the application
 app = Ec2InstanceManager.new(ARGV, STDIN)

data/ec2-instance-manager.gemspec

@@ -5,15 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2-instance-manager}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Kiessler"]
-  s.date = %q{2009-09-11}
-  s.default_executable = %q{ec2_instance_manager}
+  s.date = %q{2009-09-14}
+  s.default_executable = %q{ec2-instance-manager}
   s.description = %q{Launches EC2 instances for multiple AWS accounts}
   s.email = %q{kiessler@inceedo.com}
-  s.executables = ["ec2_instance_manager"]
+  s.executables = ["ec2-instance-manager"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -25,11 +25,12 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "bin/ec2_instance_manager",
+     "bin/ec2-instance-manager",
      "config.yml.sample",
      "ec2-instance-manager.gemspec",
-     "lib/ec2_instance_manager.rb",
-     "lib/ec2_methods.rb",
+     "lib/ec2-instance-manager.rb",
+     "lib/ec2-instance-manager/ec2_instance_manager.rb",
+     "lib/ec2-instance-manager/status.rb",
      "test/ec2-instance-manager_test.rb",
      "test/test_helper.rb"
   ]

data/lib/ec2-instance-manager.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+gem 'amazon-ec2'
+require 'AWS'
+
+require File.dirname(__FILE__) + '/ec2-instance-manager/ec2_instance_manager'

data/lib/{ec2_instance_manager.rb → ec2-instance-manager/ec2_instance_manager.rb}

@@ -1,38 +1,46 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-gem 'amazon-ec2'
-require 'AWS'
-
-require File.dirname(__FILE__) + '/ec2_methods'
+require File.dirname(__FILE__) + '/status'
 
 class Ec2InstanceManager
-  include Ec2Methods
-  VERSION = '0.1'
+  include Status
+  VERSION = '0.1.2'
   
-  attr_reader :options, :config, :customer_key
+  attr_reader :config, :customer_key
 
   def initialize(arguments, stdin)
     @arguments = arguments
     @stdin = stdin
-    @config = YAML.load(File.read("config.yml"))
+  end
+
+  def config; @config ||= read_config; end
+  def read_config
+    if File.exists?("config.yml")
+      @config = YAML.load(File.read("config.yml"))
+    else
+      begin
+        @config = YAML.load(File.read("#{ENV['HOME']}/.ec2_instance_manager_config.yml"))
+      rescue Errno::ENOENT
+        raise "config.yml expected in current directory or ~/.ec2_instance_manager_config.yml"
+      end
+    end
+  end
+
+  def ec2
+    @ec2 ||= AWS::EC2::Base.new(:access_key_id => config[@customer_key]['amazon_access_key_id'],
+      :secret_access_key => config[@customer_key]['amazon_secret_access_key'])
   end
 
   def run
     puts "EC2 Instance Manager"
     puts
-    puts "Which customer config do you want to use? (#{@config.keys.join(", ")})"
+    puts "Which customer config do you want to use? (#{config.keys.join(", ")})"
     @customer_key = gets
     @customer_key = @customer_key.rstrip.lstrip
     @customer_key = 'default' if @customer_key.empty?
 
-    @ec2 = AWS::EC2::Base.new(:access_key_id => @config[@customer_key]['amazon_access_key_id'],
-      :secret_access_key => @config[@customer_key]['amazon_secret_access_key'])
-
     puts "Configuration: #{@customer_key}"
-    puts "AMAZON_ACCESS_KEY_ID: #{@config[@customer_key]['amazon_access_key_id']}"
-    puts "KEY: #{@config[@customer_key]['key']}"
-    puts "ZONE: #{@config[@customer_key]['availability_zone']}"
+    puts "AMAZON_ACCESS_KEY_ID: #{config[@customer_key]['amazon_access_key_id']}"
+    puts "KEY: #{config[@customer_key]['key']}"
+    puts "ZONE: #{config[@customer_key]['availability_zone']}"
     puts
     
     status_info
@@ -42,11 +50,11 @@ class Ec2InstanceManager
     ami_id = gets
     ami_id = ami_id.lstrip.rstrip
 
-    result = @ec2.run_instances(
+    result = ec2.run_instances(
     	:image_id => ami_id,
-    	:instance_type => @config[@customer_key]['instance_type'],
-    	:key_name => @config[@customer_key]['key'],
-    	:availability_zone => @config[@customer_key]['availability_zone']
+    	:instance_type => config[@customer_key]['instance_type'],
+    	:key_name => config[@customer_key]['key'],
+    	:availability_zone => config[@customer_key]['availability_zone']
     )
 
     instance_id = result.instancesSet.item[0].instanceId
@@ -68,7 +76,7 @@ class Ec2InstanceManager
 
     if not public_ip.empty? and public_ip.size > 1
       puts "Associating public IP address... #{public_ip}"
-      result = @ec2.associate_address(:instance_id => instance_id, :public_ip => public_ip.lstrip.rstrip)
+      result = ec2.associate_address(:instance_id => instance_id, :public_ip => public_ip.lstrip.rstrip)
       if result["return"] == "true"
         puts "=> Success."
       end
@@ -80,7 +88,7 @@ class Ec2InstanceManager
 
     if not volume_id.empty? and volume_id.size > 1
       puts "Attaching volume... #{volume_id}"
-      result = @ec2.attach_volume(:volume_id => volume_id.lstrip.rstrip, :instance_id => instance_id, :device => '/dev/sdf')
+      result = ec2.attach_volume(:volume_id => volume_id.lstrip.rstrip, :instance_id => instance_id, :device => '/dev/sdf')
       if result["return"] == "true"
         puts "=> Success."
       end

data/lib/{ec2_methods.rb → ec2-instance-manager/status.rb}

@@ -1,13 +1,13 @@
-module Ec2Methods
+module Status
   def get_instance_state(instance_id)
-    result = @ec2.describe_instances(:instance_id => instance_id)
+    result = ec2.describe_instances(:instance_id => instance_id)
     instance_state = result["reservationSet"]["item"].first["instancesSet"]["item"].first["instanceState"]["name"]
     dns_name = result["reservationSet"]["item"].first["instancesSet"]["item"].first["dnsName"]
     return instance_state, dns_name
   end
 
   def display_ami_ids(owner_id = nil)
-    result = @ec2.describe_images(:owner_id => owner_id || @config[@customer_key]['amazon_account_number'])
+    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"]}"}
     else
@@ -16,7 +16,7 @@ module Ec2Methods
   end
   
   def display_instances
-    result = @ec2.describe_instances
+    result = ec2.describe_instances
     if result and result["reservationSet"]
       result["reservationSet"]["item"].each do |item|
         instance_id = item["instancesSet"]["item"].first["instanceId"]
@@ -31,7 +31,7 @@ module Ec2Methods
   end
   
   def display_addresses
-    result = @ec2.describe_addresses
+    result = ec2.describe_addresses
     if result and result["addressesSet"]
       result["addressesSet"]["item"].each do |ip|
         puts "#{ip["publicIp"]} => #{ip["instanceId"].nil? ? 'unassigned' : ip["instanceId"]}"
@@ -42,7 +42,7 @@ module Ec2Methods
   end
 
   def display_volumes
-    result = @ec2.describe_volumes
+    result = ec2.describe_volumes
     if result and result["volumeSet"]
       result["volumeSet"]["item"].each do |vol|
         instance_id = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: okiess-ec2-instance-manager
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
-default_executable: ec2_instance_manager
+date: 2009-09-14 00:00:00 -07:00
+default_executable: ec2-instance-manager
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -25,7 +25,7 @@ dependencies:
 description: Launches EC2 instances for multiple AWS accounts
 email: kiessler@inceedo.com
 executables: 
-- ec2_instance_manager
+- ec2-instance-manager
 extensions: []
 
 extra_rdoc_files: 
@@ -38,15 +38,17 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/ec2_instance_manager
+- bin/ec2-instance-manager
 - config.yml.sample
 - ec2-instance-manager.gemspec
-- lib/ec2_instance_manager.rb
-- lib/ec2_methods.rb
+- lib/ec2-instance-manager.rb
+- lib/ec2-instance-manager/ec2_instance_manager.rb
+- lib/ec2-instance-manager/status.rb
 - test/ec2-instance-manager_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/okiess/ec2-instance-manager
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -67,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simple EC2 Instance Manager