ec2ssh 1.0.3 → 2.0.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--order rand

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree-1.8.7-2012.02
+  - 1.9.3
+  - 2.0.0
+script: 'bundle exec rspec spec'

data/ChangeLog.md

@@ -0,0 +1,21 @@
+# Change Log
+## 2.0.0
+
+* Add dotfile (.ec2ssh); supports multiple aws keys with `$ ec2ssh update --aws-key keyname` option.
+  Thanks to @kentaro #3
+
+* Replace a gem `ktheory-right_aws` with `aws-sdk`.
+
+* Write tests.
+
+## 1.0.3
+
+* Surpress thor warnings. Thanks to @mururu #1, @sanemat #2
+
+## 1.0.2
+
+* Fix bug: Blank HostName is created if there're some "stopped" instances.
+
+## 1.0.1
+
+* First Release.

data/Gemfile

@@ -1,3 +1,8 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
+gem 'rspec', '~> 2.12'
+gem 'guard-rspec', '~> 2.4'
+gem 'webmock', '~> 1.9'
+gem 'rb-fsevent', '~> 0.9.1'
+gem 'timecop', '~> 0.5'

data/Gemfile.lock

@@ -1,25 +1,66 @@
 PATH
   remote: .
   specs:
-    ec2ssh (1.0.2)
+    ec2ssh (2.0.0)
+      aws-sdk (~> 1.8)
       highline (~> 1.6)
-      ktheory-right_aws (~> 2.0.3)
       thor (~> 0.14.6)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    highline (1.6.1)
