cnvrg 1.4.9.1 → 1.4.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea663b9f944f12a89e14c1a168f2d60aa8dd5ff23a8cd6fc1d1c706638b26eb
-  data.tar.gz: f0b1b29e6e0f4f564b7450565088de3b57a8be7c0c2a5b1e00c25642635aca86
+  metadata.gz: 82d6237ddf965c30cbc18423f39929acf57df54047817c093c6db6d6263e1a31
+  data.tar.gz: 4738157c73f5f87fd4b4b3166eec8bdc1c0d1658749f209b51962813b75c50dd
 SHA512:
-  metadata.gz: 1d9d40bea88a86d1276cdd9c1e259c44946be93ee96616971fc6bb44cd9fd44c28c273625db4eb19dc8ba8f90bfc8677002f25d7bff4ac5824be9a594687622c
-  data.tar.gz: 6aaafa5d8bde846ce84c2a9e30c43d1b2c17df591ec967dce71bb687c026a32b6d8b5f3523352c442a9781135257fb8c2ebd8efff4af0d3539a3e4a517e2ef7f
+  metadata.gz: 800049d7ef5ee405b5350f5b649930ea7cd26616a66dd89b8e06ba8f7fd09bf223cbbfc05c9ec99e65c7df2096f31920bb1d268565f4537cc854160fb7fbd995
+  data.tar.gz: dc7a3afc3d2e39042327f085efb0c07efcd032d15d697913bf1e21648f3f3c2ba8c366385f4ba9e7b246025434e17ee4df9dcf52a6672254e24aebb76e26df4b

data/lib/cnvrg/cli.rb

@@ -868,7 +868,6 @@ module Cnvrg
           return clone_data_query(dataset_url, query)
         end
 
-
         url_parts = dataset_url.split("/")
         project_index = Cnvrg::Helpers.look_for_in_path(dataset_url, "datasets")
         slug = url_parts[project_index + 1]
@@ -878,6 +877,7 @@ module Cnvrg
         response["result"] = @dataset.get_dataset(commit: commit, query: query)
         dataset_name = response["result"]["name"]
         dataset_home = Dir.pwd+"/"+dataset_name
+
         check = Helpers.checkmark
         if @dataset.init_home(remote:remote)
           log_message("Cloning #{dataset_name}", Thor::Shell::Color::BLUE)
@@ -902,9 +902,10 @@ module Cnvrg
                                            :starting_at => 0,
                                            :total => files_count,
                                            :autofinish => true)
+
           while files['keys'].length > 0
             Cnvrg::Logger.log_info("download multiple files, #{downloaded_files.size} files downloaded")
-            @files.download_multiple_files_s3(files, dataset_home, progressbar: progressbar, read_only: read)
+            @files.download_multiple_files_s3(files, @dataset.local_path, progressbar: progressbar, read_only: read)
 
             downloaded_files += files['keys'].length
             files = @files.get_clone_chunk(commit: commit, latest_id: files['latest'])
@@ -912,7 +913,6 @@ module Cnvrg
           progressbar.finish
           if downloaded_files == files_count
             Dataset.verify_cnvrgignore_exist(dataset_name, false)
-            @dataset = Dataset.new(dataset_home)
             if !read
               @dataset.write_idx(nil, commit) #nil means, generate idx
             end
@@ -1603,8 +1603,6 @@ module Cnvrg
 
       rescue => e
 
-        puts e.message
-        puts e.backtrace
         log_message("Error occurred, \nAborting", Thor::Shell::Color::RED)
         log_error(e)
         @files.rollback_commit(commit_sha1)

data/lib/cnvrg/datafiles.rb

@@ -940,7 +940,7 @@ module Cnvrg
             isolation: true
         }
         Parallel.map(files["keys"], parallel_options) do |f|
-          local_path = @dataset.working_dir + '/' + f['name']
+          local_path = @dataset.local_path + '/' + f['name']
           Cnvrg::Logger.log_info("Downloading #{local_path}")
           progressbar.progress += 1 if progressbar.present?
           if local_path.end_with? "/"
@@ -956,7 +956,7 @@ module Cnvrg
             Cnvrg::Logger.log_info("Download #{local_path} success")
             end
         end
-        rescue => e
+      rescue => e
           return Cnvrg::Result.new(false,"Could not download some files", e.message, e.backtrace)
         end
       end

data/lib/cnvrg/dataset.rb

@@ -29,7 +29,10 @@ module Cnvrg
     end
 
     def init_home(remote: false)
-      dataset_home = Dir.pwd+"/"+@slug
+      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
@@ -257,6 +260,7 @@ module Cnvrg
       if not File.exists?(self.local_path + "/.cnvrgignore")
         self.generate_cnvrg_ignore
       end
+
       ignore_list = []
       File.open(self.local_path + "/.cnvrgignore", "r").each_line do |line|
         line = line.strip
@@ -380,25 +384,29 @@ module Cnvrg
     end
 
     def self.clone(owner, dataset_name, dataset_slug, remote = false)
-
       begin
         list_dirs = []
-        if !remote
-          list_dirs << dataset_name
-        end
-        list_dirs << "#{dataset_name}/.cnvrg"
+        prefix =  dataset_name + "/"
+        list_dirs << ".cnvrg"
         list_files = [
-            "#{dataset_name}/.cnvrg/config.yml"
+            ".cnvrgignore",
+            ".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("#{dataset_name}/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
+        File.open(config_yml_path, "w+") {|f| f.write config.to_yaml}
       rescue => e
         puts "Exception in clone request:#{e.message}"
         return false

data/lib/cnvrg/version.rb

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

metadata

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