cnvrg 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14812c074d9b241c639f215c82da967e632a5b4c
-  data.tar.gz: 68845b081b102ec1d06499a09e3e576a00a89e65
+  metadata.gz: e7730f2e06b22172c2321f5a96469aa47b4d5896
+  data.tar.gz: fbfb6ed5621d075252fe01e4844c16fa995fc263
 SHA512:
-  metadata.gz: ce3a5373033f6a01bab5e0eb9d839e3a6a3b7d1b15576a996e1c00e5d6ef091e9ac6ac50a320379aa9f7ac691b16f8caacc3116b5bd79c4f3c464fbf17878c23
-  data.tar.gz: 2d1ece161322402bd3922b52f0e0371577eeade4c650d037c7956d13c04a3ce701647ff45f45c4c5415006b6e0a6c33f12bda2ddbbb9103c0a0802a49b3438d6
+  metadata.gz: b2be5b074fccb4a67ce8966fe88d42a2cb083538025a0ea5532d8bad267ac259e329b20486f0fb615f1e6a9352dcacf78edcee42ea69f84f795aaa2a2b156cc7
+  data.tar.gz: 251fdf65e5f29230edea5b295d061fb8fc1d51fefdf537a27df7773d1c76dd613f63a55a9947a6923439e00a8c1d1f0ba10c4f35b89e6101f1196317cf21d4ba

data/lib/cnvrg/cli.rb

@@ -36,7 +36,6 @@ require 'pathname'
 require 'enumerator'
 require 'ruby-progressbar'
 require 'open3'
-
 class Thor
   module Base
     def initialize(args = [], local_options = {}, config = {})
@@ -2151,6 +2150,7 @@ module Cnvrg
     method_option :force, :type => :boolean, :aliases => ["-f", "--force"], :default => false
     method_option :message, :type => :string, :aliases => ["-m", "--message"], :default => ""
     method_option :deploy, :type => :boolean, :aliases => ["-d", "--deploy"], :default => false
+    method_option :return_id, :type => :boolean, :aliases => ["-r", "--return_id"], :default => false
 
     def upload(link = false, sync = false, direct = false, ignore_list = "")
 
@@ -2163,7 +2163,7 @@ module Cnvrg
         if commit_msg.nil? or commit_msg.empty?
           commit_msg = ""
         end
-
+        return_id = options["return_id"]
         @files = Cnvrg::Files.new(@project.owner, @project.slug)
         ignore = options[:ignore] || ""
         force = options[:force] || false
@@ -2399,6 +2399,14 @@ module Cnvrg
               end
               log_message("Total of #{update_count} / #{update_total} files.", Thor::Shell::Color::GREEN)
             else
+              if return_id
+                print_res = {
+                    'success' => "true",
+                    'commit_sha1' => res["result"]["commit_id"]
+                }
+                puts JSON[print_res]
+                exit(0)
+              end
               if (options["sync"] or sync) and direct
                 log_message("#{check} Syncing project completed successfully", Thor::Shell::Color::GREEN)
 
@@ -2411,11 +2419,30 @@ module Cnvrg
 
           else
             @files.rollback_commit(commit_sha1)
-            log_message("Error: couldn't commit changes,  Rolling Back all changes.", Thor::Shell::Color::RED)
+            if return_id
+              print_res = {
+                  'success' => "false",
+                  'message' => 'couldn\'t commit changes,  Rolling Back all changes.'
+              }
+              puts JSON[print_res]
+            else
+              log_message("Error: couldn't commit changes,  Rolling Back all changes.", Thor::Shell::Color::RED)
+
+            end
           end
         else
           @files.rollback_commit(commit_sha1)
+          if return_id
+            print_res = {
+                'success' => "false",
+                'message' => "uploaded only: #{update_count} / #{update_total}, \n Rolling back"
+
+            }
+            puts JSON[print_res]
+          else
           log_message("Error: uploaded only: #{update_count} / #{update_total}, \n Rolling back", Thor::Shell::Color::RED)
+          end
+
 
         end
       rescue => e
@@ -3050,8 +3077,8 @@ module Cnvrg
     method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :default => ""
     method_option :force, :type => :boolean, :aliases => ["-f", "--force"], :default => false
     method_option :message, :type => :string, :aliases => ["-m", "--message"], :default => ""
+    method_option :return_id, :type => :boolean, :aliases => ["-r", "--return_id"], :default => false
     method_option :deploy, :type => :boolean, :aliases => ["-d", "--deploy"], :default => false
-
     def sync(direct = true)
       verify_logged_in(true) if direct
       log_start(__method__, args, options)
@@ -3060,10 +3087,8 @@ module Cnvrg
       if !options[:force]
         invoke :download, [], :new_branch => options["new_branch"], :verbose => options["verbose"], :sync => true
       end
-
-
       invoke :upload, [link = false, sync = true, direct = direct], :new_branch => options["new_branch"], :verbose => options["verbose"], :sync => true,
-             :ignore => options[:ignore], :force => options[:force], :message => options[:message], :deploy => options["deploy"]
+             :ignore => options[:ignore], :force => options[:force], :message => options[:message], :deploy => options["deploy"], :return_id => options["return_id"]
 
 
     end
@@ -3291,7 +3316,6 @@ module Cnvrg
                     begin
                       loop do
                         restart = @exp.restart_spot_instance()
-                        puts "spot status: #{restart}"
                         if restart
                           log_message('Spot instance is going to be terminated', Thor::Shell::Color::YELLOW)
                           # sync
@@ -3385,8 +3409,6 @@ module Cnvrg
                       puts cur_log
                     end
                     log << cur_log
-
-
                   end
 
 
@@ -3420,7 +3442,6 @@ module Cnvrg
                 end
                 ::Process.wait pid
               end
-
               cpu_average = cpu_total.inject(0) {|sum, el| sum + el}.to_f / cpu_total.size
               memory_average = memory_total.inject(0) {|sum, el| sum + el}.to_f / memory_total.size
               exit_status = $?.exitstatus
@@ -3440,7 +3461,6 @@ module Cnvrg
                     exit(0)
                   end
                 else
-
                   end_commit = @project.last_local_commit
                   res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
                   log_message("Experiment has failed, look at the log for more details or run cnvrg exec --log", Thor::Shell::Color::RED)
@@ -3450,13 +3470,12 @@ module Cnvrg
               end
               if sync_after
                 # Sync after run
-
-
                 download(sync = true, ignore_list = ignore)
                 upload(link = false, sync = true, direct = false, ignore_list = ignore)
 
               end
-              end_commit = @project.last_local_commit
+                end_commit = @project.last_local_commit
+                sleep(7) # end cycle
 
               res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
               check = Helpers.checkmark()
@@ -3610,7 +3629,6 @@ module Cnvrg
         else
           image_slug = image.image_slug
         end
-
         invoke :sync, [false], :force => force if sync_before
 
 
@@ -5622,10 +5640,10 @@ module Cnvrg
       def calc_output_log_time(log_count)
         if log_count <= 20
           return 5
-        elsif log_count <= 40
+        elsif log_count <= 100
           return 10
         else
-          return 30
+          return 15
         end
 
       end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler