ec2-ssh 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f253fec1905d28a541b4a90f5539f850690ff1
-  data.tar.gz: 5497db4af38b1ca7df990f23c18adbca843578f5
+  metadata.gz: c4a8cbe419bf1a45f6e32e01a1d4ba9cb192a895
+  data.tar.gz: 158753292a848f88511fd5f579d04f3626311251
 SHA512:
-  metadata.gz: d0b7adbbe570f304bed85d7ae171a1f871375061eeb64a914b590684b40b32e39f53cb6adcc4481f9414895f7aadc1e79e9bd09b12e7c21a2e366d4f95bb9935
-  data.tar.gz: 52078a2cd777a8477180f8e4a71fba99379c318b358e4a83a087fdfed5ddad0a5ffa2e2ff743d59c7529a78ccc37f6dfe4713d50e2400ba5553bb00b6e326ce1
+  metadata.gz: e507425bf577899eccb6868198457ad189eb7f15585e92d51fb09380e2f039e41f59d741c4f4b5e54cc300c03ecad97fb5f59f0b19b1ecad4789c7aa855300ca
+  data.tar.gz: 6c1372931fe51e79e7d59fb9c67c9f39b1a45e41dc51a71d6e8eb39058427a88504cc719f9c8d9ae32cb97bc24621003db0ba42f7cfb73a7e3cb3bfbde15ea1e

data/README.md

@@ -0,0 +1,41 @@
+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)
+
+
+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.
+
+
+--terminal will open multiple terminals windows of all servers found (currently only supported on OSX iTerm2)
+
+
+Usage:
+  ec2-ssh connect --cmd=CMD
+
+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

data/lib/ec2-ssh.rb

@@ -1,5 +1,5 @@
 module Ec2Ssh
-  VERSION   = "1.0.0"
+  VERSION   = "1.0.1"
   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

@@ -1,3 +1,4 @@
+require 'pry'
 module Ec2Ssh::Cli::Aws
    def aws_init(profile, region)
     ENV['AWS_PROFILE'] = profile
@@ -7,7 +8,7 @@ module Ec2Ssh::Cli::Aws
     @as = Aws::AutoScaling::Client.new()
     @ec2 = Aws::EC2::Client.new()
 
-    say "Currently running user is: #{Aws::IAM::CurrentUser.new.arn}"
+    say "Currently running AWS User is: #{Aws::IAM::CurrentUser.new.arn}"
   end
 
   def get_auto_scale_groups
@@ -34,6 +35,7 @@ module Ec2Ssh::Cli::Aws
   def get_instances(tag_key, tag_value)
     @all_servers = []
 
+    say "Fetching instances with #{tag_key}: #{tag_value}", color = :white
     response = @ec2.describe_instances({
       filters: [
       {
@@ -51,11 +53,17 @@ module Ec2Ssh::Cli::Aws
     })
 
     if !response.reservations.empty?
-      response.reservations.each {|r| r.instances.inject(@all_servers){|acc, k| acc << k.public_ip_address; acc}}
+      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
+        else
+          acc << k.public_ip_address; acc
+        end
+      }}
     else
       say "could not find any instances with the tag #{tag_key}: #{tag_value} on #{@region}"
     end
-
-    say "All servers: #{@all_servers.size}"
+    say "All servers: #{@all_servers}"
   end
 end

data/lib/ec2-ssh/cli.rb

@@ -17,7 +17,7 @@ class Ec2Ssh::Cli  < Thor
   default_task :connect
 
   desc "connect", "Connect to autoscale instance (random instance), Pass --cmd='whatever' to run a cmd on the server (use ; to seperate commands)"
-  method_option :cmd,                              :desc => 'commmand to run on remote servers', :required => true
+  method_option :cmd,                              :desc => 'commmand to run on remote servers'
   method_option :profile,                          :desc => 'aws cli profile', :default => 'default'
   method_option :region,                           :desc => "region", :default => 'us-east-1'
   method_option :user,            :aliases => 'u', :desc => 'run as user', :default => 'ec2-user'
@@ -39,7 +39,7 @@ class Ec2Ssh::Cli  < Thor
       
     if options[:as]
       get_auto_scale_groups
-    elsif options[:tag_value]
+    else options[:tag_value]
       get_instances(options[:tag_key].chomp, options[:tag_value].chomp)
     end
     

data/lib/ec2-ssh/utils.rb

@@ -1,6 +1,7 @@
 module Ec2Ssh::Cli::Utils
   def open_in_terminal
     @all_servers.each do |server|
+      say "Opening #{server} in a new tab", color = :cyan
       `osascript <<-eof
          tell application "iTerm"
           make new terminal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ami Mahloof