-    ktheory-right_aws (2.0.3)
-      right_http_connection (>= 1.2.1)
-    right_http_connection (1.2.4)
+    addressable (2.3.2)
+    aws-sdk (1.8.1.3)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    coderay (1.0.8)
+    crack (0.3.2)
+    diff-lcs (1.1.3)
+    guard (1.6.2)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
+      thor (>= 0.14.6)
+    guard-rspec (2.4.0)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    highline (1.6.15)
+    json (1.7.7)
+    listen (0.7.2)
+    lumberjack (1.0.2)
+    method_source (0.8.1)
+    nokogiri (1.5.6)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rb-fsevent (0.9.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    slop (3.4.3)
+    terminal-table (1.4.5)
     thor (0.14.6)
+    timecop (0.5.9.1)
+    uuidtools (2.1.3)
+    webmock (1.9.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ec2ssh!
-  highline (~> 1.6)
-  ktheory-right_aws (~> 2.0.3)
-  thor (~> 0.14.6)
+  guard-rspec (~> 2.4)
+  rb-fsevent (~> 0.9.1)
+  rspec (~> 2.12)
+  timecop (~> 0.5)
+  webmock (~> 1.9)

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2013 Issei Naruta
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,93 @@
+# Introduction
+ec2ssh is a ssh_config manager for amazonaws ec2.
+`ec2ssh` command adds `Host` descriptions to ssh_config (~/.ssh/config default). 'Name' tag of instances are used as `Host` descriptions.
+
+# How to use
+### 1. Set 'Name' tag to your instances
+eg. Tag 'app-server-1' as 'Name' to an instance i-xxxxx in us-west-1 region.
+
+### 2. Install ec2ssh
+
+```
+$ gem install ec2ssh
+```
+
+### 3. Execute `ec2ssh init`
+
+```
+$ ec2ssh init
+```
+
+### 4. Edit `.ec2ssh`
+
+```
+$ vi ~/.ec2ssh
+---
+path: /path/to/ssh_config
+access_key_id: YOUR_ACCESS_KEY_ID
+secret_access_key: YOUR_SECRET_ACCESS_KEY
+regions:
+- ap-northeast-1
+```
+
+### 5. Execute `ec2ssh update`
+
+```
+$ ec2ssh update
+```
+Then host-names of your instances are generated and wrote to .ssh/config
+
+### 6. And you can ssh to your instances with your tagged name.
+
+```
+$ ssh app-server-1.us-west-1
+```
+
+# Commands
+```
+$ ec2ssh help [TASK]  # Describe available tasks or one specific task
+$ ec2ssh init         # Add ec2ssh mark to ssh_config
+$ ec2ssh update       # Update ec2 hosts list in ssh_config
+$ ec2ssh remove       # Remove ec2ssh mark from ssh_config
+```
+
+Each command can use `--path` option to set ssh_config path. The default is "~/.ssh/config"
+
+```
+$ ec2ssh init --path=/path/to/ssh_config
+```
+
+# ssh_config and mark lines
+`ec2ssh init` command inserts mark lines your `.ssh/config` such as:
+
+```
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated Sun Dec 05 00:00:14 +0900 2010
+### EC2SSH END ###
+```
+
+`ec2ssh update` command inserts 'Host' descriptions between 'BEGIN' line and 'END' line.
+
+```
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated Sun Dec 05 00:00:14 +0900 2010
+Host app-server-1.us-west-1
+  HostName ec2-xxx-xxx-xxx-xxx.us-west-1.compute.amazonaws.com
+Host db-server-1.ap-southeast-1
+  HostName ec2-xxx-xxx-xxx-xxx.ap-southeast-1.compute.amazonaws.com
+    :
+    :
+### EC2SSH END ###
+```
+
+`ec2ssh remove` command removes the mark lines.
+
+# Notice
+`ec2ssh` command updates your `.ssh/config` file default. You should make a backup of it.
+
+# License
+ec2ssh is released under the MIT license.

data/bin/ec2ssh

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-require 'ec2ssh'
+$: << File.expand_path('../../lib', __FILE__)
+require 'ec2ssh/cli'
 Ec2ssh::CLI.start

data/ec2ssh.gemspec

@@ -6,16 +6,16 @@ Gem::Specification.new do |s|
   s.name        = "ec2ssh"
   s.version     = Ec2ssh::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["mirakui"]
-  s.email       = ["mirakui@tsuyabu.in"]
+  s.authors     = ["Issei Naruta"]
+  s.email       = ["mimitako@gmail.com"]
   s.homepage    = "http://github.com/mirakui/ec2ssh"
   s.summary     = %q{A ssh_config manager for AWS EC2}
-  s.description = %q{A ssh_config manager for AWS EC2}
+  s.description = %q{ec2ssh is a ssh_config manager for AWS EC2}
 
   s.rubyforge_project = "ec2ssh"
   s.add_dependency "thor", "~> 0.14.6"
   s.add_dependency "highline", "~> 1.6"
-  s.add_dependency "ktheory-right_aws", "~> 2.0.3"
+  s.add_dependency 'aws-sdk', '~> 1.8'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/ec2ssh/cli.rb

@@ -1,67 +1,76 @@
 require 'thor'
-require 'right_aws'
 require 'highline'
+require 'ec2ssh/hosts'
+require 'ec2ssh/ssh_config'
+require 'ec2ssh/dotfile'
 
 module Ec2ssh
   class CLI < Thor
-    path_option = [:path, {:banner => "/path/to/ssh_config", :default=>"#{ENV['HOME']}/.ssh/config"}]
+    class_option :path, :banner => "/path/to/ssh_config"
+    class_option :dotfile, :banner => '$HOME/.ec2ssh', :default => "#{ENV['HOME']}/.ec2ssh"
 
     desc "init", "Add ec2ssh mark to ssh_config"
-    method_option *path_option
     def init
-      config = Config.new(options.path)
+      config = SshConfig.new(config_path)
       if config.mark_exist?
-        red "Marker already exists on #{options.path}"
-        return
+        red "Marker already exists on #{config_path}"
+      else
+        config.append_mark!
+        green "Added mark to #{config_path}"
       end
-      config.append_mark!
-      green "Added mark to #{options.path}"
+      dotfile = Dotfile.update_or_create(options.dotfile, 'path' => options.path)
+      yellow "Please check and edit #{options.dotfile} before run `ec2ssh update`"
     end
 
     desc "update", "Update ec2 hosts list in ssh_config"
-    method_option *path_option
+    method_option :aws_key, :banner => 'aws key name', :default => 'default'
     def update
-      config = Config.new(options.path)
+      config = SshConfig.new(config_path)
       unless config.mark_exist?
-        red "Marker not found on #{options.path}"
-        red "Execute '#{$0} init --path=#{options.path}' first!"
+        red "Marker not found on #{config_path}"
+        red "Execute '#{$0} init --path=/path/to/ssh_config' first!"
         return
       end
-      hosts = Hosts.new.all
       config_str = config.wrap(hosts.map{|h|<<-END}.join)
 Host #{h[:host]}
   HostName #{h[:dns_name]}
       END
       config.replace! config_str
       yellow config_str
-      green "Updated #{hosts.size} hosts on #{options.path}"
-    rescue AwsEnvNotDefined
-      red <<-END 
-Set environment variables to access AWS such as:
-  export AMAZON_ACCESS_KEY_ID="..."
-  export AMAZON_SECRET_ACCESS_KEY="..."
-      END
+      green "Updated #{hosts.size} hosts on #{config_path}"
+    rescue AwsEnvNotDefined, AwsKeyNotFound
+      red "Set aws keys at #{options.dotfile}"
     end
 
     desc "remove", "Remove ec2ssh mark from ssh_config"
-    method_option *path_option
     def remove
-      config = Config.new(options.path)
+      config = SshConfig.new(config_path)
       unless config.mark_exist?
-        red "Marker not found on #{options.path}"
+        red "Marker not found on #{config_path}"
         return
       end
       config.replace! ""
-      green "Removed mark from #{options.path}"
+      green "Removed mark from #{config_path}"
     end
 
-    private
-    def hl
-      @hl ||= HighLine.new
-    end
+    no_tasks do
+      def hl
+        @hl ||= HighLine.new
+      end
+
+      def hosts
+        @hosts ||= Hosts.new(dotfile, options.aws_key).all
+      end
+
+      def dotfile
+        @dotfile ||= Dotfile.load(options.dotfile)
+      end
+
+      def config_path
+        options.path || dotfile['path'] || "#{$ENV['HOME']}/.ssh/config"
+      end
 
-    [:red,:green,:yellow].each do |col|
-      no_tasks do
+      [:red,:green,:yellow].each do |col|
         define_method(col) do |str|
           puts hl.color(str, col)
         end

data/lib/ec2ssh/dotfile.rb

@@ -0,0 +1,49 @@
+require 'yaml'
+
+module Ec2ssh
+  class AwsKeyNotFound < StandardError; end
+  class Dotfile
+    def initialize(config={})
+      @config = {
+        'path' => "~/.ssh/config",
+        'aws_keys' => {
+          'default' => {
+            'access_key_id' => ENV['AMAZON_ACCESS_KEY_ID'],
+            'secret_access_key' => ENV['AMAZON_SECRET_ACCESS_KEY']
+          }
+        },
+        'regions' => %w(ap-northeast-1),
+      }.merge(config)
+    end
+
+    def self.load(path)
+      new YAML.load(open(path).read)
+    end
+
+    def save(path)
+      open(path, 'w') {|f| f.write @config.to_yaml }
+    end
+
+    def self.update_or_create(path, config={})
+      dotfile = if File.exist?(path)
+        Dotfile.load(path)
+      else
+        new
+      end
+      dotfile.update(config)
+      dotfile.save(path)
+    end
+
+    def [](key)
+      @config[key]
+    end
+
+    def aws_key(keyname)
+      self['aws_keys'][keyname] or raise AwsKeyNotFound
+    end
+
+    def update(config)
+      @config = @config.merge config
+    end
+  end
+end

data/lib/ec2ssh/hosts.rb

@@ -1,35 +1,42 @@
+require 'aws-sdk'
+require 'ec2ssh/dotfile'
+
 module Ec2ssh
   class AwsEnvNotDefined < StandardError; end
   class Hosts
-    def initialize
-      @access_key_id = ENV["AMAZON_ACCESS_KEY_ID"].to_s
-      @secret_access_key = ENV["AMAZON_SECRET_ACCESS_KEY"].to_s
-      if @access_key_id.length == 0 || @secret_access_key.length == 0
-        raise AwsEnvNotDefined
+    def initialize(dotfile, keyname)
+      @dotfile = dotfile
+      @ec2 = Hash.new do |h,region|
+        key = dotfile.aws_key(keyname)
+        raise AwsEnvNotDefined if key['access_key_id'].empty? || key['secret_access_key'].empty?
+        h[region] = AWS::EC2.new(
+          :ec2_endpoint      => "#{region}.ec2.amazonaws.com",
+          :access_key_id     => key['access_key_id'],
+          :secret_access_key => key['secret_access_key']
+        )
       end
     end
 
     def all
-      ec2 = RightAws::Ec2.new(@access_key_id, @secret_access_key)
-      regions = ec2.describe_regions
-      regions.map do |region|
+      @dotfile['regions'].map {|region|
         process_region region
-      end.flatten
+      }.flatten
     end
 
     private
-    def process_region(region)
-      ec2 = RightAws::Ec2.new(@access_key_id, @secret_access_key, :region => region)
-      instance_names = {}
-      ec2.describe_tags.each do |tag|
-        next unless tag[:key]=='Name' && tag[:resource_type]=='instance'
-        instance_names[tag[:resource_id]] = tag[:value]
+      def process_region(region)
+        instances(region).map {|instance|
+          name_tag = instance[:tag_set].find {|tag| tag[:key] == 'Name' }
+          next nil if name_tag.nil? || name_tag[:value].empty?
+          name = name_tag[:value]
+          dns_name = instance[:dns_name] or next nil
+          {:host => "#{name}.#{region}", :dns_name => dns_name}
+        }.compact.sort {|a,b| a[:host] <=> b[:host] }
+      end
+
+      def instances(region)
+        response = @ec2[region].instances.tagged('Name').filtered_request(:describe_instances)
+        response[:instance_index].values
       end
-      ec2.describe_instances.map do |instance|
-        instance_name = instance_names[instance[:aws_instance_id]] or next nil
-        dns_name = instance[:dns_name] or next nil
-        instance_name.empty? || dns_name.empty? ? nil : {:host => "#{instance_name}.#{region}", :dns_name => dns_name}
-      end.compact
-    end
   end
 end

data/lib/ec2ssh/{config.rb → ssh_config.rb}

@@ -1,7 +1,7 @@
 require 'pathname'
 
 module Ec2ssh
-  class Config
+  class SshConfig
     HEADER = "### EC2SSH BEGIN ###"
     FOOTER = "### EC2SSH END ###"
 
@@ -43,7 +43,7 @@ module Ec2ssh
 #{HEADER}
 # Generated by ec2ssh http://github.com/mirakui/ec2ssh
 # DO NOT edit this block!
-# Updated #{Time.now}
+# Updated #{Time.now.iso8601}
 #{text}
 #{FOOTER}
       END

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '1.0.3'
+  VERSION = '2.0.0'
 end

data/lib/ec2ssh.rb

@@ -1,5 +1,2 @@
 module Ec2ssh
-  autoload :CLI, "ec2ssh/cli"
-  autoload :Config, "ec2ssh/config"
-  autoload :Hosts, "ec2ssh/hosts"
 end

data/spec/lib/ec2ssh/cli_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+require 'ec2ssh/cli'
+require 'ec2ssh/dotfile'
+
+describe Ec2ssh::CLI do
+  before(:all) do
+    Ec2ssh::Hosts.tap do |cls|
+      cls.class_eval do
+        def all
+          [
+            {:host => 'db-01', :dns_name => 'ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com'},
+            {:host => 'db-02', :dns_name => 'ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com'},
+          ]
+        end
+      end
+    end
+  end
+  let(:cli) { described_class }
+  let(:ssh_config_path) do
+    path = tmp_dir.join('ssh_config')
+    path.open('w') {|f| f.write <<-END }
+Host foo.bar.com
+  HostName 1.2.3.4
+    END
+    path
+  end
+  let(:ssh_config_string) { ssh_config_path.read }
+  let(:dotfile_path) do
+    tmp_dir.join('dot.ec2ssh')
+  end
+
+  around do |example|
+    tz = ENV['TZ']
+    ENV['TZ'] = 'UTC'
+    Timecop.freeze(Time.local(2013,1,1,0,0,0)) { example.call }
+    ENV['TZ'] = 'tz'
+  end
+
+  subject { ssh_config_string }
+
+  describe '#init' do
+    before do
+      silence(:stdout) { cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}] }
+    end
+
+    it { should eq(<<-END) }
+Host foo.bar.com
+  HostName 1.2.3.4
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated 2013-01-01T00:00:00+00:00
+
+### EC2SSH END ###
+END
+  end
+
+  describe '#update' do
+    before do
+      silence(:stdout) do
+        cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}]
+        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path}]
+      end
+    end
+
+    it { should eq(<<-END) }
+Host foo.bar.com
+  HostName 1.2.3.4
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated 2013-01-01T00:00:00+00:00
+Host db-01
+  HostName ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com
+Host db-02
+  HostName ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com
+
+### EC2SSH END ###
+END
+  end
+
+  describe '#update with aws-keys option' do
+    before do
+      silence(:stdout) do
+        cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}]
+      end
+      dotfile = Ec2ssh::Dotfile.load(dotfile_path)
+      dotfile['aws_keys']['key1'] = {
+        'access_key_id' => 'ACCESS_KEY_ID',
+        'secret_access_key' => 'SECRET_ACCESS_KEY'
+      }
+      @output = capture(:stdout) do
+        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path} --aws-key #{keyname}]
+      end
+    end
+
+    subject { @output }
+
+    context do
+      let(:keyname) { 'default' }
+      it { should =~ /Updated 2 hosts/ }
+    end
+
+    context do
+      let(:keyname) { 'key1' }
+      it { should =~ /Updated 2 hosts/ }
+    end
+
+    context do
+      let(:keyname) { 'key2' }
+      it { should_not =~ /^Updated 2 hosts/ }
+    end
+  end
+
+  describe '#remove' do
+    before do
+      silence(:stdout) do
+        cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}]
+        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path}]
+        cli.start %W[remove --path #{ssh_config_path} --dotfile #{dotfile_path}]
+      end
+    end
+
+    it { should eq(<<-END) }
+Host foo.bar.com
+  HostName 1.2.3.4
+END
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+require 'bundler/setup'
+Bundler.require
+
+require 'webmock/rspec'
+require 'pathname'
+require 'stringio'
+
+RSpec.configure do |config|
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+
+  def base_dir
+    Pathname('../..').expand_path(__FILE__)
+  end
+
+  def tmp_dir
+    base_dir.join('tmp')
+  end
+
+  alias :silence :capture
+
+  config.before(:all) do
+    unless tmp_dir.directory?
+      tmp_dir.mkdir
+    end
+  end
+end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: ec2ssh
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
-  - 3
-  version: 1.0.3
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
-- mirakui
+- Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-02-12 00:00:00 Z
+date: 2013-03-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -49,24 +49,23 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ktheory-right_aws
+  name: aws-sdk
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 31
         segments: 
-        - 2
-        - 0
-        - 3
-        version: 2.0.3
+        - 1
+        - 8
+        version: "1.8"
   type: :runtime
   version_requirements: *id003
-description: A ssh_config manager for AWS EC2
+description: ec2ssh is a ssh_config manager for AWS EC2
 email: 
-- mirakui@tsuyabu.in
+- mimitako@gmail.com
 executables: 
 - ec2ssh
 extensions: []
@@ -75,16 +74,25 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
+- .rvmrc
+- .travis.yml
+- ChangeLog.md
 - Gemfile
 - Gemfile.lock
-- README.rdoc
+- Guardfile
+- MIT-LICENSE
+- README.md
 - bin/ec2ssh
 - ec2ssh.gemspec
 - lib/ec2ssh.rb
 - lib/ec2ssh/cli.rb
-- lib/ec2ssh/config.rb
+- lib/ec2ssh/dotfile.rb
 - lib/ec2ssh/hosts.rb
+- lib/ec2ssh/ssh_config.rb
 - lib/ec2ssh/version.rb
+- spec/lib/ec2ssh/cli_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/mirakui/ec2ssh
 licenses: []
 
@@ -114,9 +122,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ec2ssh
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A ssh_config manager for AWS EC2
-test_files: []
-
+test_files: 
+- spec/lib/ec2ssh/cli_spec.rb
+- spec/spec_helper.rb

data/README.rdoc

@@ -1,48 +0,0 @@
-== Introduction
-ec2ssh is a ssh_config manager for amazonaws ec2.
-<tt>ec2ssh</tt> command adds <tt>Host</tt> descriptions to ssh_config (~/.ssh/config default). 'Name' tag of instances are used as <tt>Host</tt> descriptions.
-== How to use
-1. Set 'Name' tag to your instances
-eg. Tag 'app-server-1' as 'Name' to an instance i-xxxxx in us-west-1 region.
-2. install ec2ssh
-    gem install ec2ssh
-3. Set environment variables "AMAZON_ACCESS_KEY_ID" and "AMAZON_SECRET_ACCESS_KEY"
-    export AMAZON_ACCESS_KEY_ID="..."
-    export AMAZON_SECRET_ACCESS_KEY="..."
-4. execute <tt>ec2ssh</tt> init and <tt>update</tt>
-    ec2ssh init
-    ec2ssh update
-Then host-names of your instances are generated and wrote to .ssh/config
-5. And you can ssh to your instances with your tagged name.
-    ssh user@app-server-1.us-west-1
-== Commands
-    ec2ssh help [TASK]  # Describe available tasks or one specific task
-    ec2ssh init         # Add ec2ssh mark to ssh_config
-    ec2ssh update       # Update ec2 hosts list in ssh_config
-    ec2ssh remove       # Remove ec2ssh mark from ssh_config
-Each command can be used <tt>--path</tt> option to set ssh_config path. The default is "~/.ssh/config"
-    ec2ssh init --path=/path/to/ssh_config
-== ssh_config and mark lines
-<tt>ec2ssh init</tt> command inserts mark lines your <tt>.ssh/config</tt> such as:
-    ### EC2SSH BEGIN ###
-    # Generated by ec2ssh http://github.com/mirakui/ec2ssh
-    # DO NOT edit this block!
-    # Updated Sun Dec 05 00:00:14 +0900 2010
-    ### EC2SSH END ###
-<tt>ec2ssh update</tt> command inserts 'Host' descriptions between 'BEGIN' line and 'END' line.
-    ### EC2SSH BEGIN ###
-    # Generated by ec2ssh http://github.com/mirakui/ec2ssh
-    # DO NOT edit this block!
-    # Updated Sun Dec 05 00:00:14 +0900 2010
-    Host app-server-1.us-west-1
-      HostName ec2-xxx-xxx-xxx-xxx.us-west-1.compute.amazonaws.com
-    Host db-server-1.ap-southeast-1
-      HostName ec2-xxx-xxx-xxx-xxx.ap-southeast-1.compute.amazonaws.com
-        :
-        :
-    ### EC2SSH END ###
-<tt>ec2ssh remove</tt> command removes the mark lines.
-== Notice
-<tt>ec2ssh</tt> command updates your <tt>.ssh/config</tt> file default. You should make a backup of it.
-== License
-ec2ssh is released under the MIT license.