diff --git a/CHANGELOG.md b/CHANGELOG.md index 40ede5ff03..37db1c53ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.48.2] - 2021-07-31 +### Fixed +- Dependency error in `remote` commands +- Remove incorrect `.gitignore` file generation + ## [0.48.1] - 2021-07-26 ### Fixed - `sql` command failing on OSX diff --git a/Cargo.lock b/Cargo.lock index 85a73b043c..2a65e04363 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ dependencies = [ [[package]] name = "alloc-no-stdlib" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192ec435945d87bc2f70992b4d818154b5feede43c09fb7592146374eac90a6" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" [[package]] name = "alloc-stdlib" @@ -93,9 +93,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2", "quote", @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f29919120f08613aadcd4383764e00526fc9f18b6c0895814faeed0dd78613e" +checksum = "f2aa5b67b28d2530dac2071d92d7d12beb12d1559f137c3726e6e7b87980fc19" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1052e1c3b8d4d80eb84a8b94f0a1498797b5fb96314c001156a1c761940ef4ec" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "kamu" -version = "0.48.1" +version = "0.48.2" dependencies = [ "assert_matches", "bytes", @@ -1073,7 +1073,7 @@ dependencies = [ [[package]] name = "kamu-cli" -version = "0.48.1" +version = "0.48.2" dependencies = [ "chrono", "chrono-humanize", @@ -1109,7 +1109,7 @@ dependencies = [ [[package]] name = "kamu-test" -version = "0.48.1" +version = "0.48.2" dependencies = [ "chrono", "opendatafabric", @@ -1457,7 +1457,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opendatafabric" -version = "0.48.1" +version = "0.48.2" dependencies = [ "byteorder", "chrono", @@ -2067,24 +2067,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" [[package]] name = "serde" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ "proc-macro2", "quote", @@ -2093,9 +2093,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ "indexmap", "itoa", @@ -2201,9 +2201,9 @@ checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" [[package]] name = "slog-async" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60813879f820c85dbc4eabf3269befe374591289019775898d56a81a804fbdc" +checksum = "766c59b252e62a34651412870ff55d8c4e6d04df19b43eecb2703e417b097ffe" dependencies = [ "crossbeam-channel", "slog", @@ -2238,9 +2238,9 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" dependencies = [ "libc", "winapi", @@ -2766,9 +2766,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "xml-rs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "yaml-rust" diff --git a/kamu-cli/Cargo.toml b/kamu-cli/Cargo.toml index b2b05e1e75..5295250758 100644 --- a/kamu-cli/Cargo.toml +++ b/kamu-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kamu-cli" -version = "0.48.1" +version = "0.48.2" description = "Decentralized data management tool" authors = ["Sergii Mikhtoniuk "] license = "MPL-2.0" diff --git a/kamu-cli/src/commands/init_command.rs b/kamu-cli/src/commands/init_command.rs index e7eb3cd9b5..92e96fadf1 100644 --- a/kamu-cli/src/commands/init_command.rs +++ b/kamu-cli/src/commands/init_command.rs @@ -2,7 +2,6 @@ use super::{Command, Error}; use kamu::infra::*; use std::fs; -use std::io::prelude::*; pub struct InitCommand { workspace_layout: WorkspaceLayout, @@ -31,18 +30,6 @@ impl Command for InitCommand { fs::create_dir_all(&self.workspace_layout.run_info_dir)?; fs::create_dir_all(&self.workspace_layout.local_volume_dir)?; - { - let gitignore_path = self.workspace_layout.kamu_root_dir.join(".gitignore"); - let mut gitignore = fs::File::create(gitignore_path)?; - writeln!(gitignore, "/config")?; - gitignore.sync_all()?; - } - - { - let gitignore_path = self.workspace_layout.local_volume_dir.join(".gitignore"); - fs::write(gitignore_path, "*\n".as_bytes())?; - } - eprintln!( "{}", console::style("Initialized an empty workspace") diff --git a/kamu-core-test/Cargo.toml b/kamu-core-test/Cargo.toml index 70bf0aa6b2..3f3c916644 100644 --- a/kamu-core-test/Cargo.toml +++ b/kamu-core-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kamu-test" -version = "0.48.1" +version = "0.48.2" authors = ["Sergii Mikhtoniuk "] edition = "2018" diff --git a/kamu-core/Cargo.toml b/kamu-core/Cargo.toml index 3763b89e6e..83999606f3 100644 --- a/kamu-core/Cargo.toml +++ b/kamu-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kamu" -version = "0.48.1" +version = "0.48.2" authors = ["Sergii Mikhtoniuk "] edition = "2018" diff --git a/kamu-core/src/infra/sync_service_impl.rs b/kamu-core/src/infra/sync_service_impl.rs index 26d9ac4ccf..c43ea4627f 100644 --- a/kamu-core/src/infra/sync_service_impl.rs +++ b/kamu-core/src/infra/sync_service_impl.rs @@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex}; pub struct SyncServiceImpl { workspace_layout: WorkspaceLayout, metadata_repo: Arc, - remote_factory: Arc>, + remote_factory: Arc, _logger: Logger, } @@ -20,7 +20,7 @@ impl SyncServiceImpl { pub fn new( workspace_layout: &WorkspaceLayout, metadata_repo: Arc, - remote_factory: Arc>, + remote_factory: Arc, logger: Logger, ) -> Self { Self { @@ -53,8 +53,6 @@ impl SyncService for SyncServiceImpl { let client = self .remote_factory - .lock() - .unwrap() .get_remote_client(&remote) .map_err(|e| SyncError::InternalError(e.into()))?; @@ -198,8 +196,6 @@ impl SyncService for SyncServiceImpl { let client = self .remote_factory - .lock() - .unwrap() .get_remote_client(&remote) .map_err(|e| SyncError::InternalError(e.into()))?; diff --git a/kamu-core/tests/infra/test_sync_service_impl.rs b/kamu-core/tests/infra/test_sync_service_impl.rs index 48aa32e3d3..dee0376958 100644 --- a/kamu-core/tests/infra/test_sync_service_impl.rs +++ b/kamu-core/tests/infra/test_sync_service_impl.rs @@ -7,7 +7,7 @@ use opendatafabric::*; use assert_matches::assert_matches; use chrono::prelude::*; use std::path::{Path, PathBuf}; -use std::sync::{Arc, Mutex}; +use std::sync::Arc; use url::Url; fn list_files(dir: &Path) -> Vec { @@ -96,7 +96,7 @@ fn do_test_sync(tmp_workspace_dir: &Path, remote_url: Url) { let volume_layout = VolumeLayout::new(&workspace_layout.local_volume_dir); let dataset_layout = DatasetLayout::new(&volume_layout, dataset_id); let metadata_repo = Arc::new(MetadataRepositoryImpl::new(&workspace_layout)); - let remote_factory = Arc::new(Mutex::new(RemoteFactory::new(logger.clone()))); + let remote_factory = Arc::new(RemoteFactory::new(logger.clone())); let sync_svc = SyncServiceImpl::new( &workspace_layout, diff --git a/opendatafabric/Cargo.toml b/opendatafabric/Cargo.toml index 06522e1042..53f6178f3d 100644 --- a/opendatafabric/Cargo.toml +++ b/opendatafabric/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opendatafabric" -version = "0.48.1" +version = "0.48.2" authors = ["Sergii Mikhtoniuk "] edition = "2018"