cnvrg 1.11.14 → 1.11.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4efa915d1f57cfba945987168eb4cfd118bfee50e8d5e3fa76dd08592176e054
-  data.tar.gz: 8f2b8cd5916f6281c25791f36791c6cc3052f0b4fe7a1094661c635f63eb1b9d
+  metadata.gz: 2b8064702c190a7af0e1541f7a523e950e771439caa1f68d98177c094551dbb5
+  data.tar.gz: 982aa81d2da514f30b45ad45e4ec4b9a12a648e22c9b60d98afe318eba30e753
 SHA512:
-  metadata.gz: 24459de6ce2e782816f68f891e79f8b4fe75d98571983321358619be51fd718055581aea9c4db8a850aea3af97ada9b50207b8278490088c42dce60407b1dc8e
-  data.tar.gz: 03a9f04384ddfebc7e3ee9b0eb10361d808e686286b77ba26753969284e7ae707c147aab7221325d89f9bd22151d378f2865a96c1b01d2d45657f488d2ee97ee
+  metadata.gz: 9f3dcc03516cbe0a3ffd8bd5fa57f976b09028568e8014f161d43581fbc4b8c4def858297b55ef1d750efcd0af276905c006e5ebe7f3e17dd1268e81ad34f084
+  data.tar.gz: de7a4ea731e3230c225149d345e0ab2dde8466b2dd66008aba09d90a0bc287a9d61a8fb266f755a4665ce57c27e7c97c198b7435ab15c0d1fb63977552677150

data/cnvrg.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'rspec', '~> 3.0'
     spec.add_development_dependency 'vcr', '~> 3.0'
     spec.add_development_dependency 'aruba'
-    spec.add_development_dependency 'pry'	
-    
+    spec.add_development_dependency 'pry'
+
     spec.add_runtime_dependency 'mimemagic', '~> 0.3.1','>=0.3.2'
     spec.add_runtime_dependency 'faraday', '~> 0.15.2'
     spec.add_runtime_dependency 'netrc', '~> 0.11.0'

data/lib/cnvrg/cli.rb

@@ -2346,7 +2346,6 @@ module Cnvrg
             log_message("#{check} Project is up to date", Thor::Shell::Color::GREEN, (((options["sync"] or sync) and !direct) ? false : true))
             return true
           end
-          force = true
         end
 
         if ignore.nil? or ignore.empty?
@@ -3323,7 +3322,7 @@ module Cnvrg
                                real: real_time
                     }
                     if print_log
-                      puts line
+                      puts({log: line, timestamp: Time.now, exp_logs: true}.to_json)
                     end
                     log << cur_log
                     if log.size >= 10

data/lib/cnvrg/datafiles.rb

@@ -43,6 +43,8 @@ module Cnvrg
     def verify_files_exists(files)
       paths = []
       files.each do |file|
+        # dir shouldnt have ending slash.
+        file = file[0..-2] if file.end_with? '/'
         if File.exists? file
           if File.directory? file
             paths += Dir.glob("#{file}/**/*")

data/lib/cnvrg/downloader/client.rb

@@ -17,7 +17,9 @@ module Cnvrg
         count = 0
         begin
           count += 1
-          sts = open(sts_path, {ssl_verify_mode: 0}).read rescue nil
+          sts_file = open(sts_path, {ssl_verify_mode: 0})
+          sts = sts_file.read
+          sts.split("\n")
         rescue => e
           backoff_time_seconds = backoff_time(count)
           sleep backoff_time_seconds
@@ -25,7 +27,6 @@ module Cnvrg
           retry if count <= 20
           raise StandardError.new("Cant access storage: #{e.message}")
         end
-        sts.split("\n")
       end
 
       def cut_prefix(prefix, file)

data/lib/cnvrg/files.rb

@@ -733,7 +733,7 @@ module Cnvrg
       unless Cnvrg::CLI.is_response_success(res, false)
         raise SignalException.new("Cant download files from the server.")
       end
-      self.download_multpile_files_s3(res['result'], @project_home, postfix: postfix, progress: progress, threads: threads)
+      self.download_multiple_files_s3(res['result'], @project_home, postfix: postfix, progress: progress, threads: threads)
     end
 
 
@@ -750,7 +750,7 @@ module Cnvrg
       conflicted.each{|file| self.delete_conflict(file); progress.progress += 1 if progress.present?}
     end
 
-    def download_multpile_files_s3(files, project_home, postfix: '', progress: nil, threads: 15)
+    def download_multiple_files_s3(files, project_home, postfix: '', progress: nil, threads: 15)
       cli = Cnvrg::CLI.new()
       begin
         props = {}
@@ -779,14 +779,15 @@ module Cnvrg
               if download_dir(file_path, file_path, project_home)
                 download_succ_count += 1
               else
-                raise SignalException.new("Could not create directory #{file_path}.")
+                raise StandardError.new("Could not create directory #{file_path}.")
               end
             rescue => e
-              cli.log_info("Could not create directory #{file_path}. error: #{e.message}", Thor::Shell::Color::RED)
+              cli.log_message("Could not create directory #{file_path}. error: #{e.message}", Thor::Shell::Color::RED)
               raise e
             end
           else
             file_path += postfix
+
             # blob
             begin
               if not File.exists?(project_home+"/"+File.dirname(file_path))
@@ -795,12 +796,19 @@ module Cnvrg
               local_path = project_home+"/"+file_path
               storage_path = f["path"]
               @client.safe_download(storage_path, local_path)
-              progress.progress += 1 if progress.present?
-              download_succ_count += 1
             rescue => e
-              cli.log_info("Could not download file #{file_path}. error: #{e.message}", Thor::Shell::Color::RED)
+              cli.log_message("Could not download file #{file_path}. error: #{e.message}", Thor::Shell::Color::RED)
               raise e
             end
+
+            # progressbar can throw an exception so we no longer trust it!
+            begin
+              progress.progress += 1 if progress.present?
+            rescue
+              nil
+            ensure
+              download_succ_count += 1
+            end
           end
         end
         if download_succ_count == files["keys"].size

data/lib/cnvrg/flow.rb

@@ -62,7 +62,7 @@ module Cnvrg
       resp = Cnvrg::API.request(url, 'POST', {flow_version: recipe.to_json}) || {}
       if resp["status"] == 200
         return [Flows.new(resp["flow_version"]["flow_id"], project: project), resp["flow_version"]["id"]]
-      elsif resp["status"] == 400
+      elsif resp["status"].between?(400,499)
         raise StandardError.new(resp["message"])
       end
       raise StandardError.new("Can't create new flow")

data/lib/cnvrg/project.rb

@@ -448,8 +448,8 @@ module Cnvrg
           next
         end
         if File.directory? e
-
-          tree_idx[label + "/"] = nil
+          dir_name = (label.ends_with? "/") ? label : (label + "/")
+          tree_idx[dir_name] = nil
         else
           file_in_idx = old_idx[:tree][label] rescue nil
           last_modified = File.mtime(e).to_f
@@ -513,10 +513,11 @@ module Cnvrg
         #upload
         local_idx = self.generate_idx(deploy: deploy, files: specific_files)
       end
+
       commit = local_idx[:commit]
       tree = local_idx[:tree]
       ignore_list = self.send_ignore_list()
-      if force or specific_files.present?
+      if force
         added = []
         if tree.present?
           added += local_idx[:tree].keys

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.11.14'
+  VERSION = '1.11.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.11.14
+  version: 1.11.23
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler