aws-ssh 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6982e9f815c9f9271c5176348bf1ec46afea3a74
-  data.tar.gz: 79cffa033b806b19c8f1a406d897027ec9dfba5b
+  metadata.gz: 4b0810c9f39a7a08a1da018725f544033769ba09
+  data.tar.gz: e7cb343982032d66e38dab1024b17b0cbf1e63f3
 SHA512:
-  metadata.gz: 45f2bf73998b7d28e1545d6a9d3a39adfc4bd248acc4aca59075acbedfaaccf42a858ce12e9f46d84429e1e2a0ee6c1bdd9286ad92bb1e1e4cb830574cce7cc6
-  data.tar.gz: aa594d1686abe4202fb97f2fb7e41048b589f41f91018380ae36634dd807d2195cd92a117143870b7bdc760cd2d0b22514ec8a3854e0b88f8b0985e7c4804e15
+  metadata.gz: 80ab44660e1e6b860d4bb5961ff421b12599e01291b31a414165071d29c1605ef75a8a68b7bdc5ec5a68897f346003957c2e5649c094519cccaeda31eb32bba2
+  data.tar.gz: b97b74819572525b07eb07edb52c0d4692cff0b0fa376d14852728e45f6084229b8cdcd3f5dbfe6b4d5a53fc5a596ca7a369a5e42121fe616a1ad0259ae359aa

data/bin/aws-ssh

@@ -11,6 +11,7 @@ module AWSSH
       'format'  => 'ssh',
       'verbose' => false
     }
+    AWS_CONFIG_KEYS = [:profile, :region]
 
     attr_accessor :host_regex
 
@@ -23,13 +24,9 @@ module AWSSH
       shout "Options: #{cli.to_h.inspect}"
       shout "Defaults: #{defaults.inspect}"
 
-      Aws.config.merge!(profile: cli[:profile], region: cli[:region])
+      Aws.config.merge!(cli.to_h.select { |key| AWS_CONFIG_KEYS.include?(key) })
 
-      if cli['show-only']
-        print_output
-      else
-        ssh!
-      end
+      cli['show-only'] ? print_output : ssh!
     end
 
     def cli
@@ -51,6 +48,10 @@ Examples:
 
   # All hosts in one-line (suitable for CSSH):
   worker@10.20.30.40 worker@10.20.30.41
+
+The config file .awssh is looked up in following directories:
+  ./ (current directory)
+  ~/ ($HOME directory)
         USAGE
 
         o.separator "Options:"
@@ -69,16 +70,18 @@ Examples:
     end
 
     def ssh!
-      if instances.size > 1
+      if instances.empty?
+        exit_error! "No hostname matched."
+      elsif instances.size > 1
         print_output
-        exit_error! "\nMultiple hostnames matched. Please be more specific in hostnames regex or use the last output line to use CSSH.\n"
+        exit_error! "\nMultiple hostnames matched. Please be more specific in hostnames regex or use the last output line to use CSSH."
       end
       exec "ssh #{connection_string(instances.first)}"
     end
 
     def print_output
       instances.each do |i|
-        puts "ssh #{connection_string(i)}      \t => #{i.name}"
+        puts "ssh #{connection_string(i).ljust(30, ' ')} => #{i.name}"
       end
       puts "\n# All hosts in one-line (suitable for CSSH):"
       puts instances.map { |i| connection_string(i) }.join(' ')
@@ -90,8 +93,9 @@ Examples:
 
     def defaults
       @defaults ||= begin
-        defaults = File.exist?('.awssh') ? YAML.load_file('.awssh') : {}
-        DEFAULT_OPTIONS.merge(defaults)
+        defaults = YAML.load_file('.awssh') if File.exist?('.awssh')
+        defaults ||= YAML.load_file("#{ENV['HOME']}/.awssh") if File.exist?("#{ENV['HOME']}/.awssh")
+        DEFAULT_OPTIONS.merge(defaults) if defaults
       end
     end
 
@@ -105,6 +109,7 @@ Examples:
 
     def exit_error!(msg)
       $stderr.puts msg
+      $stderr.puts
       exit(1)
     end
 
@@ -140,8 +145,8 @@ Examples:
           next unless word_match?(instance.stack_name, stack_regex, case_sensitive)
         end
         if host_regex
-          next unless word_match?(instance.hostname, host_regex, case_sensitive)
-          next unless word_match?(instance.name, host_regex, case_sensitive)
+          next unless word_match?(instance.hostname, host_regex, case_sensitive) ||
+                      word_match?(instance.name, host_regex, case_sensitive)
         end
 
         instance

data/bin/awssh

@@ -0,0 +1 @@
+bin/aws-ssh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Rafael Sales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -69,9 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A tool that makes easy to ssh into AWS EC2 servers
 test_files: []
-has_rdoc: 

data/bin/awssh

@@ -1,162 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'slop'
-require 'aws-sdk'
-require 'yaml'
-
-module AWSSH
-  class Runner
-    DEFAULT_OPTIONS = {
-      'user'    => ENV['user'],
-      'format'  => 'ssh',
-      'verbose' => false
-    }
-
-    attr_accessor :host_regex
-
-    def run
-      self.host_regex = cli.args.first
-      exit_error! 'AWS Region not set' unless cli[:region]
-      exit_error! 'AWS Profile not set' unless cli[:profile]
-
-      shout "Hostname: #{host_regex}"
-      shout "Options: #{cli.to_h.inspect}"
-      shout "Defaults: #{defaults.inspect}"
-
-      Aws.config.merge!(profile: cli[:profile], region: cli[:region])
-
-      if cli['show-only']
-        print_output
-      else
-        ssh!
-      end
-    end
-
-    def cli
-      @cli ||= Slop.parse do |o|
-        o.banner = <<-USAGE
-awssh - a tool that makes easy to ssh into AWS EC2 servers
-
-Usage: awssh [hostname regex]
-
-Examples:
-  $ awssh prod.*app2
-  ... will SSH into the instance and you will see:
-  user@prod-rails-app4~$
-
-  $ awssh --show-only --stack qa -u worker
-  ... will show all instances registered in QA stack of Opsworks
-  ssh worker@10.20.30.40        => MyApp QA - qa-rails-app
-  ssh worker@10.20.30.41        => MyApp QA - qa-sidekiq
-
-  # All hosts in one-line (suitable for CSSH):
-  worker@10.20.30.40 worker@10.20.30.41
-        USAGE
-
-        o.separator "Options:"
-        o.string '-s',  '--stack',      'AWS OpsWorks Stack name regex. E.g: `-s prod` will match "Production" stack name'
-        o.string '-p',  '--profile',    'AWS config profile name. Default: profile set in .awssh file', default: defaults['profile']
-        o.string '-r',  '--region',     'AWS region. E.g: us-east-1. Default: region set in .awssh file', default: defaults['region']
-        o.string '-u',  '--user',       'SSH username to use. Default: user set in .awssh file or current machine user', default: defaults['user']
-        o.bool   '-so', '--show-only',  'Only show the matched hosts instead of ssh. Default: false', default: false
-        o.bool   '-cs', '--csensitive', 'Use case-sensitive for regex matching. Default: false', default: false
-        o.bool   '-v',  '--verbose',    'Verbose mode. Default: false', default: false
-        o.on '--help', 'Shows help' do
-          puts o
-          exit
-        end
-      end
-    end
-
-    def ssh!
-      if instances.size > 1
-        print_output
-        exit_error! "\nMultiple hostnames matched. Please be more specific in hostnames regex or use the last output line to use CSSH.\n"
-      end
-      exec "ssh #{connection_string(instances.first)}"
-    end
-
-    def print_output
-      instances.each do |i|
-        puts "ssh #{connection_string(i)}      \t => #{i.name}"
-      end
-      puts "\n# All hosts in one-line (suitable for CSSH):"
-      puts instances.map { |i| connection_string(i) }.join(' ')
-    end
-
-    def connection_string(instance)
-      "#{cli[:user]}@#{instance.ip}"
-    end
-
-    def defaults
-      @defaults ||= begin
-        defaults = File.exist?('.awssh') ? YAML.load_file('.awssh') : {}
-        DEFAULT_OPTIONS.merge(defaults)
-      end
-    end
-
-    def instances
-      @instances ||= AWSEC2.new.instances(host_regex, cli[:stack], cli[:csensitive]).select do |i|
-        shout "Instance #{i.name} is not part of an Opsworks Stack" unless i.stack_name
-        shout "Instance #{i.name} not running. Current state: #{i.state}" unless i.running?
-        i.running?
-      end
-    end
-
-    def exit_error!(msg)
-      $stderr.puts msg
-      exit(1)
-    end
-
-    def shout(msg)
-      puts "[DEBUG] #{msg}" if cli.verbose?
-    end
-  end
-
-  EC2Instance = Struct.new(:name, :hostname, :stack_name, :state, :ip) do
-    def initialize(instance)
-      name       = extract_tag(instance, 'Name')
-      hostname   = extract_tag(instance, 'opsworks:instance')
-      stack_name = extract_tag(instance, 'opsworks:stack')
-
-      super(name, hostname, stack_name, instance.state.name, instance.public_ip_address)
-    end
-
-    def running?
-      state == 'running'
-    end
-
-    def extract_tag(instance, tag)
-      tag = instance.tags.find { |t| t.key == tag }
-      tag ? tag.value : nil
-    end
-  end
-
-  class AWSEC2
-    def instances(host_regex, stack_regex, case_sensitive)
-      ec2.describe_instances.reservations.map(&:instances).flatten.map do |instance_data|
-        instance = EC2Instance.new(instance_data)
-        if stack_regex
-          next unless word_match?(instance.stack_name, stack_regex, case_sensitive)
-        end
-        if host_regex
-          next unless word_match?(instance.hostname, host_regex, case_sensitive)
-          next unless word_match?(instance.name, host_regex, case_sensitive)
-        end
-
-        instance
-      end.compact.sort_by(&:name)
-    end
-
-    def ec2
-      @ec2 ||= Aws::EC2::Client.new
-    end
-
-    def word_match?(value, regex_str, case_sensitive)
-      regex = case_sensitive ? /#{regex_str}/ : /#{regex_str}/i
-      !!(value =~ regex)
-    end
-  end
-end
-
-AWSSH::Runner.new.run