awscli 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDMxM2Y2YmNlMjQ2M2Q4YWI2ODQzMDBiNWE5ODZiOWYzZDYwNjFhMQ==
+  data.tar.gz: !binary |-
+    N2FhODA0ZTNiNjI2MzU3MzAwZDhlOGZkYzdiYjZiZTZmMDIyMDY5Zg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MGJjNDAzZjlkZjU4MGQ2MDNjNTI4MzFhZWZmMTJhMzY4YjUxMjFlYjg0NDhh
+    YTM5ZWNkMzJjNTNkNGE5YjUwMTg2NjVkMWJjYTQwNDY3ZGM1ZWU3ZWJmODhh
+    NWFhNGVmYWVkNDU4ZmJmMTQ2NjcxM2JjMmUyZGNiYTY0ZWNlY2Q=
+  data.tar.gz: !binary |-
+    ODc3ODcyMmNlOTVlYzY3ZDgyMjY4ZTc3M2ZhOTM5MGYwN2JhYjk3Y2UwZjQ5
+    YzlmMTg2NmI2NWRlNTQ1OGFiM2FhMzYxN2ViMzljZTU0OGU3MjFkMWJlZDdk
+    N2UzNDA2ZmQ4YzZhMDVkZTcyYWFhMmE2YmE4MGVmYWRmNGVkYWE=

data/README.rdoc

@@ -0,0 +1,5 @@
+= awscli
+
+Amazon Web Service Command Line Interface
+
+WIP

data/Rakefile

@@ -0,0 +1,44 @@
+require 'rake/clean'
+require 'rubygems'
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'cucumber'
+require 'cucumber/rake/task'
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
+  rd.title = 'Your application title'
+end
+
+spec = eval(File.read('awscli.gemspec'))
+
+Gem::PackageTask.new(spec) do |pkg|
+end
+CUKE_RESULTS = 'results.html'
+CLEAN << CUKE_RESULTS
+desc 'Run features'
+Cucumber::Rake::Task.new(:features) do |t|
+  opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
+  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
+  t.cucumber_opts =  opts
+  t.fork = false
+end
+
+desc 'Run features tagged as work-in-progress (@wip)'
+Cucumber::Rake::Task.new('features:wip') do |t|
+  tag_opts = ' --tags ~@pending'
+  tag_opts = ' --tags @wip'
+  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
+  t.fork = false
+end
+
+task :cucumber => :features
+task 'cucumber:wip' => 'features:wip'
+task :wip => 'features:wip'
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+end
+
+task :default => [:test,:features]

data/bin/awscli

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+#Trap interupt to quit cleanly
+Signal.trap("INT") { exit 1 }
+
+#load the path if not loaded previously
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib') unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/../lib')
+
+begin
+  require "awscli"
+rescue LoadError
+  require "rubygems"
+  require "awscli"
+end
+
+#Start the cli
+begin
+  AwsCli::Cli.start
+rescue Interrupt
+  puts "Caught Interrupt, Exiting..."
+rescue Excon::Errors::SocketError => e
+  puts "Error: Establishing Connection to AWS, #{e}"
+rescue Fog::Compute::AWS::Error
+  puts "Error: #{$!}"
+rescue Fog::Compute::AWS::NotFound
+  puts "Cannot find Resource: #{$!}"
+rescue Excon::Errors::InternalServerError
+  puts "Something went wrong, please try again!."
+  puts "Error: #{$!}"
+rescue ArgumentError => e
+  puts "Cannot recognize the argument passed, #{e}"
+end

data/features/awscli.feature

@@ -0,0 +1,8 @@
+Feature: My bootstrapped app kinda works
+  In order to get going on coding my awesome app
+  I want to have aruba and cucumber setup
+  So I don't have to do it myself
+
+  Scenario: App just runs
+    When I get help for "awscli"
+    Then the exit status should be 0

data/features/step_definitions/awscli_steps.rb

@@ -0,0 +1,6 @@
+When /^I get help for "([^"]*)"$/ do |app_name|
+  @app_name = app_name
+  step %(I run `#{app_name} help`)
+end
+
+# Add more step definitions here

data/features/support/env.rb

@@ -0,0 +1,15 @@
+require 'aruba/cucumber'
+
+ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
+
+Before do
+  # Using "announce" causes massive warnings on 1.9.2
+  @puts = true
+  @original_rubylib = ENV['RUBYLIB']
+  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+end
+
+After do
+  ENV['RUBYLIB'] = @original_rubylib
+end

data/lib/awscli.rb

@@ -0,0 +1,44 @@
+#external dependencies
+begin
+  require 'thor'
+  require 'thor/group'
+  require 'fog'
+  require 'highline'
+  require 'yaml'
+rescue LoadError
+  puts "Failed to load gems: fog, highline, thor"
+  exit 1
+end
+
+module AwsCli
+  # => require all interfaces for awscli/
+  require 'awscli/version.rb' #to get version
+  require 'awscli/errors'
+
+  # => first require cli so all subcommands can register
+  require 'awscli/cli'
+  # => register all subcommands
+    #EC2
+  require 'awscli/cli/ec2'
+  require 'awscli/cli/ec2/instances'
+  require 'awscli/cli/ec2/ami'
+  require 'awscli/cli/ec2/ebs'
+  require 'awscli/cli/ec2/eip'
+  require 'awscli/cli/ec2/keypairs'
+  require 'awscli/cli/ec2/monitoring'
+  require 'awscli/cli/ec2/placement'
+  require 'awscli/cli/ec2/reservedinstmng'
+  require 'awscli/cli/ec2/secgroups'
+  require 'awscli/cli/ec2/spot'
+  require 'awscli/cli/ec2/tags'
+  require 'awscli/cli/ec2/vmmng'
+  require 'awscli/cli/ec2/vpc'
+  require 'awscli/cli/ec2/vpc/network_acls'
+  require 'awscli/cli/ec2/vpc/net_interfaces'
+  require 'awscli/cli/ec2/vpc/internet_gateways'
+  require 'awscli/cli/ec2/vpc/dhcp'
+    #S3
+  require 'awscli/cli/s3'
+  require 'awscli/cli/s3/files'
+  require 'awscli/cli/s3/directories'
+end

data/lib/awscli/cli.rb

@@ -0,0 +1,21 @@
+module AwsCli
+  #This it the main cli runner class
+  #All class_methods should be defined here except for Thor::Groups
+  class Cli < ::Thor
+
+    default_task :help_banner   #if no option is passed call help_banner task
+    # class_option :config, :banner => "PATH", :type => :string,
+    #              :desc => 'Configuration file, accepts ENV $AWSCLI_CONFIG_FILE',
+    #              :default => ENV['AWSCLI_CONFIG_FILE'] || "~/.awscli.yml"
+
+    desc "help", "help banner"
+    def help_banner
+      puts <<-HELP.gsub(/^ {8}/, '')
+        Amazon Web Services Command Line Interface, Version - #{Awscli::VERSION}
+
+      HELP
+      help  #call help
+    end
+
+  end
+end

data/lib/awscli/cli/ec2.rb

@@ -0,0 +1,23 @@
+module AwsCli
+  module CLI
+    require 'awscli/cli'
+    require 'awscli/connection'
+    require 'awscli/ec2'
+    class Ec2 < Thor
+
+      class_option :region, :type => :string, :desc => "region to connect to", :default => 'us-west-1'
+
+      private
+
+      def create_ec2_object
+        puts "ec2 Establishing Connetion..."
+        $ec2_conn = Awscli::Connection.new.request_ec2
+        puts $ec2_conn
+        puts "ec2 Establishing Connetion... OK"
+        @ec2 = Awscli::EC2::EC2.new($ec2_conn)
+      end
+
+      AwsCli::Cli.register AwsCli::CLI::Ec2, :ec2, 'ec2 [COMMAND]', 'Elastic Cloud Compute Interface'
+    end
+  end
+end

data/lib/awscli/cli/ec2/ami.rb

@@ -0,0 +1,46 @@
+module AwsCli
+  module CLI
+    module EC2
+      require 'awscli/cli/ec2'
+      class Ami < Thor
+
+        desc "list", "List Images"
+        method_option :filter, :aliases => "-f", :type => :hash, :desc => "filter the images based on filters"
+        method_option :amazon_owned, :aliases => "-a", :type => :boolean, :default => false, :desc => "lists amazon owned images"
+        method_option :show_filters, :aliases => "-s", :type => :boolean, :default => false, :desc => "filters available"
+        def list
+          create_ec2_object
+          if options[:amazon_owned]
+            @ec2.list_amazon
+          elsif options[:show_filters]
+            @ec2.show_filters
+          else
+            @ec2.list options[:filter]
+          end
+        end
+
+        desc "create", "Create a bootable EBS volume AMI, from instance specified"
+        method_option :instance_id, :aliases => "-i", :type => :string, :required => true, :desc => "Instance used to create image"
+        method_option :name, :aliases => "-n", :type => :string, :default => "awscli_image_#{Time.now.to_i}", :desc => "Name to give image"
+        method_option :desc, :aliases => "-d", :type => :string, :default => "awscli_image-created_at-#{Time.now.to_i}", :desc => "Description of image"
+        method_option :no_reboot, :aliases => "-r", :type => :boolean, :default => false, :desc => "Optional, whether or not to reboot the image when making the snapshot"
+        def create
+          create_ec2_object
+          @ec2.create_image_from_instance options
+        end
+
+        private
+
+        def create_ec2_object
+          puts "ec2 Establishing Connetion..."
+          $ec2_conn = Awscli::Connection.new.request_ec2
+          puts "ec2 Establishing Connetion... OK"
+          @ec2 = Awscli::EC2::Ami.new($ec2_conn)
+        end
+
+        AwsCli::CLI::Ec2.register AwsCli::CLI::EC2::Ami, :ami, 'ami [COMMAND]', 'EC2 AMI Management'
+
+      end
+    end
+  end
+end

data/lib/awscli/cli/ec2/ebs.rb

@@ -0,0 +1,85 @@
+module AwsCli
+  module CLI
+    module EC2
+      require 'awscli/cli/ec2'
+      class Ebs < Thor
+
+        desc "list", "List ELastic Block Storages"
+        method_option :snapshots, :aliases => "-s", :type => :boolean, :default => false, :desc => "list snapshots"
+        def list
+          create_ec2_object
+          @ec2.list options
+        end
+
+        desc "create", "Create a EBS Volume"
+        method_option :availability_zone, :aliases => "-z", :required => true, :banner => "ZONE", :type => :string, :desc => "Name of the availability zone to create the voulume in"
+        method_option :size, :aliases => "-s", :required => true, :type => :numeric, :desc => "Size of the volume to create (in GB)"
+        method_option :snapshot_id, :aliases => "-i", :banner => "ID", :type => :string, :desc => "Snapshot ID from which to create volume from"
+        method_option :device, :aliases => "-d", :type => :string, :desc => "how the volume is exposed(in unix '/dev/sdx', in windows 'xvdf')"
+        def create
+          create_ec2_object
+          @ec2.create options
+        end
+
+        desc "attach_volume", "Attach a volume to instance"
+        method_option :instance_id, :aliases => "-i", :banner => "ID", :type => :string, :desc => "instance id to attach the volume to"
+        method_option :volume_id, :aliases => "-v", :banner => "VID", :type => :string, :desc => "volume id to attach"
+        method_option :device, :aliases => "-d", :type => :string, :desc => "how the volume is exposed(in unix '/dev/sdx', in windows 'xvdf')"
+        def attach_volume
+          create_ec2_object
+          @ec2.attach_volume options
+        end
+
+        desc "detach_voulme", "Detach a volume from instance"
+        method_option :volume_id, :aliases => "-v", :banner => "VID", :type => :string, :desc => "volume id to attach"
+        method_option :force, :aliase => "-f", :type => :boolean, :default => false, :desc => "force detaches the volume"
+        def detach_volume
+          create_ec2_object
+          @ec2.detach_volume options
+        end
+
+        desc "delete", "Delete Volume"
+        method_option :volume_id, :aliases => "-v", :banner => "VID", :required => true, :type => :string, :desc => "volume id to delete"
+        def delete
+          #ask if the user is sure about deleting the volume which leads to data loss or can make a snapshot before deleting it
+          create_ec2_object
+          @ec2.delete_volume options
+        end
+
+        desc "create_snapshot", "Create a snapshot from volume"
+        method_option :volume_id, :aliases => "-v", :banner => "VID", :required => true, :type => :string, :desc => "volume to make a snapshot from"
+        def create_snapshot
+          create_ec2_object
+          @ec2.create_snapshot
+        end
+
+        desc "copy_snapshot", "Copy a snapshot to a different region"
+        method_option :source_region, :aliases => "-s", :banner => "REGION", :required => true, :type => :string, :desc => "Region to move it from"
+        method_option :snapshot_id, :aliases => "-i", :banner => "ID", :required => true, :type => :string, :desc => "Id of the snapshot"
+        def copy_snapshot
+          create_ec2_object
+          @ec2.copy_snapshot
+        end
+
+        desc "delete_snapshot", "Delete SnapShot"
+        method_option :snapshot_id, :aliases => "-i", :banner => "ID", :required => true, :type => :string, :desc => "Snapshot Id to delete"
+        def delete_snapshot
+          create_ec2_object
+          @ec2.delete_snapshot options
+        end
+
+        private
+
+        def create_ec2_object
+          puts "ec2 Establishing Connetion..."
+          $ec2_conn = Awscli::Connection.new.request_ec2
+          puts "ec2 Establishing Connetion... OK"
+          @ec2 = Awscli::EC2::Ebs.new($ec2_conn)
+        end
+
+        AwsCli::CLI::Ec2.register AwsCli::CLI::EC2::Ebs, :ebs, 'ebs [COMMAND]', 'EC2 EBS Management'
+
+      end
+    end
+  end
+end

data/lib/awscli/cli/ec2/eip.rb

@@ -0,0 +1,56 @@
+module AwsCli
+  module CLI
+    module EC2
+      require 'awscli/cli/ec2'
+      class Eip < Thor
+
+        desc "list", "List Elastic IPs"
+        def list
+          puts "Listing EIPs"
+          create_ec2_object
+          @ec2.list
+        end
+
+        desc "create", "Create Elastic IP"
+        def create
+          create_ec2_object
+          @ec2.create
+        end
+
+        desc "delete", "Delete Elastic IP"
+        method_option :eip, :aliases => "-e", :required => true, :banner => "IP", :type => :string, :desc => "Elastic IP to delete"
+        def delete
+          create_ec2_object
+          @ec2.delete options
+        end
+
+        desc "associate", "Associate EIP with an Instance"
+        method_option :eip, :aliases => "-e", :required => true, :banner => "IP", :type => :string, :desc => "Elastic IP to associate"
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :type => :string, :desc => "Instance ID to which to associate EIP"
+        def associate
+          create_ec2_object
+          @ec2.associate options
+        end
+
+        desc "disassociate", "Disassociate EIP from an instance"
+        method_option :eip, :aliases => "-e", :required => true, :banner => "IP", :type => :string, :desc => "Elastic IP to disassociate"
+        def disassociate
+          create_ec2_object
+          @ec2.disassociate options
+        end
+
+        private
+
+        def create_ec2_object
+          puts "ec2 Establishing Connetion..."
+          $ec2_conn = Awscli::Connection.new.request_ec2
+          puts "ec2 Establishing Connetion... OK"
+          @ec2 = Awscli::EC2::Eip.new($ec2_conn)
+        end
+
+        AwsCli::CLI::Ec2.register AwsCli::CLI::EC2::Eip, :eip, 'eip [COMMAND]', 'EC2 EIP Management'
+
+      end
+    end
+  end
+end

data/lib/awscli/cli/ec2/instances.rb

