10.2.2 (#253 )

Merge branch 'master' into dev
10.2.2 version bump (#252 )
2022-12-06 19:48:46 +00:00 · 2022-12-06 19:23:45 +00:00 · 2022-12-06 19:22:06 +00:00 · 2022-12-06 19:13:07 +00:00 · 2022-12-05 17:42:26 +00:00 · 2022-12-05 13:16:03 +00:00
3 changed files with 42 additions and 50 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -379,9 +379,9 @@ dependencies = [

 [[package]]
 name = "cxx"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
 dependencies = [
 "cc",
 "cxxbridge-flags",
@@ -391,9 +391,9 @@ dependencies = [

 [[package]]
 name = "cxx-build"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -406,15 +406,15 @@ dependencies = [

 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"

 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -721,9 +721,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"

 [[package]]
 name = "h2"
-version = "0.3.12"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b"
+checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
 dependencies = [
 "bytes",
 "fnv",
@@ -957,9 +957,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"

 [[package]]
 name = "link-cplusplus"
@@ -1083,9 +1083,9 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
 dependencies = [
 "bitflags",
 "cc",
@@ -1096,9 +1096,9 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.24.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -1661,18 +1661,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"

 [[package]]
 name = "serde"
-version = "1.0.148"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.148"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
+checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1849,9 +1849,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2003,9 +2003,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.5.1"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3b82e6e823a9ee7d7f64b08f8ac3d5f08ac988f23157194bd32af3f2f92767"
+checksum = "cdc46ca74dd45faeaaf96a8fbe2406f425829705ee62100ccaa9b34a2145cff8"
 dependencies = [
 "autocfg",
 "bytes",
@@ -2032,16 +2032,16 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.6.9"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
+checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
 dependencies = [
 "bytes",
 "futures-core",
 "futures-sink",
- "log",
 "pin-project-lite",
 "tokio",
+ "tracing",
 ]

 [[package]]
@@ -2055,7 +2055,7 @@ dependencies = [

 [[package]]
 name = "topgrade"
-version = "10.2.1"
+version = "10.2.2"
 dependencies = [
 "cfg-if",
 "chrono",
@@ -2070,7 +2070,7 @@ dependencies = [
 "home",
 "lazy_static",
 "libc",
- "nix 0.24.2",
+ "nix 0.24.3",
 "notify-rust",
 "parselnk",
 "regex",
@@ -2582,7 +2582,7 @@ dependencies = [
 "futures-util",
 "hex",
 "lazy_static",
- "nix 0.23.1",
+ "nix 0.23.2",
 "once_cell",
 "ordered-stream",
 "rand",
@@ -2613,9 +2613,9 @@ dependencies = [

 [[package]]
 name = "zbus_names"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d69bb79b44e1901ed8b217e485d0f01991aec574479b68cb03415f142bc7ae67"
+checksum = "6c737644108627748a660d038974160e0cbb62605536091bdfa28fd7f64d43c8"
 dependencies = [
 "serde",
 "static_assertions",
@@ -2637,9 +2637,9 @@ dependencies = [

 [[package]]
 name = "zvariant"
-version = "3.8.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c817f416f05fcbc833902f1e6064b72b1778573978cfeac54731451ccc9e207"
+checksum = "56f8c89c183461e11867ded456db252eae90874bc6769b7adbea464caa777e51"
 dependencies = [
 "byteorder",
 "enumflags2",
@@ -2651,9 +2651,9 @@ dependencies = [

 [[package]]
 name = "zvariant_derive"
-version = "3.8.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd24fffd02794a76eb10109de463444064c88f5adb9e9d1a78488adc332bfef"
+checksum = "155247a5d1ab55e335421c104ccd95d64f17cebbd02f50cdbc1c33385f9c4d81"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["upgrade", "update"]
 license = "GPL-3.0"
 # license-file = "LICENSE"
 repository = "https://github.com/topgrade-rs/topgrade"
-version = "10.2.1"
+version = "10.2.2"
 authors = ["Roey Darwish Dror <roey.ghost@gmail.com>", "Thomas Schönauer <t.schoenauer@hgs-wt.at>"]
 exclude = ["doc/screenshot.gif"]
 edition = "2021"
@@ -39,14 +39,14 @@ strum = { version = "~0.24", features = ["derive"] }
 thiserror = "~1.0"
 tempfile = "~3.2"
 cfg-if = "~1.0"
-tokio = { version = "~1.5", features = ["process", "rt-multi-thread"] }
+tokio = { version = "~1.8", features = ["process", "rt-multi-thread"] }
 futures = "~0.3"
 regex = "~1.5"
 semver = "~1.0"
 shell-words = "~1.1"
-color-eyre = "0.6.2"
-tracing = { version = "0.1.37", features = ["attributes", "log"] }
-tracing-subscriber = { version = "0.3.16", features = ["env-filter", "time"] }
+color-eyre = "~0.6"
+tracing = { version = "~0.1", features = ["attributes", "log"] }
+tracing-subscriber = { version = "~0.3", features = ["env-filter", "time"] }

 [target.'cfg(target_os = "macos")'.dependencies]
 notify-rust = "~4.5"
--- a/src/steps/generic.rs
+++ b/src/steps/generic.rs
@@ -89,15 +89,7 @@ pub fn run_rubygems(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> {

    print_separator("RubyGems");

-    let mut command = run_type.execute(gem);
-    command.arg("update --system");
-
-    if env::var_os("RBENV_SHELL").is_none() {
-        debug!("Detected rbenv. Avoiding --user-install");
-        command.arg("--user-install");
-    }
-
-    command.status_checked()
+    run_type.execute(gem).args(["update", "--system"]).status_checked()
 }

 pub fn run_haxelib_update(ctx: &ExecutionContext) -> Result<()> {
Author	SHA1	Message	Date
Thomas Schönauer	51e7a31f48	10.2.2 (#253 )	2022-12-06 19:48:46 +00:00
Thomas Schönauer	9847fd9d4d	Merge branch 'master' into dev	2022-12-06 19:23:45 +00:00
Thomas Schönauer	24ef44291f	10.2.2 version bump (#252 )	2022-12-06 19:22:06 +00:00
Julien ITARD	ebb0c5a6d8	Fix RubyGems step (#251 ) * Bump tokio from 1.5.1 to 1.8.4 (#245) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.5.1 to 1.8.4. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.5.1...tokio-1.8.4) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix RubyGems step * Fix style Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-12-06 19:13:07 +00:00
Armel Soro	1dee462175	Fix misleading log message when detecting rbenv (#249 )	2022-12-05 17:42:26 +00:00
Armel Soro	dc82b8b766	Fix issue with RubyGems update command (#248 )	2022-12-05 13:16:03 +00:00
dependabot[bot]	73888e7669	Bump tokio from 1.5.1 to 1.8.4 (#245 ) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.5.1 to 1.8.4. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.5.1...tokio-1.8.4) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-30 21:56:52 +00:00
dependabot[bot]	46a010cc8f	Bump tokio from 1.5.1 to 1.8.4 (#147 ) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.5.1 to 1.8.4. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.5.1...tokio-1.8.4) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Schönauer <37108907+DottoDev@users.noreply.github.com>	2022-11-30 21:29:39 +00:00