geordi 4.1.0 → 5.1.0

data/lib/geordi/commands/unit.rb

@@ -1,11 +1,11 @@
 desc 'unit', 'Run Test::Unit'
 def unit
   if File.exist?('test/test_helper.rb')
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
 
     Interaction.announce 'Running Test::Unit'
-    Util.system! Util.binstub('rake'), 'test'
+    Util.run!([Util.binstub_or_fallback('rake'), 'test'])
   else
     Interaction.note 'Test::Unit not employed.'
   end

data/lib/geordi/commands/update.rb

@@ -11,12 +11,12 @@ option :test, type: :boolean, aliases: '-t', desc: 'After updating, run tests'
 
 def update
   Interaction.announce 'Updating repository'
-  Util.system! 'git pull', show_cmd: true
+  Util.run!('git pull', show_cmd: true)
 
-  invoke_cmd 'migrate'
+  invoke_geordi 'migrate'
 
   Interaction.success 'Successfully updated the project.'
 
-  invoke_cmd 'dump', options.dump, load: true if options.dump
-  invoke_cmd 'tests' if options.test
+  invoke_geordi 'dump', options.dump, load: true if options.dump
+  invoke_geordi 'tests' if options.test
 end

data/lib/geordi/commands/vnc.rb

@@ -10,7 +10,7 @@ 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! Util.binstub('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

@@ -11,8 +11,9 @@ module Geordi
   class Cucumber
 
     VNC_DISPLAY = ':17'.freeze
-    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} -localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024".freeze
-    VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}".freeze
+    VNC_PASSWORD_FILE = File.absolute_path('~/.vnc/passwd').freeze # default for "vncpasswd"
+    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} -localhost -nolisten tcp -geometry 1280x1024 -rfbauth #{VNC_PASSWORD_FILE}".freeze
+    VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY} -passwd #{VNC_PASSWORD_FILE}".freeze
     VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER].freeze
 
     def run(files, cucumber_options, options = {})
@@ -27,7 +28,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 +75,7 @@ module Geordi
       unless argv.include?('--format') || argv.include?('-f')
         format_args = spinner_available? ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
       end
-      [use_firefox_for_selenium, Util.binstub('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

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,50 +33,62 @@ 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
+          show_command = command
+        else
+          show_command = [command]
+        end
+
+        if show_cmd
+          # Join with spaces for better readability and copy-pasting
+          Interaction.note_cmd show_command.join(' ')
+        end
+
+        if confirm
           Interaction.prompt('Run this now?', 'n', /y|yes/) or Interaction.fail('Cancelled.')
         end
 
         if testing?
-          puts "Util.system! #{commands.join ', '}"
+          # Join with commas for precise argument distinction
+          puts "Util.run! #{show_command.join(', ')}"
         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(executable, *arguments)
+      def binstub_or_fallback(executable)
         binstub_file = "bin/#{executable}"
 
-        command = File.exists?(binstub_file) ? [binstub_file] : ['bundle exec', executable]
-        command.push(*arguments)
-        command.join(' ')
+        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
-          binstub 'rails', 'console', environment
+          "#{binstub_or_fallback('rails')} console #{environment}"
         else
-          binstub 'rails', 'console -e', environment
+          "#{binstub_or_fallback('rails')} console -e #{environment}"
         end
       end
 
@@ -84,7 +96,7 @@ module Geordi
         if gem_major_version('rails') == 2
           'script/server ""'
         else
-          binstub 'rails', 'server'
+          "#{binstub_or_fallback('rails')} server"
         end
       end
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '4.1.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -36,9 +36,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -97,13 +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
-  * Geordi 4.0.0 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
+  * 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
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-
-rvm:
-  - '2.0.0'
-  - '2.1.10'
-  - '2.2.10'
-  - '2.3.8'
-  - '2.4.10'
-  - '2.5.8'
-  - '2.6.6'
-
-gemfile:
-  - 'Gemfile'
-
-dist: trusty
-
-install:
-  - gem install bundler:1.17.3
-  # Replace default Travis CI bundler script with a version that doesn't
-  # explode when lockfile doesn't match recently bumped version
-  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-
-script: bundle exec rake