geordi 5.2.2 → 6.0.0.pre.rc1

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 = '6.0.0-rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.0.0.pre.rc1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,12 +32,12 @@ executables:
 - b
 - dumple
 - geordi
-- launchy_browser
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -48,15 +48,14 @@ files:
 - exe/b
 - exe/dumple
 - exe/geordi
-- exe/launchy_browser
 - geordi.gemspec
 - lib/geordi.rb
 - lib/geordi/COMMAND_TEMPLATE
 - lib/geordi/capistrano_config.rb
 - lib/geordi/chromedriver_updater.rb
 - lib/geordi/cli.rb
-- lib/geordi/commands/_setup_vnc.rb
 - lib/geordi/commands/apache_site.rb
+- lib/geordi/commands/branch.rb
 - lib/geordi/commands/bundle_install.rb
 - lib/geordi/commands/capistrano.rb
 - lib/geordi/commands/chromedriver_update.rb
@@ -71,7 +70,6 @@ files:
 - lib/geordi/commands/docker.rb
 - lib/geordi/commands/drop_databases.rb
 - lib/geordi/commands/dump.rb
-- lib/geordi/commands/firefox.rb
 - lib/geordi/commands/migrate.rb
 - lib/geordi/commands/png_optimize.rb
 - lib/geordi/commands/rake.rb
@@ -85,14 +83,12 @@ files:
 - lib/geordi/commands/unit.rb
 - lib/geordi/commands/update.rb
 - lib/geordi/commands/version.rb
-- lib/geordi/commands/vnc.rb
 - lib/geordi/commands/with_rake.rb
 - lib/geordi/commands/yarn_install.rb
 - lib/geordi/cucumber.rb
 - lib/geordi/db_cleaner.rb
 - lib/geordi/docker.rb
 - lib/geordi/dump_loader.rb
-- lib/geordi/firefox_for_selenium.rb
 - lib/geordi/gitpt.rb
 - lib/geordi/interaction.rb
 - lib/geordi/remote.rb
@@ -103,7 +99,8 @@ homepage: https://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "  Support for sequential running of integration tests tagged
+  with @solo has been dropped.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -114,11 +111,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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

data/exe/launchy_browser

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-# This script is a part of Geordi. It is used by the cucumber command to have
-# launchy open error pages from tests in the users browser, as apposed to
-# opening it within VNC.
-
-# For unknown reasons, #require cannot find 'geordi/cucumber', so we need to
-# require it this way. Hours have been spent trying to require 'geordi/cucumber'.
-require File.expand_path('../../lib/geordi/cucumber', __FILE__)
-Geordi::Cucumber.new.restore_env
-
-require 'rubygems'
-require 'launchy'
-
-Launchy.open(ARGV.first)

data/lib/geordi/commands/_setup_vnc.rb

@@ -1,64 +0,0 @@
-desc '-setup-vnc', 'Setup VNC for running Selenium tests there', hide: true
-def _setup_vnc
-  `clear`
-
-  Interaction.note 'This script will help you install a VNC server and a VNC viewer.'
-  puts
-  puts Util.strip_heredoc <<-TEXT
-    With those you will be able to use our cucumber script without being
-    disturbed by focus-stealing Selenium windows. Instead, they will open
-    inside a VNC session.
-
-    You can still inspect everything with:
-  TEXT
-  Interaction.note_cmd 'geordi vnc'
-  puts
-  Interaction.note 'Please open a second shell to execute instructions.'
-  Interaction.prompt 'Continue ...'
-
-  Interaction.announce 'Setup VNC server'
-
-  vnc_server_installed = system('which vncserver > /dev/null 2>&1')
-  if vnc_server_installed
-    Interaction.success 'It appears you already have a VNC server installed. Good job!'
-  else
-    puts 'Please run:'
-    Interaction.note_cmd 'sudo apt-get install tightvncserver'
-    puts 'In case this package is not available, you may try vnc4server instead.'
-    Interaction.prompt 'Continue ...'
-
-    puts
-
-    Interaction.note 'We will now set a password for your VNC server.'
-    puts Util.strip_heredoc <<-TEXT
-      When running our cucumber script, this password will be used while also
-      restricting access to the local machine. However, if you start a vncserver
-      without our cucumber script, keep in mind that a user with this password
-      can connect to your machine.
-
-    TEXT
-    puts 'Please run:'
-    Interaction.note_cmd 'vncpasswd'
-    Interaction.warn 'Enter a secure password!'
-    Interaction.prompt 'Continue ...'
-  end
-
-  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
-    All done. Our cucumber script will now automatically run Selenium features
-    in VNC.
-  TEXT
-
-  Interaction.success 'Happy cuking!'
-end

data/lib/geordi/commands/firefox.rb

@@ -1,32 +0,0 @@
-desc 'firefox COMMAND', 'Run a command with VNC and test browser set up (alias: chrome)'
-long_desc <<-LONGDESC
-Example: `geordi firefox b cucumber` or `geordi firefox --setup 24.0`
-
-Useful when you need Firefox for Selenium or the VNC set up, but can't use the
-`geordi cucumber` command. This command is aliased `chrome` for users running
-Selenium in Chrome.
-LONGDESC
-
-option :setup, banner: 'FIREFOX_VERSION',
-  desc: 'Install a special test runner Firefox with the given version'
-
-def firefox(*command)
-  if options.setup
-    Interaction.fail 'Firefox version required (e.g. --setup 24.0)' if options.setup == 'setup'
-
-    require 'geordi/firefox_for_selenium'
-    Geordi::FirefoxForSelenium.install(options.setup)
-
-  else
-    require 'geordi/cucumber'
-
-    Cucumber.new.setup_vnc
-    FirefoxForSelenium.setup_firefox
-
-    puts
-    Interaction.note_cmd command.join(' ')
-    system *command # Util.run! would reset the Firefox PATH
-  end
-end
-
-map 'chrome' => 'firefox'

data/lib/geordi/commands/vnc.rb

@@ -1,18 +0,0 @@
-desc 'vnc', 'Show the hidden VNC window'
-long_desc <<-LONGDESC
-Example: `geordi vnc` or `geordi vnc --setup`
-
-Launch a VNC session to the hidden screen where `geordi cucumber` runs Selenium
-tests.
-LONGDESC
-
-option :setup, type: :boolean, desc: 'Guide through the setup of VNC'
-
-def vnc
-  if options.setup
-    invoke_geordi :_setup_vnc
-  else
-    require 'geordi/cucumber'
-    Geordi::Cucumber.new.launch_vnc_viewer
-  end
-end

data/lib/geordi/firefox_for_selenium.rb

@@ -1,200 +0,0 @@
-require 'pathname'
-require 'tempfile'
-require File.expand_path('interaction', __dir__)
-
-module Geordi
-  module FirefoxForSelenium
-
-    FIREFOX_FOR_SELENIUM_BASE_PATH = Pathname.new('~/bin/firefoxes').expand_path
-    FIREFOX_FOR_SELENIUM_PROFILE_NAME = 'firefox-for-selenium'.freeze
-    FIREFOX_VERSION_FILE = Pathname.new('.firefox-version')
-
-    def self.install(version)
-      Installer.new(version).run
-    end
-
-    def self.path_from_config
-      version = FIREFOX_VERSION_FILE.exist? && File.read(FIREFOX_VERSION_FILE).strip
-
-      if version && (version != 'system')
-        unless FirefoxForSelenium.binary(version).exist?
-          Interaction.warn "Firefox #{version} not found"
-
-          Interaction.note Util.strip_heredoc(<<-INSTRUCTIONS)
-          Install it with
-            geordi firefox --setup #{version}
-          INSTRUCTIONS
-
-          Interaction.prompt('Run tests anyway?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
-        end
-
-        path(version)
-      end
-    end
-
-    def self.path(version)
-      FIREFOX_FOR_SELENIUM_BASE_PATH.join(version)
-    end
-
-    def self.binary(version, name = 'firefox')
-      path(version).join(name)
-    end
-
-    def self.setup_firefox
-      path = path_from_config
-
-      if path
-        ENV['PATH'] = "#{path}:#{ENV['PATH']}"
-        Interaction.note 'Firefox for Selenium set up'
-      end
-    end
-
-
-    class Installer
-
-      def initialize(version)
-        @version = version
-      end
-
-      def run
-        say_hello
-        check_if_run_before
-        download_firefox
-        create_separate_profile # do this before the patching because the patched binary calls firefox with a profile that does not yet exist
-        patch_old_firefox
-        configure_old_firefox
-        kkthxbb
-      end
-
-
-      private
-
-      def execute_command(cmd)
-        system(cmd) || raise("Error while executing command: #{cmd}")
-      end
-
-      def run_firefox_for_selenium(args = '')
-        execute_command("PATH=#{path}:$PATH firefox #{args}")
-      end
-
-      def path
-        FirefoxForSelenium.path(@version)
-      end
-
-      def download_url
-        "https://ftp.mozilla.org/pub/firefox/releases/#{@version}/"
-      end
-
-      def binary
-        FirefoxForSelenium.binary(@version)
-      end
-
-      def original_binary
-        FirefoxForSelenium.binary(@version, 'firefox-original')
-      end
-
-      def say_hello
-        execute_command('clear')
-
-        puts Util.strip_heredoc(<<-HELLO)
-        Whenever Firefox updates, Selenium breaks. This is annoying. This
-        script will help you create an unchanging version of Firefox for your
-        Selenium tests.
-
-        In particular, this new copy of Firefox will have the following
-        properties:
-
-        - It won't update itself with a newer version
-        - It can co-exist with your regular Firefox installation (which you can
-          update at will)
-        - It will use a profile separate from the one you use for regular
-          Firefox browsing
-        - It will not try to re-use existing Firefox windows
-        - It will automatically be used for your Selenium scenarios if you run
-          your Cucumber using the cuc binary from the geordi gem.
-        - It will live in #{path}
-        HELLO
-
-        Interaction.prompt "Press ENTER when you're ready to begin."
-      end
-
-      def check_if_run_before
-        if original_binary.exist?
-          Interaction.note 'This version seems to be already installed.'
-          Interaction.prompt 'Press ENTER to continue anyway or press CTRL+C to abort.'
-        end
-      end
-
-      def download_firefox
-        path.mkpath
-
-        puts Util.strip_heredoc(<<-INSTRUCTION)
-        Please download an old version of Firefox from: #{download_url}
-        Unpack it with: tar xjf firefox-#{@version}.tar.bz2 -C #{path} --strip-components=1
-        Now #{path.join('firefox')} should be the firefox binary, not a directory.
-        INSTRUCTION
-        Interaction.prompt 'Continue?'
-
-        File.file?(binary) || raise("Could not find #{binary}")
-      end
-
-      def create_separate_profile
-        Interaction.note "Creating a separate profile named '#{FIREFOX_FOR_SELENIUM_PROFILE_NAME}' so your own profile will be safe..."
-        # don't use the patched firefox binary for this, we don't want to give
-        # a -p option here
-        execute_command("PATH=#{path}:$PATH firefox -no-remote -CreateProfile #{FIREFOX_FOR_SELENIUM_PROFILE_NAME}")
-        puts
-      end
-
-      def patch_old_firefox
-        Interaction.note "Patching #{binary} so it uses the new profile and never re-uses windows from other Firefoxes..."
-        execute_command("mv #{binary} #{original_binary}")
-        execute_command("mv #{binary}-bin #{original_binary}-bin")
-        patched_binary = Tempfile.new('firefox')
-        patched_binary.write Util.strip_heredoc(<<-PATCH)
-          #!/usr/bin/env ruby
-          exec('#{original_binary}', '-no-remote', '-P', '#{FIREFOX_FOR_SELENIUM_PROFILE_NAME}', *ARGV)
-        PATCH
-        patched_binary.close
-        execute_command("mv #{patched_binary.path} #{binary}")
-        execute_command("chmod +x #{binary}")
-        puts
-      end
-
-      def configure_old_firefox
-        puts Util.strip_heredoc(<<-INSTRUCTION)
-        You will now have to do some manual configuration.
-
-        This script will open the patched copy of Firefox when you press ENTER.
-        Please perform the following steps manually:
-
-        - IMPORTANT: Quickly disable all automatic updates under Edit /
-          Preferences / Advanced / Update
-        - Disable the default browser check when Firefox launches
-        - Check that the version number is correct (#{@version})
-        - You should not see your bookmarks, add-ons, plugins from your regular
-          Firefox profile
-        INSTRUCTION
-
-        Interaction.prompt 'Will open the patched copy of Firefox now'
-        run_firefox_for_selenium
-      end
-
-      def kkthxbb
-        Interaction.success "Congratulations, you're done!"
-
-        puts
-        puts Util.strip_heredoc(<<-INSTRUCTION)
-        Your patched copy of Firefox will be used when you run Cucumber using
-        the cucumber script that comes with the geordi gem. If you cannot use
-        `geordi cucumber`, but still need the test browser set up, you can use:
-
-            geordi firefox <any command>
-
-        Enjoy!
-        INSTRUCTION
-      end
-
-    end
-  end
-end