awsssh 2.2.2 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f24f7623723256eaf5f5f55f4ebd96b1b6081893
-  data.tar.gz: 2de22c6cff24de85b7249978b393675587f7cfcb
+  metadata.gz: 0854a6413cf6ae7a3971665cc5e1424a648320b0
+  data.tar.gz: 109523c466e6e9331f3250b787138702fd949bc7
 SHA512:
-  metadata.gz: 61b7a1ed75de58607bdc5b05be2a8ec203d98d3cf5d6eeb7513835f3f1d0983c6b6a81d4d06aecc934766798598a76e62a17ef41175854cbb677854500a4c77f
-  data.tar.gz: ced442aab52f758bbf3765020bca0366606fffce8a7903e7eccb77cf633a0d43813b991c017aee3347f8e41865c028d8dfc9d974cee62ca09d4dbb7edf946450
+  metadata.gz: d1beffa40be5c1b8516c1ee15feaf95b39e32db9f9a75cebcfa07acf97aefe935680a2414abb8384befc90bd7e04d1ae5ce2d897afafc81bd8075ec64eed84f3
+  data.tar.gz: 599513c140e9c421e3ac2764070cb1d9dac9c72b7904bcdeae98082d71b949cd8ba3aaa1595b96ff3139e134c63a54b2a9e38b61cfd00cbf149c6a3bfec3d2bb

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    awsssh (3.0.0.rc1)
+      aws-sdk (~> 2.2.0, >= 2.2.0)
+      inifile (~> 3.0.0, >= 3.0.0)
+      thor (~> 0.19.1, >= 0.19.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-sdk (2.2.14)
+      aws-sdk-resources (= 2.2.14)
+    aws-sdk-core (2.2.14)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.14)
+      aws-sdk-core (= 2.2.14)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    inifile (3.0.0)
+    jmespath (1.1.3)
+    method_source (0.8.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    slop (3.6.0)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awsssh!
+  bundler (~> 1.8, >= 1.8.3)
+  pry (~> 0.10.3, >= 0.10.3)
+  rspec (~> 3.4.0, >= 3.4.0)

data/README.md

@@ -14,26 +14,54 @@ Mitlerweile ist aus `awsssh` ein richtiges gem geworden.
 1. `gem install awsssh`
 
 ### Configurationen
-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_`
+* Es muss die Variable `AWS_CREDENTIAL_FILE` auf das Credentialfile gesetzt sein.
+* In der Datei müssen die Zugangsdaten in der folgenden Form enthalten sein:
+```
+[PROFILE-1]
+aws_access_key_id=VALUE
+aws_secret_access_key=VALUE
+[PROFILE-n]
+aws_access_key_id=VALUE
+aws_secret_access_key=VALUE
+```
 
 ## Aufruf
 
-`awsssh -s HOST`
+### Mit Server verbinden
+
+Wenn der Profilname im Hostname enthalten ist:<br>
+`awsssh HOSTNAME`
+
+**Beispiel**<br>
+`awsssh profile-live-1`
+
+Wenn der Profilname nicht im Hostname enthalten ist:<br>
+`awsssh HOSTNAME --profile PROFILE`
 
 **Beispiel**<br>
-`awsssh -s kunde-live-1`
+`awsssh live-1 --profile KundeXY`
 
-## Hilfe
+### Liste aller Profile
+`awsssh list_profiles`
 
-`awsssh help`<br>
-Zeigt die Hilfe an
+### Liste aller Server für ein Profil
+`awsssh list_server PROFIL`
+
+### Hilfe
+`awsssh help`
+
+### Version
+`awsssh version`
 
 ## Kontakt
 
 Sebastian Thiele Twitter: (@sebat)
 
 ## Changelog
+**2016-02-04 - v 3.0.0.rc1**
+* redesign
+* new credential format
+
 **2015-11-25 - v 2.2.2**
 * [fix] List all Servers
 

data/awsssh.gemspec

@@ -18,13 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.8.3"
-  spec.add_development_dependency "rake", "~> 10.4.2"
-  spec.add_development_dependency "pry", "~> 0.10.1"
-  spec.add_development_dependency "rspec", "~> 2.6"
+  spec.add_development_dependency "bundler", "~> 1.8", ">= 1.8.3"
+  spec.add_development_dependency "pry", "~> 0.10.3", ">= 0.10.3"
+  spec.add_development_dependency "rspec", "~> 3.4.0", ">= 3.4.0"
 
-  spec.add_runtime_dependency "net-ssh", "2.7.0"
-  spec.add_runtime_dependency "inifile", "2.0.2"
-  spec.add_runtime_dependency "aws-sdk", "1.35.0"
-  spec.add_runtime_dependency "thor", "0.18.1"
+  spec.add_runtime_dependency "inifile", "~> 3.0.0", ">= 3.0.0"
+  spec.add_runtime_dependency "aws-sdk", "~> 2.2.0", ">= 2.2.0"
+  spec.add_runtime_dependency "thor", "~> 0.19.1", ">= 0.19.1"
 end

data/lib/awsssh/version.rb

@@ -1,3 +1,3 @@
 module Awsssh
-  VERSION = "2.2.2"
+  VERSION = "3.0.0.rc1"
 end

data/lib/awsssh.rb

@@ -1,211 +1,114 @@
 require "awsssh/version"
-require 'net/ssh'
-require 'json'
-require "aws-sdk"
-# Bundler.require(:default, :development)
-require "inifile"
 require "thor"
+require "inifile"
+require "aws-sdk"
+
 
 module Awsssh
   class Awsssh < Thor
-    CONFIG_DIR = ENV['AWSSSH_CONFIG_DIR'] || "/Users/#{ENV['USER']}/.aws/"
-    CONF_FILE = ENV['AWSSSH_CONFIG_FILE'] || "aws_config_"
-
-    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, :aliases => '-l', :desc => "List any items use with -s for Servers or -a ACCOUNT for accounts", :type => :boolean
-    option :check, :aliases => '-c', :desc => "Alerts when -c STATE comes up for -s SERVER"
-    option :version, :aliases => '-v', :desc => "Version"
-    long_desc <<-LONGDESC
-      # Connect to a Server:
-
-
-      > $ awsssh -s SERVER
-      \x5 This will connect you to a Server. This will work only if the first part of the server name is the same as the account name.
-
-      > $ awsssh -s SERVER -a ACCOUNT
-      \x5 With -a you can spezify a account to connect with. The server name don't play any role.
-
-      # List all Account:
-
-      > $ awsssh -l -a
-      \x5 This will list all Accounts
 
-      # List all Servers for a Account
-
-      > $ awsssh -l -s ACCOUNT
-      \x5 List all Servers vor Account ACCOUNT
-
-      # Check Server Status
-
-    LONGDESC
-    def connect
-      if options[:list] && options[:account]
-        list_accounts
-      elsif options[:list] && options[:server]
-        list_servers(options[:server])
-      elsif options[:server]
-        connecting(options[:server], options[:account])
-      elsif options[:version]
-        puts VERSION
-      else
-        help "connect"
+    desc "list_profiles", "List all your avavible profiles"
+    def list_profiles()
+      credentials = open_credantial_file
+      puts "List of all known AWS Accounts"
+      puts
+      credentials.sections.each do |section|
+        puts "   #{section}"
       end
     end
 
-    def help(*args)
-      super("connect")
-    end
+    desc "list_server PROFILE", "List all Server for given profile"
+    def list_server(profile)
+      credentials = open_credantial_file
+      raise "Profile `#{profile}` not found. Please try `awsssh list_profiles`" if credentials[profile].empty?
+      aws_connection(profile, credentials)
 
-    private
+      puts "Stacks and instances for profile `#{profile}`"
+      puts
 
-      ##
-      # 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]
+      @client.describe_stacks.stacks.each do |stack|
+        puts "##### Stack: #{stack.name}"
+        @client.describe_instances({stack_id: stack.stack_id}).instances.each do |instance|
+          printf "             %-20s status: %-11s %s\n" % [instance.hostname, instance.status, public_dns(instance)]
         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}`)
+        puts ""
       end
+    end
 
-      ##
-      # 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
+    desc "connect SERVERNAME", "Connect to Hostname"
+    option :profile, :desc => "specify a profile - see `awsssh list_profiles`"
+    def connect (hostname)
+      hostname_parts = hostname.split("-")
+      profile = options[:profile] || hostname_parts[0]
+      credentials = open_credantial_file
+      puts "Profile `#{profile}` not found. Try `awsssh SERVERNAME --profile PROFILE`" if credentials[profile].empty?
+      exit -1 if credentials[profile].empty?
+
+      aws_connection(profile, credentials)
+      puts "looking for hostname `#{hostname}` in profile `#{profile}`. This may take a while..."
+      puts
+      public_dns = find_server(@client.describe_stacks.stacks, hostname)
+      if public_dns.nil?
+        puts "`#{hostname}` was not found or has no public ip."
+        puts "Try `awsssh list_server PROFILE`"
+        puts "checking your local ssh config..."
+        puts
+        exec "ssh #{hostname}"
+        exit -1
+      else
+        puts "start ssh connection to `#{hostname}`..."
+        puts
+        exec "ssh #{public_dns}"
+        exit 0
       end
+    end
 
-      ##
-      # Server Name
-      #
-      # * *Args*  :
-      #   - +stack+ -> Stack as JSON
-      #
-      # * *Returns* :
-      #   - [String]
-      #     - <servername> (<status>)
-      def server_name(stack)
-        stack[:instances].each do |instance|
-          host = build_hostname(instance)
-          printf "\t- %-20s %s \t %-15s \t %s\n", instance[:hostname], instance[:status], host[:ip], host[:hostname]
-        end
-      end
+    desc "version", "Version"
+    def version
+      puts "version #{VERSION}"
+    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
-        end
-      end
 
-      ##
-      # 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 = build_hostname(i)[:hostname]
-              break
-            end
-          end
-          break unless public_dns.nil?
-        end
+    private
 
-        if public_dns.nil?
-          puts "Server '#{server}' not found. Try ssh"
-          exec "ssh #{server}"
-          exit -1
-        end
+    ##
+    # open and check credential file
+    #
+    def open_credantial_file()
+      raise "Enviroment variable `AWS_CREDENTIAL_FILE` not set" if ENV['AWS_CREDENTIAL_FILE'].nil?
+      raise "Credential File not found. Please check path `#{ENV['AWS_CREDENTIAL_FILE']}`" unless File.exist?(ENV['AWS_CREDENTIAL_FILE'])
+      IniFile.load(ENV['AWS_CREDENTIAL_FILE'])
+    end
 