@@ -0,0 +1,195 @@
+module AwsCli
+  module CLI
+    module EC2
+      require 'awscli/cli/ec2'
+      class Instances < Thor
+
+        # default_task :list
+
+        desc "list", "ec2_describe_instances"
+        long_desc <<-LONGDESC
+         List and describe your instances
+         The INSTANCE parameter is the instance ID(s) to describe.
+         If unspecified all your instances will be returned.
+        LONGDESC
+        def list
+          puts "Listing Instances"
+          create_ec2_object
+          # puts parent_options #access awscli/cli/ec2.rb class options
+          @ec2.list_instances
+        end
+
+        desc "diatt", "ec2_describe_instance_attribute"
+        long_desc <<-LONGDESC
+          Describes the specified attribute of the specified instance. You can specify only one attribute at a time.
+          \x5
+          Available Attributes to Request:
+          architecture ami_launch_index availability_zone block_device_mapping network_interfaces client_token
+          dns_name ebs_optimized groups flavor_id iam_instance_profile image_id instance_initiated_shutdown_behavior
+          kernel_id key_name created_at monitoring placement_group platform private_dns_name private_ip_address
+          public_ip_address ramdisk_id root_device_name root_device_type security_group_ids state state_reason subnet_id
+          tenancy tags user_data vpc_id volumes username
+        LONGDESC
+        method_option :id, :aliases => "-i", :banner => "INSTANCEID", :type => :string, :desc => "Id of an instance to modify attribute", :required => true
+        method_option :attr, :aliases => "-a", :banner => "ATTR", :type => :string, :desc => "Attribute to modify", :required => true
+        def diatt
+          create_ec2_object
+          @ec2.describe_instance_attribute(options[:id], options[:attr])
+        end
+
+
+        desc "miatt", "ec2_modify_instance_attribute"
+        long_desc <<-LONGDESC
+          Modifies an instance attribute. Only one attribute can be specified per call.
+        LONGDESC
+        method_option :id,                :aliases => "-i", :banner => "INSTANCEID",      :type => :string, :desc => "Id of an instance to modify attribute",                   :required => true
+        method_option :isize,             :aliases => "-t", :banner => "VALUE",           :type => :string, :desc => "Changes the instance type to the specified value."
+        method_option :kernel,            :aliases => "-k", :banner => "VALUE",           :type => :string, :desc => "Changes the instance's kernel to the specified value"
+        method_option :ramdisk,           :aliases => "-r", :banner => "VALUE",           :type => :string, :desc => "Changes the instance's RAM disk to the specified value"
+        method_option :userdata,          :aliases => "-u", :banner => "VALUE",           :type => :string, :desc => "Changes the instance's user data to the specified value"
+        method_option :disable_api_term,  :aliases => "-d", :banner => "true|false" ,     :type => :string, :desc => "Changes the instance's DisableApiTermination flag to the specified value. Setting this flag means you can't terminate the instance using the API"
+        method_option :inst_shutdown_beh, :aliases => "-s", :banner => "stop|terminate",  :type => :string, :desc => "Changes the instance's InstanceInitiatedShutdownBehavior flag to the specified value."
+        method_option :source_dest_check, :aliases => "-c", :banner => "true|false" ,     :type => :string, :desc => "This attribute exists to enable a Network Address Translation (NAT) instance in a VPC to perform NAT. The attribute controls whether source/destination checking is enabled on the instance. A value of true means checking is enabled, and false means checking is disabled"
+        method_option :group_id,          :aliases => "-g", :banner => "G1, G2, ..",      :type => :array,  :desc => "This attribute is applicable only to instances running in a VPC. Use this parameter when you want to change the security groups that an instance is in."
+        def miatt
+          create_ec2_object
+          opts = Marshal.load(Marshal.dump(options))  #create a copy of options, as original options hash cannot be modified
+          opts.reject!{ |k| k == 'id' } #remove id from opts
+          abort "Please pass an attribute by setting respective option" unless opts
+          abort "You can only pass one attribute at a time" if opts.size != 1
+          opts.each do |k,v|
+            puts "calling modify_instance_attribute with: #{options[:id]}, #{k}, #{opts[k]}"
+            @ec2.modify_instance_attribute(options[:id], k, opts[k])
+          end
+
+        end
+
+        desc "riatt", "ec2_reset_instance_attribute"
+        long_desc <<-LONGDESC
+          Resets an instance attribute to its initial value. Only one attribute can be specified per call.
+        LONGDESC
+        def riatt
+          puts "Not yet Implemented"
+        end
+
+        desc "dins", "ec2_describe_instance_status"
+        long_desc <<-LONGDESC
+         Describe the status for one or more instances.
+         Checks are performed on your instances to determine if they are
+         in running order or not. Use this command to see the result of these
+         instance checks so that you can take remedial action if possible.
+
+         There are two types of checks performed: INSTANCE and SYSTEM.
+         INSTANCE checks examine the health and reachability of the
+         application environment. SYSTEM checks examine the health of
+         the infrastructure surrounding your instance.
+        LONGDESC
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :desc => "instance id that needs to be stopped"
+        def dins
+          create_ec2_object
+          @ec2.describe_instance_status options[:instance_id]
+        end
+
+        desc "import", "ec2_import_instance"
+        long_desc <<-LONGDESC
+          Create an import instance task to import a virtual machine into EC2
+          using meta_data from the given disk image. The volume size for the
+          imported disk_image will be calculated automatically, unless specified.
+        LONGDESC
+        def import
+          puts "Cannot find it in the *FOG*"
+        end
+
+        desc "reboot", "ec2_reboot_instances"
+        long_desc <<-LONGDESC
+         Reboot selected running instances.
+         The INSTANCE parameter is an instance ID to reboot.
+        LONGDESC
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :desc => "instance id that needs to be stopped"
+        def reboot
+          create_ec2_object
+          @ec2.reboot_instance options[:instance_id]
+        end
+
+        desc "create", "ec2_run_instances"
+        long_desc <<-LONGDESC
+          Launch an instance of a specified AMI.\x5
+          Usage Examples:\x5
+          awscli ec2 instances create -i 'ami-xxxxxxx' -b '{:DeviceName => '/dev/sdg', :VirtualName => 'ephemeral0'}' -g 'default' -t 'm1.small' -k 'default' --tags=name:testserver
+        LONGDESC
+        method_option :image_id,             :aliases => "-i", :required => true, :banner => "AMIID", :type => :string, :desc => "Id of machine image to load on instances"
+        method_option :availability_zone,    :banner => "ZONE", :type => :string, :desc => "Placement constraint for instances"
+        method_option :placement_group,      :banner => "GROUP", :type => :string, :desc => "Name of existing placement group to launch instance into"
+        method_option :tenancy,              :banner => "TENANCY", :type => :string, :desc => "Tenancy option in ['dedicated', 'default'], defaults to 'default'"
+        method_option :block_device_mapping, :aliases => "-b", :type => :array , :desc => "hashes of device mappings, see help for how to pass values"
+        method_option :client_token,         :type => :string, :desc => "unique case-sensitive token for ensuring idempotency"
+        method_option :groups,               :aliases => "-g", :banner => "SG1 SG2 SG3",:type => :array, :default => ["default"], :desc => "Name of security group(s) for instances (not supported for VPC). Default: 'default'"
+        method_option :flavor_id,            :aliases => "-t",:type => :string, :default => "m1.small", :desc => "Type of instance to boot."
+        method_option :kernel_id,            :type => :string, :desc => "Id of kernel with which to launch"
+        method_option :key_name,             :aliases => "-k", :required => true, :type => :string, :desc => "Name of a keypair to add to booting instances"
+        method_option :monitoring,           :type => :boolean, :default => false, :desc => "Enables monitoring, defaults to false"
+        method_option :ramdisk_id,           :type => :string, :desc => "Id of ramdisk with which to launch"
+        method_option :subnet_id,            :type => :string, :desc => "VPC option to specify subnet to launch instance into"
+        method_option :user_data,            :type => :string, :desc => "Additional data to provide to booting instances"
+        method_option :ebs_optimized,        :type => :boolean, :default => false, :desc => "Whether the instance is optimized for EBS I/O"
+        method_option :vpc_id,               :type => :string, :desc => "VPC to connect to"
+        method_option :tags,                 :type => :hash, :default => {'Name' => "awscli-#{Time.now.to_i}"}, :desc => "Tags to identify server"
+        method_option :private_ip_address,   :banner => "IP",:type => :string, :desc => "VPC option to specify ip address within subnet"
+        method_option :wait_for,             :aliases => "-w", :type => :boolean, :default => false, :desc => "wait for the server to get created and return public_dns"
+       def create
+          create_ec2_object
+          @ec2.create_instance options
+        end
+
+        desc "start", "ec2_start_instances"
+        long_desc <<-LONGDESC
+          Start selected running instances.
+        LONGDESC
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :desc => "instance id that needs to be stopped"
+        def start
+          create_ec2_object
+          @ec2.start_instance options[:instance_id]
+        end
+
+        desc "stop", "ec2_stop_instances"
+        long_desc <<-LONGDESC
+          Stop selected running instances.
+        LONGDESC
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :desc => "instance id that needs to be stopped"
+        def stop
+          create_ec2_object
+          @ec2.stop_instance options[:instance_id]
+        end
+
+        desc "kill", "ec2_terminate_instances"
+        long_desc <<-LONGDESC
+          Terminate selected running instances
+        LONGDESC
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :desc => "instance id that needs to be stopped"
+        def terminate
+          create_ec2_object
+          @ec2.terminate_instance options[:instance_id]
+        end
+
+        desc "console_output", "Retrieve console output for specified instance"
+        method_option :instance_id, :aliases => "-i", :required => true, :banner => "ID", :desc => "instance id to get console output from"
+        def console_output
+          create_ec2_object
+          @ec2.get_console_output options[:instance_id]
+        end
+
+        private
+
+        def create_ec2_object
+          puts "ec2 Establishing Connetion..."
+          $ec2_conn = Awscli::Connection.new.request_ec2
+          puts "ec2 Establishing Connetion... OK"
+          @ec2 = Awscli::EC2::EC2.new($ec2_conn)
+        end
+
+        AwsCli::CLI::Ec2.register AwsCli::CLI::EC2::Instances, :instances, 'instances [COMMAND]', 'EC2 Instance Management'
+
+      end
+    end
+  end
+end