anveo-ec2ssh 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/anveo-ec2ssh.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{anveo-ec2ssh}
-  s.version = "0.2.0"
+  s.name = "anveo-ec2ssh"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ramon Salvadó}, %q{Brian Racer}]
-  s.date = %q{2012-01-31}
-  s.description = %q{Since ec2 instance public hostnames are dynamic, and not easy to remember or type, this script provides a list all your running instances so you can select the one you want to ssh into easily (without having to pass the aws console ritual each time you need the hostname).}
-  s.email = %q{bracer@gmail.com}
-  s.executables = [%q{ec2ssh}]
+  s.authors = ["Ramon Salvad\u{f3}", "Brian Racer"]
+  s.date = "2012-07-02"
+  s.description = "Since ec2 instance public hostnames are dynamic, and not easy to remember or type, this script provides a list all your running instances so you can select the one you want to ssh into easily (without having to pass the aws console ritual each time you need the hostname)."
+  s.email = "bracer@gmail.com"
+  s.executables = ["ec2ssh"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
     "lib/ec2ssh.rb",
     "lib/templates/ec2ssh_config_sample.yaml"
   ]
-  s.homepage = %q{http://github.com/anveo/ec2ssh}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{A script to make it easier to ssh into running amazon EC2 instances.}
+  s.homepage = "http://github.com/anveo/ec2ssh"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "A script to make it easier to ssh into running amazon EC2 instances."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/bin/ec2ssh

@@ -13,7 +13,7 @@ end
 ENV["EC2_URL"] = nil
 
 # TODO: Add proper command line arguments handling
-account = ARGV[0] || "default"
+account = (ARGV[0] unless ARGV[0] =~ /^-/) || 'default'
 
 ec2ssh = Ec2ssh::App.new("~/.ec2ssh", account.to_sym)
 ec2ssh.select_instance

data/lib/ec2ssh.rb

@@ -16,6 +16,8 @@ module Ec2ssh
 
     def initialize(file = "~/.ec2ssh", account=:default)
       @config = read_aws_config(file, account)
+      @config[:cache_ttl] ||= 0
+      @config[:account] = account.to_s
     end
 
     def select_instance(instances=[])
@@ -46,7 +48,8 @@ module Ec2ssh
       # output table
       puts table
 
-      input = ask(">>  ")
+      puts ">> id-or-name <user> <key> <public or private>"
+      input = ask(">> ")
       options = input.split
 
       # check if last arg is 'public' or 'private'. If so remove it from the options stack and save the value
@@ -127,15 +130,36 @@ module Ec2ssh
       id = @config[:id]
       key = @config[:key]
       regions ||= @config[:regions] || get_all_ec2_regions
-      instances = regions.map do |region|
-        silence_stream STDOUT do
-          Aws::Ec2.new(id, key, :region => region).describe_instances
+      cache_ttl = @config[:cache_ttl]
+      cache_dir = File.expand_path("~/.ec2ssh.d")
+      cache_filename = File.expand_path("#{cache_dir}/#{@config[:account]}-cache")
+
+      # make sure cache dir exists
+      Dir.mkdir(cache_dir) unless File.exist?(cache_dir)
+
+      # clear cache if -nc or --no-cache is passwd
+      if ARGV.include?('-nc') || ARGV.include?('--no-cache')
+        File.delete(cache_filename) if File.exist?(cache_filename)
+      end
+
+      if File.exist?(cache_filename) && (Time.now.to_i - File.mtime(cache_filename).to_i <= cache_ttl)
+        instances = YAML.load(File.read(cache_filename))
+      else
+        instances = regions.map do |region|
+          silence_stream STDOUT do
+            Aws::Ec2.new(id, key, :region => region).describe_instances
+          end
+        end.flatten
+
+        # cache data to disk
+        File.open(cache_filename, 'w+') do |f|
+          f.write YAML.dump(instances)
         end
-      end.flatten
+      end
+
+      instances
     rescue Aws::AwsError => e
       abort "AWS Error. #{e.message}"
     end
-
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anveo-ec2ssh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws
-  requirement: &70219192880180 !ruby/object:Gem::Requirement
+  requirement: &70198445246460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70219192880180
+  version_requirements: *70198445246460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70219192879080 !ruby/object:Gem::Requirement
+  requirement: &70198445244940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219192879080
+  version_requirements: *70198445244940
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70219192877760 !ruby/object:Gem::Requirement
+  requirement: &70198445243300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70219192877760
+  version_requirements: *70198445243300
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70219192876660 !ruby/object:Gem::Requirement
+  requirement: &70198445241900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70219192876660
+  version_requirements: *70198445241900
 - !ruby/object:Gem::Dependency
   name: text-table
-  requirement: &70219192875040 !ruby/object:Gem::Requirement
+  requirement: &70198445240900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70219192875040
+  version_requirements: *70198445240900
 - !ruby/object:Gem::Dependency
   name: aws
-  requirement: &70219192873280 !ruby/object:Gem::Requirement
+  requirement: &70198445240020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70219192873280
+  version_requirements: *70198445240020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70219192872220 !ruby/object:Gem::Requirement
+  requirement: &70198445239040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219192872220
+  version_requirements: *70198445239040
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70219192870940 !ruby/object:Gem::Requirement
+  requirement: &70198445253280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -99,10 +99,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70219192870940
+  version_requirements: *70198445253280
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70219192869600 !ruby/object:Gem::Requirement
+  requirement: &70198445251360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70219192869600
+  version_requirements: *70198445251360
 - !ruby/object:Gem::Dependency
   name: text-table
-  requirement: &70219192868140 !ruby/object:Gem::Requirement
+  requirement: &70198445250020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,7 +121,7 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70219192868140
+  version_requirements: *70198445250020
 description: Since ec2 instance public hostnames are dynamic, and not easy to remember
   or type, this script provides a list all your running instances so you can select
   the one you want to ssh into easily (without having to pass the aws console ritual
@@ -158,6 +158,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2416354190427887780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A script to make it easier to ssh into running amazon EC2 instances.