ec2manage 0.0.2 → 0.0.3

data/bin/ec2manage.compiled.rbc

@@ -0,0 +1,131 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+67
+26
+93
+0
+15
+29
+18
+0
+5
+7
+0
+64
+47
+49
+1
+1
+30
+8
+61
+26
+93
+1
+15
+24
+13
+45
+2
+3
+12
+49
+4
+1
+10
+35
+8
+56
+15
+5
+7
+5
+64
+47
+49
+1
+1
+15
+5
+7
+0
+64
+47
+49
+1
+1
+25
+8
+61
+15
+92
+1
+27
+34
+92
+0
+27
+15
+2
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+6
+s
+18
+ec2manage/commands
+x
+7
+require
+x
+9
+LoadError
+n
+x
+3
+===
+s
+8
+rubygems
+p
+9
+I
+0
+I
+4
+I
+17
+I
+5
+I
+24
+I
+6
+I
+2d
+I
+7
+I
+43
+x
+39
+/Users/mat/code/ec2manage/bin/ec2manage
+p
+0

data/lib/ec2manage/commands.rb

@@ -1,6 +1,7 @@
 require 'ec2manage'
 require 'commander/import'
-require 'ec2manage/commander_ext'
+require 'ec2manage/ext/commander'
+require 'ec2manage/ext/highline'
 
 program :name,        EC2Manage.name
 program :version,     EC2Manage.version
@@ -8,7 +9,11 @@ program :description, EC2Manage.summary
 
 default_command :help
 
-command :create do |c|
+def connection
+  EC2Manage::Connection.new(self).connection
+end
+
+command "create-instance" do |c|
   c.syntax      = '[options]'
   c.summary     = 'Create an instance.'
   c.description = 'Creates an EC2 instance according to the specified options.'
@@ -25,9 +30,21 @@ command :create do |c|
   c.option '-d', '--device STRING',      'Device to attach the volume on.'
 
   c.action do |args, options|
-    options.default :template => 'default'
-    debugger; 1
-    say "hello creation of template: #{options.template}"
+    p options.__hash__
+    structure = EC2Manage::Structure.new(self, options.__hash__)
+    say "hello creation of template: #{structure.path}"
+  end
+end
+
+command "create-keypair" do |c|
+  c.syntax = '<name>'
+  c.summary = 'Create a keypair.'
+  c.description = 'Creates a keypair with the specified name and writes it to ~/.ssh.'
+
+  c.action do |args|
+    name = args.shift or raise 'Please specify a name for this keypair.'
+    keypair = connection.create_key_pair(name)
+    EC2Manage::KeyManager.new.store(keypair)
   end
 end
 
@@ -36,7 +53,7 @@ command :list do |c|
   c.description = 'Lists all instances associated with the current account.'
 
   c.action do |args, options|
-    say "hello listing"
+    jj EC2Manage::Lister.new(connection).list
   end
 end
 

data/lib/ec2manage/connection.rb

@@ -0,0 +1,47 @@
+require 'right_aws'
+require 'right_http_connection'
+require 'fileutils'
+
+Rightscale::HttpConnection.params[:ca_file] = File.join(File.dirname(__FILE__), "cacert-root.crt")
+
+class EC2Manage::Connection
+  def self.config_path
+    "#{ENV['HOME']}/.ec2manage"
+  end
+
+  def self.credentials_path
+    "#{config_path}/credentials"
+  end
+
+  def self.right_aws_logger
+    Logger.new("#{config_path}/right_aws.log")
+  end
+
+  def initialize(ui)
+    @ui = ui
+
+    if File.exist?(self.class.credentials_path)
+      config = JSON.parse(File.read(self.class.credentials_path))
+      @access_key_id     = config["access_key_id"]
+      @secret_access_key = config["secret_access_key"]
+    else
+      @ui.say "<%= color('Whoops!', :bold, :red) %> I couldn't find a credentials file."
+      @ui.say "We'll have to create one."
+
+      @access_key_id     = @ui.ask("<%= color('Please enter your Access Key ID:', :bold) %>     ")
+      @secret_access_key = @ui.ask("<%= color('Please enter your Secret Access Key:', :bold) %> ")
+
+      @ui.say "Now I'll write this to #{@ui.color(self.class.credentials_path, :bold)} for safe keeping."
+
+      FileUtils.mkdir_p(File.dirname(self.class.credentials_path))
+      File.open(self.class.credentials_path, 'w') do |f|
+        f.print({"access_key_id" => @access_key_id, "secret_access_key" => @secret_access_key}.to_json)
+      end
+    end
+  end
+
+  def connection
+    @connection = RightAws::Ec2.new(@access_key_id, @secret_access_key,
+                                    :logger => self.class.right_aws_logger)
+  end
+end

data/lib/ec2manage/ext/commander.rb

@@ -0,0 +1,29 @@
+# Automatically include the executable and command name
+# in the syntax statment
+class Commander::Command
+  def syntax=(syntax)
+    @syntax = "#{EC2Manage.name} #{@name} #{syntax}"
+  end
+end
+
+# take back control of -t and -v
+#$parser = OptionParser.new
+#class OptionParser
+#  def self.new
+#    $parser
+#  end
+#end
+#
+#class Commander::Runner
+#  alias :original_global_option :global_option
+#  def global_option *args, &block
+#    args.shift if %w(-t -v).include?(args.first)
+#    original_global_option(*args, &block)
+#  end
+#
+#  def parse_global_options
+#  end
+#
+#  def remove_global_options(*args)
+#  end
+#end

data/lib/ec2manage/ext/highline.rb

@@ -0,0 +1,5 @@
+# Also allow access to the color method, otherwise I don't
+# see how we could assign a color to a local variable
+module Kernel
+  def_delegators :$terminal, :color
+end

data/lib/ec2manage/info.rb

@@ -0,0 +1,27 @@
+module EC2Manage
+  def self.version
+    '0.0.3'
+  end
+
+  def self.name
+    'ec2manage'
+  end
+
+  def self.summary
+    'A command-line manager for EC2 instances.'
+  end
+
+  def self.description
+    <<-EOS.gsub('      ','')
+      ec2manage is a command line tool for managing EC2 instances.
+
+      It's main goal is to provide the same style of control as the
+      Amazon EC2 API Tools but with additional structure and metadata
+      make administrative decisions easier.
+    EOS
+  end
+
+  def self.directory
+    '.' + name
+  end
+end

data/lib/ec2manage/lister.rb

@@ -0,0 +1,28 @@
+class EC2Manage::Lister
+  def initialize(connection)
+    @connection = connection
+  end
+
+  def list
+    { 'instances' => instances }
+  end
+
+  def instances
+    @connection.describe_instances.map do |i|
+      data = { 'zone'    => i[:aws_availability_zone],
+               'ami'     => i[:aws_image_id],
+               'keypair' => i[:ssh_key_name],
+               'groups'  => i[:aws_groups] }
+
+      data['volumes'] = map_volumes(i[:block_device_mappings]) if i[:block_device_mappings]
+
+      data
+    end
+  end
+
+  def map_volumes(volumes)
+    volumes.map do |v|
+      { 'device' => v[:device_name] }
+    end
+  end
+end

data/lib/ec2manage/structure.rb

@@ -0,0 +1,70 @@
+require 'pathname'
+require 'json'
+require 'ostruct'
+
+class EC2Manage::Structure
+  attr_reader :options
+
+  attr_reader :zone, :ami, :keypair, :groups
+  attr_reader :volumes
+
+  def initialize(ui, options)
+    @ui      = ui
+    @options = options
+
+    load_template
+    override_options
+  end
+
+  def override_options
+    [:zone, :ami, :keypair, :group, :name].each do |key|
+      instance_variable_set("@#{key}", options[key]) if options[key]
+    end
+  end
+
+  def template_warning
+    if @options[:template]
+      here = Pathname.new(__FILE__)
+      example = here.dirname.join(*%w(.. .. spec fixtures default.json))
+      @ui.say <<-EOS
+<%= color('Hey!', :bold, :red) %> I couldn't find the template file #{path}.
+
+You might want to create it. Here's an example:
+
+#{example.read}
+      EOS
+    end
+  end
+
+  def load_template
+    return template_warning unless File.exist?(path)
+
+    data = JSON.parse(File.read(path))
+    data.each do |key, value|
+      instance_variable_set("@#{key}", value)
+    end
+
+    @volumes.map! { |v| OpenStruct.new(v) }
+  end
+
+  def ensure_extension(template)
+    if template !~ /\.json$/
+      (template || 'default') + '.json'
+    else
+      template
+    end
+  end
+
+  def resolve(path)
+    if path.exist?
+      path.to_s
+    else
+      File.join(ENV['HOME'], EC2Manage.directory, path.basename)
+    end
+  end
+
+  def path
+    pathname = Pathname.new(ensure_extension(options[:template]))
+    resolve(pathname)
+  end
+end

data/lib/ec2manage.rb

@@ -1,30 +1,4 @@
-module EC2Manage
-  def self.version
-    '0.0.2'
-  end
-
-  def self.name
-    'ec2manage'
-  end
-
-  def self.summary
-    'A command-line manager for EC2 instances.'
-  end
-
-  def self.description
-    <<-EOS.gsub('      ','')
-      ec2manage is a command line tool for managing EC2 instances.
-
-      It's main goal is to provide the same style of control as the
-      Amazon EC2 API Tools but with additional structure and metadata
-      make administrative decisions easier.
-    EOS
-  end
-
-  def self.building?
-    $0.include?("gem") && ARGV[0] == "build"
-  end
-end
-
-#require 'ruby-debug'
-#raise 'Take out the debugger!' if EC2Manage.building?
+require 'ec2manage/info'
+require 'ec2manage/connection'
+require 'ec2manage/structure'
+require 'ec2manage/lister'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ec2manage
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mat Schaffer
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: commander
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 4
         - 0
@@ -32,12 +35,14 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -49,9 +54,11 @@ dependencies:
   name: right_aws
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -63,14 +70,30 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: |
   ec2manage is a command line tool for managing EC2 instances.
   
@@ -88,10 +111,16 @@ extra_rdoc_files: []
 files: 
 - README.md
 - bin/ec2manage
-- lib/ec2manage/commander_ext.rb
+- bin/ec2manage.compiled.rbc
 - lib/ec2manage/commands.rb
+- lib/ec2manage/connection.rb
+- lib/ec2manage/ext/commander.rb
+- lib/ec2manage/ext/highline.rb
+- lib/ec2manage/info.rb
+- lib/ec2manage/lister.rb
+- lib/ec2manage/structure.rb
 - lib/ec2manage.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/matschaffer/ec2manage
 licenses: []
 
@@ -101,23 +130,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A command-line manager for EC2 instances.

data/lib/ec2manage/commander_ext.rb

@@ -1,6 +0,0 @@
-# Automatically include the executable and command name in the syntax statment
-class Commander::Command
-  def syntax=(syntax)
-    @syntax = "#{EC2Manage.name} #{@name} #{syntax}"
-  end
-end