-        puts "Connecting to #{server} (#{public_dns})"
-        exec "ssh #{public_dns}"
+    ##
+    #
+    def aws_connection(profile, credentials = nil)
+      credentials ||= open_credantial_file
+      @client = Aws::OpsWorks::Client.new({
+        region: credentials[profile]["region"],
+        credentials: Aws::Credentials.new(
+          credentials[profile]["aws_access_key_id"],
+          credentials[profile]["aws_secret_access_key"]
+        )
+      })
+    end
 
-      end
+    def public_dns(instance)
+      public_ip = instance.public_ip || instance.elastic_ip
+      return nil if public_ip == nil
+      "ec2-#{public_ip.gsub(".", "-")}.#{instance.availability_zone.chop}.compute.amazonaws.com"
+    end
 
-      def build_hostname(instance)
-        host = {}
-        if instance[:status] != 'online'
-          host[:ip] = host[:hostname] = nil
-          return host
+    def find_server(stacks, hostname)
+      stacks.each do |stack|
+        @client.describe_instances({stack_id: stack.stack_id}).instances.each do |instance|
+          return public_dns(instance) if instance.hostname == hostname
         end
-        az = (instance[:availability_zone][-1].match(/[a-z]/)) ?
-          instance[:availability_zone][0..-2] :
-          instance[:availability_zone]
-        host[:ip] = instance[:public_ip] || instance[:elastic_ip]
-        host[:hostname] = "ec2-#{host[:ip].gsub("\.", "\-")}.#{az}.compute.amazonaws.com"
-        host
       end
+      return nil
+    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
 end

data/spec/awsssh_spec.rb

@@ -8,10 +8,10 @@ describe Awsssh::Awsssh do
     capture(:stdout) { runner.send(*args, &block) }
   end
 
-  describe "on list stacks" do
-    it "lists all stacks" do
+  describe "on list server" do
+    it "lists all server" do
       base = Awsssh::Awsssh.new ["-s"]
-      base.send(:list_stacks, 'trox').class.should eq [].class
+      expect(base.send(:list_server, 'trox').class).to eq [].class
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsssh
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Sebastian Thiele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,112 +16,120 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 3.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+        version: 3.4.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 2.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 description: This will connects you with an EC2 instace
 email:
 - Sebastian.Thiele@infopark.de
@@ -132,6 +140,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -155,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2