ruby: sort packages and configuration
This commit is contained in:
parent
9eb8f86b9a
commit
4ef8fcac78
|
@ -19,10 +19,10 @@
|
||||||
flycheck
|
flycheck
|
||||||
rbenv
|
rbenv
|
||||||
robe
|
robe
|
||||||
ruby-test-mode
|
|
||||||
rspec-mode
|
rspec-mode
|
||||||
ruby-tools
|
|
||||||
rubocop
|
rubocop
|
||||||
|
ruby-test-mode
|
||||||
|
ruby-tools
|
||||||
rvm
|
rvm
|
||||||
))
|
))
|
||||||
|
|
||||||
|
@ -30,6 +30,28 @@
|
||||||
(add-to-list 'ruby-packages 'enh-ruby-mode)
|
(add-to-list 'ruby-packages 'enh-ruby-mode)
|
||||||
(add-to-list 'ruby-packages 'ruby-mode))
|
(add-to-list 'ruby-packages 'ruby-mode))
|
||||||
|
|
||||||
|
(defun ruby/init-bundler ()
|
||||||
|
(use-package bundler
|
||||||
|
:defer t
|
||||||
|
:init
|
||||||
|
(dolist (mode '(ruby-mode enh-ruby-mode))
|
||||||
|
(spacemacs/declare-prefix-for-mode mode "mb" "ruby/bundle")
|
||||||
|
(spacemacs/set-leader-keys-for-major-mode mode
|
||||||
|
"bc" 'bundle-check
|
||||||
|
"bi" 'bundle-install
|
||||||
|
"bs" 'bundle-console
|
||||||
|
"bu" 'bundle-update
|
||||||
|
"bx" 'bundle-exec))))
|
||||||
|
|
||||||
|
(when (configuration-layer/layer-usedp 'auto-completion)
|
||||||
|
(defun ruby/post-init-company ()
|
||||||
|
(spacemacs|add-company-hook ruby-mode)
|
||||||
|
(spacemacs|add-company-hook enh-ruby-mode)
|
||||||
|
|
||||||
|
(with-eval-after-load 'company-dabbrev-code
|
||||||
|
(dolist (mode '(ruby-mode enh-ruby-mode))
|
||||||
|
(push mode company-dabbrev-code-modes)))))
|
||||||
|
|
||||||
(defun ruby/init-chruby ()
|
(defun ruby/init-chruby ()
|
||||||
(use-package chruby
|
(use-package chruby
|
||||||
:if (equal 'chruby 'ruby-version-manager)
|
:if (equal 'chruby 'ruby-version-manager)
|
||||||
|
@ -51,6 +73,32 @@
|
||||||
(spacemacs/add-to-hooks 'spacemacs//enable-chruby
|
(spacemacs/add-to-hooks 'spacemacs//enable-chruby
|
||||||
'(ruby-mode-hook enh-ruby-mode-hook)))))
|
'(ruby-mode-hook enh-ruby-mode-hook)))))
|
||||||
|
|
||||||
|
(defun ruby/init-enh-ruby-mode ()
|
||||||
|
"Initialize Ruby Mode"
|
||||||
|
(use-package enh-ruby-mode
|
||||||
|
:mode (("\\(Rake\\|Thor\\|Guard\\|Gem\\|Cap\\|Vagrant\\|Berks\\|Pod\\|Puppet\\)file\\'" . enh-ruby-mode)
|
||||||
|
("\\.\\(rb\\|rabl\\|ru\\|builder\\|rake\\|thor\\|gemspec\\|jbuilder\\)\\'" . enh-ruby-mode))
|
||||||
|
:interpreter "ruby"
|
||||||
|
:config
|
||||||
|
(progn
|
||||||
|
(setq enh-ruby-deep-indent-paren nil
|
||||||
|
enh-ruby-hanging-paren-deep-indent-level 2)
|
||||||
|
(sp-with-modes 'enh-ruby-mode
|
||||||
|
(sp-local-pair
|
||||||
|
"{" "}"
|
||||||
|
:pre-handlers '(sp-ruby-pre-handler)
|
||||||
|
:post-handlers '(sp-ruby-post-handler
|
||||||
|
(spacemacs/smartparens-pair-newline-and-indent "RET"))
|
||||||
|
:suffix "")))))
|
||||||
|
|
||||||
|
(defun ruby/post-init-evil-matchit ()
|
||||||
|
(dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
|
||||||
|
(add-hook hook `turn-on-evil-matchit-mode)))
|
||||||
|
|
||||||
|
(defun ruby/post-init-flycheck ()
|
||||||
|
(spacemacs/add-flycheck-hook 'ruby-mode)
|
||||||
|
(spacemacs/add-flycheck-hook 'enh-ruby-mode))
|
||||||
|
|
||||||
(defun ruby/init-rbenv ()
|
(defun ruby/init-rbenv ()
|
||||||
(use-package rbenv
|
(use-package rbenv
|
||||||
:if (equal 'rbenv 'ruby-version-manager)
|
:if (equal 'rbenv 'ruby-version-manager)
|
||||||
|
@ -72,73 +120,6 @@
|
||||||
(spacemacs/add-to-hooks 'spacemacs//enable-rbenv
|
(spacemacs/add-to-hooks 'spacemacs//enable-rbenv
|
||||||
'(ruby-mode-hook enh-ruby-mode-hook)))))
|
'(ruby-mode-hook enh-ruby-mode-hook)))))
|
||||||
|
|
||||||
(defun ruby/init-ruby-mode ()
|
|
||||||
(use-package ruby-mode
|
|
||||||
:defer t
|
|
||||||
:config
|
|
||||||
(progn
|
|
||||||
(spacemacs/set-leader-keys-for-major-mode 'ruby-mode
|
|
||||||
"'" 'ruby-toggle-string-quotes
|
|
||||||
"{" 'ruby-toggle-block)
|
|
||||||
(sp-with-modes 'ruby-mode
|
|
||||||
(sp-local-pair "{" "}"
|
|
||||||
:pre-handlers '(sp-ruby-pre-handler)
|
|
||||||
:post-handlers '(sp-ruby-post-handler (spacemacs/smartparens-pair-newline-and-indent "RET"))
|
|
||||||
:suffix "")))))
|
|
||||||
|
|
||||||
(defun ruby/init-enh-ruby-mode ()
|
|
||||||
"Initialize Ruby Mode"
|
|
||||||
(use-package enh-ruby-mode
|
|
||||||
:mode (("\\(Rake\\|Thor\\|Guard\\|Gem\\|Cap\\|Vagrant\\|Berks\\|Pod\\|Puppet\\)file\\'" . enh-ruby-mode)
|
|
||||||
("\\.\\(rb\\|rabl\\|ru\\|builder\\|rake\\|thor\\|gemspec\\|jbuilder\\)\\'" . enh-ruby-mode))
|
|
||||||
:interpreter "ruby"
|
|
||||||
:config
|
|
||||||
(progn
|
|
||||||
(setq enh-ruby-deep-indent-paren nil
|
|
||||||
enh-ruby-hanging-paren-deep-indent-level 2)
|
|
||||||
(sp-with-modes 'enh-ruby-mode
|
|
||||||
(sp-local-pair "{" "}"
|
|
||||||
:pre-handlers '(sp-ruby-pre-handler)
|
|
||||||
:post-handlers '(sp-ruby-post-handler (spacemacs/smartparens-pair-newline-and-indent "RET"))
|
|
||||||
:suffix "")))))
|
|
||||||
|
|
||||||
(defun ruby/post-init-evil-matchit ()
|
|
||||||
(dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
|
|
||||||
(add-hook hook `turn-on-evil-matchit-mode)))
|
|
||||||
|
|
||||||
(defun ruby/post-init-flycheck ()
|
|
||||||
(spacemacs/add-flycheck-hook 'ruby-mode)
|
|
||||||
(spacemacs/add-flycheck-hook 'enh-ruby-mode))
|
|
||||||
|
|
||||||
(defun ruby/init-ruby-tools ()
|
|
||||||
(use-package ruby-tools
|
|
||||||
:defer t
|
|
||||||
:init
|
|
||||||
(dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
|
|
||||||
(add-hook hook 'ruby-tools-mode))
|
|
||||||
:config
|
|
||||||
(progn
|
|
||||||
(spacemacs|hide-lighter ruby-tools-mode)
|
|
||||||
(dolist (mode '(ruby-mode enh-ruby-mode))
|
|
||||||
(spacemacs/declare-prefix-for-mode mode "mx" "ruby/text")
|
|
||||||
(spacemacs/set-leader-keys-for-major-mode mode
|
|
||||||
"x\'" 'ruby-tools-to-single-quote-string
|
|
||||||
"x\"" 'ruby-tools-to-double-quote-string
|
|
||||||
"x:" 'ruby-tools-to-symbol)))))
|
|
||||||
|
|
||||||
(defun ruby/init-bundler ()
|
|
||||||
(use-package bundler
|
|
||||||
:defer t
|
|
||||||
:init
|
|
||||||
(dolist (mode '(ruby-mode enh-ruby-mode))
|
|
||||||
(spacemacs/declare-prefix-for-mode mode "mb" "ruby/bundle")
|
|
||||||
(spacemacs/set-leader-keys-for-major-mode mode
|
|
||||||
"bc" 'bundle-check
|
|
||||||
"bi" 'bundle-install
|
|
||||||
"bs" 'bundle-console
|
|
||||||
"bu" 'bundle-update
|
|
||||||
"bx" 'bundle-exec))))
|
|
||||||
|
|
||||||
(defun ruby/init-robe ()
|
(defun ruby/init-robe ()
|
||||||
"Initialize Robe mode"
|
"Initialize Robe mode"
|
||||||
(use-package robe
|
(use-package robe
|
||||||
|
@ -212,6 +193,36 @@
|
||||||
"rrp" 'rubocop-check-project
|
"rrp" 'rubocop-check-project
|
||||||
"rrP" 'rubocop-autocorrect-project)))))
|
"rrP" 'rubocop-autocorrect-project)))))
|
||||||
|
|
||||||
|
(defun ruby/init-ruby-mode ()
|
||||||
|
(use-package ruby-mode
|
||||||
|
:defer t
|
||||||
|
:config
|
||||||
|
(progn
|
||||||
|
(spacemacs/set-leader-keys-for-major-mode 'ruby-mode
|
||||||
|
"'" 'ruby-toggle-string-quotes
|
||||||
|
"{" 'ruby-toggle-block)
|
||||||
|
(sp-with-modes 'ruby-mode
|
||||||
|
(sp-local-pair "{" "}"
|
||||||
|
:pre-handlers '(sp-ruby-pre-handler)
|
||||||
|
:post-handlers '(sp-ruby-post-handler (spacemacs/smartparens-pair-newline-and-indent "RET"))
|
||||||
|
:suffix "")))))
|
||||||
|
|
||||||
|
(defun ruby/init-ruby-tools ()
|
||||||
|
(use-package ruby-tools
|
||||||
|
:defer t
|
||||||
|
:init
|
||||||
|
(dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
|
||||||
|
(add-hook hook 'ruby-tools-mode))
|
||||||
|
:config
|
||||||
|
(progn
|
||||||
|
(spacemacs|hide-lighter ruby-tools-mode)
|
||||||
|
(dolist (mode '(ruby-mode enh-ruby-mode))
|
||||||
|
(spacemacs/declare-prefix-for-mode mode "mx" "ruby/text")
|
||||||
|
(spacemacs/set-leader-keys-for-major-mode mode
|
||||||
|
"x\'" 'ruby-tools-to-single-quote-string
|
||||||
|
"x\"" 'ruby-tools-to-double-quote-string
|
||||||
|
"x:" 'ruby-tools-to-symbol)))))
|
||||||
|
|
||||||
(defun ruby/init-ruby-test-mode ()
|
(defun ruby/init-ruby-test-mode ()
|
||||||
"Define keybindings for ruby test mode"
|
"Define keybindings for ruby test mode"
|
||||||
(use-package ruby-test-mode)
|
(use-package ruby-test-mode)
|
||||||
|
@ -242,12 +253,3 @@
|
||||||
(setq rspec-use-rvm t)
|
(setq rspec-use-rvm t)
|
||||||
(spacemacs/add-to-hooks 'rvm-activate-corresponding-ruby
|
(spacemacs/add-to-hooks 'rvm-activate-corresponding-ruby
|
||||||
'(ruby-mode-hook enh-ruby-mode-hook)))))
|
'(ruby-mode-hook enh-ruby-mode-hook)))))
|
||||||
|
|
||||||
(when (configuration-layer/layer-usedp 'auto-completion)
|
|
||||||
(defun ruby/post-init-company ()
|
|
||||||
(spacemacs|add-company-hook ruby-mode)
|
|
||||||
(spacemacs|add-company-hook enh-ruby-mode)
|
|
||||||
|
|
||||||
(with-eval-after-load 'company-dabbrev-code
|
|
||||||
(dolist (mode '(ruby-mode enh-ruby-mode))
|
|
||||||
(push mode company-dabbrev-code-modes)))))
|
|
||||||
|
|
Loading…
Reference in a new issue