cnvrg 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 080cd87745b468971f39517ad0f5ba066ab41b00
-  data.tar.gz: 7fa5794bb717f1899827784ed952c38ee400e2dd
+  metadata.gz: f68e73ce51d096ab10bae5dd5ba07b6444c4d898
+  data.tar.gz: a50d1f1e96a4e21d9a408d7c5c5e915888480ec2
 SHA512:
-  metadata.gz: 3983ba01e3b2e1c8848083be9329b4ec96dacea91863e263e7acf647952bf38425cf4daf153daf6852e7a51d31b45ae293d07a89c4f301196666c6737a35531f
-  data.tar.gz: a8abe5f77854e51f90eee110fdc419fd4c2efd2d2e4b572fda2ae2086d489c1790d4e3ea19db4ee06ad3dbcaeba5c34b8a969b2a60a2100155e31a40d13672c7
+  metadata.gz: e1d21cda34620db5df089a2e4db43b730c0a3eb5265d423101cd91d5e5c606e56b15be8df027bc7e4b0ff35eb1de9eddcb7ea6f4e735792fb3992e7d4f5f10b8
+  data.tar.gz: 9e8094bb8658f213aa7af9c943e3015e38fbb7d244176da607186cefb8fd64b5221d3a7d4ce27427aba45dfe8f33fed031f5e044a165e17a7625b34dcb106084

data/lib/cnvrg/api.rb

@@ -44,7 +44,7 @@ module Cnvrg
             end
 
             @user, @pass = n[Cnvrg::Helpers.netrc_domain]
-
+            begin
             conn = Faraday.new
             conn.headers['Auth-Token'] = @pass
             conn.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
@@ -102,6 +102,10 @@ module Cnvrg
                 end
             else
             end
+            rescue
+               return nil
+            end
+
         end
 
         def self.endpoint_uri

data/lib/cnvrg/cli.rb

@@ -412,16 +412,16 @@ module Cnvrg
           begin
             (result["added"] + result["updated_on_local"]).each do |f|
               puts f
