contexto 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de77f650841b467399bee6dbf2d29a5696109e56
-  data.tar.gz: 828dd1907ca53b14b6a157993f60e7c4ca2582f2
+  metadata.gz: ee3f0c704b3e64a3bf0a7918efd31722f4c75ed1
+  data.tar.gz: ad05060c02428b7ca51dc251faaa8e262dbca6c2
 SHA512:
-  metadata.gz: 89c7a8bd03f7354bdebe06e4160801f19984ed5ff55da37366287733ce8f74f2241a7d6e0410c0c8709c3484ad02525427d48d173fc7914e4391dce37156bacf
-  data.tar.gz: 041afed7733f84b832d593498cacce3bc7ae833f93d8c8e5e7c70ba4a44c4759328109f425fb5419801b6b5f55520d6a062e50b0cdd96cd682a0e406d5825ed5
+  metadata.gz: 654c9fac82ff73b4c37fe2afc391544350aacd5725a201d46b1f0b5f93c911e07e7ecc29db99cbc43a9e74f1583afa9f69f9b7675ee66dfdc07e607fe3b4679d
+  data.tar.gz: 1e8676c564d870af09e1e7cfa2db6ea4dc9710c4b501ed6d213121a42832542409951d0362aa49f6e7a20160dc41e22ea4df19db89e310155618dcc03029174a

data/README.md

@@ -103,6 +103,28 @@ Run options: --seed 52808
 ................................................E
 ```
 
+#### Shell on Docker host
+
+You can get an SSH shell on the Docker host too using the `--ssh` task.
+
+```shell
+$ contexto -c sandbox -s backend-app -t sidekiq --ssh
+
+                         ** Contexto Contextualizes **
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Last login: Sat Apr  1 18:58:38 2017 from ip-172-31-12-234.ec2.internal
+
+   __|  __|  __|
+   _|  (   \__ \   Amazon ECS-Optimized Amazon Linux AMI 2016.09.f
+ ____|\___|____/
+
+For documentation visit, http://aws.amazon.com/documentation/ecs
+9 package(s) needed for security, out of 19 available
+Run "sudo yum update" to apply all updates.
+[ec2-user@ip-10-2-1-221 ~]$
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/contexto

@@ -12,6 +12,7 @@ $stderr.sync = true
 
 options = {}
 options[:console]     = false
+options[:ssh]     = false
 
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: contexto [options]'
@@ -20,6 +21,7 @@ optparse = OptionParser.new do |opts|
   opts.on('-t', '--container CONTAINER', 'Container') { |v| options[:container] = v }
   opts.on('-r', '--rake COMMAND', 'Rake command') { |v| options[:rake] = v }
   opts.on('-b', '--console') { options[:console] = true }
+  opts.on('-f', '--ssh') { options[:ssh] = true }
 end
 
 begin

data/lib/contexto/contextualize.rb

@@ -4,7 +4,7 @@ require 'aws-sdk'
 module Contexto
   # ECS class
   class Contextualize
-    attr_reader :display, :cluster, :service, :container, :console, :rake
+    attr_reader :display, :cluster, :service, :container, :console, :ssh, :rake
 
     def initialize(params = {})
       @cluster = params.fetch(:cluster) if params[:cluster]
@@ -12,16 +12,19 @@ module Contexto
       @container = params.fetch(:container) if params[:container]
       @rake = params.fetch(:rake) if params[:rake]
       @console = params.fetch(:console)
+      @ssh = params.fetch(:ssh)
       @display = Contexto::Display.new
     end
 
     def run
-      if ssh?
+      if connect?
         task = describe_tasks
         ec2_instance_id = describe_container_instance(task[:container_instance_arn])
         @ssh = Contexto::SSH.new(describe_instances(ec2_instance_id), cluster, service, container)
         if console
           @ssh.console
+        elsif ssh
+          @ssh.ssh
         elsif rake
           @ssh.rake(rake)
         end
@@ -46,8 +49,8 @@ module Contexto
 
     private
 
-    def ssh?
-      (console || rake)
+    def connect?
+      (console || ssh || rake)
     end
 
     def show_clusters

data/lib/contexto/ssh.rb

@@ -14,15 +14,23 @@ module Contexto
     end
 
     def console
-      exec "#{cmd} c'\""
+      exec "#{ssh_cmd} #{cmd} c'\""
+    end
+
+    def ssh
+      exec "#{ssh_cmd}\""
     end
 
     def rake(rake_cmd)
       exec "#{cmd} #{rake_cmd}'\""
     end
 
+    def ssh_cmd
+      "ssh -t -A #{@bastion_host} \"ssh -t ec2-user@#{@ipaddress} "
+    end
+
     def cmd
-      "ssh -t -A #{@bastion_host} \"ssh -t ec2-user@#{@ipaddress} 'docker exec -it \\$(docker ps | grep ecs-#{@cluster}-#{@service}-.*-#{@container} | cut -d\\  -f1) bin/rails "
+      "'docker exec -it \\$(docker ps | grep ecs-#{@cluster}-#{@service}-.*-#{@container} | cut -d\\  -f1) bin/rails "
     end
   end
 end

data/lib/contexto/version.rb

@@ -1,4 +1,4 @@
 # Contexto version
 module Contexto
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contexto
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk