From 3f553b0a7140b43141ea476e719ba831e92480e8 Mon Sep 17 00:00:00 2001
From: Aria Edmonds <aria@ar1as.space>
Date: Fri, 6 Jul 2018 23:31:57 +1000
Subject: [PATCH 1/7] lang/ruby: Initial work on porting to enh-ruby

---
 modules/lang/ruby/config.el   | 91 ++++++++++++++++++++---------------
 modules/lang/ruby/packages.el |  6 ++-
 2 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 5c5e3b713..cd18264e3 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -6,21 +6,36 @@
 (defvar-local +ruby-current-version nil
   "The currently active ruby version.")
 
+(defvar +ruby-ask-for-server t
+  "Ask for a server whenever you open a ruby buffer.
 
-;;
-;; Plugins
-;;
+This will only ask once if you say yes, but if you say no and keep opening
+buffers, itll ask every time.")
 
-(def-package! ruby-mode
-  :mode "\\.\\(?:pry\\|irb\\)rc\\'"
+;; FIXME: Add these
+;; does anyone actually use these?
+;; (map! :map ruby-mode-map
+;;       :localleader
+;;       :prefix "r"
+;;       :nv "b"  #'ruby-toggle-block
+;;       :nv "ec" #'ruby-refactor-extract-constant
+;;       :nv "el" #'ruby-refactor-extract-to-let
+;;       :nv "em" #'ruby-refactor-extract-to-method
+;;       :nv "ev" #'ruby-refactor-extract-local-variable
+;;       :nv "ad" #'ruby-refactor-add-parameter
+;;       :nv "cc" #'ruby-refactor-convert-post-conditional))
+(def-package! enh-ruby-mode
+  :mode "\\.rb$"
+  :mode "\\.rake$"
+  :mode "\\.gemspec$"
+  :mode "\\.\\(pry\\|irb\\)rc$"
+  :mode "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\|Pod\\|Puppet\\|Berks\\)file$"
   :config
-  (set-company-backend! 'ruby-mode 'company-dabbrev-code)
-  (set-electric! 'ruby-mode :words '("else" "end" "elseif"))
   (set-env! "RBENV_ROOT")
-  (set-repl-handler! 'ruby-mode #'inf-ruby) ; `inf-ruby'
-  (setq ruby-deep-indent-paren t)
-  ;; Don't interfere with my custom RET behavior
-  (define-key ruby-mode-map [?\n] nil)
+  (add-hook 'enh-ruby-mode-hook #'flycheck-mode)
+  (set-electric! 'enh-ruby-ode :words '("else" "end" "elsif"))
+  (setq sp-max-pair-length 6) ;; so class and module work
+  (set-repl-handler! 'enh-ruby-mode #'inf-ruby) ; `inf-ruby'
 
   ;; Version management with rbenv
   (defun +ruby|add-version-to-modeline ()
@@ -29,7 +44,7 @@
           (if +ruby-current-version
               (format "Ruby %s" +ruby-current-version)
             "Ruby")))
-  (add-hook 'ruby-mode-hook #'+ruby|add-version-to-modeline)
+  (add-hook 'enh-ruby-mode-hook #'+ruby|add-version-to-modeline)
 
   (if (not (executable-find "rbenv"))
       (setq +ruby-current-version (string-trim (shell-command-to-string "ruby --version 2>&1 | cut -d' ' -f2")))
@@ -43,36 +58,41 @@ environment variables."
               +ruby-current-version version-str)
         (when (member version-str +ruby-rbenv-versions)
           (setenv "RBENV_VERSION" version-str))))
-    (add-hook 'ruby-mode-hook #'+ruby|detect-rbenv-version))
+    (add-hook 'enh-ruby-mode-hook #'+ruby|detect-rbenv-version)))
 
-  (map! :map ruby-mode-map
-        :localleader
-        :prefix "r"
-        :nv "b"  #'ruby-toggle-block
-        :nv "ec" #'ruby-refactor-extract-constant
-        :nv "el" #'ruby-refactor-extract-to-let
-        :nv "em" #'ruby-refactor-extract-to-method
-        :nv "ev" #'ruby-refactor-extract-local-variable
-        :nv "ad" #'ruby-refactor-add-parameter
-        :nv "cc" #'ruby-refactor-convert-post-conditional))
+(def-package! yard-mode :hook enh-ruby-mode)
 
+(def-package! rbenv
+  :after enh-ruby-mode
+  :config
+  (global-rbenv-mode))
 
-(def-package! ruby-refactor
-  :commands
-  (ruby-refactor-extract-to-method ruby-refactor-extract-local-variable
-   ruby-refactor-extract-constant ruby-refactor-add-parameter
-   ruby-refactor-extract-to-let ruby-refactor-convert-post-conditional))
+(def-package! rubocop
+  :after enh-ruby-mode
+  :hook (enh-ruby-mode . rubocop-mode))
 
+(def-package! robe
+  :after enh-ruby-mode
+  :hook (enh-ruby-mode . robe-mode)
+  :init
+  (set-company-backend! 'enh-ruby-mode 'company-robe)
+  ;; robe-start erros if you hit no.
+  ;; FIXME: Once hit no, itll ask every time you open a new buffer. This is
+  ;; defined behaviour but not what we want!
+  (when +ruby-ask-for-server
+    (add-hook! 'enh-ruby-mode-hook (ignore-errors (call-interactively #'robe-start)))))
 
-;; Highlight doc comments
-(def-package! yard-mode :hook ruby-mode)
-
+;; FIXME: needed??
+(after! smartparens-ruby
+  (sp-local-pair 'enh-ruby-mode "{" "}"
+                 :pre-handlers '(:rem sp-ruby-pre-handler)
+                 :post-handlers '(:rem sp-ruby-post-handler)))
 
 (def-package! rspec-mode
   :mode ("/\\.rspec\\'" . text-mode)
   :init
   (associate! rspec-mode :match "/\\.rspec$")
-  (associate! rspec-mode :modes (ruby-mode yaml-mode) :files ("spec/"))
+  (associate! rspec-mode :modes (enh-ruby-mode yaml-mode) :files ("spec/"))
 
   (defvar evilmi-ruby-match-tags
     '((("unless" "if") ("elsif" "else") "end")
@@ -89,7 +109,7 @@ environment variables."
   ;; so remove it anyway!
   (advice-remove 'compilation-buffer-name 'rspec-compilation-buffer-name-wrapper)
   :config
-  (remove-hook 'ruby-mode-hook #'rspec-enable-appropriate-mode)
+  (remove-hook 'enh-ruby-mode-hook #'rspec-enable-appropriate-mode)
   (map! :map (rspec-mode-map rspec-verifiable-mode-map)
         :localleader
         :prefix "t"
@@ -104,11 +124,6 @@ environment variables."
   :after inf-ruby
   :config (set-company-backend! 'inf-ruby-mode 'company-inf-ruby))
 
-
-;; `rake'
-(setq rake-completion-system 'default)
-
-
 ;;
 ;; Evil integration
 ;;
diff --git a/modules/lang/ruby/packages.el b/modules/lang/ruby/packages.el
index 5328f19fa..661a8d1b8 100644
--- a/modules/lang/ruby/packages.el
+++ b/modules/lang/ruby/packages.el
@@ -3,12 +3,16 @@
 
 ;; requires ruby ruby-lint
 
+(package! enh-ruby-mode)
+(package! rbenv)
+(package! rubocop)
 (package! inf-ruby)
 (package! rspec-mode)
-(package! ruby-refactor)
 (package! yard-mode)
 (package! rake)
+(package! robe)
 
 (when (featurep! :completion company)
   (package! company-inf-ruby))
 
+

From 6b1265ae5ac4676917aa44560704789c57ebb64a Mon Sep 17 00:00:00 2001
From: Aria Edmonds <aria@ar1as.space>
Date: Fri, 6 Jul 2018 23:40:54 +1000
Subject: [PATCH 2/7] lang/ruby: bit more refactoring

---
 modules/lang/ruby/config.el | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index cd18264e3..441e01132 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -12,7 +12,7 @@
 This will only ask once if you say yes, but if you say no and keep opening
 buffers, itll ask every time.")
 
-;; FIXME: Add these
+;; FIXME: Add these?
 ;; does anyone actually use these?
 ;; (map! :map ruby-mode-map
 ;;       :localleader
@@ -37,6 +37,11 @@ buffers, itll ask every time.")
   (setq sp-max-pair-length 6) ;; so class and module work
   (set-repl-handler! 'enh-ruby-mode #'inf-ruby) ; `inf-ruby'
 
+  ;; FIXME: needed??
+  (after! smartparens-ruby
+    (sp-local-pair 'enh-ruby-mode "{" "}"
+                  :pre-handlers '(:rem sp-ruby-pre-handler)
+                  :post-handlers '(:rem sp-ruby-post-handler)))
   ;; Version management with rbenv
   (defun +ruby|add-version-to-modeline ()
     "Add version string to the major mode in the modeline."
@@ -64,29 +69,26 @@ environment variables."
 
 (def-package! rbenv
   :after enh-ruby-mode
+  :when (executable-find "rbenv")
   :config
   (global-rbenv-mode))
 
 (def-package! rubocop
-  :after enh-ruby-mode
   :hook (enh-ruby-mode . rubocop-mode))
 
+;; FIXME: Clean up all processes from this/inf-ruby when all the ruby buffers
+;; are closed
 (def-package! robe
-  :after enh-ruby-mode
   :hook (enh-ruby-mode . robe-mode)
   :init
-  (set-company-backend! 'enh-ruby-mode 'company-robe)
   ;; robe-start erros if you hit no.
   ;; FIXME: Once hit no, itll ask every time you open a new buffer. This is
   ;; defined behaviour but not what we want!
   (when +ruby-ask-for-server
-    (add-hook! 'enh-ruby-mode-hook (ignore-errors (call-interactively #'robe-start)))))
+    (add-hook! 'enh-ruby-mode-hook (ignore-errors (call-interactively #'robe-start))))
+  :config
+  (set-company-backend! 'robe-mode 'company-robe))
 
-;; FIXME: needed??
-(after! smartparens-ruby
-  (sp-local-pair 'enh-ruby-mode "{" "}"
-                 :pre-handlers '(:rem sp-ruby-pre-handler)
-                 :post-handlers '(:rem sp-ruby-post-handler)))
 
 (def-package! rspec-mode
   :mode ("/\\.rspec\\'" . text-mode)
@@ -118,7 +120,6 @@ environment variables."
         :n "s" #'rspec-verify-single
         :n "v" #'rspec-verify))
 
-
 (def-package! company-inf-ruby
   :when (featurep! :completion company)
   :after inf-ruby

From 12b32d6208db9d000f1af2564d7d13c5497d9bce Mon Sep 17 00:00:00 2001
From: Aria Edmonds <aria@ar1as.space>
Date: Fri, 6 Jul 2018 23:46:23 +1000
Subject: [PATCH 3/7] lang/ruby: Add rubocop binds

---
 modules/lang/ruby/config.el | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 441e01132..44167d42d 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -74,7 +74,14 @@ environment variables."
   (global-rbenv-mode))
 
 (def-package! rubocop
-  :hook (enh-ruby-mode . rubocop-mode))
+  :hook (enh-ruby-mode . rubocop-mode)
+  :config
+  (map! :map rubocop-mode
+        :localleader
+        :nv "f" #'rubocop-check-current-file
+        :nv "F" #'rubocop-autocorrect-current-file
+        :nv "p" #'rubocop-check-project
+        :nv "P" #'rubocop-autocorrect-project))
 
 ;; FIXME: Clean up all processes from this/inf-ruby when all the ruby buffers
 ;; are closed

From 811290368c442f153c3a984d42fdab65e4531540 Mon Sep 17 00:00:00 2001
From: Aria Edmonds <aria@ar1as.space>
Date: Fri, 6 Jul 2018 23:54:25 +1000
Subject: [PATCH 4/7] lang/ruby: what's 'this' lol

---
 modules/lang/ruby/config.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 44167d42d..6fabd60c7 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -9,7 +9,7 @@
 (defvar +ruby-ask-for-server t
   "Ask for a server whenever you open a ruby buffer.
 
-This will only ask once if you say yes, but if you say no and keep opening
+Robe will only ask once if you say yes, but if you say no and keep opening
 buffers, itll ask every time.")
 
 ;; FIXME: Add these?

From 372f02b6c00211ec51a523f07913e0775fa2975d Mon Sep 17 00:00:00 2001
From: Aria Edmonds <aria@ar1as.space>
Date: Fri, 6 Jul 2018 23:55:51 +1000
Subject: [PATCH 5/7] lang/ruby: fix type (enh-ruby-ode)

---
 modules/lang/ruby/config.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 6fabd60c7..dd519630f 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -33,7 +33,7 @@ buffers, itll ask every time.")
   :config
   (set-env! "RBENV_ROOT")
   (add-hook 'enh-ruby-mode-hook #'flycheck-mode)
-  (set-electric! 'enh-ruby-ode :words '("else" "end" "elsif"))
+  (set-electric! 'enh-ruby-mode :words '("else" "end" "elsif"))
   (setq sp-max-pair-length 6) ;; so class and module work
   (set-repl-handler! 'enh-ruby-mode #'inf-ruby) ; `inf-ruby'
 

From f5f87ee0a3f8f5b29122ebb2b50551ed4c5240c4 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 6 Jul 2018 22:38:01 +0200
Subject: [PATCH 6/7] Refactor lang/ruby & remove +ruby-ask-for-server

To conform to conventions and remove redundancies (like activating
flycheck-mode, which is global now).

Also, should now silently create a robe server.
---
 modules/lang/ruby/config.el | 78 ++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 45 deletions(-)

diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index dd519630f..0757982ff 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -6,42 +6,25 @@
 (defvar-local +ruby-current-version nil
   "The currently active ruby version.")
 
-(defvar +ruby-ask-for-server t
-  "Ask for a server whenever you open a ruby buffer.
 
-Robe will only ask once if you say yes, but if you say no and keep opening
-buffers, itll ask every time.")
+;;
+;; Plugins
+;;
 
-;; FIXME: Add these?
-;; does anyone actually use these?
-;; (map! :map ruby-mode-map
-;;       :localleader
-;;       :prefix "r"
-;;       :nv "b"  #'ruby-toggle-block
-;;       :nv "ec" #'ruby-refactor-extract-constant
-;;       :nv "el" #'ruby-refactor-extract-to-let
-;;       :nv "em" #'ruby-refactor-extract-to-method
-;;       :nv "ev" #'ruby-refactor-extract-local-variable
-;;       :nv "ad" #'ruby-refactor-add-parameter
-;;       :nv "cc" #'ruby-refactor-convert-post-conditional))
 (def-package! enh-ruby-mode
-  :mode "\\.rb$"
-  :mode "\\.rake$"
-  :mode "\\.gemspec$"
-  :mode "\\.\\(pry\\|irb\\)rc$"
-  :mode "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\|Pod\\|Puppet\\|Berks\\)file$"
+  :mode "\\.rb\\'"
+  :mode "\\.rake\\'"
+  :mode "\\.gemspec\\'"
+  :mode "\\.\\(?:pry\\|irb\\)rc\\'"
+  :mode "/\\(?:Gem\\|Cap\\|Vagrant\\|Rake\\|Pod\\|Puppet\\|Berks\\)file\\'"
   :config
   (set-env! "RBENV_ROOT")
-  (add-hook 'enh-ruby-mode-hook #'flycheck-mode)
   (set-electric! 'enh-ruby-mode :words '("else" "end" "elsif"))
-  (setq sp-max-pair-length 6) ;; so class and module work
   (set-repl-handler! 'enh-ruby-mode #'inf-ruby) ; `inf-ruby'
 
-  ;; FIXME: needed??
-  (after! smartparens-ruby
-    (sp-local-pair 'enh-ruby-mode "{" "}"
-                  :pre-handlers '(:rem sp-ruby-pre-handler)
-                  :post-handlers '(:rem sp-ruby-post-handler)))
+  ;; so class and module pairs work
+  (setq-hook! 'enh-ruby-mode-hook sp-max-pair-length 6)
+
   ;; Version management with rbenv
   (defun +ruby|add-version-to-modeline ()
     "Add version string to the major mode in the modeline."
@@ -65,34 +48,40 @@ environment variables."
           (setenv "RBENV_VERSION" version-str))))
     (add-hook 'enh-ruby-mode-hook #'+ruby|detect-rbenv-version)))
 
+
 (def-package! yard-mode :hook enh-ruby-mode)
 
+
 (def-package! rbenv
   :after enh-ruby-mode
-  :when (executable-find "rbenv")
   :config
-  (global-rbenv-mode))
+  (when (executable-find "rbenv")
+    (global-rbenv-mode +1)))
+
 
 (def-package! rubocop
   :hook (enh-ruby-mode . rubocop-mode)
   :config
-  (map! :map rubocop-mode
+  (map! :map rubocop-mode-map
         :localleader
         :nv "f" #'rubocop-check-current-file
         :nv "F" #'rubocop-autocorrect-current-file
         :nv "p" #'rubocop-check-project
         :nv "P" #'rubocop-autocorrect-project))
 
+
 ;; FIXME: Clean up all processes from this/inf-ruby when all the ruby buffers
 ;; are closed
 (def-package! robe
   :hook (enh-ruby-mode . robe-mode)
   :init
-  ;; robe-start erros if you hit no.
-  ;; FIXME: Once hit no, itll ask every time you open a new buffer. This is
-  ;; defined behaviour but not what we want!
-  (when +ruby-ask-for-server
-    (add-hook! 'enh-ruby-mode-hook (ignore-errors (call-interactively #'robe-start))))
+  ;; robe-start errors if you hit no.
+  (defun +ruby|init-robe ()
+    (when (executable-find "ruby")
+      (cl-letf (((symbol-function #'yes-or-no-p)
+                 (lambda (&rest _) t)))
+        (ignore-errors (robe-start)))))
+  (add-hook 'enh-ruby-mode-hook #'+ruby|init-robe)
   :config
   (set-company-backend! 'robe-mode 'company-robe))
 
@@ -116,7 +105,7 @@ environment variables."
   ;; (even for things unrelated to ruby/rspec). Even if the function were
   ;; autoloaded, it seems silly to add this advice before rspec-mode is loaded,
   ;; so remove it anyway!
-  (advice-remove 'compilation-buffer-name 'rspec-compilation-buffer-name-wrapper)
+  (advice-remove 'compilation-buffer-name #'rspec-compilation-buffer-name-wrapper)
   :config
   (remove-hook 'enh-ruby-mode-hook #'rspec-enable-appropriate-mode)
   (map! :map (rspec-mode-map rspec-verifiable-mode-map)
@@ -125,17 +114,16 @@ environment variables."
         :n "r" #'rspec-rerun
         :n "a" #'rspec-verify-all
         :n "s" #'rspec-verify-single
-        :n "v" #'rspec-verify))
+        :n "v" #'rspec-verify)
+
+  ;; Evil integration
+  (when (featurep! :feature evil +everywhere)
+    (add-hook! '(rspec-mode-hook rspec-verifiable-mode-hook)
+      #'evil-normalize-keymaps)))
+
 
 (def-package! company-inf-ruby
   :when (featurep! :completion company)
   :after inf-ruby
   :config (set-company-backend! 'inf-ruby-mode 'company-inf-ruby))
 
-;;
-;; Evil integration
-;;
-
-(when (featurep! :feature evil +everywhere)
-  (add-hook! '(rspec-mode-hook rspec-verifiable-mode-hook)
-    #'evil-normalize-keymaps))

From 00d6e7b9caa7c5538caf45e8ef48720fa5779e77 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 6 Jul 2018 23:11:26 +0200
Subject: [PATCH 7/7] Cleanup robe processes killing last ruby buffer

Experimental?
---
 modules/lang/ruby/autoload.el | 15 +++++++++++++++
 modules/lang/ruby/config.el   |  7 ++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 modules/lang/ruby/autoload.el

diff --git a/modules/lang/ruby/autoload.el b/modules/lang/ruby/autoload.el
new file mode 100644
index 000000000..8f9519283
--- /dev/null
+++ b/modules/lang/ruby/autoload.el
@@ -0,0 +1,15 @@
+;;; lang/ruby/autoload.el -*- lexical-binding: t; -*-
+
+;;;###autoload
+(defun +ruby|cleanup-robe-servers ()
+  "Clean up dangling inf robe processes if there are no more `enh-ruby-mode'
+buffers open."
+  ;; FIXME This should wait X seconds before cleaning up
+  (unless (or (not robe-mode) (doom-buffers-in-mode 'enh-ruby-mode))
+    (let (inf-buffer kill-buffer-query-functions)
+      (while (setq inf-buffer (robe-inf-buffer))
+        (let ((process (get-buffer-process inf-buffer))
+              confirm-kill-processes)
+          (when (processp process)
+            (kill-process (get-buffer-process inf-buffer))
+            (kill-buffer inf-buffer)))))))
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 0757982ff..0f6ade8b8 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -78,9 +78,10 @@ environment variables."
   ;; robe-start errors if you hit no.
   (defun +ruby|init-robe ()
     (when (executable-find "ruby")
-      (cl-letf (((symbol-function #'yes-or-no-p)
-                 (lambda (&rest _) t)))
-        (ignore-errors (robe-start)))))
+      (cl-letf (((symbol-function #'yes-or-no-p) (lambda (_) t)))
+        (ignore-errors (robe-start))
+        (when (robe-running-p)
+          (add-hook 'kill-buffer-hook #'+ruby|cleanup-robe-servers nil t)))))
   (add-hook 'enh-ruby-mode-hook #'+ruby|init-robe)
   :config
   (set-company-backend! 'robe-mode 'company-robe))