cnvrg 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70906f4870c9aa2b3457673212893d09e6b5f22e15a5dc4c3b0cc2115e74d8d9
-  data.tar.gz: ff9de0565cf2c81102c68a21154af1f97d843e65d51fc8eb69f3a490b64bb9a3
+  metadata.gz: 5b5e5904880441ee1b4610eb69e2d3d5c74e0e58f4f7d1dbd0e1547de0c47e9c
+  data.tar.gz: 37b7b8c6f82b00ca93ccc8a323c84653e2c83757008c57c04d5a98c32bcad2de
 SHA512:
-  metadata.gz: d839249d813d8004c9d00553f81273e890d7beb3bfab4bb65b64453f459bd6e4c366c59b35cee2773716e2c26f6f5b30223937837e088fe964e98a60b242c6e3
-  data.tar.gz: f7cac4b24a2f7fc275e28dd03b2fad4b7374dd52c648dd84f36652d6e7bd61f24e834aa89b1f826ac39e7680aa7cbfc6ca1564bc3611fdfe53dfd650368d7319
+  metadata.gz: 8a5d6540f9da9ab77321435d5f4ece63010faf6d0ce05a76ce938236eaa6cd4c1853aa004f732313d69b644b66df50da505b9c55a4fc165a6e353f7e48c414c9
+  data.tar.gz: 4f9f90f9f465db06e62a2f25fe84161b0a0994afb68d9d7ff4604959f3627bdbea20eead733fa50942e5a93191d445b010f7b152211c9948b746e69e8c4e839f

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")
@@ -1905,7 +1908,7 @@ module Cnvrg
               log_message("Remove dir in order to clone #{project_name}", Thor::Shell::Color::RED)
               exit(1)
             end
-  
+
           end
           clone_resp = Project.clone_dir(slug, owner, project_name,git)
           project_home = Dir.pwd + "/" + project_name

data/lib/cnvrg/dataset.rb

@@ -471,22 +471,32 @@ 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
+
+      pb.finish unless progressbar
       @dataset.write_success
       true
     end

data/lib/cnvrg/helpers.rb

@@ -3,7 +3,7 @@ module Cnvrg
 
     extend self
     def parallel_threads
-      5
+      15
     end
 
     def self.parallel_options

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.11.2'
+  VERSION = '1.11.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler