geordi 12.1.1 → 12.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04313c8ce7c7ad6e748f4b75a35deb5e888c66bbbc1070e1213677b610c971f1
-  data.tar.gz: 210726dbce934e3d0db120b4f7a5aa2eba7bbb4d4056868e8e083eadcbec02c2
+  metadata.gz: d9e766c4baaefc4065662e1efa4004110d2ba16eb4da7021cffbf1bea8b83b77
+  data.tar.gz: e131a2fccc5ba9db7b992c58fe42b402fcc59651d7c52935cb8a2f6b543d0c85
 SHA512:
-  metadata.gz: a52a0c665afd173e9371cad4fa64a65dc3fea587f9c415f376aa3706799b222e55917a8e47ad0e4a8d71b78e35c0ed2b5115cc0f0ef95a9c720e1de25b51d809
-  data.tar.gz: 00c8b800c1ea5b89e63e178c26448a93db8de1cb566ddf324facfb99ede4df107e19100eeee0bf42fac1c4db5d8e7c6d43a919bd4e6015d5481ecfdb22587c5d
+  metadata.gz: 2f9b6cb8eb4446380a744db6abb19f15a040ab6a2d0bbca5d54454d46ec308d687d2e4a11ddabc51c37bccbe0033cbf43882dcb69fedc4e9398cd09071df88a3
+  data.tar.gz: c36974d65e12a0b4020cf1dfe5e9303dc8bba71aa3082ff675a002fb6d68469af7da4e5774d67c233414755cb8a068fb8f7dd46d2d3ac8069ec963c515d9bb3d

data/CHANGELOG.md

@@ -6,11 +6,23 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 
 ### Compatible changes
-* `geordi commit` will now auto-suggest a matching issue based on the current branch
 
 ### Breaking changes
 
 
+## 12.2.0 2025-07-03
+
+### Compatible changes
+* `geordi deploy` will now respect the configured deploy branch from teh Capistrano config. Previously, it would choose "production" for a deploy to the production stage, and master/main else.
+
+
+## 12.1.0 2025-05-03
+
+### Compatible changes
+* `geordi commit` will now auto-suggest a matching issue based on the current branch
+* Some improvements and fixes
+
+
 ## 12.0.0 2025-02-25
 
 ### Compatible changes

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 gem 'aruba', '< 1' # Drops support for Ruby 2.2-
 gem 'rake', '< 13' # Drops support for Ruby 2.1
 gem 'rspec'
+gem 'abbrev' # Dependency of Highline
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    geordi (12.1.1)
+    geordi (12.2.0)
       thor (~> 1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abbrev (0.1.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aruba (0.14.14)
@@ -88,6 +89,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  abbrev
   aruba (< 1)
   cucumber (~> 9)
   geordi!

data/README.md

@@ -48,7 +48,7 @@ On the first execution we ask for your Linear API token. It will be
 stored in `~/.config/geordi/global.yml`.
 
 **Options**
-- `-m, --from-main, [--from-master], [--no-from-master]`: Branch from master instead of the current branch
+- `-m, --from-main, --from-master`: Branch from master instead of the current branch
 
 
 ### `geordi capistrano COMMAND`
@@ -98,7 +98,7 @@ servers. When passed a number, directly connects to the selected server.
 IRB flags can be given as `irb_flags: '...'` in the global Geordi config file (`~/.config/geordi/global.yml`).
 
 **Options**
-- `-s, [--select-server=[SERVER_NUMBER]]`: Select a server to connect to
+- `-s, --select-server=[SERVER_NUMBER]`: Select a server to connect to
 
 
 ### `geordi cucumber [FILES and OPTIONS]`
@@ -117,11 +117,11 @@ In order to limit processes in a parallel run, you can set an environment
 variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi cucumber`
 
 **Options**
-- `-m, [--modified], [--no-modified]`: Run all modified features
-- `-c, [--containing=STRING]`: Run all features that contain STRING
-- `-v, [--verbose], [--no-verbose]`: Show the test run command
-- `-d, [--debug], [--no-debug]`: Run Cucumber with `-f pretty -b`, which helps hunting down bugs
-- `-r, [--rerun=N]`: Rerun features up to N times while failing
+- `-m, --modified`: Run all modified features
+- `-c, --containing=STRING`: Run all features that contain STRING
+- `-v, --verbose`: Show the test run command
+- `-d, --debug`: Run Cucumber with `-f pretty -b`, which helps hunting down bugs
+- `-r, --rerun=N`: Rerun features up to N times while failing
 
 
 ### `geordi delete-dumps [DIRECTORY]`
@@ -170,8 +170,8 @@ instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 -M option: `geordi deploy -M staging`.
 
 **Options**
-- `-M, [--no-migrations], [--no-no-migrations]`: Run cap deploy instead of cap deploy:migrations
-- `-c, [--current-branch], [--no-current-branch]`: Set DEPLOY_BRANCH to the current branch during deploy
+- `-M, --no-migrations`: Run cap deploy instead of cap deploy:migrations
+- `-c, --current-branch`: Set DEPLOY_BRANCH to the current branch during deploy
 
 
 ### `geordi drop-databases`
@@ -191,11 +191,11 @@ Geordi will ask for confirmation before actually dropping databases and will
 offer to edit the whitelist instead.
 
 **Options**
-- `-P, [--postgres-only], [--no-postgres-only]`: Only clean PostgreSQL
-- `-M, [--mysql-only], [--no-mysql-only]`: Only clean MySQL/MariaDB
-- `[--postgres=PORT_OR_SOCKET]`: Use PostgreSQL port or socket
-- `[--mysql=PORT_OR_SOCKET]`: Use MySQL/MariaDB port or socket
-- `-S, [--sudo], [--no-sudo]`: Access databases as root
+- `-P, --postgres-only`: Only clean PostgreSQL
+- `-M, --mysql-only`: Only clean MySQL/MariaDB
+- `--postgres=PORT_OR_SOCKET`: Use PostgreSQL port or socket
+- `--mysql=PORT_OR_SOCKET`: Use MySQL/MariaDB port or socket
+- `-S, --sudo`: Access databases as root
 
 
 ### `geordi dump [TARGET]`
@@ -225,8 +225,8 @@ not match, please issue separate commands for dumping (`dump -d`) and sourcing
 (`dump -l -d`).
 
 **Options**
-- `-l, [--load=[DUMP_FILE]]`: Load a dump
-- `-d, [--database=NAME]`: Target database, if there are multiple databases
+- `-l, --load=[DUMP_FILE]`: Load a dump
+- `-d, --database=NAME`: Target database, if there are multiple databases
 
 
 ### `geordi help [COMMAND]`
@@ -288,25 +288,15 @@ and pulls, and will tell each step before performing it.
 
 Part two after performing the update: `geordi security-update finish`. Switches
 branches, pulls, pushes and deploys as required by our workflow. This as well
-will tell each step before performing it. In detail:
-
-1. Ask user if tests are green
-2. Push production
-3. Check out master and pull
-4. Merge production and push in master
-5. Deploy staging, if there is a staging environment
-6. Ask user if deployment log is okay and staging application is still running
-7. Deploy other stages
-8. Ask user if deployment log is okay and application is still running on all stages
-9. Inform user about the next (manual) steps
+will tell each step before performing it.
 
 
 ### `geordi server [PORT]`
 Start a development server.
 
 **Options**
-- `-p, [--port=PORT]`: Choose a port
-- `-P, [--public], [--no-public]`: Make the server accessible from the local network
+- `-p, --port=PORT`: Choose a port
+- `-P, --public`: Make the server accessible from the local network
 
 
 ### `geordi setup`
@@ -322,8 +312,8 @@ If a local bin/setup file is found, Geordi skips its routine and runs bin/setup
 instead.
 
 **Options**
-- `-d, [--dump=TARGET]`: After setup, dump the TARGET db and source it into the development db
-- `-t, [--test], [--no-test]`: After setup, run tests
+- `-d, --dump=TARGET`: After setup, dump the TARGET db and source it into the development db
+- `-t, --test`: After setup, run tests
 
 
 ### `geordi shell TARGET`
@@ -335,7 +325,7 @@ Selecting the server: `geordi shell staging -s` shows a menu with all available
 servers. When passed a number, directly connects to the selected server.
 
 **Options**
-- `-s, [--select-server=[SERVER_NUMBER]]`: Select a server to connect to
+- `-s, --select-server=[SERVER_NUMBER]`: Select a server to connect to
 
 
 ### `geordi tests [FILES]`
@@ -365,8 +355,8 @@ Example: `geordi update`
 Performs: `git pull`, `bundle install` (if necessary) and migrates (if applicable).
 
 **Options**
-- `-d, [--dump=TARGET]`: After updating, dump the TARGET db and source it into the development db
-- `-t, [--test], [--no-test]`: After updating, run tests
+- `-d, --dump=TARGET`: After updating, dump the TARGET db and source it into the development db
+- `-t, --test`: After updating, run tests
 
 
 ### `geordi version`

data/Rakefile

@@ -1,6 +1,11 @@
+require_relative 'lib/geordi/interaction'
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+# Run this before releasing
+Rake::Task['release:guard_clean'].enhance [:check]
+
 desc 'Default: Run all tests'
 task default: [:rspec, :features]
 
@@ -12,6 +17,12 @@ task :rspec do
   system 'bundle exec rspec'
 end
 
+task :check do
+  Geordi::Interaction.prompt('Are all specs & features green?', 'y', /y|yes/) || Geordi::Interaction.fail('Please run all tests with `rake`.')
+  Geordi::Interaction.prompt('Have you updated the README?', 'y', /y|yes/) || Geordi::Interaction.fail('Please update the README with `rake readme`.')
+  Geordi::Interaction.prompt('Have you updated the CHANGELOG', 'y', /y|yes/) || Geordi::Interaction.fail('Please update the CHANGELOG with the latest changes.')
+end
+
 task :readme do
   require File.expand_path('lib/geordi/cli', __dir__)
 
@@ -53,7 +64,11 @@ You can always run `geordi help <command>` to quickly look up command help.
     if visible_options.any?
       geordi_section << "**Options**\n"
       visible_options.values.each do |option|
-        geordi_section << "- `#{option.usage}`"
+        usage = option.usage
+          .gsub(/\[(--.*?)\]/, '\1')
+          .sub(/, --no-[\w-]+, --skip-[\w-]+$/, '')
+
+        geordi_section << "- `#{usage}`"
         geordi_section << ": #{option.description}" if option.description
         geordi_section << "\n"
       end

data/lib/geordi/capistrano_config.rb

@@ -18,6 +18,20 @@ module Geordi
       deploy_info.scan(/^\s*server\s*['"](.*?)['"]/).flatten
     end
 
+    def branch
+      deploy_info[/
+        # Marker
+        ^\s*set.:branch,
+
+        # Might be followed by ENV['DEPLOY_BRANCH']
+        .*
+
+        # Assume the last word in quotes will be the right branch
+        # (\1 matches the opening quote character)
+        (['"])(\w+)\1\s*$
+      /x, 2]
+    end
+
     def primary_server
       # Actually, servers may have a :primary property. From Capistrano 3, the
       # first listed server is the primary one by default, which is a good-
@@ -43,14 +57,10 @@ module Geordi
 
     def load_deploy_info
       lines = []
-      self.deploy_info = ''
-
-      if stage
-        lines += File.readlines(File.join(root, "config/deploy/#{stage}.rb"))
-      end
-
+      lines += File.readlines(File.join(root, "config/deploy/#{stage}.rb")).push("\n") if stage
       lines += File.readlines(File.join(root, 'config/deploy.rb'))
 
+      self.deploy_info = ''
       lines.each do |line|
         next if line =~ /^\s*#/ # Omit comment lines
         line.chomp! if line =~ /[\\,]\s*$/ # Join wrapped lines

data/lib/geordi/commands/deploy.rb

@@ -1,3 +1,5 @@
+require_relative '../capistrano_config'
+
 desc 'deploy [STAGE]', 'Guided deployment across branches'
 long_desc <<-LONGDESC
 Example: `geordi deploy` or `geordi deploy p[roduction]` or `geordi deploy --current-branch`
@@ -47,6 +49,8 @@ def deploy(target_stage = nil)
 
   # Ask for required information
   target_stage ||= Interaction.prompt 'Deployment stage:', branch_stage_map.fetch(Util.current_branch, 'staging')
+  capistrano_config = CapistranoConfig.new(target_stage)
+
   if options.current_branch
     stage_file = "config/deploy/#{target_stage}.rb"
     Util.file_containing?(stage_file, 'DEPLOY_BRANCH') || Interaction.fail(<<~ERROR)
@@ -57,10 +61,10 @@ def deploy(target_stage = nil)
     ERROR
 
     source_branch = target_branch = Util.current_branch
-  else
+  else # Normal deploy
     source_branch = Interaction.prompt 'Source branch:', Util.current_branch
 
-    deploy_branch = 'production' if target_stage == 'production'
+    deploy_branch = capistrano_config.branch
     deploy_branch ||= Util.git_default_branch
     target_branch = Interaction.prompt 'Deploy branch:', deploy_branch
   end

data/lib/geordi/dump_loader.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'abbrev' # Dependency of Highline
 require 'highline'
 require 'geordi/interaction'
 require 'geordi/util'

data/lib/geordi/gitlinear.rb

@@ -1,3 +1,4 @@
+require 'abbrev' # Dependency of Highline
 require 'highline'
 require 'net/http'
 require 'json'

data/lib/geordi/remote.rb

@@ -1,6 +1,7 @@
 require 'geordi/capistrano_config'
 require 'geordi/interaction'
 require 'geordi/util'
+require 'abbrev' # Dependency of Highline
 require 'highline/import'
 require 'pathname'
 require 'fileutils'

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '12.1.1'.freeze
+  VERSION = '12.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.1.1
+  version: 12.2.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor