geordi 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ae46d6ac8d8dd9bf53654f65445df1d0c576833db47db589b76e94cbb5784c0
-  data.tar.gz: 0034075de2f4f848686463486854cfaaee3980918048ce3480c3d6dc50634f0b
+  metadata.gz: '080677a5fee73a4a5ddc02c2f68b5927ec66cb95b328ccbac62abf6aa26d0e19'
+  data.tar.gz: 78da560700b6bd7e72424fa1d7f5df556e88d2b80e834aaf7582f6012e31d94c
 SHA512:
-  metadata.gz: c52e541c8204de7e79e2935211251001b9992898770632eca578678eae5b58d4d8edb5c64b2ec82fa4f797109adc76091f9293a4bd2e3a0567c1a65a050791ab
-  data.tar.gz: 63bdba922fb2eaccd2edd3fffe233abc67fce88587606fea218685b4ee682181ea5f8c6daf728227dfa736d838327eef6f1ae930f67dec056dcd6c23fb0d6a85
+  metadata.gz: 10384fad288da0e83e9add107b9b46dcfb83c9f06c777389975127a10d98e94829ffd9414b1607246a31fbfc201d5f732934072ad93e95bb07f28eeac174388e
+  data.tar.gz: d76fae6a3b79ebf391aa51df3b9348c263e5903afb1dd89b53f99e2893469bac285b5a5f438d5d120cfa60f5938b22d84e882f7b2dd1aa0f6d966e3b82af8f4c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (2.12.0)
+    geordi (2.12.1)
       thor (~> 0.18.0)
 
 GEM
@@ -13,16 +13,9 @@ 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)
@@ -30,40 +23,18 @@ 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)
@@ -71,25 +42,7 @@ 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
@@ -101,9 +54,7 @@ DEPENDENCIES
   highline
   launchy
   parallel_tests
-  pry
   rspec-mocks
-  tracker_api
 
 BUNDLED WITH
    1.17.3

data/features/docker.feature

@@ -30,7 +30,7 @@ Feature: The docker command
     Then the output should contain "x Your project does not seem to be properly set up."
 
 
-  Scenario: Setup runs docker-compose build
+  Scenario: Setup runs docker-compose pull
     Given a file named "docker-compose.yml" with:
     """
     services:
@@ -38,7 +38,7 @@ Feature: The docker command
     """
 
     When I run `geordi docker setup`
-    Then the output should contain "docker-compose build"
+    Then the output should contain "docker-compose pull"
 
 
   Scenario: Shell checks for existence of docker
@@ -48,12 +48,15 @@ Feature: The docker command
       And the output should contain "x You need to install docker first"
 
 
-  Scenario: Shell runs docker-compose run maiun
+  Scenario: Shell runs docker-compose run main
     Given a file named "docker-compose.yml" with:
     """
     services:
       main: foo
     """
+      And I set the environment variables to:
+        | variable      | value             |
+        | SSH_AUTH_SOCK | /path/to/sock/ssh |
 
     When I run `geordi docker shell`
-    Then the output should contain "docker-compose run --service-ports main"
+    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"

data/lib/geordi/commands/docker.rb

@@ -10,6 +10,11 @@ class DockerCLI < Thor
     docker.shell
   end
 
+  desc 'vnc', 'Open a vnc viewer connecting to the docker container.'
+  def vnc
+    docker.vnc
+  end
+
   private
 
   def docker

data/lib/geordi/cucumber.rb

@@ -13,7 +13,7 @@ module Geordi
     VNC_DISPLAY = ':17'
     VNC_SERVER_DEFAULT_OPTIONS = '-localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024'
     VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} #{ENV.fetch('GEORDI_VNC_OPTIONS', VNC_SERVER_DEFAULT_OPTIONS)}"
-    VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}"
+    VNC_VIEWER_COMMAND = "vncviewer"
     VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER]
 
     def run(files, cucumber_options, options = {})
@@ -30,10 +30,10 @@ module Geordi
       system command # Util.system! would reset the Firefox PATH
     end
 
-    def launch_vnc_viewer
+    def launch_vnc_viewer(source = VNC_DISPLAY)
       fork {
         error = capture_stderr do
-          system(VNC_VIEWER_COMMAND)
+          system(VNC_VIEWER_COMMAND, source)
         end
         unless $?.success?
           if $?.exitstatus == 127

data/lib/geordi/docker.rb

@@ -1,4 +1,5 @@
 require 'geordi/interaction'
+require 'geordi/cucumber'
 require 'yaml'
 
 module Geordi
@@ -10,7 +11,7 @@ module Geordi
     def setup
       check_installation_and_config
       announce('Building containers...')
-      if execute(:system, 'docker-compose', 'build')
+      if execute(:system, 'docker-compose', 'pull')
         success('Build successful.')
       else
         fail('Build failed.')
@@ -19,7 +20,14 @@ module Geordi
 
     def shell
       check_installation_and_config
-      execute(:exec, 'docker-compose', 'run', '--service-ports', 'main')
+      command = [:exec, 'docker-compose', 'run', '--service-ports']
+      command += ssh_agent_forward
+      command += ['main']
+      execute(*command)
+    end
+
+    def vnc
+      Cucumber.new.launch_vnc_viewer('::5967')
     end
 
     private
@@ -67,5 +75,14 @@ module Geordi
     rescue
       false
     end
+
+    def ssh_agent_forward
+      if (auth_sock = ENV['SSH_AUTH_SOCK'])
+        dirname = File.dirname(auth_sock)
+        ['-v', "#{dirname}:#{dirname}", '-e', "SSH_AUTH_SOCK=#{auth_sock}"]
+      else
+        []
+      end
+    end
   end
 end

data/lib/geordi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor