diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 5bcaabfbc..21fc9756f 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -16,7 +16,7 @@ jobs: contents: write # this is needed to push commits and branches steps: - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0 with: egress-policy: audit diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index f0d1abb9b..017d26213 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -26,7 +26,7 @@ jobs: - macos-latest steps: - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0 with: egress-policy: audit @@ -47,7 +47,7 @@ jobs: - test steps: - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0 with: egress-policy: audit diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52c297f3f..8b1835f72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: if: github.repository == 'ohmyzsh/ohmyzsh' steps: - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0 with: egress-policy: audit diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index e3117769f..b9489cf6f 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -17,7 +17,7 @@ jobs: if: github.repository == 'ohmyzsh/ohmyzsh' steps: - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0 with: egress-policy: audit - name: Authenticate as @ohmyzsh diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index fa767fbcb..f31221f88 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0 with: egress-policy: audit @@ -60,6 +60,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2 + uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1 with: sarif_file: results.sarif diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md index 8280a344c..b322b8d71 100644 --- a/plugins/bundler/README.md +++ b/plugins/bundler/README.md @@ -22,7 +22,8 @@ plugins=(... bundler) | `bo` | `bundle open` | Opens the source directory for a gem in your bundle | | `bout` | `bundle outdated` | List installed gems with newer versions available | | `bp` | `bundle package` | Package your needed .gem files into your application | -| `bu` | `bundle update --all` | Update your gems to the latest available versions | +| `bu` | `bundle update` | Update your gems to the latest available versions | +| `bua` | `bundle update --all` | Update all gems to the latest available versions | ## Gem wrapper diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index a496d42de..4af27f4d2 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -9,7 +9,8 @@ alias bl="bundle list" alias bo="bundle open" alias bout="bundle outdated" alias bp="bundle package" -alias bu="bundle update --all" +alias bu="bundle update" +alias bua="bundle update --all" ## Gem wrapper diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md index e5a4fd2ea..a12c77c02 100644 --- a/plugins/flutter/README.md +++ b/plugins/flutter/README.md @@ -13,16 +13,20 @@ plugins=(... flutter) | Alias | Command | Description | | :--------- | :---------------------- | :------------------------------------------------------------------------- | | `fl` | `flutter` | Shorthand for flutter command | +| `fla` | `flutter analyze` | Analyzes flutter code | | `flattach` | `flutter attach` | Attaches flutter to a running flutter application with enabled observatory | | `flb` | `flutter build` | Build flutter application | -| `flchnl` | `flutter channel` | Switches flutter channel (requires input of desired channel) | | `flc` | `flutter clean` | Cleans flutter project | -| `fldvcs` | `flutter devices` | List connected devices (if any) | +| `flchnl` | `flutter channel` | Switches flutter channel (requires input of desired channel) | | `fldoc` | `flutter doctor` | Runs flutter doctor | -| `flpub` | `flutter pub` | Shorthand for flutter pub command | +| `fldvcs` | `flutter devices` | List connected devices (if any) | | `flget` | `flutter pub get` | Installs dependencies | +| `fll` | `flutter logs` | Shows flutter logs | +| `flpu` | `flutter pub upgrade` | Upgrades dependencies | +| `flpub` | `flutter pub` | Shorthand for flutter pub command | | `flr` | `flutter run` | Runs flutter app | | `flrd` | `flutter run --debug` | Runs flutter app in debug mode (default mode) | | `flrp` | `flutter run --profile` | Runs flutter app in profile mode | | `flrr` | `flutter run --release` | Runs flutter app in release mode | -| `flupgrd` | `flutter upgrade` | Upgrades flutter version depending on the current channel | +| `flt` | `flutter test` | Runs flutter tests | +| `flupgrd` | `flutter upgrade` | Upgrades flutter version depending on the current channel | \ No newline at end of file diff --git a/plugins/flutter/flutter.plugin.zsh b/plugins/flutter/flutter.plugin.zsh index 5e853b78f..db8f5d389 100644 --- a/plugins/flutter/flutter.plugin.zsh +++ b/plugins/flutter/flutter.plugin.zsh @@ -1,16 +1,20 @@ alias fl="flutter" +alias fla="flutter analyze" alias flattach="flutter attach" alias flb="flutter build" -alias flchnl="flutter channel" alias flc="flutter clean" -alias fldvcs="flutter devices" +alias flchnl="flutter channel" alias fldoc="flutter doctor" -alias flpub="flutter pub" +alias fldvcs="flutter devices" alias flget="flutter pub get" +alias fll="flutter logs" +alias flpu="flutter pub upgrade" +alias flpub="flutter pub" alias flr="flutter run" alias flrd="flutter run --debug" alias flrp="flutter run --profile" alias flrr="flutter run --release" +alias flt="flutter test" alias flupgrd="flutter upgrade" # COMPLETION FUNCTION diff --git a/plugins/rails/README.md b/plugins/rails/README.md index c0c37ff3d..f023031a6 100644 --- a/plugins/rails/README.md +++ b/plugins/rails/README.md @@ -24,11 +24,12 @@ plugins=(... rails) | `rdm` | `rails db:migrate` | Run pending db migrations | | `rdmd` | `rails db:migrate:down` | Undo specific db migration | | `rdmr` | `rails db:migrate:redo` | Redo specific db migration | +| `rdmrs` | `rails db:migrate:reset` | Delete the database and set it up again from scratch. | | `rdms` | `rails db:migrate:status` | Show current db migration status | | `rdmtc` | `rails db:migrate db:test:clone` | Run pending migrations and clone db into test database | | `rdmu` | `rails db:migrate:up` | Run specific db migration | | `rdr` | `rails db:rollback` | Roll back the last migration | -| `rdrs` | `rails db:reset` | Delete the database and set it up again | +| `rdrs` | `rails db:reset` | Delete the database and set it up again from schema. | | `rds` | `rails db:seed` | Seed the database | | `rdsl` | `rails db:schema:load` | Load the database schema | | `rdtc` | `rails db:test:clone` | Clone the database into the test database | diff --git a/plugins/rails/_rails b/plugins/rails/_rails index dbd843c80..f92f696f0 100644 --- a/plugins/rails/_rails +++ b/plugins/rails/_rails @@ -214,6 +214,7 @@ _rails_subcommands() { "db\:migrate[Migrate the database]" "db\:migrate\:down[Run the 'down' for a given migration VERSION]" "db\:migrate\:redo[Roll back the database one migration and re-migrate up]" + "db\:migrate\:reset[Drop and recreate all databases from scratch for the current environment]" "db\:migrate\:status[Display status of migrations]" "db\:migrate\:up[Run the 'up' for a given migration VERSION]" "db\:prepare[Run setup if database does not exist, or run migrations if it does]" diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh index 75dd9b0c6..9d503768e 100644 --- a/plugins/rails/rails.plugin.zsh +++ b/plugins/rails/rails.plugin.zsh @@ -52,6 +52,7 @@ alias rdd='rails db:drop' alias rdm='rails db:migrate' alias rdmd='rails db:migrate:down' alias rdmr='rails db:migrate:redo' +alias rdmrs='rails db:migrate:reset' alias rdms='rails db:migrate:status' alias rdmtc='rails db:migrate db:test:clone' alias rdmu='rails db:migrate:up' diff --git a/plugins/ufw/README.md b/plugins/ufw/README.md index ffcc6d6f7..5aeb7f1b9 100644 --- a/plugins/ufw/README.md +++ b/plugins/ufw/README.md @@ -16,3 +16,4 @@ Some of the commands include: * `deny /` add deny rule * `disable` disables the firewall * `enable` enables the firewall +* `route` add route rule diff --git a/plugins/ufw/_ufw b/plugins/ufw/_ufw index f5ad03377..701231ec7 100644 --- a/plugins/ufw/_ufw +++ b/plugins/ufw/_ufw @@ -31,6 +31,7 @@ _1st_arguments=( 'reject:add reject rule' 'reload:reloads firewall' 'reset:reset firewall' + 'route:add route rule' 'show:show firewall report' 'status:show firewall status' 'version:display version information' @@ -43,6 +44,7 @@ _arguments -C \ '1:: :->cmds' \ '2:: :->subcmds' \ '3:: :->subsubcmds' \ + '4:: :->subsubsubcmds' \ && return 0 local rules @@ -83,6 +85,17 @@ case "$state" in 'raw' 'builtins' 'before-rules' 'user-rules' 'after-rules' 'logging-rules' 'listening' 'added' \ && ret=0 ;; + (route) + _values 'route' \ + 'delete[delete route rule]' \ + 'insert[insert route rule at NUM]' \ + 'prepend[prepend route rule]' \ + 'allow[add allow route rule]' \ + 'deny[add deny route rule]' \ + 'reject[add reject route rule]' \ + 'limit[add limit route rule]' \ + && ret=0 + ;; (delete) rules="$(_ufw_delete_rules)" if [[ -n "$rules" ]] ; then @@ -109,6 +122,37 @@ case "$state" in 'incoming' 'outgoing' \ && ret=0 ;; + (route) + case "$line[2]" in + (delete|prepend) + _values 'route-action' \ + 'allow[route allow rule]' \ + 'deny[route deny rule]' \ + 'reject[route reject rule]' \ + 'limit[route limit rule]' \ + && ret=0 + ;; + (insert) + _message 'route rule number' + ;; + esac + ;; + esac + ;; + (subsubsubcmds) + case "$line[1]" in + (route) + case "$line[2]" in + (insert) + _values 'route-action' \ + 'allow[route allow rule]' \ + 'deny[route deny rule]' \ + 'reject[route reject rule]' \ + 'limit[route limit rule]' \ + && ret=0 + ;; + esac + ;; esac esac diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme index e8ae18dda..ead1fadfa 100644 --- a/themes/josh.zsh-theme +++ b/themes/josh.zsh-theme @@ -10,6 +10,7 @@ function josh_prompt { prompt=" " branch=$(git_current_branch) + branch="${branch//\%/%%}" ruby_version=$(ruby_prompt_info) path_size=${#PWD} branch_size=${#branch} @@ -31,7 +32,7 @@ function josh_prompt { prompt=" $prompt" done - prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} ${branch//\%/%%}" + prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} ${branch}" echo $prompt }