awsssh 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDM3MTZlNjg5OWM0YzMyMjkzMzdjYzQzNTAyOWJkODkzZjA5YzAxNQ==
+    YTMzY2U5MjNjMDU2ZDlmNGMyN2E3MDcxNThhMzA5OGY4OTRjMzRmZg==
   data.tar.gz: !binary |-
-    MGE1NjAxYWIzZDE2YTRjMjlhNWY2YzM5OGM2ZDFjODhjMjE3OWQwZg==
+    Y2NhM2I3NGY0ZTk1OTYxODFkMDhhMWUwM2QzZTgwZDNhMzhiOTI3OQ==
 SHA512:
   metadata.gz: !binary |-
-    MmQ4MjRkNGUzNjUxMjVhNmQxNjllYzQ3Yjg5NGExZDRjYzA2OTQ4YzA4MTVl
-    OTE0OTliYWE1MDQwODJhMzRlNGQ1ZTYxZjEzN2YzODI5OTE5YmQ0YjhjZDhm
-    NmU5M2Y3ODIxOWY5MTM5Mzc3MWUxNDFhOGM5OGQwM2RlM2Q4ZmM=
+    ZDQyYjY1MjBiNDBmZmIwZjRjNjYzM2JlNGVkMzM4ZWUyMGQxZTYzMWVjNGJm
+    OTA2N2JjNDAyZTI1YTQ0ZGVkYjZlMGQwOGQxMzRhNDliYmM4ZTY1NDg0N2I0
+    ZDMyYzVmMDRmMzRkNmJhMzk4ZWJkNTVmMjY1MjY3ZTcyNmRmOWU=
   data.tar.gz: !binary |-
-    OGE5NzdiM2FhYjE3MWIyOGI3OGNhZGZjNWVjNGI2M2JiM2ZlYzU5NzFiM2U2
-    ZGUwOGY5ZTg3YzM1Y2U1MWJkYWZkYjE3YjM5ZmE3OWMwMTFlNDg5ZjRjMGM3
-    Y2YwZTM2NmMxODczNDg0YjQyOGFhMDRhYTQ3OTA5YTkwNzVmNDc=
+    MzY5YmYzZjc2Mjk3NDA0MjBjNTgyM2M3ZTY4MDRhODk1MzYwY2U4ZmRhNzQw
+    NzAwNDgyM2Q5YjJlNmVhOTZlNGY4MzFhNzkzMDM5NDA0Njg1ZThhZDY4ZDQ3
+    M2M3YmY2ZjRlN2ZlNDU5MTljZGNkYzEyZmI1ODE4ZGNlZTBkYzc=

data/README.md

@@ -1,43 +1,53 @@
 # AWSSSH
 
