cnvrg 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb82613324f1a1f409c0819b795be4a580bf6f31
-  data.tar.gz: fb950e5920d8cae1cd10609ec4ba0eba1707bfbf
+  metadata.gz: 819730717280428ac1ba231d43462cb827253cc1
+  data.tar.gz: 95c1963b178296af0655d54b691b02895ced41ef
 SHA512:
-  metadata.gz: 3d51178739e2851c1871de672d85ca1c69d099cdb9f94f3b80a222ae1cc30cbfae60a9d1892995be0657c9cf5f8eb406cbd9ae30cda3a4183891a87370f226d0
-  data.tar.gz: 3cb42c96a9e8a04e7a0ee672e5ac404ae46b4668b96e6edc107ee89d46a48e64764f5b46cabfb163e060b00b3982fb5a7a7ac7755d56d9aaf72bb0b9e8a9e01f
+  metadata.gz: 61563035b65f94b7d87354a6dcb783119179edf655cd6881595035417d15c6441b0337f48ae9de9b410136bd3133eb3254fb995af46ffbd67d785e09312aa3e2
+  data.tar.gz: fda3bfcd38199e6c04c46a2c2ca7812182e58352c0a0c9d06898acca3f5de30178160d35ab6b6d86d640d7c89ecb1a773a562d44af369e652b5e476943aa8c21

data/lib/cnvrg/cli.rb

@@ -305,7 +305,7 @@ module Cnvrg
         compression_path = "#{home_dir}/.cnvrg/tmp"
         config = {owner: owner, username: current_user, version_last_check: get_start_day(), api: url, compression_path: compression_path}
         File.open(home_dir + "/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
-        say "Done"
+        say "Done", Thor::Shell::Color::GREEN
       rescue
         say "ERROR", Thor::Shell::Color::RED
           File.open(home_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
@@ -340,7 +340,7 @@ module Cnvrg
         compression_path = "#{home_dir}/.cnvrg/tmp"
         config = {owner: owner, username: current_user, version_last_check: get_start_day(), api: url, compression_path: compression_path}
         File.open(home_dir + "/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
-        say "Done"
+        say "Done", Thor::Shell::Color::GREEN
       rescue
         say "ERROR", Thor::Shell::Color::RED
       end
@@ -408,7 +408,7 @@ module Cnvrg
           end
         end
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -442,7 +442,7 @@ module Cnvrg
         say "#{checks} Done", Thor::Shell::Color::GREEN
 
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -544,7 +544,7 @@ module Cnvrg
         exit(1)
       rescue SignalException
 
-        say "\nAborting"
+        say "\nAborting",Thor::Shell::Color::RED
         logout()
         exit(1)
       end
@@ -565,7 +565,7 @@ module Cnvrg
         puts e.message
         puts e.backtrace
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting",Thor::Shell::Color::RED
         exit(1)
       end
 
@@ -587,7 +587,7 @@ module Cnvrg
 
 
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -676,7 +676,7 @@ module Cnvrg
 
           @project.revert(working_dir)
         end
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -762,7 +762,7 @@ module Cnvrg
         log_error(e)
       rescue SignalException
 
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -802,7 +802,7 @@ module Cnvrg
       rescue => e
         log_error(e)
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -826,7 +826,7 @@ module Cnvrg
         log_error(e)
       rescue SignalException
 
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -891,6 +891,7 @@ module Cnvrg
             downloaded_files += files['keys'].length
             files = @files.get_clone_chunk(commit: commit, latest_id: files['latest'])
           end
+          progressbar.finish
           if downloaded_files == files_count
             Dataset.verify_cnvrgignore_exist(dataset_name, false)
             @dataset = Dataset.new(dataset_home)
@@ -905,7 +906,7 @@ module Cnvrg
           exit(1)
         end
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -983,7 +984,7 @@ module Cnvrg
           end
         end
       rescue SignalException
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -1009,7 +1010,7 @@ module Cnvrg
 
       rescue SignalException
 
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -1031,7 +1032,7 @@ module Cnvrg
       rescue SignalException
         log_end(-1)
 
-        say "\nAborting"
+        say "\nAborting", Thor::Shell::Color::RED
         exit(1)
       end
     end
@@ -1813,112 +1814,22 @@ module Cnvrg
 
         if clone_resp
           @project = Project.new(project_home)
-          @files = Cnvrg::Files.new(@project.owner, slug)
+          @files = Cnvrg::Files.new(@project.owner, slug, project_home: project_home)
           response = @project.clone(remote, commit_to_clone)
           Cnvrg::CLI.is_response_success response
+          commit_sha1 = response["result"]["commit"]
+          files = response["result"]["tree"].keys
           idx = {commit: response["result"]["commit"], tree: response["result"]["tree"]}
-
           log_message("Downloading files", Thor::Shell::Color::BLUE)
-          files = response["result"]["files"]
-
-          if !files.nil?
-            begin
-              download_result = @files.download_multpile_files_s3(files, project_home)
-              @project.set_idx(idx)
-
-            rescue Interrupt
-              log_message("Couldn't download, Rolling Back all changes.", Thor::Shell::Color::RED)
-
-              @files.revoke_clone(project_home)
-              return
-            end
-            Project.verify_cnvrgignore_exist(project_name, remote)
-            if !download_result.is_success?
-              log_message(download_result.e_msg, download_result.msg_color, false)
-              log_message(download_result.e_msg_backtrace, download_result.msg_color, false)
-
-              @files.revoke_clone(project_home)
-            end
-            log_message(download_result.msg, download_result.msg_color)
-          else
-            current_commit = response["result"]["commit"]
-            if !response["result"]["tree"].nil?
-              parallel_options = {
-                  :progress => {
-                      :title => "Download Progress",
-                      :progress_mark => '=',
-                      :format => "%b>>%i| %p%% %t",
-                      :starting_at => 0,
-                      :total => response["result"]["tree"].size,
-                      :autofinish => true
-                  },
-                  in_processes: ParallelProcesses,
-                  in_thread: ParallelThreads
-              }
-            begin
-              successful_changes =[]
-              is_success = true
-              clone_result = Parallel.map((response["result"]["tree"]), parallel_options) do |f|
-
-                relative_path = f[0].gsub(/^#{@project.local_path}/, "")
-                if f[0].end_with? "/"
-                  # dir
-                  if @files.download_dir(f[0], relative_path, project_home)
-                    f
-                    successful_changes << relative_path
-                  else
-                    is_success =false
-                    log_message("Could not create directory: #{f[0]}", Thor::Shell::Color::RED)
-                    raise Parallel::Kill
-                  end
-                else
-                  # blob
-
-                  if @files.download_file_s3(f[0], relative_path, project_home, commit_sha1=current_commit)
-                    f
-                    successful_changes << relative_path
-                  else
-                    is_success =false
-                    log_message("Could not download file: #{f[0]}", Thor::Shell::Color::RED)
-                    raise Parallel::Kill
-
-                  end
-                end
-              end
-              successful_changes = response["result"]["tree"]
-              if !successful_changes.nil? and is_success
-                @project.set_idx(idx)
-                Project.verify_cnvrgignore_exist(project_name,remote)
-                log_message("Done.\nDownloaded  #{successful_changes.size}/#{response["result"]["tree"].size} files", Thor::Shell::Color::GREEN)
-              else
-                log_message("Couldn't download some files", Thor::Shell::Color::RED)
-
-              end
-            rescue Interrupt
-              log_message("Couldn't download, Rolling Back all changes.", Thor::Shell::Color::RED)
-
-              @files.revoke_clone(project_home)
-              return
-            end
-            end
-
-
-          end
-
-        else
-
-          log_message("Error: Couldn't clone: #{project_name}", Thor::Shell::Color::RED)
-          @files.revoke_clone(project_home)
-
-          return
+          progressbar = @files.create_progressbar(files.size, "Clone Progress")
+          @files.download_files(files, commit_sha1, progress: progressbar)
+          progressbar.finish
+          Project.verify_cnvrgignore_exist(project_name, remote)
+          @project.set_idx(idx)
+          log_message("Done")
+          log_message("Downloaded #{files.size} files")
         end
-      rescue SignalException
-        say "\nAborting"
-        @files.revoke_clone(project_home)
-
-        return
       end
-
     end
 
 
@@ -2360,7 +2271,7 @@ module Cnvrg
                                          :autofinish => true)
         @files.upload_multiple_files(to_upload, commit_sha1, progress: progressbar)
         @files.delete_files_from_server(deleted, commit_sha1)
-        progressbar.progress += deleted.size
+        progressbar.finish
         res = @files.end_commit(commit_sha1, force: force, message: commit_msg)
         unless Cnvrg::CLI.is_response_success(res, false)
           raise StandardError.new("Cant end commit")
@@ -2614,6 +2525,9 @@ module Cnvrg
         if git or @project.is_git
           return download_in_git(commit)
         end
+        if commit.present?
+          return jump(commit)
+        end
         ignore = options[:ignore] || ""
         if ignore.nil? or ignore.empty?
           ignore = ignore_list
@@ -2683,17 +2597,20 @@ module Cnvrg
 
 
         Cnvrg::Logger.log_info("Downloading updated files:#{updated_files.join(",")}")
-        @files.download_files(updated_files, commit, progress: progressbar) if updated_files.present?
+        @files.download_files(updated_files, commit, progress: progressbar)
 
         Cnvrg::Logger.log_info("Downloading conflicted files:#{conflicted_files.join(",")}")
-        @files.download_files(conflicted_files, commit, postfix: ".conflict", progress: progressbar) if conflicted_files.present?
+        @files.download_files(conflicted_files, commit, postfix: ".conflict", progress: progressbar)
 
         Cnvrg::Logger.log_info("Delete files: #{deleted_files.join(",")}")
         @files.delete_files_local(deleted_files, conflicted: conflicted_deleted, progress: progressbar)
 
         # update idx with latest commit
-        @project.update_idx_with_commit!(commit)
+        # the latest true its because if we define --commit in the cmd it will go to "def jump(options['commit'])"
+        # so if we are downloads something, we have to stay here.
+        @project.update_idx_with_commit!(commit, latest: true)
         #TODO Sync, remove idx, sync again and pray
+        progressbar.finish
         check = Helpers.checkmark()
         Cnvrg::Logger.log_info("Finished downloading successfuly")
         if options["verbose"]
@@ -2728,10 +2645,11 @@ module Cnvrg
         project_home = get_project_home
         @project = Project.new(project_home)
         current_commit = @project.last_local_commit
-        if current_commit.eql? commit_sha1
+        if current_commit.start_with? commit_sha1 #commit_sha1 can be partial.
           log_message("Project is already updated", Thor::Shell::Color::GREEN)
           exit(0)
         end
+        log_message("Jumping to commit #{commit_sha1}")
         @files = Cnvrg::Files.new(@project.owner, @project.slug, project_home: project_home)
         resp = @project.jump_idx(destination: commit_sha1)
         if resp.blank?
@@ -2739,81 +2657,27 @@ module Cnvrg
           exit(0)
         end
         compare = resp['result']['compare']
-        resolver = resp['result']['resolver']
         latest = resp['result']['latest']
         commit = resp['result']['commit']
-        updated_files = compare['updated_on_server']
+        updated_files = compare['updated_on_server'] + compare['added']
         conflicted_files = compare['conflicts']
+        conflicted_deleted = compare['delete_conflicts'] || []
         deleted_files = compare['deleted']
         overall_changes = [updated_files, conflicted_files, deleted_files].flatten.size
 
-
-        progressbar = ProgressBar.create(:title => "Download Progress",
-                           :progress_mark => '=',
-                           :format => "%b>>%i| %p%% %t",
-                           :starting_at => 0,
-                           :total => overall_changes,
-                           :autofinish => true)
-
+        progressbar = @files.create_progressbar(overall_changes, "Download Progress")
         @files.download_files(updated_files, commit_sha1, progress: progressbar)
         @files.download_files(conflicted_files, commit_sha1, progress: progressbar, postfix: '.conflicted')
-        @files.delete_files_local(deleted_files, progress: progressbar)
-
-
-        @project.set_on_branch(latest)
-        @project.update_idx_with_commit!(commit)
+        @files.delete_files_local(deleted_files, progress: progressbar, conflicted: conflicted_deleted)
+        progressbar.finish
+        @project.update_idx_with_commit!(commit, latest: latest)
         @project.generate_idx
+
         log_message("Jumped successfuly!", Thor::Shell::Color::GREEN)
       rescue => e
+        Logger::log_error(e)
         log_message("Cant jump to the specified commit", Thor::Shell::Color::RED)
       end
-      #   successful_changes = []
-      #
-      #   if !response["result"]["tree"].nil?
-
-      #     commit_sha1 = response["result"]["commit"]
-      #     idx = {commit: response["result"]["commit"], tree: response["result"]["tree"]}
-      #     File.open(project_home + "/.cnvrg/idx.yml", "w+") {|f| f.write idx.to_yaml}
-      #     if is_remote
-      #       current_tree = Dir.glob("**/*", File::FNM_DOTMATCH).flatten.reject {|file| file.start_with? '.' or file.eql? "__init__.py" or file.eql? "uwsgi.ini" or file.ends_with? "/." or file.eql? "."}
-      #     else
-      #       current_tree = Dir.glob("**/*", File::FNM_DOTMATCH).flatten.reject {|file| file.start_with? '.cnvrg' or file.ends_with? "/." or file.eql? "."}
-      #     end
-      #
-      #     jump_result = Parallel.map(response["result"]["tree"], parallel_options) do |f|
-      #
-      #       relative_path = f[0].gsub(/^#{@project.local_path}/, "")
-      #       log_message("Downloading #{f[0]}", Thor::Shell::Color::BLUE, false)
-      #       if f[0].end_with? "/"
-      #         # dir
-      #         @files.download_dir(f[0], relative_path, project_home)
-      #
-      #       else
-      #         # blob
-      #         @files.download_file_s3(f[0], relative_path, project_home, commit_sha1 = commit_sha1)
-      #       end
-      #     end
-      #
-      #
-      #     successful_changes = jump_result.select {|x| not x.nil?}
-      #   end
-      #   response["result"]["tree"].each do |f|
-      #     if f[0].end_with? "/"
-      #       current_tree.delete(f[0][0, f[0].size - 1])
-      #     else
-      #       current_tree.delete(f[0])
-      #     end
-      #   end
-      #
-      #   FileUtils.rm_rf(current_tree)
-      #   log_message("Done. Jumped to #{commit_sha1} completed successfully", Thor::Shell::Color::GREEN)
-      # rescue => e
-      #   log_message("Error occurred, Aborting", Thor::Shell::Color::RED)
-      #   log_error(e)
-      # rescue SignalException
-      #
-      #   exit(1)
-      # end
     end
 
     desc 'show', 'Show specific file from a specific commit'
@@ -2911,6 +2775,7 @@ module Cnvrg
     method_option :output_dir, :type => :string, :aliases => ["--output_dir"], :default => nil
     def sync(direct = true)
       verify_logged_in(true) if direct
+      @project = Project.new(get_project_home)
       log_start(__method__, args, options)
       log_message('Checking for new updates from remote version', Thor::Shell::Color::BLUE, options["verbose"])
       log_message('Syncing project', Thor::Shell::Color::BLUE, !options["verbose"])
@@ -2919,7 +2784,7 @@ module Cnvrg
       in_exp = options["in_exp"] || (job_slug.present? and job_type.present?)
       in_exp = false if job_type.present? and job_type == "NotebookSession"
       run_download = true
-      if options[:force] or options[:files].present? or options[:output_dir].present? or in_exp
+      if options[:force] or options[:files].present? or options[:output_dir].present? or in_exp or @project.is_branch
         run_download = false
       end
       if run_download
@@ -3477,10 +3342,6 @@ module Cnvrg
           else
             sync_result = invoke :sync, [false], :force => false
           end
-
-
-
-
         end
         #handle grid if it's git project
         if project.is_git and grid.present?
@@ -3516,6 +3377,7 @@ module Cnvrg
         if forced_commit and (commit_to_run.nil? or commit_to_run.empty?)
           commit_to_run = forced_commit
         end
+
         commit_to_run = commit_to_run.presence || project.last_local_commit
 
         res = exp.exec_remote(command, commit_to_run, instance_type, image, schedule, local_timestamp, grid, path_to_cmd, data, data_commit,
@@ -5491,7 +5353,7 @@ module Cnvrg
         end
       end
 
-      def log_message(message, type, to_print = true)
+      def log_message(message, type=Thor::Shell::Color::GREEN, to_print = true)
         if to_print
           say message, type
         end
@@ -5538,10 +5400,10 @@ module Cnvrg
             error = response['message'] || "Unknown error"
             # Cnvrg::CLI.log_end(1, error)
             if response["status"] == 500
-              say("<%= color('Server Error', RED) %>")
+              log_message('Server Error', Thor::Shell::Color::RED)
             else
               $LOG.error message: error, type: "error"
-              say("<%= color('Error:#{error}', RED) %>")
+              log_message("error", Thor::Shell::Color::RED)
             end
 
             if should_exit
@@ -5555,7 +5417,7 @@ module Cnvrg
             puts e.message
             puts e.backtrace
           rescue SignalException
-            say "Aborting"
+            log_message "Aborting", Thor::Shell::Color::RED
           end
 
         end
@@ -5837,7 +5699,7 @@ module Cnvrg
         rescue
           return false
         rescue SignalException
-          say "\nAborting"
+          say "\nAborting", Thor::Shell::Color::RED
           Exit(0)
         end
 

data/lib/cnvrg/files.rb

@@ -567,17 +567,15 @@ module Cnvrg
     end
 
 
-      def download_file_s3(absolute_path, relative_path, project_home, commit_sha1=nil, conflict=false)
+      def download_file_s3(relative_path, commit_sha1=nil, postfix: '')
         begin
-          res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path,
+          res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {relative_path: relative_path,
                                                                               commit_sha1: commit_sha1,new_version:true})
 
           Cnvrg::CLI.is_response_success(res, false)
           if res["result"]
             download_resp = res
             filename = download_resp["result"]["filename"]
-
-            absolute_path += ".conflict" if conflict
             sts_path = download_resp["result"]["path_sts"]
             retries = 0
             success= false
@@ -632,8 +630,8 @@ module Cnvrg
                   :endpoint=> endpoint,:force_path_style=> true,:ssl_verify_peer=>false,
                   :http_open_timeout => 60, :retry_limit => 20)
             end
-
-            File.open(project_home+"/"+absolute_path, 'w+') do |file|
+            absolute_path = "#{@project_home}/#{relative_path}#{postfix}"
+            File.open(absolute_path, 'w+') do |file|
               resp = client.get_object({bucket:bucket,
                                     key:file_key}, target: file)
             end
@@ -649,7 +647,21 @@ module Cnvrg
         end
       end
 
+    def create_progressbar(length = 10, title = 'Progress')
+      ProgressBar.create(:title => title,
+                         :progress_mark => '=',
+                         :format => "%b>>%i| %p%% %t",
+                         :starting_at => 0,
+                         :total => length,
+                         :autofinish => true)
+    end
+
     def download_files(files, commit, postfix: '', progress: nil)
+      return if files.blank?
+      if Cnvrg::Helpers.server_version < 1
+        Cnvrg::Logger.log_info("Download files from older server.")
+        return self.download_files_old(files, commit, progress: progress, postfix: postfix)
+      end
       res = Cnvrg::API.request(@base_resource + "download_files", 'POST', {files: files, commit: commit})
       unless Cnvrg::CLI.is_response_success(res, false)
         raise Exception.new("Cant download files from the server.")
@@ -657,6 +669,14 @@ module Cnvrg
       self.download_multpile_files_s3(res['result'], @project_home, postfix: postfix, progress: progress)
     end
 
+
+    def download_files_old(files, commit, postfix: '', progress: nil)
+      files.each do |file|
+        self.download_file_s3(file, commit, postfix: postfix)
+        progress.progress += 1 if progress.present?
+      end
+    end
+
     def delete_files_local(deleted, conflicted: [], progress: nil)
       deleted -= conflicted
       deleted.each{|file| self.delete(file); progress.progress += 1 if progress.present?}

data/lib/cnvrg/project.rb

@@ -11,7 +11,7 @@ module Cnvrg
       begin
         @local_path = project_home
         @working_dir = project_home
-        config = YAML.load_file(project_home+"/.cnvrg/config.yml")
+        config = YAML.load_file(project_home + "/.cnvrg/config.yml")
         @title = config[:project_name]
         @slug = config[:project_slug]
         @owner = config[:owner]
@@ -45,7 +45,7 @@ module Cnvrg
       end
       list = new_ignore.split(",")
       begin
-        File.open(self.local_path+"/.cnvrgignore", "a+") do |f|
+        File.open(self.local_path + "/.cnvrgignore", "a+") do |f|
           f.puts("\n")
           list.each do |i|
             f.puts("#{i}\n")
@@ -59,16 +59,16 @@ module Cnvrg
 
     def get_ignore_list
       ignore_list = []
-      if !File.exist? self.local_path+"/.cnvrgignore"
+      if !File.exist? self.local_path + "/.cnvrgignore"
         return ignore_list
       end
-      File.open(self.local_path+"/.cnvrgignore", "r").each_line do |line|
+      File.open(self.local_path + "/.cnvrgignore", "r").each_line do |line|
         line = line.strip
         if line.start_with? "#" or ignore_list.include? line or line.empty?
           next
         end
         if line.ends_with? "*"
-          list_regex = Dir.glob("**/#{line}",File::FNM_DOTMATCH).flatten
+          list_regex = Dir.glob("**/#{line}", File::FNM_DOTMATCH).flatten
           list_regex.each do |l|
             ignore_list << l
             if File.directory?(l)
@@ -79,15 +79,15 @@ module Cnvrg
 
           end
         elsif line.ends_with? "/*"
-          line = line.gsub("/*","")
+          line = line.gsub("/*", "")
           regex_list = Dir.glob("**/#{line}/**/*", File::FNM_DOTMATCH).flatten
           ignore_list << regex_list
         elsif line.include? "*"
-             regex_list = Dir.glob("**/#{line}").flatten
-             ignore_list << regex_list
+          regex_list = Dir.glob("**/#{line}").flatten
+          ignore_list << regex_list
         elsif line.end_with? "/" or File.directory?(line)
-            ignore_list << line
-            all_sub = Dir.glob("#{line}/**/*", File::FNM_DOTMATCH).flatten
+          ignore_list << line
+          all_sub = Dir.glob("#{line}/**/*", File::FNM_DOTMATCH).flatten
 
           ignore_list << all_sub.flatten
 
@@ -102,16 +102,16 @@ module Cnvrg
     def send_ignore_list()
       begin
         ignore_list = []
-        File.open(self.local_path+"/.cnvrgignore", "r").each_line do |line|
+        File.open(self.local_path + "/.cnvrgignore", "r").each_line do |line|
           line = line.strip
           if line.start_with? "#" or ignore_list.include? line or line.empty?
             next
           end
           if line.end_with? "/"
-            ignore_list << line.gsub("/","")
-            ignore_list << line+"."
+            ignore_list << line.gsub("/", "")
+            ignore_list << line + "."
           elsif line.include? "*"
-            line = line.gsub("*",".*")
+            line = line.gsub("*", ".*")
             ignore_list << line
           else
             ignore_list << line
@@ -126,7 +126,7 @@ module Cnvrg
 
     # Create project
 
-    def self.create(project_name, clean, with_docker=false)
+    def self.create(project_name, clean, with_docker = false)
       if clean
         list_dirs = [project_name, project_name + "/.cnvrg"]
       else
@@ -149,7 +149,7 @@ module Cnvrg
       ]
       cnvrgreadme = Helpers.readme_content
       cnvrgignore = Helpers.cnvrgignore_content
-      cnvrghyper  = Helpers.hyper_content
+      cnvrghyper = Helpers.hyper_content
 
       begin
 
@@ -166,10 +166,10 @@ module Cnvrg
         FileUtils.mkdir_p list_dirs
         FileUtils.touch list_files
 
-        File.open(project_name + "/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-        File.open(project_name + "/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
-        File.open(project_name + "/README.md", "w+") { |f| f.write cnvrgreadme }
-        File.open(project_name + "/src/hyper.yaml", "w+") { |f| f.write cnvrghyper }
+        File.open(project_name + "/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
+        File.open(project_name + "/.cnvrgignore", "w+") {|f| f.write cnvrgignore}
+        File.open(project_name + "/README.md", "w+") {|f| f.write cnvrgreadme}
+        File.open(project_name + "/src/hyper.yaml", "w+") {|f| f.write cnvrghyper}
 
       rescue
         return false
@@ -177,75 +177,76 @@ module Cnvrg
       return true
     end
 
-    def self.link(owner, project_name, docker=false, git = false)
-        ignore_exits = File.exist? ".cnvrgignore"
-        list_dirs = [".cnvrg"
-        ]
-        list_files = [
-            ".cnvrg/config.yml"
-        ]
-        if !ignore_exits
-          list_files <<
-              ".cnvrgignore"
-        end
+    def self.link(owner, project_name, docker = false, git = false)
+      ignore_exits = File.exist? ".cnvrgignore"
+      list_dirs = [".cnvrg"
+      ]
+      list_files = [
+          ".cnvrg/config.yml"
+      ]
+      if !ignore_exits
+        list_files <<
+            ".cnvrgignore"
+      end
 
-        cnvrgreadme = Helpers.readme_content
-        cnvrgignore = Helpers.cnvrgignore_content
-        begin
-          response = Cnvrg::API.request("cli/create_project", 'POST', {title: project_name, owner: owner, is_docker: docker})
-          Cnvrg::CLI.is_response_success(response)
-          response = JSON.parse response["result"]
-          project_slug = response["slug"]
-
-          config = {project_name: project_name,
-                    project_slug: project_slug,
-                    owner: owner,
-                    git: git}
-          FileUtils.mkdir_p list_dirs
-          FileUtils.touch list_files
-          File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore } unless ignore_exits
-          if !File.exist? "README" and !File.exist? "README.md"
-            FileUtils.touch [ "README.md" ]
-            File.open("README.md", "w+") { |f| f.write cnvrgreadme }
-          end
+      cnvrgreadme = Helpers.readme_content
+      cnvrgignore = Helpers.cnvrgignore_content
+      begin
+        response = Cnvrg::API.request("cli/create_project", 'POST', {title: project_name, owner: owner, is_docker: docker})
+        Cnvrg::CLI.is_response_success(response)
+        response = JSON.parse response["result"]
+        project_slug = response["slug"]
 
-        rescue => e
-          puts e
-          return false
+        config = {project_name: project_name,
+                  project_slug: project_slug,
+                  owner: owner,
+                  git: git}
+        FileUtils.mkdir_p list_dirs
+        FileUtils.touch list_files
+        File.open(".cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
+        File.open(".cnvrgignore", "w+") {|f| f.write cnvrgignore} unless ignore_exits
+        if !File.exist? "README" and !File.exist? "README.md"
+          FileUtils.touch ["README.md"]
+          File.open("README.md", "w+") {|f| f.write cnvrgreadme}
         end
-        return true
+
+      rescue => e
+        puts e
+        return false
       end
+      return true
+    end
 
-      def self.clone_dir(project_slug, project_owner, project_name,is_git=false)
-        list_dirs = [project_name,
-                     project_name + "/.cnvrg"
-        ]
+    def self.clone_dir(project_slug, project_owner, project_name, is_git = false)
+      list_dirs = [project_name,
+                   project_name + "/.cnvrg"
+      ]
 
 
-        list_files = [
-            project_name + "/.cnvrg/config.yml",
-            project_name+"/.cnvrgignore",
-        ]
-        begin
-          config = {project_name: project_name,
-                    project_slug: project_slug,
-                    owner: project_owner,
-                    git: is_git}
-          FileUtils.mkdir_p list_dirs
-          FileUtils.touch list_files
-          cnvrgignore = Helpers.cnvrgignore_content
+      list_files = [
+          project_name + "/.cnvrg/config.yml",
+          project_name + "/.cnvrgignore",
+      ]
+      begin
+        config = {project_name: project_name,
+                  project_slug: project_slug,
+                  owner: project_owner,
+                  git: is_git}
+        FileUtils.mkdir_p list_dirs
+        FileUtils.touch list_files
+        cnvrgignore = Helpers.cnvrgignore_content
 
 
-          File.open(project_name + "/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          File.open(project_name+"/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
+        File.open(project_name + "/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
+        File.open(project_name + "/.cnvrgignore", "w+") {|f| f.write cnvrgignore}
 
-        rescue
-          return false
-        end
-        return true
+      rescue
+        return false
       end
-    def self.verify_cnvrgignore_exist(project_name,remote)
+      return true
+    end
+
+    def self.verify_cnvrgignore_exist(project_name, remote)
       path = ".cnvrgignore"
       if !File.exist? path
         path = "#{project_name}/.cnvrgignore"
@@ -255,10 +256,10 @@ module Cnvrg
         begin
           list_files = [
               path
-        ]
-        FileUtils.touch list_files
-        cnvrgignore = Helpers.cnvrgignore_content
-        File.open(path, "w+") { |f| f.write cnvrgignore }
+          ]
+          FileUtils.touch list_files
+          cnvrgignore = Helpers.cnvrgignore_content
+          File.open(path, "w+") {|f| f.write cnvrgignore}
         rescue => e
           return false
         end
@@ -266,64 +267,66 @@ module Cnvrg
       end
     end
 
-      def self.clone_dir_remote(project_slug, project_owner, project_name,is_git=false)
-        list_dirs = [
-            ".cnvrg"
-        ]
-
-
+    def self.clone_dir_remote(project_slug, project_owner, project_name, is_git = false)
+      list_dirs = [
+          ".cnvrg"
+      ]
 
-          list_files = [
-            ".cnvrg/config.yml",
 
-        ]
+      list_files = [
+          ".cnvrg/config.yml",
 
+      ]
 
-          begin
-          config = {project_name: project_name,
-                    project_slug: project_slug,
-                    owner: project_owner,
-                    git: is_git
-          }
-          FileUtils.mkdir_p list_dirs
-          FileUtils.touch list_files
 
+      begin
+        config = {project_name: project_name,
+                  project_slug: project_slug,
+                  owner: project_owner,
+                  git: is_git
+        }
+        FileUtils.mkdir_p list_dirs
+        FileUtils.touch list_files
 
-          File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          if !File.exist? ".cnvrgignore"
-            FileUtils.touch ".cnvrgignore"
-            list_files << ".cnvrgignore"
-            cnvrgignore = Helpers.cnvrgignore_content
-            File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
 
+        File.open(".cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
+        if !File.exist? ".cnvrgignore"
+          FileUtils.touch ".cnvrgignore"
+          list_files << ".cnvrgignore"
+          cnvrgignore = Helpers.cnvrgignore_content
+          File.open(".cnvrgignore", "w+") {|f| f.write cnvrgignore}
 
-          end
 
-        rescue
-          return false
         end
-        return true
+
+      rescue
+        return false
       end
+      return true
+    end
+
     def update_is_new_branch(new_branch)
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
+      config = YAML.load_file(@working_dir + "/.cnvrg/config.yml")
       config[:new_branch] = new_branch
-      File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
+      File.open(@working_dir + "/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
     end
+
     def get_new_branch
       begin
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
-      return config[:new_branch]
-      rescue =>e
+        config = YAML.load_file(@working_dir + "/.cnvrg/config.yml")
+        return config[:new_branch]
+      rescue => e
         return false
 
       end
     end
 
     def remove_new_branch
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
+      config = YAML.load_file(@working_dir + "/.cnvrg/config.yml")
       new_config = config.except(:new_branch)
-      File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write new_config.to_yaml }
+      File.open(@working_dir + "/.cnvrg/config.yml", "w+") {|f| f.write new_config.to_yaml}
     end
+
     def generate_output_dir(output_dir)
       Cnvrg::Logger.log_info("Generating output dir for #{output_dir}")
       upload_list = []
@@ -332,10 +335,10 @@ module Cnvrg
         next if e.end_with? "/."
         if File.directory? e
 
-          upload_list << e+"/"
+          upload_list << e + "/"
         else
           upload_list << e
-          end
+        end
       end
       if Dir.exists? output_dir
         upload_list << output_dir + "/"
@@ -364,130 +367,132 @@ module Cnvrg
 
     end
 
-      def generate_idx(deploy:false)
-        if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
-          old_idx = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
-        else
-          old_idx = {:tree => {}, :commit => nil}
-        end
+    def generate_idx(deploy: false)
+      if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
+        old_idx = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
+      else
+        old_idx = {:tree => {}, :commit => nil}
+      end
 
-        tree_idx = Hash.new(0)
-        list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject { |x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~ /^#{self.local_path}\/\.git\/*/) or (x =~/^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~/^#{self.local_path}\/\.cnvrgignore/) }
-        list_ignore = self.get_ignore_list()
-        if deploy
-          list_ignore << ["main.py","main.pyc", "__init__.py", "uwsgi.ini"]
-          list_ignore.flatten!
-        end
+      tree_idx = Hash.new(0)
+      list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject {|x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~ /^#{self.local_path}\/\.git\/*/) or (x =~ /^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~ /^#{self.local_path}\/\.cnvrgignore/)}
+      list_ignore = self.get_ignore_list()
+      if deploy
+        list_ignore << ["main.py", "main.pyc", "__init__.py", "uwsgi.ini"]
+        list_ignore.flatten!
+      end
 
-        Parallel.map(list, in_threads: IDXParallelThreads) do |e|
-          label = e.gsub(self.local_path + "/", "")
-          ignore_label = label.gsub("/","//")
-          if list_ignore.include? ignore_label
-            next
-          end
-          if File.directory? e
+      Parallel.map(list, in_threads: IDXParallelThreads) do |e|
+        label = e.gsub(self.local_path + "/", "")
+        ignore_label = label.gsub("/", "//")
+        if list_ignore.include? ignore_label
+          next
+        end
+        if File.directory? e
 
-            tree_idx[label+"/"] = nil
+          tree_idx[label + "/"] = nil
+        else
+          sha1 = OpenSSL::Digest::SHA1.file(e).hexdigest
+          if old_idx.nil? or old_idx.to_h[:tree].nil?
+            tree_idx[label] = {sha1: sha1, commit_time: nil}
+          elsif old_idx[:tree][label].nil? or old_idx[:tree][label][:sha1] != sha1
+            tree_idx[label] = {sha1: sha1, commit_time: nil}
           else
-            sha1 =  OpenSSL::Digest::SHA1.file(e).hexdigest
-            if old_idx.nil? or old_idx.to_h[:tree].nil?
-              tree_idx[label] = {sha1: sha1, commit_time: nil}
-            elsif old_idx[:tree][label].nil? or old_idx[:tree][label][:sha1] != sha1
-              tree_idx[label] = {sha1: sha1, commit_time: nil}
-            else
-              tree_idx[label] = old_idx[:tree][label]
-            end
+            tree_idx[label] = old_idx[:tree][label]
           end
         end
+      end
 
-        old_idx[:tree] = tree_idx
+      old_idx[:tree] = tree_idx
 
-        File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write old_idx.to_yaml }
-        return YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
-      end
-      def get_idx
-        unless File.exists? "#{self.local_path}/.cnvrg/idx.yml"
-          empty_idx = {:commit => nil, :tree => {}}
-          File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write empty_idx.to_yaml }
-          return empty_idx
-        end
-        YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
+      File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') {|f| f.write old_idx.to_yaml}
+      return YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
+    end
+
+    def get_idx
+      unless File.exists? "#{self.local_path}/.cnvrg/idx.yml"
+        empty_idx = {:commit => nil, :tree => {}}
+        File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') {|f| f.write empty_idx.to_yaml}
+        return empty_idx
       end
+      YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
+    end
 
     def set_idx(idx)
       FileUtils.mkdir_p("#{self.local_path}/.cnvrg")
-      File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx.to_yaml }
+      File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') {|f| f.write idx.to_yaml}
+    end
+
+    def clone(remote = 0, commit)
+      response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/clone", 'POST', {project_slug: self.slug, remote: remote, commit: commit})
+      return response
     end
 
-      def clone(remote=0, commit)
-        response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/clone", 'POST', {project_slug: self.slug, remote: remote, commit: commit})
-        return response
-      end
     def git_download_commit(commit)
       response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/git_download_commit", 'POST', {commit_sha1: commit})
-      CLI.is_response_success(response,true)
+      CLI.is_response_success(response, true)
       return response
     end
 
       def compare_idx(new_branch, force:false, deploy: false, in_exp:false, specific_files: [], download: false)
-        is_download = download
-        if is_download
-          local_idx = self.get_idx
-        else
-          #upload
-          local_idx = self.generate_idx(deploy: deploy)
-        end
-        commit = local_idx[:commit]
-        tree = local_idx[:tree]
-        ignore_list = self.send_ignore_list()
-        if force or specific_files.present?
-          added = []
-          if specific_files.present?
-            added = specific_files
-          elsif tree.present?
-            added << local_idx[:tree].keys
-            added.flatten!
-          end
-          response ={"result"=> {"commit"=>nil,"tree"=> {"added"=> added,
-                     "updated_on_server"=> [],
-                     "updated_on_local"=> [],
-                     "update_local" => [],
-                     "deleted"=> [],
-                     "conflicts"=> []} } }
-          return response
+      is_download = download
+      if is_download
+        local_idx = self.get_idx
+      else
+        #upload
+        local_idx = self.generate_idx(deploy: deploy)
+      end
+      commit = local_idx[:commit]
+      tree = local_idx[:tree]
+      ignore_list = self.send_ignore_list()
+      if force or specific_files.present?
+        added = []
+        if specific_files.present?
+          added = specific_files
+        elsif tree.present?
+          added << local_idx[:tree].keys
+          added.flatten!
         end
-        #we dont want to send it on download - we only compare between commits sha1 in download.
-        if is_download
-          #the new server doesnt need the tree, but the old probably needs :X
-          local_idx[:tree] = {} if Cnvrg::Helpers.server_version > 0
+        response = {"result" => {"commit" => nil, "tree" => {"added" => added,
+                                                             "updated_on_server" => [],
+                                                             "updated_on_local" => [],
+                                                             "update_local" => [],
+                                                             "deleted" => [],
+                                                             "conflicts" => []}}}
+        return response
+      end
+      #we dont want to send it on download - we only compare between commits sha1 in download.
+      if is_download
+        #the new server doesnt need the tree, but the old probably needs :X
+        local_idx[:tree] = {} if Cnvrg::Helpers.server_version > 0
+      end
+      response = Cnvrg::API.request(@base_resource + "status", 'POST', {idx: local_idx, new_branch: new_branch,
+                                                                        current_commit: commit, ignore: ignore_list, force: force, in_exp: in_exp, download: download})
+
+      CLI.is_response_success(response, true)
+      if is_download
+        if Cnvrg::Helpers.server_version > 0
+          #trying to optimize the download using resolver
+          resolve = response['result']['tree']['resolver'] || tree #tree of file -> sha1 from current commit to check conflicts
+          destination_files = response['result']['tree']['destination'] || {} #tree of file -> sha1 from last commit to check files that already downloaded
+        else
+          resolve = tree
+          destination_files = {}
         end
-        response = Cnvrg::API.request(@base_resource + "status", 'POST', {idx: local_idx, new_branch: new_branch,
-                                                                                                   current_commit: commit,ignore:ignore_list, force:force,in_exp:in_exp, download: download})
-
-        CLI.is_response_success(response,true)
-        if is_download
-          if Cnvrg::Helpers.server_version > 0
-            #trying to optimize the download using resolver
-            resolve = response['result']['tree']['resolver'] || tree #tree of file -> sha1 from current commit to check conflicts
-            destination_files = response['result']['tree']['destination'] || {} #tree of file -> sha1 from last commit to check files that already downloaded
-          else
-            resolve = tree
-            destination_files = {}
-          end
-          @files = self.get_files
-          local_tree = @files.calculate_sha1(resolve.keys)
-          changed_files = resolve.keys.select{|file| local_tree[file] != resolve[file]}
+        @files = self.get_files
+        local_tree = @files.calculate_sha1(resolve.keys)
+        changed_files = resolve.keys.select {|file| local_tree[file] != resolve[file]}
 
-          # means that the user changed the file locally
-          response['result']['tree']['update_local'] = changed_files
+        # means that the user changed the file locally
+        response['result']['tree']['update_local'] = changed_files
 
-          # means that we already downloaded this file and we dont need it anymore
-          downloaded_files = destination_files.keys.select{|file| local_tree[file] == destination_files[file]}
-          response['result']['tree']['added'] -= downloaded_files
-          response['result']['tree']['updated_on_server'] -= downloaded_files
-        end
-        return response
+        # means that we already downloaded this file and we dont need it anymore
+        downloaded_files = destination_files.keys.select {|file| local_tree[file] == destination_files[file]}
+        response['result']['tree']['added'] -= downloaded_files
+        response['result']['tree']['updated_on_server'] -= downloaded_files
       end
+      return response
+    end
 
     def get_files
       Cnvrg::Files.new(self.owner, self.slug, project_home: @local_path)
@@ -502,52 +507,52 @@ module Cnvrg
                                     'POST',
                                     {tree: tree, ignore: ignore_list,
                                      dest_commit: destination, current_commit: current_commit})
-      CLI.is_response_success(response,false)
+      CLI.is_response_success(response, false)
       response
     end
 
     def set_on_branch(is_latest)
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
+      config = YAML.load_file(@working_dir + "/.cnvrg/config.yml")
       @is_branch = !is_latest
       config[:is_branch] = @is_branch
 
-      File.open(@working_dir+"/.cnvrg/config.yml", 'w') { |f| f.write config.to_yaml }
+      File.open(@working_dir + "/.cnvrg/config.yml", 'w') {|f| f.write config.to_yaml}
 
     end
 
-      def compare_commit(commit)
-        if commit.nil? or commit.empty?
-          commit = last_local_commit
-        end
-        response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commit/compare", 'POST', {current_commit: commit})
-        CLI.is_response_success(response,false)
-        update_is_new_branch(response["result"]["new_branch"])
-        return response["result"]["new_branch"]
+    def compare_commit(commit)
+      if commit.nil? or commit.empty?
+        commit = last_local_commit
       end
+      response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commit/compare", 'POST', {current_commit: commit})
+      CLI.is_response_success(response, false)
+      update_is_new_branch(response["result"]["new_branch"])
+      return response["result"]["new_branch"]
+    end
 
-      def update_idx_with_files_commits!(files, commit_time)
-
-        idx_hash = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
-        files.each do |path|
-          idx_hash[:tree].to_h[path].to_h[:commit_time] = commit_time
-        end
-        File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx_hash.to_yaml }
+    def update_idx_with_files_commits!(files, commit_time)
 
-        return true
+      idx_hash = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
+      files.each do |path|
+        idx_hash[:tree].to_h[path].to_h[:commit_time] = commit_time
       end
+      File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') {|f| f.write idx_hash.to_yaml}
+
+      return true
+    end
 
-      def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp,workers, file_input, title)
+    def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp, workers, file_input, title)
+      response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/deploy", 'POST', {file_to_run: file_to_run, function: function,
+                                                                                         image_slug: image_slug, input_params: input_params,
+                                                                                         commit_sha1: commit_to_run,
+                                                                                         instance_type: instance_type,
+                                                                                         scheduling_query: scheduling_query,
+                                                                                         local_timestamp: local_timestamp,
+                                                                                         workers: workers, file_input: file_input,
+                                                                                         title: title})
+      return response
+    end
 
-        response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/deploy", 'POST', {file_to_run: file_to_run, function: function,
-                                                                                           image_slug: image_slug, input_params: input_params,
-                                                                                           commit_sha1: commit_to_run,
-                                                                                           instance_type: instance_type,
-                                                                                           scheduling_query: scheduling_query,
-                                                                                           local_timestamp: local_timestamp,
-                                                                                            workers:workers,file_input:file_input,
-                                                                                            title: title})
-        return response
-      end
     def list_commits
       response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commits/list", 'GET')
       CLI.is_response_success(response)
@@ -567,17 +572,19 @@ module Cnvrg
       CLI.is_response_success(response)
       return response
     end
-      def update_idx_with_commit!(commit)
-        idx_hash = self.get_idx
-        idx_hash[:commit] = commit
 
-        File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx_hash.to_yaml }
-        return true
-      end
+    def update_idx_with_commit!(commit, latest: nil)
+      idx_hash = self.get_idx
+      idx_hash[:commit] = commit
+      self.set_on_branch(latest) unless latest.nil?
 
-      def revert(working_dir)
-        FileUtils.rm_rf working_dir
-      end
+      File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') {|f| f.write idx_hash.to_yaml}
+      return true
+    end
+
+    def revert(working_dir)
+      FileUtils.rm_rf working_dir
+    end
 
     def init_machines
       Cnvrg::Logger.log_info("Init machines.")
@@ -599,5 +606,6 @@ module Cnvrg
       machines.include? machine
     end
 
-    end
+
   end
+end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Yochay Ettun