+              absolute_path = "#{@project.local_path}/#{f}"
               relative_path = f.gsub(/^#{@project.local_path + "/"}/, "")
-
-              if File.directory?(f)
-                resDir = @files.create_dir(f, relative_path, commit_sha1)
+              if File.directory?(absolute_path)
+                resDir = @files.create_dir(absolute_path, relative_path, commit_sha1)
                 if resDir
                   update_count += 1
                   successful_updates<< relative_path
                 end
               else
-                res = @files.upload_file(f, relative_path, commit_sha1)
+                res = @files.upload_file(absolute_path, relative_path, commit_sha1)
                 if res
                   update_count += 1
                   successful_updates<< relative_path
@@ -453,7 +453,8 @@ module Cnvrg
             @files.rollback_commit(commit_sha1)
             say "User aborted, Rolling Back all changes.", Thor::Shell::Color::RED
             exit(0)
-          rescue
+          rescue => e
+            puts e
             @files.rollback_commit(commit_sha1)
             say "Exception while trying to upload, Rolling back", Thor::Shell::Color::RED
             exit(0)
@@ -493,7 +494,9 @@ module Cnvrg
             @files.rollback_commit(commit_sha1)
           end
         rescue SignalException
-          say "/nAborting"
+          say "\nAborting",Thor::Shell::Color::BLUE
+          say "\nRolling back all changes",Thor::Shell::Color::BLUE
+          @files.rollback_commit(commit_sha1)
           exit(1)
         end
 
@@ -539,6 +542,7 @@ module Cnvrg
               # dir
               if @files.download_dir(f, relative_path, project_home)
                 successful_changes << relative_path
+
               end
             else
               # blob
@@ -556,7 +560,25 @@ module Cnvrg
             say "Total of #{successful_changes.size} / #{update_total} files.", Thor::Shell::Color::GREEN
           end
         rescue SignalException
-          say "/nAborting"
+          say "\nAborting", Thor::Shell::Color::BLUE
+          if successful_changes.nil?
+            exit(1)
+          end
+          successful_changes.each do |f|
+
+            abs_path = "#{@project.local_path}/#{f}"
+            filename = File.basename abs_path
+            say "revoking #{filename}"
+            if result["conflicts"].include? f
+              @files.revoke_download_file(abs_path,f,filename,true)
+            elsif result["updated_on_server"].include? f
+              if File.directory? abs_path
+                @files.revoke_download_dir(abs_path,f,project_home)
+              else
+                @files.revoke_download_file(project_home,abs_path,filename)
+              end
+            end
+          end
           exit(1)
         end
       end
@@ -602,7 +624,9 @@ module Cnvrg
       method_option :upload_output, :type => :string, :aliases => ["--uo", "-uo"], :default => ""
 
       def exec(*cmd)
-        begin
+          log = []
+          cpu_average =0
+          memory_average = 0
           verify_logged_in()
 
           project_home = get_project_home
@@ -614,11 +638,12 @@ module Cnvrg
           email_notification = options["email_notification"]
           upload_output = options["upload_output"]
           time_to_upload = calc_output_time(upload_output)
-
+        begin
           if sync_before
             # Sync before run
             say "Syncing project before running", Thor::Shell::Color::BLUE
             say 'Checking for new updates from remote version', Thor::Shell::Color::BLUE
+
             download()
             upload()
             say "Done Syncing", Thor::Shell::Color::BLUE
@@ -626,7 +651,7 @@ module Cnvrg
 
           start_commit = @project.last_local_commit
           cmd = cmd.join("\s")
-          log = []
+
           say "Running: #{cmd}\n", Thor::Shell::Color::BLUE
 
           @exp = Experiment.new(@project.owner, @project.slug)
@@ -698,28 +723,42 @@ module Cnvrg
                   rescue Errno::ENOENT
 
                     exp_success = false
+
                     say "command \"#{cmd}\" couldn't be executed, verify command is valid", Thor::Shell::Color::RED
                   rescue PTY::ChildExited
 
                     exp_success = false
                     say "The process exited!", Thor::Shell::Color::RED
                   rescue => e
-                  ensure
-                    ::Process.wait pid
 
                   end
+                  ::Process.wait pid
                   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
-                  puts exit_status
-                  if exit_status != 0
+                  if $?.exitstatus != 0
                     exp_success = false
                   end
                   if !exp_success
+                    if !Cnvrg::Helpers.internet_connection?
+                      wait_offline = agree "Seems like you're offline, wait until your'e back online?",limited_to: ['y', 'n'], default: 'n'
+                      if wait_offline
+                        say "Waiting until your'e online..", Thor::Shell::Color::BLUE
+                        while !Cnvrg::Helpers.internet_connection?
+                        end
+                        exit_status = 0
+                      else
+                        say "Experiment has failed, your'e computer is offline", Thor::Shell::Color::RED
+                        exit(0)
+                      end
+                    else
+
                     end_commit = @project.last_local_commit
                     res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
                     say "Experiment has failed, look at the log for more details or run cnvrg exec --log", Thor::Shell::Color::RED
                     exit(0)
+                    end
+
                   end
                   if sync_after
                     say "Syncing project after running", Thor::Shell::Color::BLUE
@@ -735,6 +774,7 @@ module Cnvrg
                   say "#{check} Done. Experiment's result: #{Cnvrg::Helpers.remote_url}/#{@project.owner}/projects/#{@project.slug}/experiments/#{@exp.slug}", Thor::Shell::Color::GREEN
                 end
               rescue
+
                 say "Couldn't run #{cmd}, check your input parameters", Thor::Shell::Color::RED
                 exit(1)
               end
@@ -744,7 +784,12 @@ module Cnvrg
 
           end
         rescue SignalException
-          say "/nAborting"
+          exit_status =  -1
+          end_commit = @project.last_local_commit
+
+          res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
+          say "\nAborting"
+
           exit(1)
         end
       end
@@ -802,7 +847,7 @@ module Cnvrg
               elsif run_docker.include? "port is already allocated"
                 say "Couldn't start notebook with port 8888, port is taken", Thor::Shell::Color::RED
                 port_container = `#{docker_path} ps |grep 8888 |awk '{print $1}'`.strip!
-                stop = ask "There is another running notebook server: #{port_container}, do you want to stop it?", Thor::Shell::Color::BLUE, limited_to: ['y', 'n'], default: 'y'
+                stop = agree "There is another running notebook server: #{port_container}, do you want to stop it?", limited_to: ['y', 'n'], default: 'y'
                 if stop == "y"
                   did_stop = system("#{docker_path} stop #{port_container}")
                   if !did_stop
@@ -1114,12 +1159,19 @@ module Cnvrg
         end
 
         def self.is_response_success(response, should_exit=true)
-          if response["status"]!= 200
+          if response.nil?
+            if Cnvrg::Helpers.internet_connection?
+                say("<%= color('Error:You seems to be offline', RED) %>")
+            else
+              say("<%= color('Error', RED) %>")
+            end
+          elsif response["status"]!= 200
             error = response['message']
             if response["status"] == 500
               say("<%= color('Server Error', RED) %>")
             else
-              say("<%= color('Error: #{error}', RED) %>")
+              puts response
+              say("<%= color('Error:#{error}', RED) %>")
             end
 
             if should_exit
@@ -1177,9 +1229,17 @@ module Cnvrg
             say 'Please log in via `cnvrg login`', Thor::Shell::Color::YELLOW
             exit(1)
           end
+
           if !Helpers.internet_connection?
-            say "you seem to be offline, please check your internet connection", Thor::Shell::Color::RED
-            exit(1)
+              wait_offline = agree "Seems like you're offline, wait until your'e back online?",limited_to: ['y', 'n'], default: 'n'
+              if wait_offline
+                say "Waiting until your'e online..", Thor::Shell::Color::BLUE
+                while !Cnvrg::Helpers.internet_connection?
+                end
+              else
+                say "you seem to be offline, please check your internet connection", Thor::Shell::Color::RED
+                exit(0)
+              end
           end
 
           config = YAML.load_file(File.expand_path('~')+"/.cnvrg/config.yml")

data/lib/cnvrg/files.rb

@@ -17,18 +17,18 @@ module Cnvrg
 
     def upload_file(absolute_path, relative_path, commit_sha1)
       file_name = File.basename relative_path
-      file_size = File.size(relative_path).to_f
-      mime_type = MimeMagic.by_path(relative_path)
+      file_size = File.size(absolute_path).to_f
+      mime_type = MimeMagic.by_path(absolute_path)
       content_type = !(mime_type.nil? or mime_type.text?) ? mime_type.type : "text/plain"
       upload_resp = Cnvrg::API.request(@base_resource + "upload_file", 'POST_FILE', {absolute_path: absolute_path, relative_path: relative_path,
                                                                                      commit_sha1: commit_sha1, file_name: file_name,
                                                                                      file_size: file_size, file_content_type: content_type})
       if Cnvrg::CLI.is_response_success(upload_resp, false)
         if file_size.to_f>= Cnvrg::Files::LARGE_FILE.to_f
-          s3_res = upload_large_files_s3(upload_resp, relative_path)
+          s3_res = upload_large_files_s3(upload_resp, absolute_path)
         else
           path = upload_resp["result"]["path"]
-          s3_res = upload_small_files_s3(path, relative_path, content_type)
+          s3_res = upload_small_files_s3(path, absolute_path, content_type)
         end
 
         if s3_res
@@ -186,6 +186,21 @@ module Cnvrg
     def download_dir(absolute_path, relative_path, project_home)
       FileUtils.mkdir_p("#{project_home}/#{absolute_path}")
     end
+    def revoke_download_dir(absolute_path, relative_path, project_home)
+      puts FileUtils.rmtree("#{absolute_path}")
+    end
+
+    def revoke_download_file(project_home,absolute_path,filename,conflict=false)
+      begin
+      file_location = absolute_path.gsub(/#{filename}\/?$/, "")
+
+      filename += ".conflict" if conflict
+      FileUtils.remove("#{file_location}/#{filename}")
+        return true
+      rescue
+       return false
+      end
+    end
 
     def start_commit
 

data/lib/cnvrg/helpers.rb

@@ -15,7 +15,23 @@ module Cnvrg
         end
       end
     def remote_url
-        "https://cnvrg.io"
+      home_dir = File.expand_path('~')
+      config = ""
+      begin
+        if File.exist? home_dir+"/.cnvrg/config.yml"
+          config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
+        else
+          return "https://cnvrg.io"
+        end
+
+      rescue
+        return "https://cnvrg.io"
+      end
+      if !config or config.empty? or config.to_h[:api].nil?
+        return "https://cnvrg.io"
+      else
+        return config.to_h[:api].gsub("/api","")
+      end
     end
 
     def windows?

data/lib/cnvrg/project.rb

@@ -21,7 +21,8 @@ module Cnvrg
         end
         
         def url
-            "#{RemoteURL}/#{self.owner}/projects/#{self.slug}"
+            url = Cnvrg::Helpers.remote_url
+            "#{url}/#{self.owner}/projects/#{self.slug}"
         end
 
         def update_ignore_list(new_ignore)

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler