cnvrg 1.11 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a9acd0283e8ef3c4aacfa23c90d2954e3e0a2ad4f2a70eed66ea0b87144956
-  data.tar.gz: 8221939940f215d62f6c5a66705cbdd20f6218c87007d2f71d9a4fdba0af5285
+  metadata.gz: 6f3169f1879068224c90bee508cc59f70ea0511ddf035121f68fa3903a179cb6
+  data.tar.gz: '008d3c425851891ecc80363c141636c54a9ed3abcc3fa80083f5ef190a7bcba8'
 SHA512:
-  metadata.gz: 286544fb7129aef8fa679aa3daacdfa983cc10154709ceadbaf58406676780225559702b41195182156a379e0f4c6bc192d067eb39a7476a605bd9381f504597
-  data.tar.gz: '09e9a6a66e91b29afd2940b02d424785556cce005d1b966e7f3e82c6eb448014d6c8657570c4305274fae7b1d34f824520f6e12a90688f069dfaa8facad5d1b8'
+  metadata.gz: a3b9ad00997260f78fbdd3b492676847d85102ba2e87d6c54d64a8f0703250e87f01cd0346b797355f1206ff0b2c5dd2c1e2b70bbb50ec03dac2ff1a6f2a4c61
+  data.tar.gz: 87beff960a61713abab357b95e890c6e247fc3605f2cea7fed5767d259a728448a3bdfcd2e810833b4632f9794efc3e043e773ff600d47abf6d49d4792bc9953

data/lib/cnvrg/cli.rb

@@ -896,10 +896,12 @@ module Cnvrg
             return
           end
 
+
           if only_tree
-            success = Dataset.clone_tree(commit: commit, dataset_home: dataset_home)
-            return if success
+            Dataset.clone_tree(commit: commit, dataset_home: dataset_home)
+            return
           end
+
           commit = response["result"]["commit"]
           files_count = response["result"]["file_count"]
           files = @files.get_clone_chunk(commit: commit)
@@ -911,6 +913,7 @@ module Cnvrg
                                            :total => files_count,
                                            :autofinish => true)
 
+          Dataset.clone_tree(commit: commit, dataset_home: dataset_home, progressbar: progressbar)
 
           while files['keys'].length > 0
             Cnvrg::Logger.log_info("download multiple files, #{downloaded_files.size} files downloaded")
@@ -964,10 +967,9 @@ module Cnvrg
         Cnvrg::CLI.is_response_success(response,true)
         dataset_name = response["results"]["name"]
         dataset_slug = response["results"]["slug"]
-        dataset_home = Dir.pwd+"/"+dataset_slug
+        dataset_home = Dir.pwd + "/" + dataset_slug
         Dataset.stop_if_dataset_present(dataset_home, dataset_name) if soft
 
-        # dataset_home = Dir.pwd
         if Dataset.blank_clone(owner, dataset_name, dataset_slug)
           dataset = Dataset.new(dataset_home)
           log_message("Cloning #{dataset_name}", Thor::Shell::Color::BLUE)
@@ -986,12 +988,13 @@ module Cnvrg
           begin
             log_message("Downloading files", Thor::Shell::Color::BLUE)
             Parallel.map((response["results"]["query_files"]), parallel_options) do |f|
-              relative_path = f["fullpath"].gsub(/^#{dataset_home}/, "")
+              relative_path = f["fullpath"].gsub(/^#{dataset_home}/, "").gsub(/^#{slug}/, "")
               relative_path_dir = relative_path.split("/")
               file_name = relative_path_dir.pop()
               relative_path_dir = relative_path_dir.join("/")
               abs_path = dataset_home + "/" + relative_path_dir
               abs_path = dataset_home if flatten
+
               begin
                 FileUtils.mkdir_p(abs_path) unless File.exist? (abs_path + "/" + file_name)
               rescue
@@ -1781,8 +1784,7 @@ module Cnvrg
       print_table(list)
     end
 
-    desc 'commits', 'List all commits for a specific Project'
-
+    desc 'commits', 'List all commits for a specific Project', :hide => true
     def list_commits()
       verify_logged_in(true)
       log_start(__method__, args, options)
@@ -1796,7 +1798,7 @@ module Cnvrg
     end
 
 
-    desc 'unlink', 'Unlink a project from current directory'
+    desc 'unlink', 'Unlink a project from current directory', :hide => true
 
     def unlink
       verify_logged_in(false)
@@ -2893,7 +2895,7 @@ module Cnvrg
       end
     end
 
-    desc 'show', 'Show specific file from a specific commit'
+    desc 'show', 'Show specific file from a specific commit', :hide => true
     method_option :path, :type => :string, :aliases => ["-p"], :desc => "File path", :default => ""
     method_option :commit, :type => :string, :aliases => ["-c"], :desc => "Commit sha1", :default => nil
 
@@ -4806,8 +4808,7 @@ module Cnvrg
 
     end
 
-    desc 'list_machines', 'Lists all machines belong to your organization'
-
+    desc 'list_machines', 'Lists all machines belong to your organization', :hide => true
     def list_machines
       begin
         verify_logged_in(false)

data/lib/cnvrg/dataset.rb

@@ -471,23 +471,38 @@ module Cnvrg
       response.to_json
     end
 
-    def self.clone_tree(commit: 'latest', dataset_home: nil)
+    def self.clone_tree(commit: 'latest', dataset_home: nil, progressbar: nil)
       @dataset = Cnvrg::Dataset.new(dataset_home)
       @files = Cnvrg::Datafiles.new(@dataset.owner, @dataset.slug, dataset: @dataset)
       trees = @files.get_trees(commit: commit)
       return false if trees.nil?
-      pb = ProgressBar.create(:title => "Download Progress",
-                              :progress_mark => '=',
-                              :format => "%b>>%i| %p%% %t",
-                              :starting_at => 0,
-                              :total => trees.size,
-                              :autofinish => true)
+
+      if progressbar
+        pb = progressbar
+        pb.total += trees.size
+      else
+        pb = ProgressBar.create(
+          :title => "Download Progress",
+          :progress_mark => '=',
+          :format => "%b>>%i| %p%% %t",
+          :starting_at => 0,
+          :total => trees.size,
+          :autofinish => true
+        )
+      end
+
       trees.each do |tree|
         pb.progress += 1
         @files.download_dir(dataset_home, tree)
       end
-      pb.finish
-      @dataset.write_success
+
+      unless progressbar
+        # if progessbar sent it means that its not only tree so we dont want to finish the progress bar
+        # and we dont want to write success
+
+        pb.finish
+        @dataset.write_success
+      end
       true
     end
 

data/lib/cnvrg/files.rb

@@ -115,7 +115,7 @@ module Cnvrg
         #upload files
         blob_id_chunk = Parallel.map(files.keys, in_threads: ParallelThreads) do |file|
           begin
-            Cnvrg::Helpers.try_until_success{self.upload_single_file(files[file].merge(parsed_chunk_of_files[file]))}
+            upload_single_file(files[file].merge(parsed_chunk_of_files[file]))
           rescue => e
             Cnvrg::CLI.log_message("Failed to upload #{file}: #{e.message}", 'red') unless suppress_exceptions
             Cnvrg::Logger.log_error(e)
@@ -188,7 +188,7 @@ module Cnvrg
     def upload_single_file(file)
       path = file['path']
       absolute_path = file[:absolute_path]
-      @client.upload(path, absolute_path)
+      @client.safe_upload(path, absolute_path)
     end
 
     def parse_file(file)

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.11'
+  VERSION = '1.11.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: '1.11'
+  version: 1.11.6
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler