Обновление ohmyzsh

zsh/plugins/rails/README.md

@@ -18,9 +18,11 @@ plugins=(... rails)
 | `rcs` | `rails console --sandbox`  | Test code in a sandbox, without changing any data  |
 | `rd`  | `rails destroy`            | Undo a generate operation                          |
 | `rdb` | `rails dbconsole`          | Interact with your db from the console             |
-| `rgen`  | `rails generate`           | Generate boilerplate code                          |
+| `rgen`| `rails generate`           | Generate boilerplate code                          |
 | `rgm` | `rails generate migration` | Generate a db migration                            |
 | `rp`  | `rails plugin`             | Run a Rails plugin command                         |
+| `rr`  | `rails routes`             | List all defined routes                            |
+| `rrg` | `rails routes \| grep`     | List and filter the defined routes                 |
 | `ru`  | `rails runner`             | Run Ruby code in the context of Rails              |
 | `rs`  | `rails server`             | Launch a web server                                |
 | `rsd` | `rails server --debugger`  | Launch a web server with debugger                  |
@@ -43,8 +45,6 @@ plugins=(... rails)
 | `rdsl`  | `rake db:schema:load`           | Load the database schema                               |
 | `rlc`   | `rake log:clear`                | Clear Rails logs                                       |
 | `rn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
-| `rr`    | `rake routes`                   | List all defined routes                                |
-| `rrg`   | `rake routes | grep`            | List and filter the defined routes                     |
 | `rt`    | `rake test`                     | Run Rails tests                                        |
 | `rmd`   | `rake middleware`               | Interact with Rails middlewares                        |
 | `rsts`  | `rake stats`                    | Print code statistics                                  |
@@ -80,4 +80,3 @@ separately. For example: `REP rake db:migrate` will migrate the production db.
 | `ssp`   | `ruby script/spec`                 |
 | `sc`    | `ruby script/console`              |
 | `sd`    | `ruby script/server --debugger`    |
-

zsh/plugins/rails/rails.plugin.zsh

@@ -17,7 +17,7 @@ function _rake_command () {
     bin/stubs/rake $@
   elif [ -e "bin/rake" ]; then
     bin/rake $@
-  elif type bundle &> /dev/null && [ -e "Gemfile" ]; then
+  elif type bundle &> /dev/null && ([ -e "Gemfile" ] || [ -e "gems.rb" ]); then
     bundle exec rake $@
   else
     command rake $@
@@ -46,6 +46,8 @@ alias rdb='rails dbconsole'
 alias rgen='rails generate'
 alias rgm='rails generate migration'
 alias rp='rails plugin'
+alias rr='rails routes'
+alias rrg='rails routes | grep'
 alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
@@ -65,8 +67,6 @@ alias rdmtc='rake db:migrate db:test:clone'
 alias rdsl='rake db:schema:load'
 alias rlc='rake log:clear'
 alias rn='rake notes'
-alias rr='rake routes'
-alias rrg='rake routes | grep'
 alias rt='rake test'
 alias rmd='rake middleware'
 alias rsts='rake stats'