Update modules/lang/*

modules/lang/ruby/config.el

@@ -1,52 +1,50 @@
-;;; module-ruby.el
+;;; lang/ruby/config.el
 
-(use-package ruby-mode
+(@def-package ruby-mode
   :mode ("\\.rb$" "\\.rake$" "\\.gemspec$" "\\.?pryrc$"
          "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
   :interpreter "ruby"
-  :init (add-hook 'ruby-mode-hook 'flycheck-mode)
+  :init
+  (add-hook 'ruby-mode-hook 'flycheck-mode)
   :config
-  (def-builder! ruby-mode "rake %s" "Rakefile")
-  (def-company-backend! ruby-mode (dabbrev-code))
-  (def-electric! ruby-mode :words ("else" "end" "elseif"))
-  (def-repl! ruby-mode inf-ruby)
-  (def-version-cmd! ruby-mode "ruby --version | cut -d' ' -f2")
+  (@set :build 'rake 'ruby-mode '+ruby/rake)
+  (@set :company-backend 'ruby-mode '(company-dabbrev-code))
+  (@set :electric 'ruby-mode :words "else" "end" "elseif")
+  (@set :repl 'ruby-mode 'inf-ruby)
   (setq ruby-deep-indent-paren t)
   ;; Don't interfere with my custom RET behavior
-  (define-key ruby-mode-map [?\n] nil))
+  (define-key ruby-mode-map [?\n] nil)
+
+  (@map :map ruby-mode-map
+        :localleader
+        :prefix "r"
+        :desc "toggle block"             :nv "b"  'ruby-toggle-block
+        :desc "extract method"           :nv "em" 'ruby-refactor-extract-to-method
+        :desc "extract local variable"   :nv "ev" 'ruby-refactor-extract-local-variable
+        :desc "extract constant"         :nv "ec" 'ruby-refactor-extract-constant
+        :desc "add parameter"            :nv "ad" 'ruby-refactor-add-parameter
+        :desc "extract to let"           :nv "el" 'ruby-refactor-extract-to-let
+        :desc "convert post conditional" :nv "cc" 'ruby-refactor-convert-post-conditional))
+
+
+(@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))
 
-(use-package ruby-refactor
-  :after ruby-mode
-  :config
-  (mapc (lambda (x)
-          (let ((command-name (car x))
-                (title (cadr x))
-                (region-p (caddr x))
-                predicate)
-            (setq predicate (cond ((eq region-p 'both) nil)
-                                  (t (if region-p
-                                         (lambda () (use-region-p))
-                                       (lambda () (not (use-region-p)))))))
-            (emr-declare-command (intern (format "ruby-%s" (symbol-name command-name)))
-              :title title :modes 'ruby-mode :predicate predicate)))
-        '((toggle-block                     "toggle block"            nil)
-          (refactor-extract-to-method       "extract method"          t)
-          (refactor-extract-local-variable  "extract local variable"  t)
-          (refactor-extract-constant        "extract constant"        t)
-          (refactor-add-parameter           "add parameter"           nil)
-          (refactor-extract-to-let          "extract to let"          t)
-          (refactor-convert-post-conditional "convert post conditional" t))))
 
 ;; Highlight doc comments
-(use-package yard-mode
+(@def-package yard-mode
   :commands yard-mode
   :init (add-hook 'ruby-mode-hook 'yard-mode))
 
-(use-package rspec-mode
+
+(@def-package rspec-mode
   :mode ("/\\.rspec$" . text-mode)
   :init
-  (associate! rspec-mode :match "/\\.rspec$")
-  (associate! rspec-mode :in (ruby-mode yaml-mode) :files ("spec/"))
+  (@associate rspec-mode :match "/\\.rspec$")
+  (@associate rspec-mode :in (ruby-mode yaml-mode) :files ("/spec/"))
   (defvar rspec-mode-verifiable-map (make-sparse-keymap))
   (defvar evilmi-ruby-match-tags
     '((("unless" "if") ("elsif" "else") "end")
@@ -56,23 +54,27 @@
       ;; Rake
       (("task" "namespace") () "end")))
   :config
-  (map! :map rspec-mode-map
-        (:localleader
-         :n "tr" 'rspec-rerun
-         :n "ta" 'rspec-verify-all
-         :n "ts" 'rspec-verify-single
-         :n "tv" 'rspec-verify)))
+  (@map :map rspec-mode-map
+        :localleader
+        :n "tr" 'rspec-rerun
+        :n "ta" 'rspec-verify-all
+        :n "ts" 'rspec-verify-single
+        :n "tv" 'rspec-verify))
 
-(use-package inf-ruby
+
+(@def-package inf-ruby
   :commands (inf-ruby inf-ruby-console-auto)
-  :config (def-company-backend! inf-ruby-mode (inf-ruby)))
+  :config
+  (@set :company-backend 'inf-ruby-mode '(company-inf-ruby)))
 
-(use-package company-inf-ruby :after inf-ruby)
+
+(@def-package company-inf-ruby
+  :after inf-ruby)
 
 ;;
-;; TODO Parse Rakefile for tasks
-(def-project-type! rake "rake"
-  :files ("Rakefile"))
+;; TODO Frameworks
+;;
+
+;; (@def-project rake "rake"
+;;   :files ("Rakefile"))
 
-(provide 'module-ruby)
-;;; module-ruby.el ends here

modules/lang/ruby/packages.el

@@ -0,0 +1,10 @@
+;; -*- no-byte-compile: t; -*-
+;;; lang/ruby/packages.el
+
+(@package inf-ruby)
+(@package rspec-mode)
+(@package ruby-refactor)
+(@package yard-mode)
+
+(when (@featurep :completion company)
+  (@package company-inf-ruby))