cnvrg 1.11.13 → 1.11.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74c9b6b821c1d0fadae87a6b17579fa43a445fb0166a973bb14f686d778109e5
-  data.tar.gz: 525cae9497069129defa5c02995d04548adf4155e70e2ccf5ffe4f23bd883ed2
+  metadata.gz: bc1bc67b5f62516c87e90a9b71d7d4921236eb8c13446b0c8ddac44ef9cf8544
+  data.tar.gz: '09b88539fc1fb041151d7fb1ec9931d0ddccc6e7cc50f958467d6e9fb976ba5d'
 SHA512:
-  metadata.gz: 736ae2e6aa54cdd18ff40d0a196cf6a10c764eaca2cc651fa4c2816b671b1d84bdd5d2329dea01082ab4175a95223797a3904cfa712aca51a07b6c13f63b95ab
-  data.tar.gz: bf58276b9169bc539f8d505b7482b5e9c40959e2773d1b08a323b86fd5acf9aa729f34390f56e1c3e854e9deb5d252cb4ff7f242fedba59f4ca4152c2d4f7cf3
+  metadata.gz: b7206c5c43fec47c6519e3fa9c798cbef0232ae0d9d70e708499d2312bbd5af802d6fc62e3b02f0f137f6322cd3486848fd9effbcbcca521171062ad22830e27
+  data.tar.gz: 27905ef2f218a241db92e78533390dc0b3b3fa6aa8242a925efc106eacf43d2adc11fdfc12f978ce1155fa6e1948ab9f98026ca163cb57db3729ee6080b15481

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

@@ -3323,7 +3323,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,8 @@ 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 = {}
         client = props[:client]
@@ -774,14 +775,19 @@ module Cnvrg
           file_path = f["name"]
           if file_path.end_with? "/"
             # dir
-            if download_dir(file_path, file_path, project_home)
-              download_succ_count += 1
-            else
-              return Cnvrg::Result.new(false,"Could not create directory: #{file_path}")
-              raise Parallel::Kill
+            begin
+              if download_dir(file_path, file_path, project_home)
+                download_succ_count += 1
+              else
+                raise StandardError.new("Could not create directory #{file_path}.")
+              end
+            rescue => e
+              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))
@@ -790,28 +796,30 @@ 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
-              return Cnvrg::Result.new(false,"Could not create file: #{file_path}", e.message, e.backtrace)
-              raise Parallel::Kill
+              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
           return Cnvrg::Result.new(true,"Done.\nDownloaded #{download_succ_count} files")
         end
       rescue => e
-        return Cnvrg::Result.new(false,"Could not download some files", e.message, e.backtrace)
+        cli.log_error(e)
+        raise e
       end
-
-
-
-
     end
+
     def download_file(absolute_path, relative_path, project_home, conflict=false)
         res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path})
         Cnvrg::CLI.is_response_success(res, false)

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/helpers/executer.rb

@@ -170,7 +170,7 @@ class Cnvrg::Helpers::Executer
         next
       end
       cmd = @commands_q.pop.symbolize_keys
-      comman  d_json = Cnvrg::API.request([activity_url, "commands", cmd[:slug]].join('/'), "GET")
+      command_json = Cnvrg::API.request([activity_url, "commands", cmd[:slug]].join('/'), "GET")
 
       cmd_status = command_json["status"] rescue ""
 

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.11.13'
+  VERSION = '1.11.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.11.13
+  version: 1.11.21
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.