geordi 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cdbb8d2117f5dabfe50dd59aefd6350f0bc4ed432c34b84ed69c1eb7ec4deb8
-  data.tar.gz: 8c698261c37144cb4d5d237bb7617103cb662b442702f629c8a84bc2b90e46fd
+  metadata.gz: 601c58f6344b5fb02e2514749e216e60a6f6f1cc656d2a37eabb891cc013edfa
+  data.tar.gz: 07b06fa74266f0ba5506b8218e10c78b4156c854cef9bb8bca3fd77ba5b6d30a
 SHA512:
-  metadata.gz: 5073101d9cf2117115e5ae56ef1c702f7a809390b11a80aef7d18b8006ce6a57c2519e6ba46c2498bb08fdb7f41c1dc87393dc241faaaddff9f7f02d6fea09e6
-  data.tar.gz: ebbd01ff8e87137f89dccb27f8f57d2aca28c5993631957ec5d1c23cb23b24182b368748bcfb0dadd8f0c4d841218755ac34c4f3ba449333f3aa7b2c6f0c3e25
+  metadata.gz: 533ceae3f15d374526bafa76278914212de5b930250c8375c8f4cde1661e56d4c22093a4266c48b3646b023c4925599e2c46e0f93f38b52430a9748ce1778e7c
+  data.tar.gz: edf3b697d11b5ec5c932ccd6a60311325ea0d8ed50e3d0650aae3f63b8cd514374dfd465212aae82e6585daee7f7466113cf6b1dacbf430a2b7c95269c9b0dc2

data/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.2

data/CHANGELOG.md

@@ -7,27 +7,30 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 
 ### Compatible changes
-
 ### Breaking changes
 
 
-## 5.2.2 2020-12-17
+## 5.2.3 2021-01-27
 
 ### Compatible changes
+* Remove auto-bundling from `geordi shell` and remote `geordi console`
+
+
+## 5.2.2 2020-12-17
 
+### Compatible changes
 * Ignore ACL settings when loading a PostgreSQL dump
 
 
 ## 5.2.1 2020-12-15
 
 ### Compatible changes
-
 * Fix a bug regarding `geordi vnc` which was introduced in 5.1.0
 
+
 ## 5.2.0 2020-12-14
 
 ### Compatible changes
-
 * Geordi update will exit with a warning when Ruby version changes during pull.
 * Add `geordi docker` command with support for opening a shell for dockerized dev environments.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (5.2.2)
+    geordi (5.2.3)
       thor (~> 1)
 
 GEM

data/README.md

@@ -171,6 +171,7 @@ There are three subcommands:
   Fetches all docker containers.
 - `geordi docker shell`
   Runs the docker service named 'main'.
+  Append `--secondary` to open a second shell in a already running container.
 - `geordi docker vnc`
   Opens a VNC viewer to connect to the VNC server in the container.
 

data/lib/geordi/commands/console.rb

@@ -14,9 +14,9 @@ option :select_server, type: :string, aliases: '-s', banner: '[SERVER_NUMBER]',
 
 def console(target = 'development', *_args)
   require 'geordi/remote'
-  invoke_geordi 'bundle_install'
 
   if target == 'development'
+    invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'
 
     Interaction.announce 'Opening a local Rails console'

data/lib/geordi/commands/docker.rb

@@ -1,17 +1,17 @@
 class DockerCLI < Thor
-  desc 'setup', 'Setup docker and fetch required docker-container for the current project.'
+  desc 'setup', 'Setup docker and fetch required docker-container for the current project'
   def setup
     docker.setup
   end
 
-  desc 'shell', 'Open a shell in the main docker container for the current project.'
+  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(:secondary => options[:secondary])
   end
 
-  desc 'vnc', 'Open a vnc viewer connecting to the docker container.'
+  desc 'vnc', 'Open a vnc viewer connecting to the docker container'
   def vnc
     docker.vnc
   end
@@ -24,7 +24,7 @@ class DockerCLI < Thor
   end
 end
 
-desc 'docker', 'Manage docker containers for the current project.'
+desc 'docker', 'Manage docker containers for the current project'
 long_desc <<-LONGDESC
 Manage docker containers to run your project dockerized.
 
@@ -35,10 +35,12 @@ There are three subcommands:
 
 - `geordi docker setup`
   Fetches all docker containers.
+
 - `geordi docker shell`
   Runs the docker service named 'main'.
+  Append `--secondary` to open a second shell in an already running container.
+
 - `geordi docker vnc`
   Opens a VNC viewer to connect to the VNC server in the container.
-
 LONGDESC
 subcommand 'docker', DockerCLI

data/lib/geordi/commands/shell.rb

@@ -15,8 +15,6 @@ option :select_server, type: :string, aliases: '-s', banner: '[SERVER_NUMBER]',
 def shelll(target, *_args)
   require 'geordi/remote'
 
-  invoke_geordi 'bundle_install'
-
   Interaction.announce 'Opening a shell on ' + target
   Geordi::Remote.new(target).shell(options)
 end

data/lib/geordi/cucumber.rb

@@ -60,7 +60,7 @@ module Geordi
         VNC_ENV_VARIABLES.each do |variable|
           ENV["OUTER_#{variable}"] = ENV[variable] if ENV[variable]
         end
-        ENV['BROWSER'] = ENV['LAUNCHY_BROWSER'] = File.expand_path('../../bin/launchy_browser', __dir__)
+        ENV['BROWSER'] = ENV['LAUNCHY_BROWSER'] = File.expand_path('../../exe/launchy_browser', __dir__)
         ENV['DISPLAY'] = VNC_DISPLAY
 
         Interaction.note 'Run `geordi vnc` to view the Selenium test browsers'

data/lib/geordi/util.rb

@@ -1,5 +1,6 @@
 require 'geordi/interaction'
 require 'socket'
+require 'bundler'
 
 module Geordi
   class Util
@@ -167,15 +168,10 @@ module Geordi
       # Get the version for the given gem by parsing Gemfile.lock.
       # Returns nil if the gem is not used.
       def gem_version(gem)
-        # Lines look like `* will_paginate (2.3.15)` or `railslts-version (2.3.18.16 7f51cc7)`
-        bundle_list.split("\n").each do |line|
-          matches = line.match(/\* #{gem} \(([\d\.]+)/)
-          next if matches.nil? || matches[1].nil?
+        lock_file = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
+        spec = lock_file.specs.detect { |spec| spec.name == gem }
 
-          return Gem::Version.new(matches[1])
-        end
-
-        nil
+        spec && spec.version
       end
 
       def file_containing?(file, regex)
@@ -192,12 +188,6 @@ module Geordi
         string
       end
 
-      private
-
-      def bundle_list
-        @bundle_list ||= `bundle list`
-      end
-
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '5.2.2'.freeze
+  VERSION = '5.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails