geordi 5.2.3 → 6.0.0

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.warn '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

@@ -12,8 +12,13 @@ class DockerCLI < Thor
   end
 
   desc 'vnc', 'Open a vnc viewer connecting to the docker container'
+  option :setup, default: false, type: :boolean, desc: 'Guide through the setup of VNC'
   def vnc
-    docker.vnc
+    if options.setup
+      docker.setup_vnc
+    else
+      docker.vnc
+    end
   end
 
   private
@@ -42,5 +47,6 @@ There are three subcommands:
 
 - `geordi docker vnc`
   Opens a VNC viewer to connect to the VNC server in the container.
+  Append `--setup` to be guided through the setup of VNC viewer.
 LONGDESC
 subcommand 'docker', DockerCLI

data/lib/geordi/commands/drop_databases.rb

@@ -47,6 +47,4 @@ def drop_databases
   cleaner = DBCleaner.new(extra_flags)
   cleaner.clean_mysql unless options.postgres_only
   cleaner.clean_postgres unless options.mysql_only
-
-  Interaction.success 'Done.'
 end

data/lib/geordi/commands/dump.rb

@@ -57,6 +57,9 @@ def dump(target = nil, *_args)
       Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load
 
+      Util.run! "rm #{dump_path}"
+      Interaction.note "Dump file removed"
+
       Interaction.success "Your #{loader.config['database']} database has now the data of #{target}#{database_label}."
     end
   end

data/lib/geordi/commands/remove_executable_flags.rb

@@ -10,5 +10,6 @@ def remove_executable_flags
     Interaction.note pattern
     `find . -name "#{pattern}" -exec chmod -x {} ';'`
   end
-  puts 'Done.'
+
+  Interaction.success 'Done.'
 end

data/lib/geordi/commands/rspec.rb

@@ -2,7 +2,10 @@ desc 'rspec [FILES]', 'Run RSpec'
 long_desc <<-LONGDESC
 Example: `geordi rspec spec/models/user_spec.rb:13`
 
-Runs RSpec with RSpec 1/2 support, parallel_tests detection and `bundle exec`.
+Runs RSpec with version 1/2 support, parallel_tests detection and `bundle exec`.
+
+In order to limit processes in a parallel run, you can set an environment
+variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi rspec`
 LONGDESC
 
 def rspec(*files)

data/lib/geordi/cucumber.rb

@@ -4,67 +4,23 @@ require 'tempfile'
 # This require-style is to prevent Ruby from loading files of a different
 # version of Geordi.
 require File.expand_path('interaction', __dir__)
-require File.expand_path('firefox_for_selenium', __dir__)
 require File.expand_path('settings', __dir__)
 
 module Geordi
   class Cucumber
 
-    VNC_DISPLAY = ':17'.freeze
-    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
-    VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER].freeze
-
     def run(files, cucumber_options, options = {})
       self.argv = files + cucumber_options.map { |option| option.split('=') }.flatten
       self.settings = Geordi::Settings.new
 
       consolidate_rerun_txt_files
       show_features_to_run
-      setup_vnc if settings.use_vnc?
 
       command = use_parallel_tests?(options) ? parallel_execution_command : serial_execution_command
       Interaction.note_cmd(command) if options[:verbose]
 
       puts # Make newline
-      system command # Util.run! would reset the Firefox PATH
-    end
-
-    def launch_vnc_viewer(source = VNC_DISPLAY)
-      fork do
-        error = capture_stderr do
-          system("#{VNC_VIEWER_COMMAND} #{source}")
-        end
-        unless $?.success?
-          if $?.exitstatus == 127
-            Interaction.fail 'VNC viewer not found. Install it with `geordi vnc --setup`.'
-          else
-            Interaction.note 'VNC viewer could not be opened:'
-            puts error
-            puts
-          end
-        end
-      end
-    end
-
-    def restore_env
-      VNC_ENV_VARIABLES.each do |variable|
-        ENV[variable] = ENV["OUTER_#{variable}"]
-      end
-    end
-
-    def setup_vnc
-      if try_and_start_vnc
-        VNC_ENV_VARIABLES.each do |variable|
-          ENV["OUTER_#{variable}"] = ENV[variable] if ENV[variable]
-        end
-        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'
-      end
+      system command
     end
 
     private
@@ -76,7 +32,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_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
+      [ Util.binstub_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
     end
 
     def parallel_execution_command
@@ -88,28 +44,12 @@ module Geordi
       features = find_all_features_recursively('features') if features.empty?
 
       [
-        use_firefox_for_selenium,
         'bundle exec parallel_test -t ' + type_arg,
-        %(-o '#{command_line_options.join(' ')} --tags "#{not_tag('@solo')}"'),
+        %(-o '#{command_line_options.join(' ')}'),
         "-- #{features.join(' ')}",
       ].compact.join(' ')
     end
 
-    def not_tag(name)
-      if Util.gem_major_version('cucumber') < 3
-        "~#{name}"
-      else
-        "not #{name}"
-      end
-    end
-
-    def use_firefox_for_selenium
-      path = Geordi::FirefoxForSelenium.path_from_config
-      if path
-        "PATH=#{path}:$PATH"
-      end
-    end
-
     def escape_shell_args(*args)
       args.flatten.collect do |arg|
         arg.gsub(/([\\ "])/) { |_match| "\\#{Regexp.last_match(1)}" }
@@ -117,9 +57,7 @@ module Geordi
     end
 
     def show_features_to_run
-      if command_line_options.include? '@solo'
-        Interaction.note 'All features tagged with @solo'
-      elsif command_line_options.include? 'rerun'
+      if command_line_options.include? 'rerun'
         Interaction.note 'Rerunning failed scenarios'
       elsif features_to_run.empty?
         Interaction.note 'All features in features/'
@@ -210,39 +148,5 @@ module Geordi
         features_to_run.none? { |f| f.include? ':' }
     end
 
-    def try_and_start_vnc
-      # check if vnc is already running
-      # return true if vnc_server_running?
-      error = capture_stderr do
-        system(VNC_SERVER_COMMAND)
-      end
-      case $?.exitstatus
-      when 0,
-        98 # was already running after all
-        true
-      when 127 # not installed
-        Interaction.warn 'Could not launch VNC server. Install it with `geordi vnc --setup`.'
-        false
-      else
-        Interaction.warn 'Starting VNC failed:'
-        puts error
-        puts
-        false
-      end
-    end
-
-    def capture_stderr
-      old_stderr = $stderr.dup
-      io = Tempfile.new('cuc')
-      $stderr.reopen(io)
-      yield
-      io.rewind
-      io.read
-    ensure
-      io.close
-      io.unlink
-      $stderr.reopen(old_stderr)
-    end
-
   end
 end

data/lib/geordi/db_cleaner.rb

@@ -180,7 +180,7 @@ HEREDOC
         if @mysql_command.include? '-p'
           puts "Please enter your MySQL/MariaDB account 'root' for: DROP DATABASE #{db}"
         else
-          Interaction.note "Dropping MySQL/MariaDB database #{db}"
+          puts "Dropping MySQL/MariaDB database #{db}"
         end
         `#{@mysql_command} -e 'DROP DATABASE \`#{db}\`;'`
       end
@@ -206,7 +206,7 @@ HEREDOC
       until %w[y n].include? proceed
         deletable_dbs = filter_whitelisted(dbtype, database_list)
         if deletable_dbs.empty?
-          Interaction.note "No #{dbtype} databases found that were not whitelisted"
+          Interaction.note "No #{dbtype} databases found that were not whitelisted."
           if Interaction.prompt('Edit the whitelist? [y]es or [n]o') == 'y'
             proceed = 'e'
           else
@@ -214,11 +214,11 @@ HEREDOC
           end
         end
         if proceed.empty?
-          Interaction.note "The following #{dbtype} databases are not whitelisted and could be deleted:"
+          Interaction.note "The following #{dbtype} databases are not whitelisted and can be deleted:"
           deletable_dbs.sort.each do |db|
             puts db
           end
-          Interaction.note "Those #{dbtype} databases are not whitelisted and could be deleted."
+          Interaction.note "These #{dbtype} databases are not whitelisted and can be deleted."
           proceed = Interaction.prompt('Proceed? [y]es, [n]o or [e]dit whitelist')
         end
         case proceed
@@ -226,7 +226,7 @@ HEREDOC
           proceed = '' # reset user selection
           edit_whitelist dbtype
         when 'n'
-          Interaction.success 'Not deleting anything'
+          Interaction.success 'Nothing deleted.'
           return []
         when 'y'
           return deletable_dbs

data/lib/geordi/docker.rb

@@ -1,6 +1,7 @@
 require 'geordi/interaction'
 require 'geordi/cucumber'
 require 'yaml'
+require 'open3'
 
 module Geordi
   class Docker
@@ -28,13 +29,61 @@ module Geordi
     end
 
     def vnc
-      Cucumber.new.launch_vnc_viewer('::5967')
+      check_installation_and_config
+      launch_vnc_viewer('::5967')
+    end
+
+    def setup_vnc
+      `clear`
+      Interaction.note 'This script will help you install a VNC viewer.'
+      Interaction.note 'Please open a second shell to execute instructions.'
+      Interaction.prompt 'Continue ...'
+
+      Interaction.announce 'Setup VNC viewer'
+      vnc_viewer_installed = system('which vncviewer > /dev/null 2>&1')
+      if vnc_viewer_installed
+        Interaction.success 'It appears you already have a VNC viewer installed. Good job!'
+      else
+        puts 'Please run:'
+        Interaction.note_cmd 'sudo apt-get install xtightvncviewer'
+        Interaction.prompt 'Continue ...'
+      end
+
+      puts
+      puts Util.strip_heredoc <<-TEXT
+    Done. You can view the VNC window with `geordi docker vnc`.
+      TEXT
+
+      Interaction.success 'Happy cuking!'
     end
 
     private
 
+    def launch_vnc_viewer(source)
+      fail('VNC viewer not found. Install it with `geordi docker vnc --setup`.') unless command_exists?('vncviewer')
+
+      fork do
+        error = capture_stderr do
+          system("vncviewer #{source}")
+        end
+        unless $?.success?
+          if $?.exitstatus == 127
+            fail('VNC viewer not found. Install it with `geordi docker vnc --setup`.')
+          else
+            fail("VNC viewer could not be opened: #{error}")
+          end
+        end
+      end
+      exit 0
+    end
+
     def attach_to_running_shell
-      running_containers = execute(:`, 'docker-compose ps').split("\n")
+      # The command line output of docker-compose ps changes depending on the container name length, this is
+      # caused by the varying terminal length and results in the longer outputs, e.g the container name and id
+      # to be cut after x characters and the rest being placed in the line below.
+
+      stdout_str, _error_str = execute(:capture, {'COLUMNS' => '400'}, 'docker-compose ps')
+      running_containers = stdout_str.split("\n")
       if (main_container_line = running_containers.grep(/_main_run/).first)
         container_name = main_container_line.split(' ').first
         execute(:exec, 'docker', 'exec', '-it', container_name, 'bash')
@@ -54,13 +103,17 @@ module Geordi
     def execute(kind, *args)
       if ENV['GEORDI_TESTING']
         puts "Stubbed run #{args.join(' ')}"
-        if kind == :`
+        if kind == :` || kind == :capture
           mock_parse(*args)
         else
           mock_run(*args)
         end
       else
-        send(kind, *args)
+        if kind == :capture
+          Open3.capture2(*args)
+        else
+          send(kind, *args)
+        end
       end
     end
 
@@ -112,5 +165,19 @@ module Geordi
         []
       end
     end
+
+    def capture_stderr
+      old_stderr = $stderr.dup
+      io = Tempfile.new('cuc')
+      $stderr.reopen(io)
+      yield
+      io.rewind
+      io.read
+    ensure
+      io.close
+      io.unlink
+      $stderr.reopen(old_stderr)
+    end
+
   end
 end

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.run! source_command, fail_message: "An error occured loading #{File.basename(dump_file)}"
+      Util.run! source_command, fail_message: "An error occurred loading #{File.basename(dump_file)}"
     end
 
   end