ec2-ssh 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ebd411bd39993aa0375b74cfdeddd0c8320b14
-  data.tar.gz: 1a6e3704a9c57f0a5bc5c8aca455f8b4662faba6
+  metadata.gz: 5a43390b18f7b48ba844f69545f8d87df9b6ba24
+  data.tar.gz: 495ebb1852a3542bb8736f897b3da2ac3a9517ad
 SHA512:
-  metadata.gz: fa1d38276a5e2dceb6d3f02a2399ad76abaa2601effc09caac196266c4bf717dc5a24aa6352b50946e0e889f83ea668bb20c9ebb3f6386b2b5eb1e3a1a22f220
-  data.tar.gz: 19d8aa349f32b64ec61ce1ddc45ec7eaf80e05c6deed939320feef614d30008dce589c17d4b0d05875e75340a5926534514b06911cf2a1737ed6dc283ba227f8
+  metadata.gz: 3d4127869a0221b255591ef2f95a1507f3b773faedea620ca3e923ed7e46173dea1cd0449d3b186e0498772e7de56f64b25b1f76af9ba968e5544e9f201a505f
+  data.tar.gz: 65e8f5e1507dca883d67746b4b1a43077ef29a08885910980138e74eddb40354074daf8779a6c1aa3620c17768d14f68e120cdd27e3a44cd016c85961643cb8b

data/README.md

@@ -1,41 +1,88 @@
-This utility is to be able to connect and run multiple commands either parallel sequential or in groups (based on sshkit https://github.com/capistrano/sshkit)
+This is a utility for connecting on ec2to autoscale groups and run multiple commands either parallel sequential or in groups
 
+(based on sshkit https://github.com/capistrano/sshkit)
 
+use it where you need to upload / download / capture output/ exec commands
+
+````txt
 seperate commands with a semicolon
 
 default region: us-east-1
 default user: ec2-user
 default connnection :parallel
-
+````
 
 Groups were designed in this case to relieve problems (mass Git checkouts) where you rely on a contested resource that you don't want to DDOS by hitting it too hard.
 
 Sequential runs were intended to be used for rolling restarts, amongst other similar use-cases.
 
+if the instance is on a private subnet (given you have a VPN connection) it will fallback to connecting using the internal IP address
+
+##examples:
+
+--terminal (-t) will open multiple terminals windows of all servers found (currently only supported on OSX iTerm2)
+````bash
+$ ec2-ssh -t --tag-value ElasticSearch
+````
+-------------------
+upload / download separate source,destination with a comma
+````bash
+$ ec2-ssh --download /home/ec2-user/file.txt,~/Downloads --tag-value ElasticSearch
+````
+-------------------
+coonect to instances filter by custom tag
+````bash
+$ ec2-ssh --tag-key staging --tag-value true --cmd 'touch /tmp/test'
+````
+-------------------
+pass profile of aws/credentials to use different accounts on AWS
+(http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html)
+````bash
+$ ec2-ssh --tag-value ElasticSearch --profile otherAccountName --cmd 'touch /tmp/test'
+````
+-------------------
 
---terminal will open multiple terminals windows of all servers found (currently only supported on OSX iTerm2)
+connect by selecting autoscale group name
 
+````bash
+$ ec2-ssh --as --cmd 'touch /tmp/test'
 
+0: ElasticSearch-ElasticSearchServerGroup1
+1: KibanaServerGroup
+3: LogstashServerGroup
+4: ...
+````
+simply selct the number corresponding to the autoscale group (limit of AWS SDk is to fetch maximum 100 AutoScale Groups)
+
+-------------------
+
+
+##Possible command line options
+````bash
 Usage:
-  ec2-ssh connect --cmd=CMD
+  ec2-ssh connect
 
 Options:
-      --cmd=CMD                # commmand to run on remote servers
-      [--profile=PROFILE]      # aws cli profile
-                               # Default: default
-      [--region=REGION]        # region
-                               # Default: us-east-1
-  u, [--user=USER]             # run as user
-                               # Default: ec2-user
-  p, [--parallel=PARALLEL]     # run in parallel
-  s, [--sequence=SEQUENCE]     # run in sequence
-  g, [--groups=GROUPS]         # run in groups
-  l, [--groups-limit=N]        # limit
-  w, [--wait=N]                # wait
-      [--as=AS]                # get autoscale groups
-      [--tag-key=TAG_KEY]      # tag key to filter instances by
-                               # Default: Name
-      [--tag-value=TAG_VALUE]  # tag value to filter instances by
-  t, [--terminal=TERMINAL]     # open terminal tabs for all servers
-
-Connect to autoscale instance (random instance), Pass --cmd='whatever' to run a cmd on the server
+      [--cmd=CMD]                       # commmand to run on remote servers
+      [--profile=PROFILE]               # Aws cli profile name as listed in ~/aws/credentials
+                                        # Default: default
+      [--region=REGION]                 # region
+                                        # Default: us-east-1
+  u, [--user=USER]                      # run as user
+                                        # Default: ec2-user
+  p, [--parallel=PARALLEL]              # run in parallel
+  s, [--sequence=SEQUENCE]              # run in sequence
+  g, [--groups=GROUPS]                  # run in groups
+  l, [--groups-limit=N]                 # limit
+  w, [--wait=N]                         # wait
+      [--as=AS]                         # filter by autoscale groups
+      [--tag-key=TAG_KEY]               # tag key to filter instances by
+                                        # Default: Name
+      [--tag-value=TAG_VALUE]           # tag value to filter instances by
+  t, [--terminal=TERMINAL]              # open terminal tabs for all servers
+  c, [--capture-output=CAPTURE_OUTPUT]  # capture output
+      [--upload=source,destination]     # upload a file - source,destination (make sure seperate these by comma)
+      [--download=source,destination]   # download a file - source,destination (make sure seperate these by comma)
+
+Connect to autoscale instance (random instance), Pass --cmd='whatever' to run a cmd on the server (use ; to seperate commands)
+````

data/lib/ec2-ssh.rb

@@ -1,5 +1,5 @@
 module Ec2Ssh
-  VERSION   = "1.0.6"
+  VERSION   = "1.0.7"
   ABOUT     = "ec2-ssh v#{VERSION} (c) #{Time.now.strftime("2015-%Y")} @innovia"
 
   $:.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))

data/lib/ec2-ssh/cli.rb

@@ -33,12 +33,12 @@ class Ec2Ssh::Cli  < Thor
   method_option :capture_output,  :aliases => 'c', :desc => 'capture output'
   method_option :upload,                           :desc => 'upload a file - source,destination (make sure seperate these by comma)', :banner => 'source,destination'
   method_option :download,                         :desc => 'download a file - source,destination (make sure seperate these by comma)', :banner => 'source,destination'
-
+  method_option :pty,                              :desc => 'enable pty for sudo operations', :default => false
   def connect
     extend Aws
     extend Ssh
     extend Utils
-    set_ssh(options[:user])
+    set_ssh(options[:user], options[:pty])
     aws_init(options[:profile], options[:region])
       
     if options[:as]

data/lib/ec2-ssh/ssh.rb

@@ -1,15 +1,20 @@
 module Ec2Ssh::Cli::Ssh
-  def set_ssh(user)
+  def set_ssh(user, pty)
     ENV['SSHKIT_COLOR'] = 'TRUE'
     SSHKit.config.output_verbosity = Logger::DEBUG
-    SSHKit::Backend::Netssh.configure { |ssh|
-      ssh.ssh_options = {
+    ssh_options = {
         :user => user,
         :paranoid => false,
         :forward_agent => true,
         :user_known_hosts_file => '/dev/null'
-      }
     }
+
+    SSHKit::Backend::Netssh.configure { |ssh|
+      ssh.ssh_options = ssh_options
+      ssh.pty = true if pty
+    }
+
+
   end
 
   def ssh_to(user, dsl_options, cmd, capture_output, upload, download)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ami Mahloof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor