awsssh 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b969975c60d12fb9fd8ca034d1ffb0d7621246b
-  data.tar.gz: 769bfd7c5de0f13466dcf0d595158741a920f2f9
+  metadata.gz: 71e530b89ccea7c6954872d846d25a9fa50f1827
+  data.tar.gz: 461fb7bbe46bb14a47d01ea81e18fb6067b7978b
 SHA512:
-  metadata.gz: 6cb828c344ab11d3d8e8ff0046bca635cfe4c5a0cec735b544cacfef1b82cbd2615825f3322952cc9f4dbd0336e8cd7a0f6267a432f2df21d4bef0aebc2c592f
-  data.tar.gz: e8ee0bd457af118a8036bec8ed7a637b6177c9ff43244ae41915ccc713d2043dc2d6abebcffe10f46e2f737afd7d470d7c37dd5f8ee9e1bac30fcbfdabb25b2c
+  metadata.gz: 9f29fc4c05cbe9da050d7dc0efa8dae84a2b80da3d1a561eedcd1cdfbce1f7765833dae7315677ccc47c83c2450b8c2d9d1e62ca7e298cdc3c441f584a04c775
+  data.tar.gz: 95383297c9c9f82410e0b576cb6dc56b0e093b497344894e88374c20680ae4f0b64f12921759381a4ecc4ad1a2c9749fa1132721b807dfc8268b9bddb7be4fd5

data/README.md

@@ -61,6 +61,12 @@ issues:
 [github](https://github.com/sethiele/awsssh)
 
 ## Changelog
+**2016-02-24 - v 3.1.0**
+* [enh] Show only online Server
+* [enh] colors in output
+* [enh] connect to server from list_server
+* [fix] error message for list_servers with unkown profile
+
 **2016-02-18 - v 3.0.0**
 * readme in english
 * Tests

data/awsssh.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   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"
+  spec.add_runtime_dependency "colorize", "~> 0.7.7"
 end

data/features/running.feature

@@ -8,36 +8,3 @@ Feature: Running the program
     When I run `awsssh version`
     Then the exit status should be 0
     And the output should contain "version"
-
-  Scenario: User runs the program with list_profiles parameter
-    Given a file named "bla" with:
-    """
-    [testprofile]
-    aws_access_key_id=ABC
-    aws_secret_access_key=XYZ
-    region=us-east-1
-    """
-    When I run `awsssh list_profiles`
-    Then the output should contain "testprofile"
-
-  Scenario: User runs the program with list_server parameter
-    When I run `awsssh list_server`
-    Then the exit status should be 0
-    And the output should contain "ERROR"
-    And the output should contain "Usage"
-
-  Scenario: User runs the programm without `AWS_CREDENTIAL_FILE`
-    Given I set the environment variables to:
-      | variable           | value      |
-      | AWS_CREDENTIAL_FILE |  |
-    When I run `awsssh list_profiles`
-    Then the output should contain "$AWS_CREDENTIAL_FILE not set"
-    And the exit status should not be 0
-
-  Scenario: User runs the programm woth wrong `AWS_CREDENTIAL_FILE`
-    Given I set the environment variables to:
-      | variable           | value      |
-      | AWS_CREDENTIAL_FILE | ./test.txt |
-    When I run `awsssh list_profiles`
-    Then the output should contain "Credential File not found."
-    And the exit status should not be 0

data/features/running_list_profiles.feature

@@ -0,0 +1,27 @@
+Feature: Running the program with list_profiles
+  Scenario: User runs the program
+    Given a file named "credentials" with:
+    """
+    [testprofile]
+    aws_access_key_id=ABC
+    aws_secret_access_key=XYZ
+    region=us-east-1
+    """
+    When I run `awsssh list_profiles`
+    Then the output should contain "testprofile"
+
+  Scenario: User runs without `AWS_CREDENTIAL_FILE`
+    Given I set the environment variables to:
+      | variable           | value      |
+      | AWS_CREDENTIAL_FILE |  |
+    When I run `awsssh list_profiles`
+    Then the output should contain "$AWS_CREDENTIAL_FILE not set"
+    And the exit status should not be 0
+
+  Scenario: User runs with wrong `AWS_CREDENTIAL_FILE`
+    Given I set the environment variables to:
+      | variable           | value      |
+      | AWS_CREDENTIAL_FILE | ./test.txt |
+    When I run `awsssh list_profiles`
+    Then the output should contain "Credential File not found."
+    And the exit status should not be 0

data/features/running_list_server.feature

@@ -0,0 +1,18 @@
+Feature: Running the program with list_server
+  Scenario: User runs the program without profile
+    When I run `awsssh list_server`
+    Then the exit status should be 0
+    And the output should contain "ERROR"
+    And the output should contain "Usage"
+
+  Scenario: User runs the program with unknown profile
+    Given a file named "credentials" with:
+    """
+    [testprofile]
+    aws_access_key_id=ABC
+    aws_secret_access_key=XYZ
+    region=us-east-1
+    """
+    When I run `awsssh list_server unkown`
+    Then the output should contain "Profile `unkown` not found. Try `awsssh list_profiles`"
+    And the exit status should not be 0

data/features/support/env.rb

@@ -1,4 +1,4 @@
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-ENV['AWS_CREDENTIAL_FILE'] = "bla"
+ENV['AWS_CREDENTIAL_FILE'] = "credentials"
 
 require 'aruba/cucumber'

data/lib/awsssh/version.rb

@@ -1,3 +1,3 @@
 module Awsssh
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/lib/awsssh.rb

@@ -2,11 +2,24 @@ require "awsssh/version"
 require "thor"
 require "inifile"
 require "aws-sdk"
+require "colorize"
 
 
 module Awsssh
   class Awsssh < Thor
 
+    def initialize(*args)
+      super
+      @text_colors = {
+        :infotext => :cyan,
+        :infotext_sub => :yellow,
+        :status => {
+          :online => :green,
+          :stopped => :light_red
+          }
+        }
+    end
+
     desc "list_profiles", "List all your avavible profiles"
     def list_profiles()
       credentials = open_credantial_file
@@ -18,30 +31,61 @@ module Awsssh
     end
 
     desc "list_server PROFILE", "List all Server for given profile"
+    method_option :all, :type => :boolean, :aliases => "-a", :default => false, :desc => "Show all Server"
     def list_server(profile)
       credentials = open_credantial_file
-      raise "Profile `#{profile}` not found. Please try `awsssh list_profiles`" if credentials[profile].empty?
+
+      puts "Profile `#{profile}` not found. Try `awsssh list_profiles`" if credentials[profile].empty?
+      exit -1 if credentials[profile].empty?
+
       aws_connection(profile, credentials)
 
-      puts "Stacks and instances for profile `#{profile}`"
+      puts "Stacks and instances for profile `#{profile}`".colorize(@text_colors[:infotext])
+      puts "only online server".colorize(@text_colors[:infotext_sub]) unless options[:all]
       puts
 
+      server_number = 0
+      server_online = []
+
       @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)]
+          if instance.status == "online"
+            server_number+=1
+            server_online[server_number] = public_dns = public_dns(instance)
+            printf("[%02d]" % [server_number])
+          else
+            print "    "
+            public_dns = "-"
+          end
+          printf "         %-20s status: %-11s %s\n".colorize(@text_colors[:status][instance.status.to_sym]) % [instance.hostname, instance.status, public_dns] if instance.status == "online" or options[:all]
         end
         puts ""
       end
+      while true
+        print "Would you like to connect to any server directly? Please enter Server number (Enter to exit): "
+        server_to_connect = STDIN.gets.chomp
+        if server_to_connect.to_i != 0 and !server_online[server_to_connect.to_i].nil?
+          puts "connecting to #{server_online[server_to_connect.to_i]}"
+          puts
+          puts
+          connect_server server_online[server_to_connect.to_i]
+        elsif server_to_connect.to_i > server_online.length+1
+          puts "No Server sellected"
+          puts
+        else
+          break;
+        end
+      end
     end
 
     desc "connect SERVERNAME", "Connect to Hostname"
-    option :profile, :desc => "specify a profile - see `awsssh list_profiles`"
+    method_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?
+      puts "Profile `#{profile}` not found. Try `awsssh connect SERVERNAME --profile PROFILE`" if credentials[profile].empty?
       exit -1 if credentials[profile].empty?
 
       aws_connection(profile, credentials)
@@ -53,13 +97,11 @@ module Awsssh
         puts "Try `awsssh list_server PROFILE`"
         puts "checking your local ssh config..."
         puts
-        exec "ssh #{hostname}"
-        exit -1
+        connect_server hostname
       else
         puts "start ssh connection to `#{hostname}`..."
         puts
-        exec "ssh #{public_dns}"
-        exit 0
+        connect_server public_dns
       end
     end
 
@@ -122,5 +164,10 @@ module Awsssh
       end
       return nil
     end
+
+    def connect_server(hostname)
+      exec "ssh #{hostname}"
+      exit 0
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsssh
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Sebastian Thiele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,6 +140,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 description: This will connects you with an EC2 instace
 email: Sebastian.Thiele@infopark.de
 executables:
@@ -156,6 +170,8 @@ files:
 - awsssh.gemspec
 - bin/awsssh
 - features/running.feature
+- features/running_list_profiles.feature
+- features/running_list_server.feature
 - features/step_definitions/running_steps.rb
 - features/support/env.rb
 - lib/awsssh.rb
@@ -187,6 +203,8 @@ specification_version: 4
 summary: Connects you with OpsWorks EC2
 test_files:
 - features/running.feature
+- features/running_list_profiles.feature
+- features/running_list_server.feature
 - features/step_definitions/running_steps.rb
 - features/support/env.rb
 has_rdoc: