ec2ssh 2.0.6 → 2.0.7

data/.gitignore

@@ -1,5 +1,7 @@
-*.swp
 vendor
 .bundle
 tmp
 *.gem
+Gemfile.lock
+.ruby-version
+.rvmrc

data/.travis.yml

@@ -1,7 +1,5 @@
 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

@@ -1,4 +1,9 @@
 # Change Log
+## 2.0.7
+
+* Add ssh_options (#11)
+  Thanks to @frsyuki
+
 ## 2.0.6
 
 * Change thor version specifier from 0.14.6 to 0.14 (#13)

data/README.md

@@ -156,6 +156,28 @@ Updates ssh_config by 'my_key1' aws key:
 $ ec2ssh update --aws-key my_key1
 ```
 
+## ssh options
+You can set other ssh options such as IdentityFile or User.
+
+```
+$ cat ~/.ec2ssh
+---
+path: /home/yourname/.ssh/config
+aws_keys:
+  default:
+    access_key_id: ...
+    secret_access_key: ...
+  my_key1:
+    access_key_id: ...
+    secret_access_key: ...
+regions:
+  - ap-northeast-1
+ssh_options:
+  - "IdentityFile ~/.ssh/ec2.id_rsa"
+  - "User ec2-user"
+  - "TCPKeepAlive yes"
+```
+
 # How to upgrade from 1.x to 2.x
 If you have used ec2ssh-1.x, it seems that you may not have '~/.ec2ssh'.
 So you need execute `ec2ssh init` once to create `~/.ec2ssh`, and edit it as you like.

data/lib/ec2ssh/cli.rb

@@ -83,10 +83,23 @@ module Ec2ssh
       end
 
       def merge_sections(config)
-        section_str = hosts.map { |h| <<-END }.join
+        ssh_options = dotfile['ssh_options']
+
+        section_str = hosts.map { |h|
+          section = <<-END
 Host #{h[:host]}
   HostName #{h[:dns_name]}
-        END
+          END
+
+          unless ssh_options.nil?
+            ssh_options.each {|line|
+              section << "  #{line}\n"
+            }
+          end
+
+          section
+        }.join
+
         config.sections[options.aws_key] ||= SshConfig::Section.new(
           options.aws_key,
           section_str

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,11 +69,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - .travis.yml
 - ChangeLog.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - MIT-LICENSE
 - README.md

data/.rvmrc

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

data/Gemfile.lock

@@ -1,74 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ec2ssh (2.0.5)
-      aws-sdk (~> 1.8)
-      highline (~> 1.6)
-      thor (~> 0.14)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.4)
-    aws-sdk (1.10.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
-    coderay (1.0.9)
-    crack (0.3.2)
-    diff-lcs (1.2.4)
-    ffi (1.8.1)
-    formatador (0.2.4)
-    guard (1.8.0)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.6.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    highline (1.6.19)
-    json (1.8.0)
-    listen (1.1.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.3)
-    method_source (0.8.1)
-    nokogiri (1.5.9)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    slop (3.4.5)
-    thor (0.18.1)
-    timecop (0.6.1)
-    uuidtools (2.1.4)
-    webmock (1.11.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ec2ssh!
-  guard-rspec (~> 2.4)
-  rb-fsevent (~> 0.9.1)
-  rspec (~> 2.12)
-  timecop (~> 0.5)
-  webmock (~> 1.9)