1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-12 15:34:50 +08:00

Compare commits

..

No commits in common. "4012df8fbb449bd551400c66f7602452bbae0bd1" and "cbd6fbe7a7c3ef260f497704092dc43f2e953c3f" have entirely different histories.

3 changed files with 13 additions and 38 deletions

View File

@ -1,9 +1,7 @@
# Bundler # Bundler
- Adds completion for basic bundler commands - adds completion for basic bundler commands
- adds short aliases for common bundler commands
- Adds short aliases for common bundler commands
- `ba` aliased to `bundle add`
- `be` aliased to `bundle exec`. - `be` aliased to `bundle exec`.
It also supports aliases (if `rs` is `rails server`, `be rs` will bundle-exec `rails server`). It also supports aliases (if `rs` is `rails server`, `be rs` will bundle-exec `rails server`).
- `bl` aliased to `bundle list` - `bl` aliased to `bundle list`
@ -12,12 +10,9 @@
- `bout` aliased to `bundle outdated` - `bout` aliased to `bundle outdated`
- `bu` aliased to `bundle update` - `bu` aliased to `bundle update`
- `bi` aliased to `bundle install --jobs=<cpu core count>` (only for bundler `>= 1.4.0`) - `bi` aliased to `bundle install --jobs=<cpu core count>` (only for bundler `>= 1.4.0`)
- `bcn` aliased to `bundle clean` - adds a wrapper for common gems:
- `bck` aliased to `bundle check` - looks for a binstub under `./bin/` and executes it (if present)
- calls `bundle exec <gem executable>` otherwise
- Adds a wrapper for common gems:
- Looks for a binstub under `./bin/` and executes it (if present)
- Calls `bundle exec <gem executable>` otherwise
Common gems wrapped by default (by name of the executable): Common gems wrapped by default (by name of the executable):
`annotate`, `cap`, `capify`, `cucumber`, `foodcritic`, `guard`, `hanami`, `irb`, `jekyll`, `kitchen`, `knife`, `middleman`, `nanoc`, `pry`, `puma`, `rackup`, `rainbows`, `rake`, `rspec`, `rubocop`, `shotgun`, `sidekiq`, `spec`, `spork`, `spring`, `strainer`, `tailor`, `taps`, `thin`, `thor`, `unicorn` and `unicorn_rails`. `annotate`, `cap`, `capify`, `cucumber`, `foodcritic`, `guard`, `hanami`, `irb`, `jekyll`, `kitchen`, `knife`, `middleman`, `nanoc`, `pry`, `puma`, `rackup`, `rainbows`, `rake`, `rspec`, `rubocop`, `shotgun`, `sidekiq`, `spec`, `spork`, `spring`, `strainer`, `tailor`, `taps`, `thin`, `thor`, `unicorn` and `unicorn_rails`.
@ -29,24 +24,20 @@ Please use the exact name of the executable and not the gem name.
### Add additional gems to be wrapped ### Add additional gems to be wrapped
Add this before the plugin-list in your `.zshrc`: Add this before the plugin-list in your `.zshrc`:
```sh ```sh
BUNDLED_COMMANDS=(rubocop) BUNDLED_COMMANDS=(rubocop)
plugins=(... bundler ...) plugins=(... bundler ...)
``` ```
This will add the wrapper for the `rubocop` gem (i.e. the executable). This will add the wrapper for the `rubocop` gem (i.e. the executable).
### Exclude gems from being wrapped ### Exclude gems from being wrapped
Add this before the plugin-list in your `.zshrc`: Add this before the plugin-list in your `.zshrc`:
```sh ```sh
UNBUNDLED_COMMANDS=(foreman spin) UNBUNDLED_COMMANDS=(foreman spin)
plugins=(... bundler ...) plugins=(... bundler ...)
``` ```
This will exclude the `foreman` and `spin` gems (i.e. their executable) from being wrapped. This will exclude the `foreman` and `spin` gems (i.e. their executable) from being wrapped.
## Excluded gems ## Excluded gems

View File

@ -1,4 +1,3 @@
alias ba="bundle add"
alias be="bundle exec" alias be="bundle exec"
alias bl="bundle list" alias bl="bundle list"
alias bp="bundle package" alias bp="bundle package"
@ -7,7 +6,6 @@ alias bout="bundle outdated"
alias bu="bundle update" alias bu="bundle update"
alias bi="bundle_install" alias bi="bundle_install"
alias bcn="bundle clean" alias bcn="bundle clean"
alias bck="bundle check"
bundled_commands=( bundled_commands=(
annotate annotate

View File

@ -1,14 +1,7 @@
# Use colors, but only if connected to a terminal, and that terminal # Use colors, but only if connected to a terminal, and that terminal
# supports them. # supports them.
if [ -t 1 ]; then if [ -t 1 ]; then
RB_RED=$(printf '\033[38;5;196m')
RB_ORANGE=$(printf '\033[38;5;202m')
RB_YELLOW=$(printf '\033[38;5;226m')
RB_GREEN=$(printf '\033[38;5;082m')
RB_BLUE=$(printf '\033[38;5;021m')
RB_INDIGO=$(printf '\033[38;5;093m')
RB_VIOLET=$(printf '\033[38;5;163m')
RED=$(printf '\033[31m') RED=$(printf '\033[31m')
GREEN=$(printf '\033[32m') GREEN=$(printf '\033[32m')
YELLOW=$(printf '\033[33m') YELLOW=$(printf '\033[33m')
@ -16,14 +9,6 @@ if [ -t 1 ]; then
BOLD=$(printf '\033[1m') BOLD=$(printf '\033[1m')
RESET=$(printf '\033[m') RESET=$(printf '\033[m')
else else
RB_RED=""
RB_ORANGE=""
RB_YELLOW=""
RB_GREEN=""
RB_BLUE=""
RB_INDIGO=""
RB_VIOLET=""
RED="" RED=""
GREEN="" GREEN=""
YELLOW="" YELLOW=""
@ -55,12 +40,13 @@ fi
printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
if git pull --rebase --stat origin master if git pull --rebase --stat origin master
then then
printf '%s %s__ %s %s %s %s %s__ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s' "$GREEN"
printf '%s ____ %s/ /_ %s ____ ___ %s__ __ %s ____ %s_____%s/ /_ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s\n' ' __ __ '
printf '%s / __ \%s/ __ \ %s / __ `__ \%s/ / / / %s /_ / %s/ ___/%s __ \ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s / /_%s(__ )%s / / / %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s /___/%s____/%s_/ /_/ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
printf '%s %s %s %s /____/ %s %s %s %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
printf '%s\n' ' /____/ '
printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version." printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh" printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
printf "${BLUE}${BOLD}%s${RESET}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh" printf "${BLUE}${BOLD}%s${RESET}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh"