geordi 3.2.0 → 4.0.0

data/lib/geordi/commands/unit.rb

@@ -5,7 +5,7 @@ def unit
     invoke_cmd 'yarn_install'
 
     Interaction.announce 'Running Test::Unit'
-    Util.system! 'bundle exec rake test'
+    Util.system! Util.binstub('rake'), 'test'
   else
     Interaction.note 'Test::Unit not employed.'
   end

data/lib/geordi/commands/update.rb

@@ -3,17 +3,6 @@ long_desc <<-LONGDESC
 Example: `geordi update`
 
 Performs: `git pull`, `bundle install` (if necessary) and migrates (if applicable).
-
-After updating, loads a dump into the development db when called with the
-`--dump` option:
-
-    geordi update -d staging
-
-After updating, runs all tests when called with the `--test` option:
-
-    geordi update -t
-
-See `geordi help update` for details.
 LONGDESC
 
 option :dump, type: :string, aliases: '-d', banner: 'TARGET',

data/lib/geordi/commands/vnc.rb

@@ -4,11 +4,9 @@ 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

data/lib/geordi/commands/with_rake.rb

@@ -5,7 +5,7 @@ def with_rake
     invoke_cmd 'yarn_install'
 
     Interaction.announce 'Running tests with `rake`'
-    Util.system! 'rake'
+    Util.system! Util.binstub('rake')
   else
     Interaction.note '`rake` does not run tests.'
     :did_not_perform

data/lib/geordi/cucumber.rb

@@ -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('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/util.rb

@@ -62,13 +62,21 @@ module Geordi
         end
       end
 
+      def binstub(executable, *arguments)
+        binstub_file = "bin/#{executable}"
+
+        command = File.exists?(binstub_file) ? [binstub_file] : ['bundle exec', executable]
+        command.push(*arguments)
+        command.join(' ')
+      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 'rails', 'console', environment
         else
-          "bundle exec rails console -e #{environment}"
+          binstub 'rails', 'console -e', environment
         end
       end
 
@@ -76,7 +84,7 @@ module Geordi
         if gem_major_version('rails') == 2
           'script/server ""'
         else
-          'bundle exec rails server'
+          binstub 'rails', 'server'
         end
       end
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '3.2.0'.freeze
+  VERSION = '4.0.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.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-30 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
@@ -130,7 +101,9 @@ homepage: http://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: "* Binary `geordi` installed\n"
+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
 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'

data/lib/geordi/commands/eurest.rb

@@ -1,4 +0,0 @@
-desc 'eurest', 'Open the current Eurest cantina menu', hide: true
-def eurest
-  Util.system! %(file="Speiseplan_KW`date +%V`.pdf" && wget -O/tmp/$file http://www.eurest-extranet.de/eurest/export/sites/default/sigma-technopark/de/downloads/$file && xdg-open /tmp/$file)
-end