geordi 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4359df61d9901b0d3091ef950530212fb9ba92847425d136a42c4668d6745462
-  data.tar.gz: c6cf00413126337330997068a59f097f226cdc41f9feb97d8523996d77ceeba5
+  metadata.gz: 693551524b9b50f70e2daf649cd8184cc197b1576153beaf675ebaae01a88e84
+  data.tar.gz: 915a4c3e1449f0883e31bd828a850354db26bcdcf57523ffdf28ade6e51bee1e
 SHA512:
-  metadata.gz: 6a2b44bbe812e2a20bd2002ee64f3925108203f188d88e7da0f590cf2b7d2f4e01c744525c778cce47f6e1990ec44b2df65a95adaaa15cb4a6e2d3a8167ceddb
-  data.tar.gz: 0f6441323fc798aba02f8d6947a803504e9bb11d3714001e1840959a90cf3763e590f45e112d94b6494996f78101bd73e5a7fb62440359c9c9b402dd1b9bc2a9
+  metadata.gz: bcbd43ffb224b54a7ba553c6bbcab6931d06b15df4a5e2e3eb9a93fe019187df47174bb2b61030a54d2408fb80235a1937eae7ff0a0f3c17e58756d3cbfc94b0
+  data.tar.gz: 03ef92df5d677f51ee70bec10bf035034824980b5c16c15c38e587de5b2a2cf683ddbce64067695e566fc9ee207d26af6f1986d909210b9fda61d9570bb91add

data/.ruby-version

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

data/CHANGELOG.md

@@ -7,14 +7,41 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 
 ### Compatible changes
-
 ### Breaking changes
 
+## 5.3.0 2021-02-01
 
-## 5.2.0 2020-12-14
+### Compatible changes
+* Changed: Dumping and loading a database will not keep the database dump in `tmp/` but delete it once the operation finishes successfully. Example: `geordi dump staging -l` will remove the file `tmp/staging.dump` after it loaded the dump.
+
+
+## 5.2.4 2021-01-29
 
 ### Compatible changes
+* Fix and improve delete-dumps command (now supporting multiple arguments)
+
+
+## 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.0)
+    geordi (5.3.0)
       thor (~> 1)
 
 GEM

data/README.md

@@ -111,13 +111,13 @@ in `.geordi.yml` in the project root.
 ### `geordi delete-dumps [DIRECTORY]`
 Delete database dump files (*.dump).
 
-Example: `geordi delete_dumps` or `geordi delete_dumps ~/tmp/dumps`
+Example: `geordi delete-dumps` or `geordi delete-dumps ~/tmp/dumps`
 
-Recursively search for files ending in `*.dump` and offer to delete those. When
+Recursively searches for files ending in `.dump` and offers to delete them. When
 no argument is given, two default directories are searched for dump files: the
 current working directory and `~/dumps` (for dumps created with geordi).
 
-Geordi will ask for confirmation before actually deleting files.
+Will ask for confirmation before actually deleting files.
 
 
 ### `geordi deploy [STAGE]`
@@ -169,8 +169,11 @@ 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.
 
@@ -423,11 +426,9 @@ Once you have completed your modifications, please update CHANGELOG and README
 as needed. Use `rake readme` to regenerate the Geordi section of the README from
 the command documentations.
 
-Make sure tests are green in the default Ruby *plus* in the oldest Ruby > 1.8
-that you have installed on your system (1.8.7 support has been dropped).
-
-Before releasing your changes, wait for the Travis results to see that tests
-passed in all Ruby versions.
+Make sure tests are green in the oldest supported Ruby version. Before releasing
+a new gem version, wait for the CI results to see that tests are green in all
+Ruby versions.
 
 
 Adding a new command

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/delete_dumps.rb

@@ -1,43 +1,41 @@
 desc 'delete-dumps [DIRECTORY]', 'Delete database dump files (*.dump)'
 long_desc <<-LONGDESC
-Example: `geordi delete_dumps` or `geordi delete_dumps ~/tmp/dumps`
+Example: `geordi delete-dumps` or `geordi delete-dumps ~/tmp/dumps`
 
-Recursively search for files ending in `*.dump` and offer to delete those. When
+Recursively searches for files ending in `.dump` and offers to delete them. When
 no argument is given, two default directories are searched for dump files: the
 current working directory and `~/dumps` (for dumps created with geordi).
 
-Geordi will ask for confirmation before actually deleting files.
+Will ask for confirmation before actually deleting files.
 LONGDESC
 
-def delete_dumps(dump_directory = nil)
-  deletable_dumps = []
-  dump_directories = if dump_directory.nil?
-    [
-      File.join(Dir.home, 'dumps'),
-      Dir.pwd,
-    ]
-  else
-    [dump_directory]
+def delete_dumps(*locations)
+  Interaction.announce 'Retrieving dump files'
+
+  dump_files = []
+  if locations.empty?
+    locations = [ File.join(Dir.home, 'dumps'), Dir.pwd ]
   end
-  Interaction.announce 'Looking for *.dump in ' << dump_directories.join(',')
-  dump_directories.each do |d|
-    d_2 = File.expand_path(d)
-    unless File.directory? File.realdirpath(d_2)
-      Interaction.warn "Directory #{d_2} does not exist"
+  locations.map! &File.method(:expand_path)
+
+  Interaction.note "Looking in #{locations.join(', ')}"
+  locations.each do |dir|
+    directory = File.expand_path(dir)
+    unless File.directory? File.realdirpath(directory)
+      Interaction.warn "Directory #{directory} does not exist. Skipping."
       next
     end
-    deletable_dumps.concat(Dir.glob("#{d_2}/**/*.dump"))
+    dump_files.concat Dir.glob("#{directory}/**/*.dump")
   end
+  deletable_dumps = dump_files.flatten.uniq.sort.select &File.method(:file?)
+
   if deletable_dumps.empty?
-    Interaction.success 'No dumps to delete' if deletable_dumps.empty?
-    exit 0
-  end
-  deletable_dumps.uniq!.sort!
-  Interaction.note 'The following dumps can be deleted:'
-  puts
-  puts deletable_dumps
-  Interaction.prompt('Delete those dumps', 'n', /y|yes/) || raise('Cancelled.')
-  deletable_dumps.each do |dump|
-    File.delete dump unless File.directory? dump
+    Interaction.note 'No dump files found'
+  else
+    puts deletable_dumps
+    Interaction.prompt('Delete these files?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
+
+    deletable_dumps.each &File.method(:delete)
+    Interaction.success 'Done.'
   end
 end

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

@@ -11,7 +11,7 @@ module Geordi
   class Cucumber
 
     VNC_DISPLAY = ':17'.freeze
-    VNC_PASSWORD_FILE = File.absolute_path('~/.vnc/passwd').freeze # default for "vncpasswd"
+    VNC_PASSWORD_FILE = File.expand_path('~/.vnc/passwd').freeze # default for "vncpasswd"
     VNC_SERVER_DEFAULT_OPTIONS = "-localhost -nolisten tcp -geometry 1280x1024 -rfbauth #{VNC_PASSWORD_FILE}".freeze
     VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} #{ENV.fetch('GEORDI_VNC_OPTIONS', VNC_SERVER_DEFAULT_OPTIONS)}".freeze
     VNC_VIEWER_COMMAND = "vncviewer -passwd #{VNC_PASSWORD_FILE}".freeze
@@ -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/dump_loader.rb

@@ -34,7 +34,7 @@ module Geordi
 
     def postgresql_command
       ENV['PGPASSWORD'] = config['password']
-      command = 'pg_restore --no-owner --clean'
+      command = 'pg_restore --no-owner --clean --no-acl'
       command << ' --username=' << config['username'].to_s if config['username']
       command << ' --port=' << config['port'].to_s if config['port']
       command << ' --host=' << config['host'].to_s if config['host']
@@ -58,6 +58,10 @@ module Geordi
 
       source_command = send("#{config['adapter']}_command")
       Util.run! source_command, fail_message: "An error occured loading #{File.basename(dump_file)}"
+
+      Interaction.announce 'Clean up'
+      Interaction.note 'Removing: ' + dump_file
+      Util.run!("rm #{dump_file}")
     end
 
   end

data/lib/geordi/remote.rb

@@ -59,7 +59,7 @@ module Geordi
       server_option = options[:select_server]
       server_number = server_option.to_i
 
-      server =  if server_option == 'select_server'
+      server = if server_option == 'select_server'
         select_server
       elsif server_number != 0 && server_number <= @config.servers.count
         server_index = server_number - 1

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.0'.freeze
+  VERSION = '5.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-02-01 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.1.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails