cnvrg 1.4.9.2 → 1.4.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d6237ddf965c30cbc18423f39929acf57df54047817c093c6db6d6263e1a31
-  data.tar.gz: 4738157c73f5f87fd4b4b3166eec8bdc1c0d1658749f209b51962813b75c50dd
+  metadata.gz: 57cfbe5e8781c875703c195139bb558edd39db3c70d35920efc48152412f63d2
+  data.tar.gz: 35c51593cfef1e3a54e33a95f801e5b09114df80ce5be03f2770408cc33bb0f5
 SHA512:
-  metadata.gz: 800049d7ef5ee405b5350f5b649930ea7cd26616a66dd89b8e06ba8f7fd09bf223cbbfc05c9ec99e65c7df2096f31920bb1d268565f4537cc854160fb7fbd995
-  data.tar.gz: dc7a3afc3d2e39042327f085efb0c07efcd032d15d697913bf1e21648f3f3c2ba8c366385f4ba9e7b246025434e17ee4df9dcf52a6672254e24aebb76e26df4b
+  metadata.gz: b60b3f6689af7a7d7446a52cf01c34043af9811ad3e132a5788372b51bbc83cd429ffe94d899ca53121018d3328028b14d82046bf1d0be22fefa0118fb0a17e3
+  data.tar.gz: 3c083bf5f3dc563a4863b34ba0db6a82e53f134c324b2d37e20ad08dbfc9ad9e6809e3778df197a897a43df2538a18f571293ae2e26bc62a484d738f91c56d22

data/lib/cnvrg/dataset.rb

@@ -29,18 +29,18 @@ module Cnvrg
     end
 
     def init_home(remote: false)
-      dataset_home = Dir.pwd
-      if not remote
-        dataset_home += "/"+@slug
-      end
-      if !remote and (Dir.exists? dataset_home)
-        Cnvrg::CLI.log_message("Error: Conflict with dir #{@slug}", Thor::Shell::Color::RED)
-        if Thor::Shell::Basic.new.no? "Sync to repository anyway? (current data might lost)", Thor::Shell::Color::YELLOW
-          Cnvrg::CLI.log_message("Remove dir in order to clone #{@slug}", Thor::Shell::Color::RED)
-          exit(1)
+      dataset_home = File.join(Dir.pwd, @slug)
+      if Dir.exists? dataset_home
+        if !remote
+          Cnvrg::CLI.log_message("Error: Conflict with dir #{@slug}", Thor::Shell::Color::RED)
+          if Thor::Shell::Basic.new.no? "Sync to repository anyway? (current data might lost)", Thor::Shell::Color::YELLOW
+            Cnvrg::CLI.log_message("Remove dir in order to clone #{@slug}", Thor::Shell::Color::RED)
+            exit(1)
+          end
         end
         FileUtils.rm_rf(dataset_home)
       end
+
       # if Dataset.clone(owner, dataset_name, slug, remote)
       Dataset.clone(@owner, @slug, @slug, remote)
       @local_path = dataset_home
@@ -378,35 +378,28 @@ module Cnvrg
     end
 
     def clone(commit)
-
-
-      return response
+      return
     end
 
     def self.clone(owner, dataset_name, dataset_slug, remote = false)
       begin
         list_dirs = []
-        prefix =  dataset_name + "/"
-        list_dirs << ".cnvrg"
+        if !remote
+          list_dirs << dataset_name
+        end
+        list_dirs << "#{dataset_name}/.cnvrg"
         list_files = [
-            ".cnvrgignore",
-            ".cnvrg/config.yml"
+            "#{dataset_name}/.cnvrg/config.yml",
         ]
 
         config = {dataset_name: dataset_name,
                   dataset_slug: dataset_slug,
                   owner: owner}
-        config_yml_path = ".cnvrg/config.yml"
-        if not remote
-          list_dirs = list_dirs.map {|x| prefix+x}
-          list_dirs << dataset_name
-          list_files = list_files.map {|x| prefix+x}
-          config_yml_path = prefix + config_yml_path
-        end
+
 
         FileUtils.mkdir_p list_dirs
         FileUtils.touch list_files
-        File.open(config_yml_path, "w+") {|f| f.write config.to_yaml}
+        File.open("#{dataset_name}/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
       rescue => e
         puts "Exception in clone request:#{e.message}"
         return false
@@ -442,7 +435,7 @@ module Cnvrg
 
     def write_success(in_folder = false)
       file_path = ".cnvrg/config.yml"
-      file_path = "#{@slug}/" + file_path if !in_folder
+      file_path = File.join(@local_path || @working_dir, file_path)
       if File.exist?(file_path)
         File.open(file_path, "a") {|f| f.puts(":success: true")}
       end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.4.9.2'
+  VERSION = '1.4.9.4'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.4.9.2
+  version: 1.4.9.4
 platform: ruby
 authors:
 - Yochay Ettun