ec2-ssh 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a43390b18f7b48ba844f69545f8d87df9b6ba24
-  data.tar.gz: 495ebb1852a3542bb8736f897b3da2ac3a9517ad
+  metadata.gz: f7fc4d61b4b6469b8a4c7ff5f1a40cefab2782ac
+  data.tar.gz: 4cd60c018fc113b9746adfd30e52c713bd4d2a77
 SHA512:
-  metadata.gz: 3d4127869a0221b255591ef2f95a1507f3b773faedea620ca3e923ed7e46173dea1cd0449d3b186e0498772e7de56f64b25b1f76af9ba968e5544e9f201a505f
-  data.tar.gz: 65e8f5e1507dca883d67746b4b1a43077ef29a08885910980138e74eddb40354074daf8779a6c1aa3620c17768d14f68e120cdd27e3a44cd016c85961643cb8b
+  metadata.gz: 811f77f8b9dfb8e626da2b2581b12d9530cbaf7808649ae0bc727b1a4c3b9ff6a1f91bbe1120ef8be30ed8a95d9bd74cca7f8218327fd34454473ebc5159e8ce
+  data.tar.gz: 6803e2d985724957600fe947db7288bfcdc9f88414967617fe7f608c37caad6ff9e61ccdf9cac7fb831fe2f3b1b53c51166c18194ac4593187ffcc61d9f3fc16

data/README.md

@@ -83,6 +83,7 @@ Options:
   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)
+      [--pty=PTY]                       # enable pty for sudo operations
 
 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.7"
+  VERSION   = "1.1.0"
   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/aws.rb

@@ -10,24 +10,30 @@ module Ec2Ssh::Cli::Aws
     say "Currently running AWS User is: #{Aws::IAM::CurrentUser.new.arn}"
   end
 
-  def get_auto_scale_groups
+  def get_auto_scale_groups(grep_pattern)
     say "Fetching AutoScale Groups - please wait..."
       @as_groups = @as.describe_auto_scaling_groups({max_records: 100}).auto_scaling_groups
 
       as_group_names = @as_groups.inject([]) {|acc, asg| acc << asg.auto_scaling_group_name; acc }
 
       as_selection = {}
-      as_group_names.each_with_index.inject(as_selection) {|acc, pair|
+
+      if grep_pattern
+       as_groups =  as_group_names.grep(grep_pattern)
+      else
+        as_groups = as_group_names
+      end
+      as_groups.each_with_index.inject(as_selection) {|acc, pair|
         element, index = pair
         as_selection[index] = element
         acc
-      } 
-      
+      }
+
       say "AutoScale Group in #{options[:region]}:\n"
       as_selection.each {|k,v| say "#{k}: #{v}"}
 
       selected_as = ask("Which server group do you want to ssh to?", color = :yellow)
-      
+
       get_instances('aws:autoscaling:groupName', as_selection[selected_as.to_i])
   end
 
@@ -52,7 +58,7 @@ module Ec2Ssh::Cli::Aws
     })
 
     if !response.reservations.empty?
-      response.reservations.each {|r| r.instances.inject(@all_servers){|acc, k| 
+      response.reservations.each {|r| r.instances.inject(@all_servers){|acc, k|
         if k.public_ip_address.nil?
           say "Could not find public ip address for instance: #{k.instance_id}, falling back to private ip address", color = :yellow
           acc << k.private_ip_address; acc

data/lib/ec2-ssh/cli.rb

@@ -27,20 +27,21 @@ class Ec2Ssh::Cli  < Thor
   method_option :groups_limit,    :aliases => 'l', :desc => 'limit', :type => :numeric
   method_option :wait,            :aliases => 'w', :desc => 'wait',  :type => :numeric
   method_option :as,                               :desc => 'filter by autoscale groups'
+  method_option :grep,                             :desc => 'grep autoscale name when list is fecthed'
   method_option :tag_key,                          :desc => 'tag key to filter instances by', :default => 'Name'
   method_option :tag_value,                        :desc => 'tag value to filter instances by'
   method_option :terminal,        :aliases => 't', :desc => 'open terminal tabs for all servers'
   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
+  method_option :pty,                              :desc => 'enable pty for sudo operations', :type => :boolean, :default => false
   def connect
     extend Aws
     extend Ssh
     extend Utils
     set_ssh(options[:user], options[:pty])
     aws_init(options[:profile], options[:region])
-      
+
     if options[:as]
       get_auto_scale_groups
     elsif options[:tag_value]
@@ -50,7 +51,7 @@ class Ec2Ssh::Cli  < Thor
       Ec2Ssh::Cli.start(%w{help connect})
       exit
     end
-    
+
     if options[:terminal]
       open_in_terminal
     else
@@ -64,12 +65,12 @@ class Ec2Ssh::Cli  < Thor
       mode = :groups   if options[:groups]
       mode = :sequence if options[:sequence]
 
-      mode = :parallel if mode.nil? 
+      mode = :parallel if mode.nil?
       dsl_options = {}
       dsl_options[:in] = mode
       dsl_options[:wait]  = options[:wait] if options[:wait]
       dsl_options[:limit] = options[:groups_limit] if options[:groups_limit]
-      
+
       say "dsl opts: #{dsl_options}", color = :cyan
       ssh_to(options[:user], dsl_options, options[:cmd], options[:capture_output], options[:upload], options[:download])
     end
@@ -79,6 +80,6 @@ class Ec2Ssh::Cli  < Thor
   desc "version", "version"
   def version
     say Ec2Ssh::ABOUT, color = :green
-  end  
+  end
 
 end

data/lib/ec2-ssh/ssh.rb

@@ -25,7 +25,7 @@ module Ec2Ssh::Cli::Ssh
         file = upload.split(',').map { |e| e.strip }
         source = File.expand_path(file.first)
         destination = file.last
-        puts "uploading #{source} to #{destination}..."
+        puts "uploading #{source} to #{destination}"
         upload! source, destination
       end
 
@@ -33,8 +33,8 @@ module Ec2Ssh::Cli::Ssh
         file = download.split(',').map { |e| e.strip }
         source = file.first
         destination = File.expand_path(file.last)
-        puts "downloading #{source} to #{destination}..."
-        download! source, destination
+        puts "downloading #{source} to #{destination}.#{host}"
+        download! source, "#{destination}.#{host}"
       end
 
       if capture_output 

metadata

@@ -1,73 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: ec2-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Ami Mahloof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.45
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.45
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.45
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.1
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.1
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.1
 description: EC2 SSH Utility
@@ -79,7 +79,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .gitignore
+- ".gitignore"
 - LICENSE
 - README.md
 - Rakefile
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: run commmands on multiple servers by tag or by autoscale group