-Im [Mitarbeiterhandbuch](https://employeeapps.infopark.de/manual/03_Security) sind SSH-Configurationen vorgegeben, mit denen man alle AWS-EC2s abfängt.
-Da ich aber nicht jedesmal nachschauen will, wie der Public-DNS Name einer instance ist, will ich das weiterhin in meiner ssh config pflegen und habe dort einträge wie:
+Mit hilfe dieses Gems kann man sich auf alle (bekannten) AWS EC2 Instancen verbinden die man durch seine Configurationen erreichen darf.
+Momentan ist das beschränkt auf EC2 Instancen, die durch OpsWorks verwaltet werden.
 
-```Host sihl-live1
-  Hostname ec2-54-194-243-71.eu-west-1.compute.amazonaws.com```
-
-da ein Aufruf von `$ ssh sihl-live1` dann aber die einstellung ignoriert der umweg über dieses script.
+Da sich die IP und der Public DNS der Server bei jedem Neustart ändern kann fragt dieses Gem immer bei AWS nach der aktuellen IP/DNS Name.
 
 ## Installation
 
-1. Herunterladen
-2. an die Stelle verschieben, an der es am ende liegen soll
-3. wenn bei 2. nicht /usr/* angegeben ist `rake install` ausführen. Das erstellt ein Link in `/usr/local/bin`
+Mitlerweile ist aus `awsssh` ein richtiges gem geworden.
+
+1. `gem install awsssh`
 
 ### Configurationen
-1. Das zum Umschalten der AWS Config muss das script über `awscfg <kundenname>` aufrufbar sein.
-2. Die Konfigurationsdateien müssen unter `/Users/<username>/.aws/` liegen.
-3. Die Konfigurationsdateien müssen den Namen `aws_config_<kundenname>` heißen.
+1. Die Konfigurationsdateien müssen unter `/Users/<username>/.aws/` liegen. Wenn dem nicht so ist muss es eine Umgebungsvariable geben, die den Pfad zu den Configurationsdateien beinhaltet: `export ENV['AWSSSH_CONFIG_DIR']=/path/to/configs/`
+3. Die Konfigurationsdateien müssen den Namen `aws_config_<kundenname>` haben. Wenn dem nicht so ist muss es eine Umgebungsvariable geben, die den Anfang der Configurationsdateien beinhaltet: `export ENV['AWSSSH_CONFIG_FILE']=awsconf_`
 
 ## Aufruf
 
-`awsssh HOST`
+`awsssh -s HOST`
 
 **Beispiel**<br>
-`awsssh sihl-live1`
+`awsssh -s kunde-live-1`
 
 ## Hilfe
 
-`awsssh --help`<br>
+`awsssh help`<br>
 Zeigt die Hilfe an
 
-## Inhalte
+## Kontakt
 
-`Gemfile`: zum installieren aller benötigten gems<br>
-`README.md`: diese README<br>
-`Rakefile`: für die installation<br>
-`awsssh.rb`: Erstellt die verbidnung (Programmlogik)<br>
+Sebastian Thiele (@sethiele)
 
-## Kontakt
+## Changelog
+
+**2014-03-05** - v 2.1.1
+* [enh] using thor as CLI Class
+* **New connection call** call `awsssh -s SERVER`
+* [enh] use a account for connections `awsssh -s SERVER -a ACCOUNT`
+
+**2014-03-04** - v 2.1.0
+* [enh] use AWS Ruby SDK
+* [enh] use ENV variables to access configurations
+
+**2014-02-27** - v 2.0.1 *the Ronald Fix*
+* [code] Code optimization
+* [enh] return a error message if config not found
+
+**2014-02-14** - v 2.0.0
+* [enh] first gem version
 
-Sebastian Thiele <[mailto:sebastian.thiele@infopark.de]>
+**earlier**
+* Some experiences

data/awsssh.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'awsssh'
-  s.version     = '2.1.0'
-  s.date        = '2014-02-27'
+  s.version     = '2.1.1'
+  s.date        = '2014-03-05'
   s.summary     = "Connects you with OpsWorks EC2"
-  s.description = "This will connects you with an EC3 instace"
+  s.description = "This will connects you with an EC2 instace"
   s.authors     = ["Sebastian Thiele"]
   s.email       = [%w(Sebastian.Thiele infopark.de).join('@')]
   s.license     = "MIT"
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "net-ssh", "2.7.0"
   s.add_runtime_dependency "inifile", "2.0.2"
   s.add_runtime_dependency "aws-sdk", "1.35.0"
+  s.add_runtime_dependency "thor", "0.18.1"
 end

data/bin/awsssh

@@ -2,4 +2,4 @@
 
 require "awsssh"
 
-Awsssh.new.do_start()
+Awsssh.start(ARGV)

data/lib/awsssh.rb

@@ -5,182 +5,166 @@ require 'json'
 require "aws-sdk"
 # require "pry"
 require "inifile"
+require "thor"
 
-class Awsssh
+class Awsssh < Thor
   CONFIG_DIR = ENV['AWSSSH_CONFIG_DIR'] || "/Users/#{ENV['USER']}/.aws/"
   CONF_FILE = ENV['AWSSSH_CONFIG_FILE'] || "aws_config_"
 
-  def do_start
-    if ARGV[0] == "--list-accounts"
+  desc "-s SERVER [-a ACCOUNT]", "connect to a server"
+  option :server, :aliases => :s, :desc => "(required) The server name to connect with"
+  option :account, :aliases => :a, :desc => "Specify a account for a connection. Needet if the account don't came from the server name"
+  option :list_accounts, :type => :boolean, :desc => "List all Accounts"
+  option :list_servers, :desc => "List all Servers for a given Account"
+  def connect
+    if options[:server]
+      connecting(options[:server], options[:account])
+    elsif options[:list_accounts]
       list_accounts
-    elsif ARGV[0] == "--list-servers" && !ARGV[1].nil?
-      list_servers(ARGV[1])
-    elsif !ARGV[0].nil? && ARGV[0][0,2] != "--"
-      connect ARGV[0]
+    elsif options[:list_servers]
+      list_servers(options[:list_servers])
+    elsif options[:server]
+      connecting(options[:server], options[:account])
     else
-      help
+      help "connect"
     end
   end
 
-  ##
-  # Renders the Help
-  #
-  # * *Returns* :
-  # - [String]
-  #       usage: awsssh [<instance-name>|parameters]
-  #                <instance-name>                Name of the instance
-  #       parameters:
-  #                --help                         This help
-  #                --list-accounts                List all known AWS Accounts
-  #                --list-servers <account>       List all Server for an AWS Account
-
-  def help
-    length = 30
-    puts "usage: awsssh [<instance-name>|parameters]"
-    printf "\t %-#{length}s Name of the instance\n", "<instance-name>"
-    puts  "parameters:"
-    printf "\t %-#{length}s This help\n", "--help"
-    printf "\t %-#{length}s List all known AWS Accounts\n", "--list-accounts"
-    printf "\t %-#{length}s List all Server for an AWS Account\n", "--list-servers <account>"
+  def help(*args)
+    super("connect")
   end
 
-
-  ##
-  # List stacks for a account
-  #
-  # * *Args*  :
-  #   - +account+ -> Account name
-  #
-  # * *Returns* :
-  #   - [Array] StackIDs
-
-  def list_stacks(account)
-    ow = awscfg(account)
-    stacks = ow.client.describe_stacks[:stacks]
-    stack_ids = []
-    stacks.each do |stack|
-      stack_ids << stack[:stack_id]
+  private
+    ##
+    # List stacks for a account
+    #
+    # * *Args*  :
+    #   - +account+ -> Account name
+    #
+    # * *Returns* :
+    #   - [Array] StackIDs
+    def list_stacks(account)
+      ow = awscfg(account)
+      stacks = ow.client.describe_stacks[:stacks]
+      stack_ids = []
+      stacks.each do |stack|
+        stack_ids << stack[:stack_id]
+      end
+      return stack_ids
     end
-    return stack_ids
-  end
-
-
-  ##
-  # Read Stack
-  #
-  # * *Args*  :
-  #   - +stackid+ -> Stack ID
-  #   - +account+ -> Account name
-  #
-  # * *Returns* :
-  #   - Stecks JSON
-  #
 
-  def read_stack(stackid, account)
-    ow = awscfg(account)
-    ow.client.describe_instances({:stack_id => stackid})
-    # JSON.parse(`aws opsworks describe-instances --stack-id #{stackid}`)
-  end
 
-  ##
-  # Lists all AWS Accounts
-  #
-  # * *Returns* :
-  #   - [String]
-  #       This are the known AWS Accounts:
-  #               - account
+    ##
+    # Read Stack
+    #
+    # * *Args*  :
+    #   - +stackid+ -> Stack ID
+    #   - +account+ -> Account name
+    #
+    # * *Returns* :
+    #   - Stecks JSON
+    #
+    def read_stack(stackid, account)
+      ow = awscfg(account)
+      ow.client.describe_instances({:stack_id => stackid})
+      # JSON.parse(`aws opsworks describe-instances --stack-id #{stackid}`)
+    end
 
-  def list_accounts
-    length = 30
-    puts "This are the known AWS Accounts:"
-    config_files = Dir.entries(CONFIG_DIR)
-    config_files.each do |file|
-      if file[0,CONF_FILE.length] == CONF_FILE
-        file_part = file.split("_")
-        unless file_part.last.nil?
-          printf "\t- %-#{length}s\n", file_part[2]
+    ##
+    # Lists all AWS Accounts
+    #
+    # * *Returns* :
+    #   - [String]
+    #       This are the known AWS Accounts:
+    #               - account
+    def list_accounts
+      length = 30
+      puts "This are the known AWS Accounts:"
+      config_files = Dir.entries(CONFIG_DIR)
+      config_files.each do |file|
+        if file[0,CONF_FILE.length] == CONF_FILE
+          file_part = file.split("_")
+          unless file_part.last.nil?
+            printf "\t- %-#{length}s\n", file_part[2]
+          end
         end
       end
     end
-  end
-
-  ##
-  # Server Name
-  #
-  # * *Args*  :
-  #   - +stack+ -> Stack as JSON
-  #
-  # * *Returns* :
-  #   - [String]
-  #     - <servername> (<status>)
 
-  def server_name(stack)
-    stack[:instances].each do |instance|
-      printf "\t- %-20s %s\n", instance[:hostname], instance[:status]
+    ##
+    # Server Name
+    #
+    # * *Args*  :
+    #   - +stack+ -> Stack as JSON
+    #
+    # * *Returns* :
+    #   - [String]
+    #     - <servername> (<status>)
+    def server_name(stack)
+      stack[:instances].each do |instance|
+        printf "\t- %-20s %s\n", instance[:hostname], instance[:status]
+      end
     end
-  end
-
-  ##
-  # List all Servers for a given AWS Account
-  #
-  # * *Args*    :
-  #   - +account+ -> AWS Account name
-  #
 
-  def list_servers(account)
-    stacks = list_stacks account
-    stacks.each do |stack_id|
-      stack = read_stack stack_id, account
-      server_name stack
+    ##
+    # List all Servers for a given AWS Account
+    #
+    # * *Args*    :
+    #   - +account+ -> AWS Account name
+    #
+    def list_servers(account)
+      stacks = list_stacks account
+      stacks.each do |stack_id|
+        stack = read_stack stack_id, account
+        server_name stack
+      end
     end
-  end
 
-  ##
-  # Establish the connection
-  #
-  # * *Args*  :
-  #   - +server+ -> Server name
-  #
-
-  def connect(server)
-    host = server.split("-")
-    public_dns = nil
-    stack_ids = list_stacks host[0]
-    stack_ids.each do |stack_id|
-      stack = read_stack(stack_id, host[0])
-      stack.instances.each do |i|
-        if i[:hostname] == server
-          public_dns = i[:public_dns]
-          break
+    ##
+    # Establish the connection
+    #
+    # * *Args*  :
+    #   - +server+ -> Server name
+    #
+    def connecting(server, account=nil)
+      public_dns = nil
+      host = server.split("-")
+      ac = account || host[0]
+      stack_ids = list_stacks ac
+      stack_ids.each do |stack_id|
+        stack = read_stack(stack_id, ac)
+        stack.instances.each do |i|
+          if i[:hostname] == server
+            public_dns = i[:public_dns]
+            break
+          end
         end
+        break unless public_dns.nil?
       end
-      break unless public_dns.nil?
-    end
 
-    if public_dns.nil?
-      puts "Server '#{server}' not found. Try ssh"
-      exec "ssh #{server}"
-      exit -1
-    end
-
-    puts "Connecting to #{server} (#{public_dns})"
-    exec "ssh #{public_dns}"
+      if public_dns.nil?
+        puts "Server '#{server}' not found. Try ssh"
+        exec "ssh #{server}"
+        exit -1
+      end
 
-  end
+      puts "Connecting to #{server} (#{public_dns})"
+      exec "ssh #{public_dns}"
 
-  def awscfg(account)
-    if cnf = IniFile.load(CONFIG_DIR + CONF_FILE + account)['default']
-      return AWS::OpsWorks.new(
-        access_key_id: cnf['aws_access_key_id'], 
-        secret_access_key: cnf['aws_secret_access_key'], 
-        region: cnf['region']
-      )
-    else
-      puts "No config #{CONF_FILE}#{account} found"
-      exit -1
     end
-  end
-
-
 
+    def awscfg(account)
+      if cnf = IniFile.load(CONFIG_DIR + CONF_FILE + account)
+        cnf = cnf['default']
+        return AWS::OpsWorks.new(
+          access_key_id: cnf['aws_access_key_id'], 
+          secret_access_key: cnf['aws_secret_access_key'], 
+          region: cnf['region']
+        )
+      else
+        puts "No config #{CONF_FILE}#{account} found. Maybe use -a to specify a account."
+        exit -1
+      end
+    end
+  default_task :connect
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsssh
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sebastian Thiele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -52,7 +52,21 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.35.0
-description: This will connects you with an EC3 instace
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+description: This will connects you with an EC2 instace
 email:
 - Sebastian.Thiele@infopark.de
 executables: