geordi 2.12.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080677a5fee73a4a5ddc02c2f68b5927ec66cb95b328ccbac62abf6aa26d0e19'
-  data.tar.gz: 78da560700b6bd7e72424fa1d7f5df556e88d2b80e834aaf7582f6012e31d94c
+  metadata.gz: 72b80aa5fcd6e4f4bb048f76aac069a7cb99310a3900b933f53c5549e737f52e
+  data.tar.gz: 1a0bba5ab27c1759e9b0b5a7f3b79f946596605d903129f332f53f4afb33b324
 SHA512:
-  metadata.gz: 10384fad288da0e83e9add107b9b46dcfb83c9f06c777389975127a10d98e94829ffd9414b1607246a31fbfc201d5f732934072ad93e95bb07f28eeac174388e
-  data.tar.gz: d76fae6a3b79ebf391aa51df3b9348c263e5903afb1dd89b53f99e2893469bac285b5a5f438d5d120cfa60f5938b22d84e882f7b2dd1aa0f6d966e3b82af8f4c
+  metadata.gz: aa1a3c5c3bc2278cb10f347d4b94dbea177cb94a65ce27459819cc32f87a82a6cf9408f4e659fdc3d9ca1f005e957f82e0867063d645367aec2019f721159ead
+  data.tar.gz: fd92c28543206ac2c61dca8efa017a944612e6ce84fa3f7c513b9b9056e358dc7423dae3163d3954cc56d4abf974620c76c9469a1c2a832f46836923fc0c0da1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (2.12.1)
+    geordi (2.12.2)
       thor (~> 0.18.0)
 
 GEM
@@ -13,9 +13,16 @@ GEM
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
       rspec-expectations (>= 2.99)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     contracts (0.9)
     cucumber (1.3.20)
       builder (>= 2.1.2)
@@ -23,18 +30,40 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    equalizer (0.0.11)
+    excon (0.78.0)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     ffi (1.9.18)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     highline (1.6.21)
+    ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     multi_json (1.15.0)
     multi_test (0.1.2)
+    multipart-post (2.1.1)
     parallel (0.5.16)
     parallel_tests (0.6.18)
       parallel
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
@@ -42,7 +71,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    ruby2_keywords (0.0.2)
     thor (0.18.1)
+    thread_safe (0.3.6)
+    tracker_api (1.11.0)
+      addressable
+      equalizer
+      excon
+      faraday
+      faraday_middleware
+      mimemagic
+      multi_json
+      representable
+      virtus
+    uber (0.1.0)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
@@ -54,7 +101,9 @@ DEPENDENCIES
   highline
   launchy
   parallel_tests
+  pry
   rspec-mocks
+  tracker_api
 
 BUNDLED WITH
    1.17.3

data/features/docker.feature

@@ -48,7 +48,7 @@ Feature: The docker command
       And the output should contain "x You need to install docker first"
 
 
-  Scenario: Shell runs docker-compose run main
+  Scenario: Shell runs docker-compose run main, and docker-compose stop
     Given a file named "docker-compose.yml" with:
     """
     services:
@@ -60,3 +60,27 @@ Feature: The docker command
 
     When I run `geordi docker shell`
     Then the output should contain "docker-compose run --service-ports -v /path/to/sock:/path/to/sock -e SSH_AUTH_SOCK=/path/to/sock/ssh main"
+    Then the output should contain "docker-compose stop"
+
+
+  Scenario: One can attach to a running shell
+    Given the docker command finds a running shell "project_main_run_foo"
+      And a file named "docker-compose.yml" with:
+    """
+    services:
+      main: foo
+    """
+
+    When I run `geordi docker shell --secondary`
+    Then the output should contain "Could not find a running shell"
+
+
+  Scenario: Attaching fails if no shell is running
+    Given a file named "docker-compose.yml" with:
+    """
+    services:
+      main: foo
+    """
+
+    When I run `geordi docker shell --secondary`
+    Then the output should contain "Could not find a running shell"

data/features/step_definitions/docker_command_steps.rb

@@ -8,3 +8,14 @@ Given(/the docker command cannot find the "(.*?)" binary/) do |command|
     end
   end
 end
+
+Given(/^the docker command finds a running shell "(.*?)"$/) do |shell_name|
+  require 'geordi/docker'
+  expect_any_instance_of(Geordi::Docker).to receive(:mock_parse).at_least(:once).and_wrap_original do |original, *args|
+    if args[0] =~ /docker-compose ps/
+      "other_shell\nshell_name foo"
+    else
+      original.call(*args)
+    end
+  end
+end

data/lib/geordi/commands/docker.rb

@@ -5,9 +5,10 @@ class DockerCLI < Thor
   end
 
   desc 'shell', 'Open a shell in the main docker container for the current project.'
+  option :secondary, default: false, :type => :boolean
   map 'shell' => '_shell'
   def _shell
-    docker.shell
+    docker.shell(:secondary => options[:secondary])
   end
 
   desc 'vnc', 'Open a vnc viewer connecting to the docker container.'

data/lib/geordi/docker.rb

@@ -18,12 +18,13 @@ module Geordi
       end
     end
 
-    def shell
+    def shell(options = {})
       check_installation_and_config
-      command = [:exec, 'docker-compose', 'run', '--service-ports']
-      command += ssh_agent_forward
-      command += ['main']
-      execute(*command)
+      if options[:secondary]
+        attach_to_running_shell
+      else
+        run_shell
+      end
     end
 
     def vnc
@@ -32,10 +33,32 @@ module Geordi
 
     private
 
+    def attach_to_running_shell
+      running_containers = execute(:`, 'docker-compose ps').split("\n")
+      if (main_container_line = running_containers.grep(/_main_run/).first)
+        container_name = main_container_line.split(' ').first
+        execute(:system, 'docker', 'exec', '-it', container_name, 'bash')
+      else
+        fail('Could not find a running shell. Start without --secondary first.')
+      end
+    end
+
+    def run_shell
+      command = [:system, 'docker-compose', 'run', '--service-ports']
+      command += ssh_agent_forward
+      command += ['main']
+      execute(*command)
+      execute(:system, 'docker-compose', 'stop')
+    end
+
     def execute(kind, *args)
       if ENV['GEORDI_TESTING']
         puts "Stubbed run #{args.join(' ')}"
-        mock_run(*args)
+        if kind == :`
+          mock_parse(*args)
+        else
+          mock_run(*args)
+        end
       else
         send(kind, *args)
       end
@@ -46,6 +69,11 @@ module Geordi
       true
     end
 
+    def mock_parse(*args)
+      # exists just to be stubbed in tests
+      'command output'
+    end
+
     def check_installation_and_config
       unless command_exists?('docker')
         fail('You need to install docker first with `sudo apt install docker`. After installation please log out and back in to your system once.')

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '2.12.1'
+  VERSION = '2.12.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Henning Koch