geordi 3.2.0 → 4.2.0

data/lib/geordi/commands/vnc.rb

@@ -4,15 +4,13 @@ Example: `geordi vnc` or `geordi vnc --setup`
 
 Launch a VNC session to the hidden screen where `geordi cucumber` runs Selenium
 tests.
-
-When called with `--setup`, will guide through the setup of VNC.
 LONGDESC
 
-option :setup, type: :boolean
+option :setup, type: :boolean, desc: 'Guide through the setup of VNC'
 
 def vnc
   if options.setup
-    invoke_cmd :_setup_vnc
+    invoke_geordi :_setup_vnc
   else
     require 'geordi/cucumber'
     Geordi::Cucumber.new.launch_vnc_viewer

data/lib/geordi/commands/with_rake.rb

@@ -1,11 +1,11 @@
 desc 'with-rake', 'Run tests with `rake`', hide: true
 def with_rake
   if Util.file_containing?('Rakefile', /^task.+default.+(spec|test|feature)/)
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
 
     Interaction.announce 'Running tests with `rake`'
-    Util.system! 'rake'
+    Util.run!(Util.binstub_or_fallback('rake'))
   else
     Interaction.note '`rake` does not run tests.'
     :did_not_perform

data/lib/geordi/commands/yarn_install.rb

@@ -3,6 +3,6 @@ desc 'yarn-install', 'Runs yarn install if required', hide: true
 def yarn_install
   if File.exist?('package.json') && !system('yarn check --integrity > /dev/null 2>&1')
     Interaction.announce 'Yarn install'
-    Util.system! 'yarn install'
+    Util.run!('yarn install')
   end
 end

data/lib/geordi/cucumber.rb

@@ -27,7 +27,7 @@ module Geordi
       Interaction.note_cmd(command) if options[:verbose]
 
       puts # Make newline
-      system command # Util.system! would reset the Firefox PATH
+      system command # Util.run! would reset the Firefox PATH
     end
 
     def launch_vnc_viewer
@@ -74,7 +74,7 @@ module Geordi
       unless argv.include?('--format') || argv.include?('-f')
         format_args = spinner_available? ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
       end
-      [use_firefox_for_selenium, 'b', 'cucumber', format_args, escape_shell_args(argv)].flatten.compact.join(' ')
+      [use_firefox_for_selenium, Util.binstub_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
     end
 
     def parallel_execution_command
@@ -87,7 +87,7 @@ module Geordi
 
       [
         use_firefox_for_selenium,
-        'b parallel_test -t ' + type_arg,
+        'bundle exec parallel_test -t ' + type_arg,
         %(-o '#{command_line_options.join(' ')} --tags "#{not_tag('@solo')}"'),
         "-- #{features.join(' ')}",
       ].compact.join(' ')

data/lib/geordi/dump_loader.rb

@@ -57,7 +57,7 @@ module Geordi
       Interaction.note 'Source file: ' + dump_file
 
       source_command = send("#{config['adapter']}_command")
-      Util.system! source_command, fail_message: "An error occured loading #{File.basename(dump_file)}"
+      Util.run! source_command, fail_message: "An error occured loading #{File.basename(dump_file)}"
     end
 
   end

data/lib/geordi/gitpt.rb

@@ -89,7 +89,7 @@ No staged changes. Will create an empty commit.
     extra = highline.ask("\nAdd an optional message").strip
     message << ' - ' << extra if extra != ''
 
-    Geordi::Util.system! 'git', 'commit', '--allow-empty', '-m', message, *git_args
+    Geordi::Util.run!(['git', 'commit', '--allow-empty', '-m', message, *git_args])
   end
 
   def bold(string)

data/lib/geordi/interaction.rb

@@ -24,7 +24,7 @@ module Geordi
     end
 
     # Like `note`, but pink. Use to print (bash) commands.
-    # Also see Util.system!
+    # Also see Util.run!
     def note_cmd(text)
       message = "> #{text}"
       puts "\e[35m#{message}\e[0m" # pink

data/lib/geordi/remote.rb

@@ -31,9 +31,10 @@ module Geordi
     end
 
     def dump(options = {})
+      database = options[:database] ? " #{options[:database]}" : ''
       # Generate dump on the server
       shell options.merge({
-        remote_command: "dumple #{@config.env} --for_download",
+        remote_command: "dumple #{@config.env}#{database} --for_download",
       })
 
       destination_directory = File.join(@config.root, 'tmp')
@@ -43,9 +44,9 @@ module Geordi
 
       Interaction.note "Downloading remote dump to #{relative_destination} ..."
       server = @config.primary_server
-      Util.system! "scp -C #{@config.user(server)}@#{server}:#{REMOTE_DUMP_PATH} #{destination_path}"
+      Util.run!("scp -C #{@config.user(server)}@#{server}:#{REMOTE_DUMP_PATH} #{destination_path}")
 
-      Interaction.success "Dumped the #{@stage} database to #{relative_destination}."
+      Interaction.success "Dumped the#{database} #{@stage} database to #{relative_destination}."
 
       destination_path
     end
@@ -74,7 +75,7 @@ module Geordi
       remote_command << " -c '#{options[:remote_command]}'" if options[:remote_command]
 
       Interaction.note 'Connecting to ' + server.to_s
-      Util.system! 'ssh', "#{@config.user(server)}@#{server}", '-t', remote_command
+      Util.run!(['ssh', "#{@config.user(server)}@#{server}", '-t', remote_command])
     end
 
   end

data/lib/geordi/settings.rb

@@ -8,7 +8,7 @@ module Geordi
     GLOBAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/global_settings.yml'.freeze : File.join(ENV['HOME'], '.config/geordi/global.yml').freeze
     LOCAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/local_settings.yml'.freeze : './.geordi.yml'.freeze
 
-    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key ].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver ].freeze
     ALLOWED_LOCAL_SETTINGS = %w[ use_vnc pivotal_tracker_project_ids ].freeze
 
     def initialize
@@ -25,6 +25,15 @@ module Geordi
       save_global_settings
     end
 
+    def auto_update_chromedriver
+      @global_settings["auto_update_chromedriver"] || false
+    end
+
+    def auto_update_chromedriver=(value)
+      @global_settings['auto_update_chromedriver'] = value
+      save_global_settings
+    end
+
     # Local settings
     # They should not be changed by geordi to avoid unexpected diffs, therefore
     # there are no setters for these settings
@@ -129,7 +138,7 @@ module Geordi
     def inquire_pt_api_key
       Geordi::Interaction.warn 'Your settings are missing or invalid.'
       Geordi::Interaction.warn "Please configure your Pivotal Tracker access."
-      token = Geordi::Interaction.prompt 'Your API key:'
+      token = Geordi::Interaction.prompt('Your API key:').to_s # Just be sure
       self.pivotal_tracker_api_key = token
       puts
 

data/lib/geordi/util.rb

@@ -21,7 +21,7 @@ module Geordi
         # install missing gem
         Interaction.warn 'Probably missing gem: ' + gem_name
         Interaction.prompt('Install it now?', 'y', /y|yes/) || Interaction.fail('Missing Gems.')
-        system! install_command, show_cmd: true
+        Util.run!(install_command, show_cmd: true)
 
         # retry
         Gem.clear_paths
@@ -33,42 +33,60 @@ module Geordi
       # Run a command with a clean environment.
       # Print an error message and exit if the command fails.
       #
-      # @option show_cmd: Whether to print the command
-      # @option confirm: Whether to ask for confirmation before running it
-      # @option fail_message: The text to print on command failure
-      def system!(*commands)
-        options = commands.last.is_a?(Hash) ? commands.pop : {}
-        Interaction.note_cmd commands.join(' ') if options[:show_cmd]
-
-        if options[:confirm]
+      # show_cmd: Whether to print the command
+      # confirm: Whether to ask for confirmation before running it
+      # fail_message: The text to print on command failure
+      def run!(command, show_cmd: false, confirm: false, fail_message: 'Something went wrong.')
+        # Disable shell features for arrays https://stackoverflow.com/questions/13338147/ruby-system-method-arguments
+        # Conversion: ['ls *', 'some arg'] => ['ls', '*', 'some arg']
+        # If you need shell features, you need to pass in a String instead of an array.
+        if command.is_a?(Array)
+          real_command, *arguments = *command
+          command = [real_command.split(' '), arguments].flatten
+          printable_command = command.join(', ')
+        else
+          printable_command = command
+        end
+
+        if show_cmd
+          Interaction.note_cmd printable_command
+        end
+
+        if confirm
           Interaction.prompt('Run this now?', 'n', /y|yes/) or Interaction.fail('Cancelled.')
         end
 
         if testing?
-          puts "Util.system! #{commands.join ', '}"
+          puts "Util.run! #{printable_command}"
         else
           # Remove Geordi's Bundler environment when running commands.
           success = if !defined?(Bundler)
-            system(*commands)
+            system(*command)
           elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.1.2')
             Bundler.with_original_env do
-              system(*commands)
+              system(*command)
             end
           else
-            Bundler.clean_system(*commands)
+            Bundler.clean_system(*command)
           end
 
-          success || Interaction.fail(options[:fail_message] || 'Something went wrong.')
+          success || Interaction.fail(fail_message)
         end
       end
 
+      def binstub_or_fallback(executable)
+        binstub_file = "bin/#{executable}"
+
+        File.exists?(binstub_file) ? binstub_file : "bundle exec #{executable}"
+      end
+
       def console_command(environment)
         if gem_major_version('rails') == 2
           'script/console ' + environment
         elsif gem_major_version('rails') == 3
-          'bundle exec rails console ' + environment
+          "#{binstub_or_fallback('rails')} console #{environment}"
         else
-          "bundle exec rails console -e #{environment}"
+          "#{binstub_or_fallback('rails')} console -e #{environment}"
         end
       end
 
@@ -76,7 +94,7 @@ module Geordi
         if gem_major_version('rails') == 2
           'script/server ""'
         else
-          'bundle exec rails server'
+          "#{binstub_or_fallback('rails')} server"
         end
       end
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '3.2.0'.freeze
+  VERSION = '4.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,23 +30,9 @@ email:
 - henning.koch@makandra.de
 executables:
 - b
-- cap-all
-- console-for
-- cuc
-- cuc-show
-- cuc-vnc-setup
-- deploy-to-production
-- dump-for
 - dumple
 - geordi
-- gitpt
 - launchy_browser
-- load-dump
-- migrate-all
-- rs
-- run_tests
-- shell-for
-- tests
 extensions: []
 extra_rdoc_files: []
 files:
@@ -60,23 +46,9 @@ files:
 - README.md
 - Rakefile
 - exe/b
-- exe/cap-all
-- exe/console-for
-- exe/cuc
-- exe/cuc-show
-- exe/cuc-vnc-setup
-- exe/deploy-to-production
-- exe/dump-for
 - exe/dumple
 - exe/geordi
-- exe/gitpt
 - exe/launchy_browser
-- exe/load-dump
-- exe/migrate-all
-- exe/rs
-- exe/run_tests
-- exe/shell-for
-- exe/tests
 - geordi.gemspec
 - lib/geordi.rb
 - lib/geordi/COMMAND_TEMPLATE
@@ -98,7 +70,6 @@ files:
 - lib/geordi/commands/deploy.rb
 - lib/geordi/commands/drop_databases.rb
 - lib/geordi/commands/dump.rb
-- lib/geordi/commands/eurest.rb
 - lib/geordi/commands/firefox.rb
 - lib/geordi/commands/migrate.rb
 - lib/geordi/commands/png_optimize.rb
@@ -126,11 +97,13 @@ files:
 - lib/geordi/settings.rb
 - lib/geordi/util.rb
 - lib/geordi/version.rb
-homepage: http://makandra.com
+homepage: https://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: "* Binary `geordi` installed\n"
+post_install_message: |
+  * Binary `geordi` installed
+  * Geordi 4 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
 rdoc_options: []
 require_paths:
 - lib
@@ -145,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails

data/exe/cap-all

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi ca[pistrano]` instead'
-exec 'geordi', 'capistrano', *ARGV

data/exe/console-for

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi con[sole]` instead'
-exec 'geordi', 'console', *ARGV

data/exe/cuc

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi cu[cumber]` instead'
-exec 'geordi', 'cucumber', *ARGV

data/exe/cuc-show

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi vn[c]` instead'
-exec 'geordi', 'vnc'

data/exe/cuc-vnc-setup

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi vn[c] --setup` instead'
-exec 'geordi', 'vnc', '--setup'

data/exe/deploy-to-production

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi dep[loy]` instead'
-exec 'geordi', 'deploy'

data/exe/dump-for

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-if (i = ARGV.index '-s')
-  ARGV[i] = '-l'
-end
-
-puts 'DEPRECATED: Use `geordi du[mp]` instead'
-exec 'geordi', 'dump', *ARGV

data/exe/gitpt

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi com[mit]` instead'
-exec 'geordi', 'commit'

data/exe/load-dump

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi du[mp] -l` instead'
-exec 'geordi', 'dump', '-l', *ARGV

data/exe/migrate-all

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi m[igrate]` instead'
-exec 'geordi', 'migrate'

data/exe/rs

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi rs[pec]` instead'
-exec 'geordi', 'rspec', *ARGV

data/exe/run_tests

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi f[irefox]` instead'
-exec 'geordi', 'firefox', *ARGV

data/exe/shell-for

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi sh[ell]` instead'
-exec 'geordi', 'shell', *ARGV

data/exe/tests

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'DEPRECATED: Use `geordi t[est]` instead'
-exec 'geordi', 'test'