From cad03d2fad931e684e255eeed44411ce64386eca Mon Sep 17 00:00:00 2001
From: Dana Sherson <robot@dana.sh>
Date: Sun, 3 Dec 2023 13:16:35 +1300
Subject: [PATCH] Rubocop

---
 .rubocop.yml                          |   5 +-
 .spellr_wordlists/english.txt         |   1 +
 Brewfile                              |  77 ++++++++++----------
 Gemfile                               |   8 ++-
 spec/bash_support_spec.rb             |  54 +++++++-------
 spec/git_helper_spec.rb               |  28 ++++----
 spec/git_spec.rb                      |  90 +++++++++++++++--------
 spec/spec_helper.rb                   |   2 +-
 spec/speckly.rb                       |  51 ++++++-------
 spec/speckly/api.rb                   |   3 +-
 spec/speckly/command.rb               |  17 ++---
 spec/speckly/concat_io.rb             |   2 +
 spec/speckly/eventually.rb            |   6 +-
 spec/speckly/io.rb                    |  12 ++--
 spec/speckly/rspec.rb                 |   2 +
 spec/speckly/rspec/have_exitstatus.rb |  30 +++++---
 spec/speckly/rspec/have_output.rb     | 100 +++++++++++++++++++-------
 spec/speckly/rspec_matchers.rb        |   4 +-
 spec/speckly/session.rb               |   4 +-
 spec/support/git_helpers.rb           |  25 ++++---
 20 files changed, 314 insertions(+), 207 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 54cd86d..2e90217 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,7 @@ AllCops:
     - .bundle/**/*
     - tmp/**/*
     - vendor/**/*
+    - github-cctray/**/*
   DisplayCopNames: true
   DisplayStyleGuide: true
 
@@ -59,14 +60,14 @@ Metrics:
   CountComments: false
 
 Metrics/BlockLength:
-  ExcludedMethods:
+  AllowedMethods:
     - configure
     - describe
     - context
     - it
 
 Layout/LineLength:
-  Max: 80
+  Max: 120
   IgnoreCopDirectives: true
 
 Metrics/MethodLength:
diff --git a/.spellr_wordlists/english.txt b/.spellr_wordlists/english.txt
index 052e7e3..b7664fe 100644
--- a/.spellr_wordlists/english.txt
+++ b/.spellr_wordlists/english.txt
@@ -48,6 +48,7 @@ coreaudiod
 cppflags
 cruisecontrol
 cwd
+cyclomatic
 dest
 diffable
 diffr
diff --git a/Brewfile b/Brewfile
index 51fc99e..7adbe17 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,39 +1,40 @@
-tap "heroku/brew"
-tap "homebrew/bundle"
-tap "homebrew/cask"
-tap "homebrew/cask-fonts"
-tap "homebrew/core"
-tap "homebrew/services"
-brew "fnm"
-brew "rust"
-brew "pcre"
-brew "bash"
-brew "chruby"
-brew "ruby-install"
-brew "exercism"
-brew "diffr"
-brew "git"
-brew "git-lfs"
-brew "gnupg"
-brew "jq"
-brew "pinentry-mac"
-brew "pkg-config"
-brew "rbspy"
-brew "shellcheck"
-brew "wget"
-brew "yq"
-cask "finicky"
-cask "textmate"
-cask "1password"
-cask "docker"
-cask "dropbox"
-cask "firefox"
-cask "font-inconsolata"
-cask "google-chrome"
-cask "istat-menus"
-cask "visual-studio-code"
-cask "ccmenu"
-cask "slack"
-cask "spotify"
-cask "textmate"
+# frozen_string_literal: true
 
+tap 'heroku/brew'
+tap 'homebrew/bundle'
+tap 'homebrew/cask'
+tap 'homebrew/cask-fonts'
+tap 'homebrew/core'
+tap 'homebrew/services'
+brew 'fnm'
+brew 'rust'
+brew 'pcre'
+brew 'bash'
+brew 'chruby'
+brew 'ruby-install'
+brew 'exercism'
+brew 'diffr'
+brew 'git'
+brew 'git-lfs'
+brew 'gnupg'
+brew 'jq'
+brew 'pinentry-mac'
+brew 'pkg-config'
+brew 'rbspy'
+brew 'shellcheck'
+brew 'wget'
+brew 'yq'
+cask 'finicky'
+cask 'textmate'
+cask '1password'
+cask 'docker'
+cask 'dropbox'
+cask 'firefox'
+cask 'font-inconsolata'
+cask 'google-chrome'
+cask 'istat-menus'
+cask 'visual-studio-code'
+cask 'ccmenu'
+cask 'slack'
+cask 'spotify'
+cask 'textmate'
diff --git a/Gemfile b/Gemfile
index 70cf73b..f6ffcb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'spellr'
-gem 'rspec'
-gem 'tty_string'
 gem 'pry'
+gem 'rspec'
 gem 'rubocop'
 gem 'rubocop-rspec'
+gem 'spellr'
+gem 'tty_string'
diff --git a/spec/bash_support_spec.rb b/spec/bash_support_spec.rb
index 6f158c6..132ca84 100644
--- a/spec/bash_support_spec.rb
+++ b/spec/bash_support_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 COLOR_RED = ENV.fetch('COLOR_RED')
 COLOR_GREEN = ENV.fetch('COLOR_GREEN')
 COLOR_YELLOW = ENV.fetch('COLOR_YELLOW')
@@ -11,14 +13,14 @@
 RSpec.describe 'bash_support' do
   it 'returns current ruby version' do
     copy_file '.ruby-version'
-    expect(run 'ruby -v').to have_output(
+    expect(run('ruby -v')).to have_output(
       "ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-darwin22]\n"
     )
   end
 
   describe 'echoerr' do
     it 'returns red text for echoerr' do
-      expect(run 'echoerr No', expect_exit: 1).to have_output(
+      expect(run('echoerr No', expect_exit: 1)).to have_output(
         stderr: "#{COLOR_RED}error: No#{COLOR_RESET}\n",
         stdout: nil
       )
@@ -27,156 +29,156 @@
 
   describe 'echodo' do
     it 'returns grey text for echodo to stderr and does the thing to stdout' do
-      expect(run "echodo echo 1").to have_output(
+      expect(run('echodo echo 1')).to have_output(
         stderr: "#{COLOR_GREY}echo 1#{COLOR_RESET}\n",
         stdout: "1\n"
       )
     end
 
     it 'removes unnecessary single quotes' do
-      expect(run "echodo echo '1'").to have_output(
+      expect(run("echodo echo '1'")).to have_output(
         stderr: "#{COLOR_GREY}echo 1#{COLOR_RESET}\n",
         stdout: "1\n"
       )
     end
 
     it 'removes unnecessary double quotes' do
-      expect(run 'echodo echo "1"').to have_output(
+      expect(run('echodo echo "1"')).to have_output(
         stderr: "#{COLOR_GREY}echo 1#{COLOR_RESET}\n",
         stdout: "1\n"
       )
     end
 
     it 'retains quoted empty double quoted strings' do
-      expect(run 'echodo echo ""').to have_output(
+      expect(run('echodo echo ""')).to have_output(
         stderr: "#{COLOR_GREY}echo ''#{COLOR_RESET}\n",
         stdout: "\n"
       )
     end
 
     it 'retains quoted empty single quoted strings' do
-      expect(run "echodo echo ''").to have_output(
+      expect(run("echodo echo ''")).to have_output(
         stderr: "#{COLOR_GREY}echo ''#{COLOR_RESET}\n",
         stdout: "\n"
       )
     end
 
     it 'uses single quotes to escape spaces when given a single quoted string' do
-      expect(run "echodo echo '1 and 2'").to have_output(
+      expect(run("echodo echo '1 and 2'")).to have_output(
         stderr: "#{COLOR_GREY}echo '1 and 2'#{COLOR_RESET}\n",
         stdout: "1 and 2\n"
       )
     end
 
     it 'uses single quotes to escape spaces when given a double quoted string' do
-      expect(run 'echodo echo "1 and 2"').to have_output(
+      expect(run('echodo echo "1 and 2"')).to have_output(
         stderr: "#{COLOR_GREY}echo '1 and 2'#{COLOR_RESET}\n",
         stdout: "1 and 2\n"
       )
     end
 
     it 'uses single quotes to escape spaces when given a backslash escaped string' do
-      expect(run "echodo echo 1\\ and\\ 2").to have_output(
+      expect(run('echodo echo 1\\ and\\ 2')).to have_output(
         stderr: "#{COLOR_GREY}echo '1 and 2'#{COLOR_RESET}\n",
         stdout: "1 and 2\n"
       )
     end
 
     it 'uses single quotes to escape \\(whatever\\)' do
-      expect(run "echodo echo \\(whatever\\)").to have_output(
+      expect(run('echodo echo \\(whatever\\)')).to have_output(
         stderr: "#{COLOR_GREY}echo '(whatever)'#{COLOR_RESET}\n",
         stdout: "(whatever)\n"
       )
     end
 
     it "uses single quotes to escape '(whatever)'" do
-      expect(run "echodo echo '(whatever)'").to have_output(
+      expect(run("echodo echo '(whatever)'")).to have_output(
         stderr: "#{COLOR_GREY}echo '(whatever)'#{COLOR_RESET}\n",
         stdout: "(whatever)\n"
       )
     end
 
     it "uses single quotes to escape '[whatever]" do
-      expect(run "echodo echo '[whatever]'").to have_output(
+      expect(run("echodo echo '[whatever]'")).to have_output(
         stderr: "#{COLOR_GREY}echo '[whatever]'#{COLOR_RESET}\n",
         stdout: "[whatever]\n"
       )
     end
 
     it "uses single quotes to escape 'what)ever]'" do
-      expect(run "echodo echo 'what)ever]'").to have_output(
+      expect(run("echodo echo 'what)ever]'")).to have_output(
         stderr: "#{COLOR_GREY}echo 'what)ever]'#{COLOR_RESET}\n",
         stdout: "what)ever]\n"
       )
     end
 
     it "uses single quotes to escape 'what) ever]'" do
-      expect(run "echodo echo 'what) ever]'").to have_output(
+      expect(run("echodo echo 'what) ever]'")).to have_output(
         stderr: "#{COLOR_GREY}echo 'what) ever]'#{COLOR_RESET}\n",
         stdout: "what) ever]\n"
       )
     end
 
     it "uses single quotes to escape 'what)ever'" do
-      expect(run "echodo echo 'what)ever'").to have_output(
+      expect(run("echodo echo 'what)ever'")).to have_output(
         stderr: "#{COLOR_GREY}echo 'what)ever'#{COLOR_RESET}\n",
         stdout: "what)ever\n"
       )
     end
 
     it "uses single quotes to escape 'what>ever'" do
-      expect(run "echodo echo 'what>ever'").to have_output(
+      expect(run("echodo echo 'what>ever'")).to have_output(
         stderr: "#{COLOR_GREY}echo 'what>ever'#{COLOR_RESET}\n",
         stdout: "what>ever\n"
       )
     end
 
     it "uses single quotes to escape 'what<ever'" do
-      expect(run "echodo echo 'what<ever'").to have_output(
+      expect(run("echodo echo 'what<ever'")).to have_output(
         stderr: "#{COLOR_GREY}echo 'what<ever'#{COLOR_RESET}\n",
         stdout: "what<ever\n"
       )
     end
 
     it "uses single quotes to escape 'what\\n\\never'" do
-      expect(run "echodo echo 'what\n\never'").to have_output(
+      expect(run("echodo echo 'what\n\never'")).to have_output(
         stderr: "#{COLOR_GREY}echo 'what\n\never'#{COLOR_RESET}\n",
         stdout: "what\n\never\n"
       )
     end
 
     it "uses single quotes to escape '$dance'" do
-      expect(run "echodo echo '$dance'").to have_output(
+      expect(run("echodo echo '$dance'")).to have_output(
         stderr: "#{COLOR_GREY}echo '$dance'#{COLOR_RESET}\n",
         stdout: "$dance\n"
       )
     end
 
     it %{uses single quotes to escape '"$dance"'} do
-      expect(run %{echodo echo '"$dance"'}).to have_output(
+      expect(run(%{echodo echo '"$dance"'})).to have_output(
         stderr: %{#{COLOR_GREY}echo '"$dance"'#{COLOR_RESET}\n},
         stdout: %{"$dance"\n}
       )
     end
 
     it 'uses double quotes to escape single quotes' do
-      expect(run "echodo echo don\\'t").to have_output(
+      expect(run("echodo echo don\\'t")).to have_output(
         stderr: %{#{COLOR_GREY}echo "don't"#{COLOR_RESET}\n},
         stdout: "don't\n"
       )
     end
 
     it 'uses single quotes to escape double quotes' do
-      expect(run %{echodo echo 'do or do not there is no "try"'})
+      expect(run(%{echodo echo 'do or do not there is no "try"'}))
         .to have_output(
-          stderr: %{#{COLOR_GREY}echo 'do or do not there is no \"try\"'#{COLOR_RESET}\n},
+          stderr: %{#{COLOR_GREY}echo 'do or do not there is no "try"'#{COLOR_RESET}\n},
           stdout: %{do or do not there is no "try"\n}
         )
     end
 
     it 'uses double quotes to escape both types of quotes' do
       # because "\"" works and '\'' doesn't
-      expect(run %{echodo echo "do or don't "'there is no "try"'})
+      expect(run(%{echodo echo "do or don't "'there is no "try"'}))
         .to have_output(
           stderr: %{#{COLOR_GREY}echo "do or don't there is no \\"try\\""#{COLOR_RESET}\n},
           stdout: %{do or don't there is no "try"\n}
@@ -187,7 +189,7 @@
       # I never want history expansion
       # so I `set +H` in bash_profile
       # so I don't need to escape `!`
-      expect(run %{echodo echo !}).to have_output(
+      expect(run(%{echodo echo !})).to have_output(
         stderr: %{#{COLOR_GREY}echo !#{COLOR_RESET}\n},
         stdout: %{!\n}
       )
diff --git a/spec/git_helper_spec.rb b/spec/git_helper_spec.rb
index 71c75d2..5d37d71 100644
--- a/spec/git_helper_spec.rb
+++ b/spec/git_helper_spec.rb
@@ -1,45 +1,47 @@
+# frozen_string_literal: true
+
 RSpec.describe 'git helper spec' do
   describe 'git_web_url' do
-    before { git("init") }
+    before { git('init') }
 
     it 'returns the github web url for https git' do
-      git("remote add origin https://github.com/robotdana/dotfiles.git")
-      expect(run 'git_web_url').to have_output(
+      git('remote add origin https://github.com/robotdana/dotfiles.git')
+      expect(run('git_web_url')).to have_output(
         "https://github.com/robotdana/dotfiles\n"
       )
     end
 
     it 'returns the github web url for ssh git' do
-      git("remote add upstream git@github.com:robotdana/dotfiles.git")
-      expect(run 'git_web_url upstream').to have_output(
+      git('remote add upstream git@github.com:robotdana/dotfiles.git')
+      expect(run('git_web_url upstream')).to have_output(
         "https://github.com/robotdana/dotfiles\n"
       )
     end
 
     it 'returns the bitbucket web url for https git' do
-      git("remote add origin https://bitbucket.org/robotdana/dotfiles.git")
-      expect(run 'git_web_url').to have_output(
+      git('remote add origin https://bitbucket.org/robotdana/dotfiles.git')
+      expect(run('git_web_url')).to have_output(
         "https://bitbucket.org/robotdana/dotfiles\n"
       )
     end
 
     it 'returns the bitbucket web url for ssh git' do
-      git("remote add upstream git@bitbucket.org:robotdana/dotfiles.git")
-      expect(run 'git_web_url upstream').to have_output(
+      git('remote add upstream git@bitbucket.org:robotdana/dotfiles.git')
+      expect(run('git_web_url upstream')).to have_output(
         "https://bitbucket.org/robotdana/dotfiles\n"
       )
     end
 
     it 'returns the gitlab web url for https git' do
-      git("remote add origin https://gitlab.com/robotdana/dotfiles.git")
-      expect(run 'git_web_url').to have_output(
+      git('remote add origin https://gitlab.com/robotdana/dotfiles.git')
+      expect(run('git_web_url')).to have_output(
         "https://gitlab.com/robotdana/dotfiles\n"
       )
     end
 
     it 'returns the gitlab web url for ssh git' do
-      git("remote add upstream git@gitlab.com:robotdana/dotfiles.git")
-      expect(run 'git_web_url upstream').to have_output(
+      git('remote add upstream git@gitlab.com:robotdana/dotfiles.git')
+      expect(run('git_web_url upstream')).to have_output(
         "https://gitlab.com/robotdana/dotfiles\n"
       )
     end
diff --git a/spec/git_spec.rb b/spec/git_spec.rb
index 87c4d5b..d33890c 100644
--- a/spec/git_spec.rb
+++ b/spec/git_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 RSpec.describe 'git' do
   before do
-    git("init")
+    git('init')
     git_commit("--no-verify --allow-empty -m 'Initial commit'")
   end
 
@@ -12,18 +14,20 @@
       expect(file('a-file-to-keep')).to exist
     end
 
-    it "cleans up when using amend" do
+    it 'cleans up when using amend' do
       create_file_list 'a', 'b'
-      git_add("a")
+      git_add('a')
       git_commit("-m 'Original commit'")
       git_commit("--amend -m 'Amended commit'")
-      git_add("b")
+      git_add('b')
       git_commit("--amend -m 'Amended commit with b'")
       expect(file('a')).to exist
       expect(file('b')).to exist
       expect_clean_git_status
       expect_empty_stash
-      expect(git_log).to have_output(["Amended commit with b", "Initial commit"], split: true)
+      expect(git_log).to have_output(
+        ['Amended commit with b', 'Initial commit'], split: true
+      )
     end
   end
 
@@ -34,22 +38,27 @@
       git_add('file1')
       git_commit("-m 'Commit 1'")
 
-      git_checkout("-b branch2")
-      git("rm file1")
-      git_add("file2")
+      git_checkout('-b branch2')
+      git('rm file1')
+      git_add('file2')
       git_commit("-m 'Commit 2'")
-      git_checkout("main")
-      file("file1").write("amended text")
-      git_add("file1")
+      git_checkout('main')
+      file('file1').write('amended text')
+      git_add('file1')
       git_commit("-m 'Commit 3'")
-      expect(git("merge branch2", expect_exit: 1)).to have_output(<<~MESSAGE)
+      expect(git('merge branch2', expect_exit: 1)).to have_output(<<~MESSAGE)
         CONFLICT (modify/delete): file1 deleted in branch2 and modified in HEAD.  Version HEAD of file1 left in tree.
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
 
-      expect(run 'yes n | gmc').to have_output(stdout: end_with("Merge branch 'branch2'\n"))
+      expect(run('yes n | gmc')).to have_output(stdout: end_with("Merge branch 'branch2'\n"))
 
-      expect(git_log).to have_output(["Merge branch 'branch2'", "Commit 3", "Commit 2", "Commit 1", "Initial commit"], split: true)
+      expect(git_log).to have_output(
+        [
+          "Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1',
+          'Initial commit'
+        ], split: true
+      )
       expect(file('file1')).to exist
       expect(file('file2')).to exist
       expect(file('file1').read).to eq('amended text')
@@ -71,16 +80,21 @@
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
       expect(run('yes n | gmc')).to have_output(stdout: end_with("Merge branch 'branch2'\n"))
-      expect(git_log).to have_output(["Merge branch 'branch2'", "Commit 3", "Commit 2", "Commit 1", "Initial commit"], split: true)
-      expect(file('file1')).to_not exist
+      expect(git_log).to have_output(
+        [
+          "Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1',
+          'Initial commit'
+        ], split: true
+      )
+      expect(file('file1')).not_to exist
       expect(file('file2')).to exist
     end
 
-    it "resolves a merge conflict: ours deleted: keep theirs" do
+    it 'resolves a merge conflict: ours deleted: keep theirs' do
       create_file('text', path: 'file1')
-      git_add("file1")
+      git_add('file1')
       git_commit("-m 'Commit 1'")
-      git_checkout("-b branch2")
+      git_checkout('-b branch2')
       file('file1').write('amended text')
       git_add('file1')
       git_commit('-m "Commit 2"')
@@ -96,11 +110,16 @@
       run('yes | gmc')
       expect(file('file1')).to exist
       expect(file('file2')).to exist
-      expect(git_log).to have_output(["Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1', 'Initial commit'], split: true)
+      expect(git_log).to have_output(
+        [
+          "Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1',
+          'Initial commit'
+        ], split: true
+      )
       expect(file('file1').read).to eq 'amended text'
     end
 
-    it "resolves a merge conflict: theirs deleted: delete ours" do
+    it 'resolves a merge conflict: theirs deleted: delete ours' do
       file('file1').write('text')
       git_add('file1')
       git_commit('-m "Commit 1"')
@@ -116,28 +135,39 @@
         Automatic merge failed; fix conflicts and then commit the result.
       MESSAGE
       run('yes | gmc')
-      expect(file('file1')).to_not exist
-      expect(git_log).to have_output(["Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1', 'Initial commit'], split: true)
+      expect(file('file1')).not_to exist
+      expect(git_log).to have_output(
+        [
+          "Merge branch 'branch2'", 'Commit 3', 'Commit 2', 'Commit 1',
+          'Initial commit'
+        ], split: true
+      )
     end
   end
 
   describe 'git_reword' do
-    it "can reword the commit message" do
-      git_checkout("-b branch")
+    it 'can reword the commit message' do
+      git_checkout('-b branch')
       file('a').write('a')
       git_add('.')
       git_commit('-m "Commit message to be changed"')
       file('b').write('b')
       git_add('.')
       git_commit('-m "Commit message to remain"')
-      sha_by_name = run("git_find_sha to be changed")
+      sha_by_name = run('git_find_sha to be changed')
       expect(sha_by_name).to have_output(/\A\h+\n\z/)
-      sha_by_alias = run("git rev-parse --short HEAD^")
+      sha_by_alias = run('git rev-parse --short HEAD^')
       expect(sha_by_alias).to have_output(/\A\h+\n\z/)
       expect(sha_by_name.output.to_s).to eq sha_by_alias.output.to_s
-      expect(run("git_reword 'to be changed'", env: { GIT_EDITOR: "sed -i.~ 's/to be changed/was changed/'" }))
-        .to_not have_output
-      expect(git_log).to have_output(["Commit message to remain", "Commit message was changed", "Initial commit"], split: true)
+      expect(run("git_reword 'to be changed'",
+                 env: { GIT_EDITOR: "sed -i.~ 's/to be changed/was changed/'" }))
+        .not_to have_output
+      expect(git_log).to have_output(
+        [
+          'Commit message to remain', 'Commit message was changed',
+          'Initial commit'
+        ], split: true
+      )
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a598041..d6ddfa5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -24,7 +24,7 @@ def warn(msg) # leftovers:allow
 Speckly.default_max_wait_time = 10
 Speckly.default_command_prefix = []
 
-Dir.glob(::File.expand_path('support/**/*.rb', __dir__)).each do |file|
+Dir.glob(File.expand_path('support/**/*.rb', __dir__)).each do |file|
   require file
 end
 
diff --git a/spec/speckly.rb b/spec/speckly.rb
index 002819f..0760f5d 100644
--- a/spec/speckly.rb
+++ b/spec/speckly.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'speckly/api'
 require_relative 'speckly/command'
 require_relative 'speckly/concat_io'
@@ -5,7 +7,6 @@
 require_relative 'speckly/session'
 require_relative 'speckly/eventually'
 
-
 module Speckly
   @original_working_directory = Dir.pwd
 
@@ -14,10 +15,8 @@ module Speckly
   @default_command_prefix = []
 
   class << self
-    attr_writer :default_env
-    attr_writer :default_max_wait_time
-    attr_writer :default_command_prefix
-    attr_accessor :original_working_directory
+    attr_writer :default_env, :default_max_wait_time, :default_command_prefix
+    attr_accessor :original_working_directory, :current_session
 
     def default_env
       @default_env ||= defined?(Bundler) ? ::Bundler.original_env.dup : ENV.to_h.dup
@@ -30,22 +29,20 @@ def default_max_wait_time
     def default_command_prefix
       @default_command_prefix ||= []
     end
-
-    attr_accessor :current_session
   end
 
   module_function
 
-  def session
-    if !block_given?
-      Speckly.current_session = Speckly.current_session || Session.new
-    else
+  def session # rubocop:disable Metrics
+    if block_given?
       begin
         Speckly.current_session = Session.new(Speckly.current_session)
         yield
       ensure
         Speckly.current_session = Speckly.current_session.pop
       end
+    else
+      Speckly.current_session = Speckly.current_session || Session.new
     end
   end
 
@@ -54,9 +51,9 @@ def cleanup_session
     Speckly.current_session = nil
   end
 
-  def run_command(cmd, *args, expect_exit: 0, anywhere: false, chdir: Speckly.session.dir, **kwargs)
-    chdir = Speckly.path(chdir, anywhere: anywhere)
-    command = Command.new(cmd, *args, chdir: chdir, **kwargs)
+  def run_command(cmd, *, expect_exit: 0, anywhere: false, chdir: Speckly.session.dir, **) # rubocop:disable Metrics
+    chdir = Speckly.path(chdir, anywhere:)
+    command = Command.new(cmd, *, chdir:, **)
 
     Speckly.session.commands << command
     Speckly.session.chdir(chdir) { yield command } if block_given?
@@ -66,18 +63,16 @@ def run_command(cmd, *args, expect_exit: 0, anywhere: false, chdir: Speckly.sess
   end
   alias_method :run, :run_command
 
-  def create_file(*lines, path:, anywhere: false)
-    path = Speckly.path(path, anywhere: anywhere)
+  def create_file(*lines, path:, anywhere: false) # rubocop:disable Metrics
+    path = Speckly.path(path, anywhere:)
     path.parent.mkpath
 
     if lines.empty?
       path.write('') unless path.exist?
+    elsif path.exist?
+      raise Errno::EEXIST unless path.read == "#{lines.join("\n")}\n"
     else
-      if path.exist?
-        raise Errno::EEXIST unless path.read == lines.join("\n") + "\n"
-      else
-        path.write(lines.join("\n") + "\n")
-      end
+      path.write("#{lines.join("\n")}\n")
     end
 
     path
@@ -87,7 +82,8 @@ def path(relative_path, anywhere: false)
     path = ::File.expand_path(relative_path, session.dir)
 
     if anywhere && !Speckly.session.within_temp_dir?(path)
-      raise ArgumentError, "#{path} isn't within a temp directory created by Speckly"
+      raise ArgumentError,
+            "#{path} isn't within a temp directory created by Speckly"
     end
 
     ::Pathname.new(path)
@@ -102,9 +98,9 @@ def stderr
     Speckly.session.stderr
   end
 
-  def copy_file(*relative_paths, anywhere: false)
+  def copy_file(*relative_paths, anywhere: false) # rubocop:disable Metrics
     relative_paths.each do |relative_path|
-      dest = Speckly.path(relative_path, anywhere: anywhere)
+      dest = Speckly.path(relative_path, anywhere:)
       dest.parent.mkpath
       ::FileUtils.cp_r(
         ::File.expand_path(relative_path, ::Speckly.original_working_directory),
@@ -113,9 +109,8 @@ def copy_file(*relative_paths, anywhere: false)
     end
   end
 
-
   def create_dir(path, anywhere: false, &block)
-    Speckly.path(path, anywhere: anywhere).mkpath
+    Speckly.path(path, anywhere:).mkpath
     return path unless block_given?
 
     Dir.chdir(path, &block)
@@ -123,7 +118,7 @@ def create_dir(path, anywhere: false, &block)
 
   def create_symlink(hash, anywhere: false)
     hash.each do |link, target|
-      link_path = Speckly.path(link, anywhere: anywhere)
+      link_path = Speckly.path(link, anywhere:)
       link_path.parent.mkpath
 
       FileUtils.ln_s(Speckly.path(target, anywhere: true), link_path.to_s)
@@ -132,7 +127,7 @@ def create_symlink(hash, anywhere: false)
 
   def create_file_list(*filenames, anywhere: false)
     filenames.each do |filename|
-      Speckly.create_file(filename, path: filename, anywhere: anywhere)
+      Speckly.create_file(filename, path: filename, anywhere:)
     end
   end
 end
diff --git a/spec/speckly/api.rb b/spec/speckly/api.rb
index 6b996d5..e4c0213 100644
--- a/spec/speckly/api.rb
+++ b/spec/speckly/api.rb
@@ -1,3 +1,4 @@
-module Speckly
+# frozen_string_literal: true
 
+module Speckly
 end
diff --git a/spec/speckly/command.rb b/spec/speckly/command.rb
index 11678a8..3ccb684 100644
--- a/spec/speckly/command.rb
+++ b/spec/speckly/command.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'pty'
 require 'timeout'
 
 module Speckly
   class Command
-    def initialize(command, *args, merge_output: false, chdir: ::Dir.pwd, env: {}, **kwargs)
+    def initialize(command, *, merge_output: false, chdir: ::Dir.pwd, env: {}, **) # rubocop:disable Metrics
       @command = [*Speckly.default_command_prefix, command, *args]
       @env = ::Speckly.default_env.merge(env.transform_keys(&:to_s)).freeze
       @merge_output = merge_output
@@ -14,18 +16,17 @@ def initialize(command, *args, merge_output: false, chdir: ::Dir.pwd, env: {}, *
         @env,
         *Speckly.default_command_prefix,
         command,
-        *args,
+        *,
         unsetenv_others: true,
         in: @stdin.reader.fileno,
         out: @stdout.writer.fileno,
         err: @stderr.writer.fileno,
-        chdir: chdir,
-        **kwargs)
+        chdir:,
+        **
+      )
     end
 
-    attr_reader :pid
-    attr_reader :env
-    attr_reader :command
+    attr_reader :pid, :env, :command
 
     def merged?
       @merge_output
@@ -47,7 +48,7 @@ def stderr
       @stderr.reader
     end
 
-    def cleanup
+    def cleanup # rubocop:disable Metrics
       @stdin&.close
     ensure
       begin
diff --git a/spec/speckly/concat_io.rb b/spec/speckly/concat_io.rb
index 902a66f..643cc20 100644
--- a/spec/speckly/concat_io.rb
+++ b/spec/speckly/concat_io.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Speckly
   class ConcatIO
     def initialize(ios)
diff --git a/spec/speckly/eventually.rb b/spec/speckly/eventually.rb
index 171005d..4353c4c 100644
--- a/spec/speckly/eventually.rb
+++ b/spec/speckly/eventually.rb
@@ -5,14 +5,14 @@
 module Speckly
   module Eventually
     class << self
-      def satisfy(wait: Speckly.default_max_wait_time, break_if_stopped: nil, &block)
+      def satisfy(wait: Speckly.default_max_wait_time, &block) # rubocop:disable Metrics
         Timeout.timeout(wait + 1) do
           start_time = monotonic_time
-          end_time = start_time + (wait)
+          end_time = start_time + wait
           until end_time < monotonic_time
             result = block.call
             return true if result
-            # return result if break_if_stopped&.stopped?
+
             sleep(rand / 10)
           end
         end
diff --git a/spec/speckly/io.rb b/spec/speckly/io.rb
index f5ee21a..3ae24c2 100644
--- a/spec/speckly/io.rb
+++ b/spec/speckly/io.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module Speckly
@@ -28,7 +30,7 @@ def initialize(io)
       @io = io
     end
 
-    def to_s(wait: Speckly.default_max_wait_time)
+    def to_s
       buf << @io.read_nonblock(4096)
       buf
     rescue ::IO::WaitReadable
@@ -45,24 +47,24 @@ def inspect
       to_s.inspect
     end
 
-    def print(string, wait: Speckly.default_max_wait_time)
+    def print(string)
       writable?
       @io.print(string.dup.force_encoding(Encoding::BINARY))
       @io.flush
     end
 
-    def puts(string, wait: Speckly.default_max_wait_time)
+    def puts(string)
       writable?
       @io.puts(string.dup.force_encoding(Encoding::BINARY))
       @io.flush
     end
 
     def writable?
-      ::IO.select(nil, [@io], nil, 0)
+      ::IO.select(nil, [@io], nil, 0) # rubocop:disable Lint/IncompatibleIoSelectWithFiberScheduler
     end
 
     def readable?
-      ::IO.select([@io], nil, nil, 0)
+      ::IO.select([@io], nil, nil, 0) # rubocop:disable Lint/IncompatibleIoSelectWithFiberScheduler
     end
 
     def fileno
diff --git a/spec/speckly/rspec.rb b/spec/speckly/rspec.rb
index 6c3b872..a543b0b 100644
--- a/spec/speckly/rspec.rb
+++ b/spec/speckly/rspec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../speckly'
 require_relative 'rspec_matchers'
 
diff --git a/spec/speckly/rspec/have_exitstatus.rb b/spec/speckly/rspec/have_exitstatus.rb
index f5463cd..6901735 100644
--- a/spec/speckly/rspec/have_exitstatus.rb
+++ b/spec/speckly/rspec/have_exitstatus.rb
@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 module Speckly
   RSpec::Matchers.define :have_exitstatus do |expected = NO_ARG, wait: Speckly.default_max_wait_time|
     match do |actual|
       if expected == NO_ARG
-        has_any_exitstatus?(actual, wait: wait)
+        has_any_exitstatus?(actual, wait:)
       else
-        has_any_exitstatus?(actual, wait: wait) && values_match?(expected, actual.exitstatus)
+        has_any_exitstatus?(actual, wait:) && values_match?(expected, actual.exitstatus)
       end
     end
 
@@ -14,32 +16,42 @@ module Speckly
       if expected == NO_ARG
         !actual.exitstatus
       else
-        has_any_exitstatus?(actual, wait: wait) && !values_match?(expected, actual.exitstatus)
+        has_any_exitstatus?(actual,
+                            wait:) && !values_match?(expected,
+                                                     actual.exitstatus)
       end
     end
 
     failure_message do
       if expected == NO_ARG
-        "expected run #{Shellwords.join(actual.command).inspect} to have an exitstatus\noutput:\n#{actual.output}\n"
+        "expected run #{command_s} to have an exitstatus\n" \
+          "output:\n#{actual.output}\n"
       elsif actual.exitstatus.nil?
-        "expected run #{Shellwords.join(actual.command).inspect} to have exitstatus=#{expected}, has no exitstatus\noutput:\n#{actual.output}\n"
+        "expected run #{command_s} to have exitstatus=#{expected}, " \
+          "has no exitstatus\noutput:\n#{actual.output}\n"
       else
-        "expected run #{Shellwords.join(actual.command).inspect} to have exitstatus=#{expected}, has exitstatus=#{actual.exitstatus}\noutput:\n#{actual.output}\n"
+        "expected run #{command_s} to have exitstatus=#{expected}, " \
+          "has exitstatus=#{actual.exitstatus}\noutput:\n#{actual.output}\n"
       end
     end
 
     failure_message_when_negated do
       if expected == NO_ARG
-        "expected run #{Shellwords.join(actual.command).inspect} to not have an exitstatus, has exitstatus=#{actual.exitstatus}"
+        "expected run #{command_s} to not have an exitstatus, " \
+          "has exitstatus=#{actual.exitstatus}"
       else
-        "expected run #{Shellwords.join(actual.command).inspect} to not have exitstatus=#{expected}"
+        "expected run #{command_s} to not have exitstatus=#{expected}"
       end
     end
 
     private
 
+    def command_s
+      Shellwords.join(actual.command).inspect
+    end
+
     def has_any_exitstatus?(actual, wait:)
-      Speckly::Eventually.satisfy(wait: wait, break_if_stopped: actual) do
+      Speckly::Eventually.satisfy(wait:) do
         actual.exitstatus
       end
     end
diff --git a/spec/speckly/rspec/have_output.rb b/spec/speckly/rspec/have_output.rb
index 40e2d00..464b423 100644
--- a/spec/speckly/rspec/have_output.rb
+++ b/spec/speckly/rspec/have_output.rb
@@ -1,39 +1,72 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 require 'tty_string'
+require 'English'
 
-module Speckly
-  unless ''.respond_to?(:present?)
-    ::RSpec::Matchers.define_negated_matcher(:be_present, :be_empty)
-  end
+module Speckly # rubocop:disable Metrics/ModuleLength
+  ::RSpec::Matchers.define_negated_matcher(:be_present, :be_empty) unless ''.respond_to?(:present?)
 
-  ::RSpec::Matchers.define :have_output do |merged = NO_ARG, stdout: NO_ARG, stderr: NO_ARG, rendered: false, split: false, wait: Speckly.default_max_wait_time|
+  ::RSpec::Matchers.define :have_output do | # rubocop:disable Metrics/ParameterLists
+      merged = NO_ARG,
+      stdout: NO_ARG,
+      stderr: NO_ARG,
+      rendered: false,
+      split: false,
+      wait: Speckly.default_max_wait_time
+    |
     match do |command|
-      raise ArgumentError, "Must be a Speckly::Command or a Speckly::Session" unless command.respond_to?(:output) && command.respond_to?(:stdout) && command.respond_to?(:stderr) && command.respond_to?(:merged?)
+      unless command.respond_to?(:output) &&
+          command.respond_to?(:stdout) &&
+          command.respond_to?(:stderr) &&
+          command.respond_to?(:merged?)
+        raise ArgumentError, 'Must be a Speckly::Command or a Speckly::Session'
+      end
+
       @command = command
       prepare_matchers(command, merged, stdout, stderr)
       prepare_value_transformer(rendered, split)
 
-      Speckly::Eventually.satisfy(wait: wait) do
-        (!@expected_merged || (@passed_merged = values_match?(@expected_merged, (@actual_merged = @transform_value.(actual.output))))) &&
-        (!@expected_stdout || (@passed_stdout = values_match?(@expected_stdout, (@actual_stdout = @transform_value.(actual.stdout))))) &&
-        (!@expected_stderr || (@passed_stderr = values_match?(@expected_stderr, (@actual_stderr = @transform_value.(actual.stderr)))))
+      Speckly::Eventually.satisfy(wait:) do
+        (!@expected_merged || (@passed_merged = values_match?(@expected_merged, (@actual_merged = @transform_value.call(actual.output))))) && # rubocop:disable Layout/LineLength
+          (!@expected_stdout || (@passed_stdout = values_match?(@expected_stdout, (@actual_stdout = @transform_value.call(actual.stdout))))) && # rubocop:disable Layout/LineLength
+          (!@expected_stderr || (@passed_stderr = values_match?(@expected_stderr, (@actual_stderr = @transform_value.call(actual.stderr))))) # rubocop:disable Layout/LineLength
       end || prepare_result_for_diff
     end
 
     match_when_negated do |command|
-      raise ArgumentError, "negated have_output with a value is not available" unless merged == NO_ARG && stdout == NO_ARG && stderr == NO_ARG
-      raise ArgumentError, "must be a Speckly::Command or a Speckly::Session" unless command.respond_to?(:output)
+      unless merged == NO_ARG && stdout == NO_ARG && stderr == NO_ARG
+        raise ArgumentError,
+              'negated have_output with a value is not available'
+      end
+      unless command.respond_to?(:output)
+        raise ArgumentError,
+              'must be a Speckly::Command or a Speckly::Session'
+      end
 
       @command = command
       sleep 0.1
-      values_match?((@expected_merged = be_empty), (@actual_merged = actual.output.to_s))
+      values_match?((@expected_merged = be_empty),
+                    (@actual_merged = actual.output.to_s))
     end
 
     failure_message do
-      message = +""
-      message << "expected #{@command} to have output: #{@expected_merged}\n\ngot:\n#{@actual_merged}\n\n" if @passed_merged == false
-      message << "expected #{@command} to have stdout: #{@expected_stdout}\n\ngot:\n#{@actual_stdout}\n\n" if @passed_stdout == false
-      message << "expected #{@command} to have stderr: #{@expected_stderr}\n\ngot:\n#{@actual_stderr}\n\n" if @passed_stderr == false
+      message = +''
+      if @passed_merged == false
+        message << prepare_failure_message(
+          :output, @expected_merged, @actual_merged
+        )
+      end
+      if @passed_stdout == false
+        message << prepare_failure_message(
+          :stdout, @expected_stdout, @actual_stdout
+        )
+      end
+      if @passed_stderr == false
+        message << prepare_failure_message(
+          :stderr, @expected_stderr, @actual_stderr
+        )
+      end
       message.chomp
     end
 
@@ -45,14 +78,25 @@ module Speckly
 
     private
 
-    def prepare_value_transformer(rendered, split)
-      split = $/ if split == true
+    def prepare_failure_message(stream, expected, actual)
+      <<~MESSAGE
+        expected #{@command} to have #{stream}:
+        #{expected}
+
+        got:
+        #{actual}
+
+      MESSAGE
+    end
+
+    def prepare_value_transformer(rendered, split) # rubocop: disable Metrics/MethodLength
+      split = $INPUT_RECORD_SEPARATOR if split == true
       clear_style = true if rendered != :keep_style
 
       @transform_value = if rendered && split
-        ->(s) { TTYString.parse(s.to_s, clear_style: clear_style).split(split) }
+        ->(s) { TTYString.parse(s.to_s, clear_style:).split(split) }
       elsif rendered
-        ->(s) { TTYString.parse(s.to_s, clear_style: clear_style) }
+        ->(s) { TTYString.parse(s.to_s, clear_style:) }
       elsif split
         ->(s) { s.to_s.split(split) }
       else
@@ -60,7 +104,7 @@ def prepare_value_transformer(rendered, split)
       end
     end
 
-    def prepare_result_for_diff
+    def prepare_result_for_diff # rubocop:disable Metrics/MethodLength
       @expected, @actual = if @expected_merged
         [@expected_merged, @actual_merged]
       elsif @expected_stdout && @expected_stderr
@@ -74,11 +118,13 @@ def prepare_result_for_diff
       false
     end
 
-    def prepare_matchers(command, merged, stdout, stderr)
+    def prepare_matchers(command, merged, stdout, stderr) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
       if command.merged? && (stdout != NO_ARG || stderr != NO_ARG)
-        raise ArgumentError, "command was run with `merged_output: true` so can't match stdout and stderr separately"
+        raise ArgumentError, 'command was run with `merged_output: true` ' \
+                             "so can't match stdout and stderr separately"
       elsif merged != NO_ARG && (stdout != NO_ARG || stderr != NO_ARG)
-        raise ArgumentError, "can't use a merged matcher and single stream matchers together"
+        raise ArgumentError, "can't use a merged matcher and single stream " \
+                             'matchers together'
       elsif merged == NO_ARG && stdout == NO_ARG && stderr == NO_ARG
         @expected_merged = be_present
       elsif stdout == NO_ARG && stderr == NO_ARG
@@ -91,11 +137,11 @@ def prepare_matchers(command, merged, stdout, stderr)
       elsif stderr != NO_ARG
         @expected_stderr = io_matcher(stderr)
       else
-        raise ArgumentError, "Unexpected argument combination"
+        raise ArgumentError, 'Unexpected argument combination'
       end
     end
 
-    def io_matcher(arg)
+    def io_matcher(arg) # rubocop:disable Metrics/MethodLength
       if arg == NO_ARG || arg == true
         be_present
       elsif arg
diff --git a/spec/speckly/rspec_matchers.rb b/spec/speckly/rspec_matchers.rb
index 3a5c2c7..7906eac 100644
--- a/spec/speckly/rspec_matchers.rb
+++ b/spec/speckly/rspec_matchers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 module Speckly
@@ -7,5 +9,3 @@ module Speckly
 
 require_relative 'rspec/have_exitstatus'
 require_relative 'rspec/have_output'
-
-
diff --git a/spec/speckly/session.rb b/spec/speckly/session.rb
index 913c620..ec5cb86 100644
--- a/spec/speckly/session.rb
+++ b/spec/speckly/session.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 
 module Speckly
@@ -19,7 +21,7 @@ def dir
 
     attr_reader :commands
 
-    def chdir(dir, return_if: :block_given?)
+    def chdir(dir, return_if: :block_given?) # rubocop:disable Metrics/MethodLength
       return_if = block_given? if return_if == :block_given?
       return_to = ::Dir.pwd if return_if
       dir = mktmpdir if dir == :temp
diff --git a/spec/support/git_helpers.rb b/spec/support/git_helpers.rb
index 5b9c669..9702286 100644
--- a/spec/support/git_helpers.rb
+++ b/spec/support/git_helpers.rb
@@ -1,26 +1,31 @@
+# frozen_string_literal: true
+
 module CLIHelper
-  def git(args = nil, **kwargs)
-    run("git #{args}", **kwargs)
+  def git(args = nil, **)
+    run("git #{args}", **)
   end
 
-  def git_add(args, **kwargs)
-    git("add #{args}", **kwargs)
+  def git_add(args, **)
+    git("add #{args}", **)
   end
 
-  def git_checkout(args, **kwargs)
-    git("checkout #{args}", **kwargs)
+  def git_checkout(args, **)
+    git("checkout #{args}", **)
   end
 
-  def git_commit(args = nil, **kwargs)
-    git("commit --no-gpg-sign #{args}", **kwargs)
+  def git_commit(args = nil, **)
+    git("commit --no-gpg-sign #{args}", **)
   end
 
   def expect_clean_git_status
-    expect(git("status --long")).to have_output("On branch main\nnothing to commit, working tree clean\n")
+    expect(git('status --long')).to have_output(<<~MESSAGE)
+      On branch main
+      nothing to commit, working tree clean
+    MESSAGE
   end
 
   def expect_empty_stash
-    expect(git("stash list")).to_not have_output
+    expect(git('stash list')).not_to have_output
   end
 
   def git_log