Fix dependency error

kamu-data · Jul 31, 2021 · 27a17aa · 27a17aa
1 parent f0c18de
commit 27a17aa
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 51 deletions.
diff --git 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
diff --git 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 <mikhtoniuk@gmail.com>"]
 license = "MPL-2.0"

diff --git 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
@@ -1,6 +1,6 @@
 [package]
 name = "kamu-test"
-version = "0.48.1"
+version = "0.48.2"
 authors = ["Sergii Mikhtoniuk <mikhtoniuk@gmail.com>"]
 edition = "2018"
 

diff --git 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 <mikhtoniuk@gmail.com>"]
 edition = "2018"
 

diff --git 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<dyn MetadataRepository>,
-    remote_factory: Arc<Mutex<RemoteFactory>>,
+    remote_factory: Arc<RemoteFactory>,
     _logger: Logger,
 }
 
@@ -20,7 +20,7 @@ impl SyncServiceImpl {
     pub fn new(
         workspace_layout: &WorkspaceLayout,
         metadata_repo: Arc<dyn MetadataRepository>,
-        remote_factory: Arc<Mutex<RemoteFactory>>,
+        remote_factory: Arc<RemoteFactory>,
         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
@@ -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<PathBuf> {
@@ -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
@@ -1,6 +1,6 @@
 [package]
 name = "opendatafabric"
-version = "0.48.1"
+version = "0.48.2"
 authors = ["Sergii Mikhtoniuk <mikhtoniuk@gmail.com>"]
 edition = "2018"