cnvrg 1.6.27 → 1.6.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cd284862886ec5b09fd54d38793623e428fec3dbfac5fc6c46667c2e820a302
-  data.tar.gz: 7f3cce766ef0935b737ce0e95dcce47bf827bc4ab45579887fa51b9ec4a02b55
+  metadata.gz: d7dee30d3b567e7e1ab181aed63426524d6f04459fe365ce5d60cc4c7671ed03
+  data.tar.gz: f8fcb9901d5bc06471500246a63f3ff28d5593fe6564f8cf0930d6d41342ed16
 SHA512:
-  metadata.gz: 32562f3442ed727ab26ee6de3af75df36bd56d6c1515d653e697936c03624efa03d741610b7e960b67a7179b3f961b7d07efb71af0e3201ff15b08939aca3719
-  data.tar.gz: 8fbaad6c29f0f7e0ae504912505f36be91825263c3cb72b2ad73df5cc7944115e605eaf3e6711b526c1cbdf9d52572c488728d62a2ce86c5ee40aa9e1a5e99b3
+  metadata.gz: 935d27a9023559e57694c726515846175bcd892a1906fdf058983268ba2e2b81ecc41bf8b31a689b01302cdc8afaef8dd6d5130d686857d6cfe30e4fdec3f45a
+  data.tar.gz: 9ebd4da0e91c62e64712453eab68c5fe7914dfc6ec5ad26aae9f6fbbf6f1cdfce8d187f7d8f8a1c0aa5f1955c6842ae317da9fca2238d20c8410c3d6c31158a3

data/lib/cnvrg/cli.rb

@@ -1986,31 +1986,7 @@ module Cnvrg
         files_to_upload, upload_errors = invoke :upload_data_files,[commit, files_list: files_list],:new_branch=>new_branch, :verbose =>verbose, :force =>force, :sync =>sync, :chunk_size => chunk_size
 
         upload_size = files_to_upload + upload_errors.try(:size) rescue 0
-
-        if files_to_upload <= 0
-          check = Helpers.checkmark
-          log_message("#{check} Data sync finished", Thor::Shell::Color::GREEN)
-          if total_deleted > 0
-            log_message("#{total_deleted} files deleted successfully.", Thor::Shell::Color::GREEN)
-          end
-
-          if total_downloaded > 0
-            log_message("#{total_downloaded} files downloaded successfully.", Thor::Shell::Color::GREEN)
-          end
-
-          if upload_errors.try(:size) > 0
-            log_message("#{upload_errors.try(:size)}/#{upload_size} files didn't upload:", Thor::Shell::Color::RED)
-            upload_errors.each do |file_hash|
-              log_message("#{file_hash[:absolute_path]}", Thor::Shell::Color::RED)
-            end
-          end
-
-          if upload_errors.blank? and total_downloaded == 0 and total_deleted == 0
-            Cnvrg::CLI.log_message("You are up to date", Thor::Shell::Color::GREEN)
-          end
-          return
-        end
-        invoke :end_commit_data,[commit, success: true, uploaded_files: files_to_upload], :new_branch=>new_branch, :force =>force
+        invoke :end_commit_data,[commit, success: true, uploaded_files: files_to_upload, sync: sync], :new_branch=>new_branch, :force =>force
         if tags
           log_message('Uploading Tags', Thor::Shell::Color::BLUE)
           dataset_dir = is_cnvrg_dir(Dir.pwd)
@@ -2035,8 +2011,10 @@ module Cnvrg
         if total_downloaded > 0
           log_message("#{total_downloaded} files downloaded successfully.", Thor::Shell::Color::GREEN)
         end
+        if upload_size > 0
+          log_message("#{files_to_upload}/#{upload_size} files uploaded successfully.", Thor::Shell::Color::GREEN)
+        end
 
-        log_message("#{files_to_upload}/#{upload_size} files uploaded successfully.", Thor::Shell::Color::GREEN)
         if upload_errors.try(:size) > 0
           log_message("#{upload_errors.try(:size)}/#{upload_size} files didn't upload:", Thor::Shell::Color::RED)
           upload_errors.each do |file_hash|
@@ -2100,7 +2078,7 @@ module Cnvrg
     method_option :new_branch, :type => :boolean, :aliases => ["-nb"], :desc => "create new branch of commits"
     method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
 
-    def end_commit_data(commit, success: true, uploaded_files: 0)
+    def end_commit_data(commit, success: true, uploaded_files: 0, sync: false)
       begin
         verify_logged_in(true)
         log_start(__method__, args, options)
@@ -2115,7 +2093,12 @@ module Cnvrg
             @dataset.revert_next_commit #removes the next commit
             log_message("#{check} Dataset is up to date", Thor::Shell::Color::GREEN)
           else
-            log_message("#{check} Data sync finished", Thor::Shell::Color::GREEN)
+            if sync
+              message = "#{check} Data sync finished"
+            else
+              message = "#{check} Data upload finished"
+            end
+            log_message(message, Thor::Shell::Color::GREEN)
             @dataset.remove_next_commit #takes the next commit and put it as current commit
             @dataset.set_partial_commit(nil)
             @dataset.backup_idx
@@ -2911,7 +2894,7 @@ module Cnvrg
     method_option :job_type, :type => :string, :aliases => ["-jt", "--job_type"], :default => nil
     method_option :files, :type => :string, :aliases => ["--files"], :default => nil
     method_option :output_dir, :type => :string, :aliases => ["--output_dir"], :default => nil
-    def  sync(direct = true)
+    def sync(direct = true)
       verify_logged_in(true) if direct
       @project = Project.new(get_project_home)
       log_start(__method__, args, options)

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.6.27'
+  VERSION = '1.6.31'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.6.27
+  version: 1.6.31
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler