Skip to content

Commit

Permalink
Merge branch 'main' into multidoc-output
Browse files Browse the repository at this point in the history
  • Loading branch information
clux authored Nov 1, 2023
2 parents 64d4b24 + 1f7b6d5 commit 9620df6
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 38 deletions.
61 changes: 30 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ path = "yq.rs"

[dependencies]
anyhow = "1.0.75"
clap = { version = "4.4.6", features = ["cargo", "derive"] }
serde_json = "1.0.107"
toml = { version = "0.8.1", features = ["display"] }
serde_yaml = "0.9.25"
tracing = "0.1.37"
clap = { version = "4.4.7", features = ["cargo", "derive"] }
serde_json = "1.0.108"
toml = { version = "0.8.6", features = ["display"] }
serde_yaml = "0.9.27"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }

[profile.release]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Via cargo:
cargo install whyq
```

or download a prebuilt from [releases](https://github.com/clux/yq/releases) either manually, or via [binstall](https://github.com/cargo-bins/cargo-binstall):
or download a prebuilt from [releases](https://github.com/clux/whyq/releases) either manually, or via [binstall](https://github.com/cargo-bins/cargo-binstall):

```sh
cargo binstall whyq
Expand Down Expand Up @@ -103,7 +103,7 @@ Add `alias tq='yq --input=toml'` to your `.bashrc` or `.zshrc` (etc) to make thi
If you need to convert json to another format you pass `--input=json`:

```sh
$ yq --input=json '.ingredients | keys' -y < test/guacamole.json ☸ production-eu-west-1󰛢monitoring
$ yq --input=json '.ingredients | keys' -y < test/guacamole.json
- avocado
- coriander
- cumin
Expand Down

0 comments on commit 9620df6

Please sign in to comment.