From fe9d55892ee8503db58282d0b6ba099e31227243 Mon Sep 17 00:00:00 2001
From: Dana Sherson <robot@dana.sh>
Date: Mon, 4 Dec 2023 23:08:14 +1300
Subject: [PATCH] Fix linters

---
 .spellr.yml                   | 4 ++--
 .spellr_wordlists/english.txt | 5 +++++
 bin/git_log_oneline           | 2 +-
 spec/git_spec.rb              | 1 -
 spec/speckly.rb               | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.spellr.yml b/.spellr.yml
index 91cda8a..0c33550 100644
--- a/.spellr.yml
+++ b/.spellr.yml
@@ -1,7 +1,7 @@
 excludes:
   - vendor
-  - test/bats
-  - test/test_helper
+  - '*.terminal'
+  - '*.itermcolors'
 
 languages:
   ruby:
diff --git a/.spellr_wordlists/english.txt b/.spellr_wordlists/english.txt
index b7664fe..0d27915 100644
--- a/.spellr_wordlists/english.txt
+++ b/.spellr_wordlists/english.txt
@@ -62,6 +62,7 @@ dont
 dotfiles
 dscacheutil
 echodo
+echodont
 echoerr
 editmsg
 edot
@@ -147,6 +148,7 @@ irbrc
 istat
 istatmenus
 itemexit
+itermcolors
 jbuilder
 jeks
 joejag
@@ -175,6 +177,7 @@ mergeoptions
 mergetool
 mkdir
 mktemp
+monokai
 mycnf
 mysql
 namespace
@@ -208,6 +211,7 @@ pkgconfig
 plist
 pmset
 ppid
+prefs
 prettierrc
 printf
 pryrc
@@ -280,6 +284,7 @@ uniq
 universalaccess
 unmatch
 unmerged
+unpushed
 unsetenv
 unstage
 unstaged
diff --git a/bin/git_log_oneline b/bin/git_log_oneline
index 1945eef..77f7d8f 100755
--- a/bin/git_log_oneline
+++ b/bin/git_log_oneline
@@ -4,5 +4,5 @@ git --no-pager \
 log \
   --color \
   --reverse \
-  --format='%h%Creset%Cred%Cgreen%Cblue%Creset%(decorate) %s %C(dim)%cr - %cn%Creset' \
+  --format='%h%C(reset)%C(red)%C(green)%C(blue)%C(reset)%(decorate) %s %C(dim)%cr - %cn%C(reset)' \
   "$@" | git_log_oneline_process
diff --git a/spec/git_spec.rb b/spec/git_spec.rb
index aefd99b..41502ac 100644
--- a/spec/git_spec.rb
+++ b/spec/git_spec.rb
@@ -59,7 +59,6 @@
         end
       ).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',
diff --git a/spec/speckly.rb b/spec/speckly.rb
index 431408a..a541f0d 100644
--- a/spec/speckly.rb
+++ b/spec/speckly.rb
@@ -70,7 +70,7 @@ def run_command( # rubocop:disable Metrics
   end
   alias_method :run, :run_command
 
-  def debug(new_login_shell_command = Speckly.default_debug_login_shell) # rubocop:disable Metrics
+  def debug(new_login_shell_command = Speckly.default_debug_login_shell)
     ::Process.wait ::Process.spawn(
       ::Speckly.default_env,
       new_login_shell_command,