diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-02-27 22:55:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 22:55:30 +0100 |
| commit | 18ee5dffdc57bb9219ee96b40da006704ac37df1 (patch) | |
| tree | e1fe420cf18fa7a916d5d43c408c6f92ed33b62d /plugins/rails | |
| parent | d81cd753e0b3a845e8f3549da245dbad102a6e4c (diff) | |
| parent | 368198b7616eb69b396de86d9ec4ff0f35bd72f0 (diff) | |
| download | zsh-18ee5dffdc57bb9219ee96b40da006704ac37df1.tar.gz zsh-18ee5dffdc57bb9219ee96b40da006704ac37df1.tar.bz2 zsh-18ee5dffdc57bb9219ee96b40da006704ac37df1.zip | |
Merge branch 'master' into clipboard
Diffstat (limited to 'plugins/rails')
| -rw-r--r-- | plugins/rails/README.md | 4 | ||||
| -rw-r--r-- | plugins/rails/rails.plugin.zsh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/rails/README.md b/plugins/rails/README.md index 5549ba18b..ad83fffe8 100644 --- a/plugins/rails/README.md +++ b/plugins/rails/README.md @@ -18,7 +18,7 @@ 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 | | `ru` | `rails runner` | Run Ruby code in the context of Rails | @@ -44,7 +44,7 @@ plugins=(... rails) | `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 | +| `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 | diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh index a8ec79db2..1fd5f0f86 100644 --- a/plugins/rails/rails.plugin.zsh +++ b/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 $@ |