Merge pull request #35 from mario-eth/release/v0.2.7

Added the dependency name as dependency key in the config

Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT"
 name = "soldeer"
 readme = "./README.md"
 repository = "https://github.com/mario-eth/soldeer"
-version = "0.2.6"
+version = "0.2.7"
 
 [dependencies]
 chrono = {version = "0.4.34", features = ["serde"]}

README.md

@@ -17,9 +17,13 @@ This project was started to solve the following issues:
 - npmjs was built for the js ecosystem not for solidity
 - github versioning of the releases is a pain and not all the projects are using it correctly
 
-## Version 0.2.6
+## Version 0.2.7
 
-#### Breaking Changes introduced in 0.2.6
+#### Version 0.2.7 introduces the following changes:
+
+Save the dependency key as the dependency name to respect the Cargo.toml format. For multiple versions for the same dependency an issue has been created to be added as a feature [#34](https://github.com/mario-eth/soldeer/issues/34). For now the dependency name is the key in the toml file.
+
+### Breaking Changes introduced in 0.2.6
 
 In 0.2.6 the `sdependencies` has been renamed to `dependencies`. Furthermore a dependency now stored in the toml respects Cargo toml format with `version` and `url` included.
 

src/config.rs

@@ -80,9 +80,8 @@ pub fn read_config(filename: String) -> Result<Vec<Dependency>, ConfigError> {
 
     let mut dependencies: Vec<Dependency> = Vec::new();
     data.dependencies.iter().for_each(|(k, v)| {
-        let parts: Vec<&str> = k.split('~').collect::<Vec<&str>>();
         dependencies.push(Dependency {
-            name: parts[0].to_string(),
+            name: k.to_string(),
             version: v["version"].to_string().replace('"', ""),
             url: v["url"].to_string().replace('\"', ""),
         });
@@ -185,7 +184,7 @@ pub fn add_to_config(
             let dir = get_current_working_dir()
                 .unwrap()
                 .join("dependencies")
-                .join(format!("{}-{}", dependency_name, dependency_version));
+                .join(dependency_name);
             remove_dir_all(dir).unwrap();
             match cleanup_dependency(dependency_name, dependency_version) {
                 Ok(_) => {}
@@ -257,15 +256,10 @@ pub fn add_to_config(
     let mut new_item: Item = Item::None;
     new_item["version"] = value(dependency_version);
     new_item["url"] = value(dependency_url);
-    let dependency_name = format!(
-        "{}~{}",
-        dependency_name.to_string().as_str(),
-        dependency_version.to_string().as_str()
-    );
     doc["dependencies"]
         .as_table_mut()
         .unwrap()
-        .insert(dependency_name.as_str(), new_item);
+        .insert(dependency_name.to_string().as_str(), new_item);
     let mut file: std::fs::File = fs::OpenOptions::new()
         .write(true)
         .append(false)