cnvrg 0.0.1422 → 0.0.1424

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d00f4715dff9ff27fc5dce8cd6de74e5dc846302
-  data.tar.gz: c3c218341d0d7ecba3f0b7bf0fcd09660bbeadec
+  metadata.gz: 175af4d0c0a0bb3bf60b921c412da5de3254927c
+  data.tar.gz: 97c6df1be57c4e17a5aeac38e1e0407eb9a1bdfc
 SHA512:
-  metadata.gz: 9c01d5eb58da2edfedcce2bf7cc6754384aa133fa335e94edc9888688f9fcf20bb5ffc1879495b37661a9a1650cbfdb6ab56813270089e6cd11856ad28ffc2fc
-  data.tar.gz: 2d2554208488d719ae4041a4c5e6dee3eaa588ded0794f06b446482f6e5c5a95d2a0e2013f1fe6e14f79c0c4e1d0a63587d24614f9acc018473afa2778475f18
+  metadata.gz: b8d9944d378b24808d49cd366e8e4d58ef31ea834b186d12774c369f793ecaf8fdff1b10e197121be2ec274cbde93447f9bcef60c5a9586837a907e5f88e3655
+  data.tar.gz: 8c36084a0068b92e58b777e2c080c132aa5df4440d7337ece94185718d4e18f0ceef2de0ab6b2edb7808d4c6fef08a31a8ce088c702e19db2030152dbcef1a3e

data/cnvrg.gemspec

@@ -39,6 +39,8 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'docker-api', '~> 1.33'
     spec.add_runtime_dependency 'rubyzip', '~> 1.2'
     spec.add_runtime_dependency 'activesupport', '~> 5.0'
+    spec.add_runtime_dependency 'ruby-progressbar'
+
 
     
 end

data/lib/cnvrg/cli.rb

@@ -33,6 +33,7 @@ require 'zip'
 require 'active_support/all'
 require 'thor'
 require 'pathname'
+require 'enumerator'
 
 
 class Thor
@@ -94,7 +95,7 @@ class Thor
         if !args.empty? and local_options.is_a? Array and !local_options.empty?
           args = args + local_options
         else
-            args = args.flatten()
+          args = args.flatten()
         end
 
       end
@@ -210,7 +211,7 @@ module Cnvrg
           config = {owner: config.to_h[:owner], username: config.to_h[:username], version_last_check: config.to_h[:version_last_check], api: url}
         end
         res = Cnvrg::API.request("/users/#{owner}/custom_api", 'POST', {custom_api: url})
-        if Cnvrg::CLI.is_response_success(res)
+        if Cnvrg::CLI.is_response_success(res,false)
 
           checks = Helpers.checkmark
 
@@ -1195,8 +1196,12 @@ module Cnvrg
             exit(1)
           end
           say "Uploading data", Thor::Shell::Color::BLUE
-
-          res = @files.upload_tar_file(tar_path, tar_path, commit_sha1)
+          eta = Time.now + 600
+          start = Time.now
+          res = false
+          with_progress_bar do
+            res = @files.upload_tar_file(tar_path, tar_path, commit_sha1)
+          end
 
           if res
             cur_idx = @dataset.get_idx.to_h
@@ -1447,7 +1452,7 @@ module Cnvrg
               else
                 # blob
 
-                if @files.download_file_s3(f[0], relative_path, project_home,commit_sha1=current_commit)
+                if @files.download_file_s3(f[0], relative_path, project_home, commit_sha1=current_commit)
                   successful_changes << relative_path
                 end
               end
@@ -1846,7 +1851,7 @@ module Cnvrg
 
         result["conflicts"].each do |f|
           relative_path = f.gsub(/^#{@project.local_path}/, "")
-          if @files.download_file_s3(f, relative_path, project_home,commit_sha1=nil, conflict=true)
+          if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=true)
             successful_changes << relative_path
           end
 
@@ -1971,7 +1976,7 @@ module Cnvrg
               end
             else
               # blob
-              if @files.download_file_s3(f[0], relative_path, project_home,commit_sha1=commit_sha1)
+              if @files.download_file_s3(f[0], relative_path, project_home, commit_sha1=commit_sha1)
                 current_tree.delete(relative_path)
 
                 successful_changes << relative_path
@@ -2063,26 +2068,26 @@ module Cnvrg
 
 
     desc 'run cmd', 'Runs an experiment'
-    method_option :local, :type => :boolean, :aliases => ["-l","--local"], :default => false
+    method_option :local, :type => :boolean, :aliases => ["-l", "--local"], :default => false
     method_option :small, :type => :boolean, :aliases => ["-sm", "--small"], :default => false
     method_option :medium, :type => :boolean, :aliases => ["-md", "--medium"], :default => false
     method_option :large, :type => :boolean, :aliases => ["-lg", "--large"], :default => false
     method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
     method_option :gpuxl, :type => :boolean, :aliases => ["--gpuxl"], :default => false
     method_option :gpuxxl, :type => :boolean, :aliases => ["--gpuxxl"], :default => false
-    method_option :sync_before, :type => :boolean, :aliases => ["-sb","--sync_before"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["-sa","--sync_after"], :default => true
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb", "--sync_before"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa", "--sync_after"], :default => true
     method_option :title, :type => :string, :aliases => ["-t", "--title"], :default => ""
     method_option :log, :type => :boolean, :aliases => ["--log"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["-en","--email_notification"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["-uo","--upload_output"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["-c","--commit"], :default => ""
-    method_option :schedule, :type => :string, :aliases => ["-s","--schedule"], :default => ""
-    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
+    method_option :email_notification, :type => :boolean, :aliases => ["-en", "--email_notification"], :default => false
+    method_option :upload_output, :type => :string, :aliases => ["-uo", "--upload_output"], :default => ""
+    method_option :commit, :type => :string, :aliases => ["-c", "--commit"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["-s", "--schedule"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i", "--image"], :default => ""
     method_option :grid, :type => :string, :aliases => ["-g", "--grid"], :default => ""
     method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
     method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
-    method_option :ignore, :type => :string, :aliases => ["-i","--ignore"], :desc => "ignore following files", :default => ""
+    method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :desc => "ignore following files", :default => ""
 
     def run(*cmd)
       sync_before = options["sync_before"]
@@ -2119,7 +2124,7 @@ module Cnvrg
         end
         exec_options = real_options.map { |x| "--#{x[0]}=#{x[1]}" }.flatten.join(" ")
         cmd_to_exec = "#{exec_options} #{cmd.join(" ")}"
-        invoke :exec_remote, [cmd] , :sync_before => sync_before, :sync_after => sync_after, :title => title, :machine_type => instance_type,
+        invoke :exec_remote, [cmd], :sync_before => sync_before, :sync_after => sync_after, :title => title, :machine_type => instance_type,
                :schedule => schedule, :log => log, :email_notification => email_notification, :upload_output => upload_output, :commit => commit,
                :image => image, :grid => grid, :data => data, :data_commit => data_commit, :ignore => ignore
         return
@@ -2141,19 +2146,19 @@ module Cnvrg
     desc '', '', :hide => true
     method_option :sync_before, :type => :boolean, :aliases => ["-sb,--sync_before"], :default => true
     method_option :sync_after, :type => :boolean, :aliases => ["-sa,--sync_after"], :default => true
-    method_option :title, :type => :string, :aliases => ["-t","--title"], :default => ""
-    method_option :log, :type => :boolean, :aliases => [ "--log"], :default => false
+    method_option :title, :type => :string, :aliases => ["-t", "--title"], :default => ""
+    method_option :log, :type => :boolean, :aliases => ["--log"], :default => false
     method_option :email_notification, :type => :boolean, :aliases => ["-en,--email_notification"], :default => false
     method_option :upload_output, :type => :string, :aliases => ["-uo,--upload_output"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["-c","--commit"], :default => ""
-    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
+    method_option :commit, :type => :string, :aliases => ["-c", "--commit"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i", "--image"], :default => ""
     method_option :indocker, :type => :boolean, :aliases => ["--indocker"], :default => false
     method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
     method_option :data_commit, :type => :string, :aliases => ["-dc", "--data_commit"], :default => ""
-    method_option :ignore, :type => :string, :aliases => ["-i","--ignore"], :desc => "ignore following files", :default => ""
-
+    method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :desc => "ignore following files", :default => ""
 
     def exec(*cmd)
+
       log = []
       cpu_average =0
       memory_average = 0
@@ -2564,20 +2569,20 @@ module Cnvrg
     end
 
     desc '', '', :hide => true
-    method_option :sync_before, :type => :boolean, :aliases => ["-sb","--sync_before"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["-sa","--sync_after"], :default => true
-    method_option :title, :type => :string, :aliases => ["-t","--title"], :default => ""
-    method_option :log, :type => :boolean, :aliases => [ "--log"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["-en","--email_notification"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["-uo","--upload_output"], :default => ""
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb", "--sync_before"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa", "--sync_after"], :default => true
+    method_option :title, :type => :string, :aliases => ["-t", "--title"], :default => ""
+    method_option :log, :type => :boolean, :aliases => ["--log"], :default => false
+    method_option :email_notification, :type => :boolean, :aliases => ["-en", "--email_notification"], :default => false
+    method_option :upload_output, :type => :string, :aliases => ["-uo", "--upload_output"], :default => ""
     method_option :machine_type, :type => :string, :default => ""
-    method_option :schedule, :type => :string, :aliases => ["-s","--schedule"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["-s", "--schedule"], :default => ""
     method_option :commit, :type => :string, :aliases => ["-c, --commit"], :default => nil
-    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i", "--image"], :default => ""
     method_option :grid, :type => :string, :aliases => ["-g", "--grid"], :default => ""
     method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
     method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
-    method_option :ignore, :type => :string, :aliases => ["-i","--ignore"], :desc => "ignore following files", :default => ""
+    method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :desc => "ignore following files", :default => ""
 
     def exec_remote(*cmd)
       verify_logged_in(true)
@@ -2589,6 +2594,7 @@ module Cnvrg
         grid = options["grid"] || nil
         data = options["data"] || nil
         data_commit = options["data_commit"] || nil
+        sync_before = options["sync_before"]
 
         instance_type = options["machine_type"] || nil
         schedule = options["schedule"] || ""
@@ -2652,9 +2658,23 @@ module Cnvrg
           image_slug = image.image_slug
         end
 
+        invoke :sync, [false], []  if sync_before
 
-        invoke :sync, [false], []
 
+        if command.include? "'"
+          oc = command.to_enum(:scan, /'/).map { Regexp.last_match }
+          pairs = oc.enum_for(:each_slice, 2).to_a
+          pairs.each_with_index do |p,i|
+            add=0
+            if i!=0
+              add=2*i
+            end
+            total_loc = command[p[0].offset(0)[0]+add..p[1].offset(0)[0]+add]
+            command[p[0].offset(0)[0]+add..p[1].offset(0)[0]+add] = "\"#{total_loc}\""
+          end
+
+
+        end
         say "Running remote experiment", Thor::Shell::Color::BLUE
         exp = Experiment.new(project.owner, project.slug)
         res = exp.exec_remote(command, commit_to_run, instance_type, image_slug, schedule, local_timestamp, grid, path_to_cmd, data, data_commit)
@@ -4573,6 +4593,9 @@ module Cnvrg
 
         config = YAML.load_file(File.expand_path('~')+"/.cnvrg/config.yml")
         version_date = config.to_h[:version_last_check]
+        if version_date.nil?
+          version_date = get_start_day()
+        end
         next_day = get_start_day+ 86399
         if not (version_date..next_day).cover?(Time.now)
           if should_update_version()
@@ -4848,73 +4871,30 @@ module Cnvrg
         `tar -xvf #{file_path} -C #{dir_path} > /dev/null 2>&1`
         return $?.success?
       end
-    end
-  end
-  class Data < SubCommandBase
-    desc "data init", "init data folder"
-    method_option :public, :type => :boolean, :aliases => ["-p", "--public"], :default => false
-
-    def init
-      cli = Cnvrg::CLI.new()
-      public = options["public"]
-      cli.init_data(public)
-    end
-
-    desc "data upload", "upload data folder"
-    method_option :ignore, :type => :array, :aliases => ["-i", "--i"], :desc => "ignore following files"
-    method_option :verbose, :type => :boolean, :aliases => ["-v"], :default => false
-    method_option :sync, :type => :boolean, :aliases => ["-s"], :default => false
-
-    def upload
-      cli = Cnvrg::CLI.new()
-      ignore = options["ignore"]
-      verbose = options["verbose"]
-      sync = options["sync"]
-
-      cli.upload_data_tar(ignore, verbose, sync)
-    end
-
-    desc 'data download', 'pull data'
-    method_option :verbose, :type => :boolean, :aliases => ["-v"], :default => false
-    method_option :sync, :type => :boolean, :aliases => ["-s"], :default => false
-
-    def download()
-      cli = Cnvrg::CLI.new()
-      verbose = options["verbose"]
-      sync = options["sync"]
-
-      cli.download_data(verbose, sync, Dir.pwd)
-
-    end
 
-    desc 'data clone', 'clone datset'
+      def with_progress_bar
+        not_done = true
+        upload_progress_bar = ProgressBar.create(:title => "Upload progress",
+                                                 :format => '%a <%B> %p%% %t',
+                                                 :starting_at => 0,
+                                                 :total => 600)
+        pb = Thread.new do
+          while not_done do
+            upload_progress_bar.increment
+            sleep(1)
 
-    def clone(dataset_url)
-      cli = Cnvrg::CLI.new()
-      cli.clone_data(dataset_url)
-
-    end
-
-    desc 'data list', 'list of datasets'
-
-    def list()
-      cli = Cnvrg::CLI.new()
-
-      cli.list_dataset()
+          end
+        end
 
+        yield.tap do # After yielding to the block, save the return value
+          not_done = false # Tell the thread to exit, cleaning up after itself…
+          pb.join # …and wait for it to do so.
+        end
+      end
     end
 
-    desc 'data commits', 'pull data'
-
-    def commits()
-      cli = Cnvrg::CLI.new()
-      cli.list_dataset_commits()
-
-    end
 
   end
-
 end
 
 
-

data/lib/cnvrg/datafiles.rb

@@ -241,20 +241,23 @@ module Cnvrg
           response = http.request request
           body = response.read_body
         end
+        is_python = false
+        s4cmd_suc = false
+        s4cmd_install_suc = false
 
         URLcrypt::key = [body].pack('H*')
 
-        python_version=`python --version  > /dev/null 2>&1` ;  is_python=$?.success?
-        if is_python
-
-          s4cmd=`pip freeze 2>/dev/null |grep -e s4cmd -e boto3 > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
-          if !s4cmd_suc
-            `pip install s4cmd  > /dev/null 2>&1` ; s4cmd_install_suc=$?.success?
-          end
-
-        end
-
-        if !s4cmd_suc or !s4cmd_suc or !s4cmd_install_suc
+        # python_version=`python --version  > /dev/null 2>&1` ;  is_python=$?.success?
+        # if is_python
+        #
+        #   s4cmd=`pip freeze 2>/dev/null |grep -e s4cmd -e boto3 > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
+        #   if !s4cmd_suc
+        #     `pip install s4cmd  > /dev/null 2>&1` ; s4cmd_install_suc=$?.success?
+        #   end
+        #
+        # end
+
+        if  !s4cmd_suc and !s4cmd_install_suc
           s3 = Aws::S3::Resource.new(
               :access_key_id => URLcrypt.decrypt(upload_resp["result"]["sts_a"]),
               :secret_access_key => URLcrypt.decrypt(upload_resp["result"]["sts_s"]),
@@ -289,10 +292,10 @@ module Cnvrg
           tmp.flush
           tmp.close
 
-          is_success = false
+            is_success = false
           count = 0
           while !is_success and count <3
-            resp = `python #{tmp.path} --max-singlepart-upload-size=#{MULTIPART_SPLIT} put -f #{file_path} s3://#{URLcrypt.decrypt(upload_resp["result"]["bucket"])}/#{upload_resp["result"]["path"]+"/"+File.basename(file_path)}  > /dev/null 2>&1`
+            resp = `python #{tmp.path} --num-threads=8 --max-singlepart-upload-size=#{MULTIPART_SPLIT} put -f #{file_path} s3://#{URLcrypt.decrypt(upload_resp["result"]["bucket"])}/#{upload_resp["result"]["path"]+"/"+File.basename(file_path)}  > /dev/null 2>&1`
             is_success =$?.success?
             count +=1
 
@@ -479,7 +482,7 @@ module Cnvrg
 
       response = Cnvrg::API.request("#{base_resource}/commit/start", 'POST', {dataset_slug: @dataset_slug,new_branch:false,
                                                                               username: @owner})
-      Cnvrg::CLI.is_response_success(response)
+      Cnvrg::CLI.is_response_success(response,false)
       return response
     end
 

data/lib/cnvrg/dataset.rb

@@ -168,8 +168,6 @@ module Cnvrg
 
         File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore } unless File.exist? ".cnvrgignore"
       rescue => e
-        puts e
-        puts e.backtrace
         return false
       end
       return true
@@ -230,7 +228,7 @@ module Cnvrg
     def downlowd_updated_data(current_commit)
 
       response = Cnvrg::API.request("users/#{self.owner}/datasets/#{self.slug}/downlowd_updated_data", 'POST', {current_commit: current_commit})
-      CLI.is_response_success(response)
+      CLI.is_response_success(response,false)
       return response
     end
     def compare_idx(new_branch, commit=last_local_commit,local_idx=nil)
@@ -239,7 +237,7 @@ module Cnvrg
       end
 
       response = Cnvrg::API.request("users/#{self.owner}/datasets/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch, current_commit: commit})
-      CLI.is_response_success(response)
+      CLI.is_response_success(response,false)
       return response
     end
 
@@ -247,7 +245,7 @@ module Cnvrg
 
     def compare_commits(commit)
       response = Cnvrg::API.request("users/#{self.owner}/datasets/#{self.slug}/compare_commits", 'POST', {compare_commit: commit,current_commit:last_local_commit})
-      CLI.is_response_success(response)
+      CLI.is_response_success(response,false)
       return response
     end
 
@@ -256,7 +254,7 @@ module Cnvrg
           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)
+        CLI.is_response_success(response,false)
         update_is_new_branch(response["result"]["new_branch"])
         return response["result"]["new_branch"]
       end

data/lib/cnvrg/experiment.rb

@@ -13,7 +13,7 @@ module Cnvrg
       res = Cnvrg::API.request(@base_resource + "experiment/start", 'POST',
                                {input: input, platform: platform, machine_name: machine_name, start_commit: start_commit,
                                 title: name, email_notification: email_notification, machine_activity: machine_activity,script_path:script_path})
-      Cnvrg::CLI.is_response_success(res)
+      Cnvrg::CLI.is_response_success(res,false)
 
       @slug = res.to_h["result"].to_h["slug"]
 
@@ -37,7 +37,7 @@ module Cnvrg
     def end_notebook_session(notebook_slug, end_commit)
       res = Cnvrg::API.request(@base_resource + "notebook/end_session", 'POST',
                                {notebook_slug: notebook_slug, end_commit: end_commit})
-      Cnvrg::CLI.is_response_success(res)
+      Cnvrg::CLI.is_response_success(res,false)
 
       return res
 
@@ -94,7 +94,7 @@ module Cnvrg
       response = Cnvrg::API.request(@base_resource + "experiment/upload_temp_log", 'POST', {output: temp_log,
                                                                                             exp_slug: @slug, cpu_average: cpu_average,
                                                                                             memory_average: memory_average})
-      Cnvrg::CLI.is_response_success(response)
+      Cnvrg::CLI.is_response_success(response,false)
     end
 
     def end(output, exit_status, end_commit, cpu_average, memory_average)
@@ -102,7 +102,7 @@ module Cnvrg
       response = Cnvrg::API.request(@base_resource + "experiment/end", 'POST', {output: output, exp_slug: @slug,
                                                                                 exit_status: exit_status, end_commit: end_commit,
                                                                                 cpu_average: cpu_average, memory_average: memory_average})
-      Cnvrg::CLI.is_response_success(response)
+      Cnvrg::CLI.is_response_success(response,false)
 
       begin
         FileUtils.rm_rf(["/home/ds/.cnvrg/tmp/exec.log"])

data/lib/cnvrg/files.rb

@@ -26,7 +26,7 @@ module Cnvrg
 
       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, sha1:sha1})
+                                                                                     file_size: file_size, file_content_type: content_type, sha1: sha1})
       if Cnvrg::CLI.is_response_success(upload_resp, false)
         path = upload_resp["result"]["path"]
         if file_size.to_f>= Cnvrg::Files::LARGE_FILE.to_f
@@ -36,24 +36,25 @@ module Cnvrg
         end
         return s3_res
         # if s3_res
-          # update_s3_resp = Cnvrg::API.request(@base_resource + "update_s3", 'POST', {path: path, commit_id: upload_resp["result"]["commit_id"],
-          #                                                           blob_id: upload_resp["result"]["id"]})
-          # is_suc = Cnvrg::CLI.is_response_success(update_s3_resp, false)
-          #
-          # return is_suc
+        # update_s3_resp = Cnvrg::API.request(@base_resource + "update_s3", 'POST', {path: path, commit_id: upload_resp["result"]["commit_id"],
+        #                                                           blob_id: upload_resp["result"]["id"]})
+        # is_suc = Cnvrg::CLI.is_response_success(update_s3_resp, false)
+        #
+        # return is_suc
       end
       return false
     end
-    def upload_log_file(absolute_path, relative_path,log_date)
+
+    def upload_log_file(absolute_path, relative_path, log_date)
       file_name = File.basename relative_path
       file_size = File.size(absolute_path).to_f
       content_type = "text/x-log"
       upload_resp = Cnvrg::API.request("/users/#{@owner}/" + "upload_cli_log", 'POST_FILE', {absolute_path: absolute_path, relative_path: relative_path,
-                                                                                     file_name: file_name,log_date:log_date,
-                                                                                     file_size: file_size, file_content_type: content_type})
+                                                                                             file_name: file_name, log_date: log_date,
+                                                                                             file_size: file_size, file_content_type: content_type})
       if Cnvrg::CLI.is_response_success(upload_resp, false)
-          path = upload_resp["result"]["path"]
-          s3_res = upload_small_files_s3(path, absolute_path,  "text/plain")
+        path = upload_resp["result"]["path"]
+        s3_res = upload_small_files_s3(path, absolute_path, "text/plain")
       end
       if s3_res
         return true
@@ -61,18 +62,19 @@ module Cnvrg
       return false
 
     end
-    def upload_exec_file(absolute_path,image_name,commit_id)
+
+    def upload_exec_file(absolute_path, image_name, commit_id)
       file_name = File.basename absolute_path
       file_size = File.size(absolute_path).to_f
       content_type = "application/zip"
       begin
         upload_resp = Cnvrg::API.request("users/#{@owner}/images/" + "upload_config", 'POST_FILE', {relative_path: absolute_path,
                                                                                                     file_name: file_name,
-                                                                                                    image_name:image_name,
+                                                                                                    image_name: image_name,
                                                                                                     file_size: file_size,
                                                                                                     file_content_type: content_type,
                                                                                                     project_slug: @project_slug,
-                                                                                                    commit_id:commit_id})
+                                                                                                    commit_id: commit_id})
         # puts upload_resp
         if Cnvrg::CLI.is_response_success(upload_resp, false)
           if upload_resp["result"]["image"] == -1
@@ -82,21 +84,20 @@ module Cnvrg
           s3_res = upload_small_files_s3(path, absolute_path, content_type)
 
         end
-      if s3_res
-        return upload_resp["result"]["id"]
+        if s3_res
+          return upload_resp["result"]["id"]
+        end
+        return false
+      rescue SignalException
+
+        say "\nAborting"
+        exit(1)
       end
-      return false
-    rescue SignalException
 
-      say "\nAborting"
-      exit(1)
     end
 
-  end
 
-
-
-  def upload_image(absolute_path, image_name, owner, is_public, is_base,dpkg,libraries,bash,message,commit_id)
+    def upload_image(absolute_path, image_name, owner, is_public, is_base, dpkg, libraries, bash, message, commit_id)
       file_name = File.basename absolute_path
       file_size = File.size(absolute_path).to_f
       if is_base
@@ -106,41 +107,42 @@ module Cnvrg
         content_type = "application/gzip"
       end
       begin
-      upload_resp = Cnvrg::API.request("users/#{owner}/images/" + "upload_cnvrg", 'POST_FILE', {relative_path: absolute_path,
-                                                                                          file_name: file_name,
-                                                                                          image_name: image_name,
-                                                                                          file_size: file_size,
-                                                                                          file_content_type: content_type,
-                                                                                          is_public: is_public,
-                                                                                          project_slug: @project_slug,
-                                                                                          commit_id:commit_id ,
-                                                                                          dpkg: dpkg,
-                                                                                          py2: libraries,
-                                                                                          py3: libraries,
-
-                                                                                          bash_history: bash,
-                                                                                          commit_message:message,
-                                                                                          is_base: is_base})
-      # puts upload_resp
-      if Cnvrg::CLI.is_response_success(upload_resp, false)
-        path = upload_resp["result"]["path"]
-        s3_res = upload_small_files_s3(path, absolute_path, content_type)
-        if s3_res
-          commit_resp = Cnvrg::API.request("users/#{owner}/images/#{upload_resp["result"]["id"]}/" + "commit", 'GET')
-          if Cnvrg::CLI.is_response_success(commit_resp, false)
-            return commit_resp["result"]["image"]
-          else
-            return false
-          end
+        upload_resp = Cnvrg::API.request("users/#{owner}/images/" + "upload_cnvrg", 'POST_FILE', {relative_path: absolute_path,
+                                                                                                  file_name: file_name,
+                                                                                                  image_name: image_name,
+                                                                                                  file_size: file_size,
+                                                                                                  file_content_type: content_type,
+                                                                                                  is_public: is_public,
+                                                                                                  project_slug: @project_slug,
+                                                                                                  commit_id: commit_id,
+                                                                                                  dpkg: dpkg,
+                                                                                                  py2: libraries,
+                                                                                                  py3: libraries,
+
+                                                                                                  bash_history: bash,
+                                                                                                  commit_message: message,
+                                                                                                  is_base: is_base})
+        # puts upload_resp
+        if Cnvrg::CLI.is_response_success(upload_resp, false)
+          path = upload_resp["result"]["path"]
+          s3_res = upload_small_files_s3(path, absolute_path, content_type)
+          if s3_res
+            commit_resp = Cnvrg::API.request("users/#{owner}/images/#{upload_resp["result"]["id"]}/" + "commit", 'GET')
+            if Cnvrg::CLI.is_response_success(commit_resp, false)
+              return commit_resp["result"]["image"]
+            else
+              return false
+            end
 
+          end
         end
-      end
-      return false
-      rescue =>e
+        return false
+      rescue => e
       end
 
     end
-    def upload_cnvrg_image(absolute_path, image_name, owner, is_public, is_base,dpkg,libraries,bash,message)
+
+    def upload_cnvrg_image(absolute_path, image_name, owner, is_public, is_base, dpkg, libraries, bash, message)
       file_name = File.basename absolute_path
       file_size = File.size(absolute_path).to_f
       if is_base
@@ -151,16 +153,16 @@ module Cnvrg
       end
       begin
         upload_resp = Cnvrg::API.request("users/#{owner}/images/" + "upload_cnvrg", 'POST_FILE', {relative_path: absolute_path,
-                                                                                            file_name: file_name,
-                                                                                            image_name: image_name,
-                                                                                            file_size: file_size,
-                                                                                            file_content_type: content_type,
-                                                                                            is_public: is_public,
-                                                                                            dpkg: dpkg,
-                                                                                            libraries: libraries,
-                                                                                            bash_history: bash,
-                                                                                            commit_message:message,
-                                                                                            is_base: is_base})
+                                                                                                  file_name: file_name,
+                                                                                                  image_name: image_name,
+                                                                                                  file_size: file_size,
+                                                                                                  file_content_type: content_type,
+                                                                                                  is_public: is_public,
+                                                                                                  dpkg: dpkg,
+                                                                                                  libraries: libraries,
+                                                                                                  bash_history: bash,
+                                                                                                  commit_message: message,
+                                                                                                  is_base: is_base})
         # puts upload_resp
         if Cnvrg::CLI.is_response_success(upload_resp, false)
           path = upload_resp["result"]["path"]
@@ -176,7 +178,7 @@ module Cnvrg
           end
         end
         return false
-      rescue =>e
+      rescue => e
       end
 
     end
@@ -208,225 +210,260 @@ module Cnvrg
 
     def upload_large_files_s3(upload_resp, file_path)
       begin
-        sts_path = upload_resp["result"]["path_sts"]
-        s4cmd_path = upload_resp["result"]["path_s4cmd"]
-
-        uri = URI.parse(sts_path)
-        http_object = Net::HTTP.new(uri.host, uri.port)
-        http_object.use_ssl = true if uri.scheme == 'https'
-        request = Net::HTTP::Get.new(sts_path)
-
-        body = ""
-        http_object.start do |http|
-          response = http.request request
-          body = response.read_body
-        end
-
-        URLcrypt::key = [body].pack('H*')
-
-        python_version=`python --version  > /dev/null 2>&1` ;  is_python=$?.success?
-        if is_python
-
-          s4cmd=`pip freeze 2>/dev/null |grep -e s4cmd -e boto3 > /dev/null 2>&1` ;  s4cmd_suc=$?.success?
-          if !s4cmd_suc
-            `pip install s4cmd  > /dev/null 2>&1` ; s4cmd_install_suc=$?.success?
+        # speed_uri = URI.parse("https://s3-us-west-2.amazonaws.com/cnvrgw2-dev/speedtest-cli")
+        # speed_http_object = Net::HTTP.new(speed_uri.host, speed_uri.port)
+        # speed_http_object.use_ssl = true if speed_uri.scheme == 'https'
+        # speed_request = Net::HTTP::Get.new("https://s3-us-west-2.amazonaws.com/cnvrgw2-dev/speedtest-cli")
+        #
+        # speed_body = ""
+        # speed_http_object.start do |http|
+        #   response = http.request speed_request
+        #   speed_body = response.read_body
+        # end
+        # speed_tmp = Tempfile.new('speed')
+        # speed_tmp << speed_body
+        # speed_tmp.flush
+        # speed_tmp.close
+        # count = 0
+        # sum = 0
+        # speed_res = `python #{speed_tmp.path} --json`
+        # if !speed_res.nil? and !speed_res.empty?
+        #   upload = JSON.parse(speed_res)["upload"]
+        #   if !upload.nil?
+        #     up_spped = (upload/1000000).round(2)
+        #   end
+        #
+        #
+        #   file_size = File.size(file_path)/1048576
+        #   est_up = ((file_size*8)/up_spped)/60
+        #   puts est_up
+        # end
+
+
+          sts_path = upload_resp["result"]["path_sts"]
+          s4cmd_path = upload_resp["result"]["path_s4cmd"]
+
+          uri = URI.parse(sts_path)
+          http_object = Net::HTTP.new(uri.host, uri.port)
+          http_object.use_ssl = true if uri.scheme == 'https'
+          request = Net::HTTP::Get.new(sts_path)
+
+          body = ""
+          http_object.start do |http|
+            response = http.request request
+            body = response.read_body
           end
 
-        end
-        if !s4cmd_suc or !s4cmd_suc or !s4cmd_install_suc
-           s3 = Aws::S3::Resource.new(
-               :access_key_id => URLcrypt.decrypt(upload_resp["result"]["sts_a"]),
-               :secret_access_key => URLcrypt.decrypt(upload_resp["result"]["sts_s"]),
-               :session_token => URLcrypt.decrypt(upload_resp["result"]["sts_st"]),
-               :region => URLcrypt.decrypt(upload_resp["result"]["region"]))
-        resp = s3.bucket(URLcrypt.decrypt(upload_resp["result"]["bucket"])).
-            object(upload_resp["result"]["path"]+"/"+File.basename(file_path)).
-            upload_file(file_path,{:use_accelerate_endpoint=>true})
-        else
-          s4cmd_uri = URI.parse(s4cmd_path)
-          s4cmd_http_object = Net::HTTP.new(s4cmd_uri.host, s4cmd_uri.port)
-          s4cmd_http_object.use_ssl = true if s4cmd_uri.scheme == 'https'
-          s4cmd_request = Net::HTTP::Get.new(s4cmd_path)
-
-          s4cmd_body = ""
-          s4cmd_http_object.start do |http|
-            response = http.request s4cmd_request
-            s4cmd_body = response.read_bodyo
-          end
-          s4cmd_new_body = s4cmd_body.gsub(" self.client = self.boto3.client('s3',
+          URLcrypt::key = [body].pack('H*')
+          is_python = false
+          s4cmd_suc = false
+          s4cmd_install_suc = false
+          # python_version=`python --version  > /dev/null 2>&1`; is_python=$?.success?
+          # if is_python
+          #
+          #   s4cmd=`pip freeze 2>/dev/null |grep -e s4cmd -e boto3 > /dev/null 2>&1`; s4cmd_suc=$?.success?
+          #   if !s4cmd_suc
+          #     `pip install s4cmd  > /dev/null 2>&1`; s4cmd_install_suc=$?.success?
+          #   end
+          #
+          # end
+          if !s4cmd_suc and !s4cmd_install_suc
+            s3 = Aws::S3::Resource.new(
+                :access_key_id => URLcrypt.decrypt(upload_resp["result"]["sts_a"]),
+                :secret_access_key => URLcrypt.decrypt(upload_resp["result"]["sts_s"]),
+                :session_token => URLcrypt.decrypt(upload_resp["result"]["sts_st"]),
+                :region => URLcrypt.decrypt(upload_resp["result"]["region"]))
+            resp = s3.bucket(URLcrypt.decrypt(upload_resp["result"]["bucket"])).
+                object(upload_resp["result"]["path"]+"/"+File.basename(file_path)).
+                upload_file(file_path, {:use_accelerate_endpoint => true})
+          else
+            s4cmd_uri = URI.parse(s4cmd_path)
+            s4cmd_http_object = Net::HTTP.new(s4cmd_uri.host, s4cmd_uri.port)
+            s4cmd_http_object.use_ssl = true if s4cmd_uri.scheme == 'https'
+            s4cmd_request = Net::HTTP::Get.new(s4cmd_path)
+
+            s4cmd_body = ""
+            s4cmd_http_object.start do |http|
+              response = http.request s4cmd_request
+              s4cmd_body = response.read_body
+            end
+            s4cmd_new_body = s4cmd_body.gsub(" self.client = self.boto3.client('s3',
                                       aws_access_key_id=aws_access_key_id,
-                                      aws_secret_access_key=aws_secret_access_key)"," self.client = self.boto3.client('s3',
+                                      aws_secret_access_key=aws_secret_access_key)", " self.client = self.boto3.client('s3',
                                       aws_access_key_id='#{ URLcrypt.decrypt(upload_resp["result"]["sts_a"])}',
                                       aws_secret_access_key='#{URLcrypt.decrypt(upload_resp["result"]["sts_s"])}',
                                       aws_session_token='#{URLcrypt.decrypt(upload_resp["result"]["sts_st"])}')")
 
 
-          tmp = Tempfile.new('s4cmd.py')
-          tmp << s4cmd_new_body
-          tmp.flush
-          tmp.close
+            tmp = Tempfile.new('s4cmd.py')
+            tmp << s4cmd_new_body
+            tmp.flush
+            tmp.close
+            #
+            is_success = false
+            count = 0
+            while !is_success and count <3
+              resp = `python #{tmp.path} --num-threads=8 --max-singlepart-upload-size=#{MULTIPART_SPLIT} put -f #{file_path} s3://#{URLcrypt.decrypt(upload_resp["result"]["bucket"])}/#{upload_resp["result"]["path"]+"/"+File.basename(file_path)} > /dev/null 2>&1 `
+              is_success =$?.success?
+              count +=1
 
-          is_success = false
-          count = 0
-          while !is_success and count <3
-            resp = `python #{tmp.path} --max-singlepart-upload-size=#{MULTIPART_SPLIT} put -f #{file_path} s3://#{URLcrypt.decrypt(upload_resp["result"]["bucket"])}/#{upload_resp["result"]["path"]+"/"+File.basename(file_path)}  > /dev/null 2>&1`
-            is_success =$?.success?
-            count +=1
+            end
+            resp= is_success
 
           end
-          resp= is_success
 
-        end
+          return resp
 
-        return resp
+          rescue => e
+          if File.exist? tmp
+            FileUtils.rm_rf [tmp]
+          end
+          return false
 
-      rescue =>e
-        if File.exist? tmp
-          FileUtils.rm_rf [tmp]
         end
-        return false
+        return true
 
       end
-      return true
 
-    end
+      def upload_small_files_s3(url_path, file_path, content_type)
+        url = URI.parse(url_path)
+        file = File.open(file_path, "rb")
+        body = file.read
+        begin
+          Net::HTTP.start(url.host) do |http|
+            http.send_request("PUT", url.request_uri, body, {
+                "content-type" => content_type,
+            })
+          end
+          return true
+        rescue Interrupt
+          return false
+        rescue
+          return false
+        end
+      end
 
-    def upload_small_files_s3(url_path, file_path, content_type)
-      url = URI.parse(url_path)
-      file = File.open(file_path, "rb")
-      body = file.read
-      begin
-        Net::HTTP.start(url.host) do |http|
-          http.send_request("PUT", url.request_uri, body, {
-              "content-type" => content_type,
-          })
+      def upload_url(file_path)
+        response = Cnvrg::API.request(@base_resource + "upload_url", 'POST', {file_s3_path: file_path})
+        if Cnvrg::CLI.is_response_success(response, false)
+          return response
+        else
+          return nil
         end
-        return true
-      rescue Interrupt
-        return false
-      rescue
-        return false
+
       end
-    end
 
-    def upload_url(file_path)
-      response = Cnvrg::API.request(@base_resource + "upload_url", 'POST', {file_s3_path: file_path})
-      if Cnvrg::CLI.is_response_success(response, false)
-        return response
-      else
-        return nil
+      def delete_file(absolute_path, relative_path, commit_sha1)
+        response = Cnvrg::API.request(@base_resource + "delete_file", 'DELETE', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
+        return Cnvrg::CLI.is_response_success(response, false)
       end
 
-    end
+      def delete_dir(absolute_path, relative_path, commit_sha1)
+        response = Cnvrg::API.request(@base_resource + "delete_dir", 'DELETE', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
+        return Cnvrg::CLI.is_response_success(response, false)
+      end
 
-    def delete_file(absolute_path, relative_path, commit_sha1)
-      response = Cnvrg::API.request(@base_resource + "delete_file", 'DELETE', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
-      return Cnvrg::CLI.is_response_success(response, false)
-    end
+      def create_dir(absolute_path, relative_path, commit_sha1)
+        response = Cnvrg::API.request(@base_resource + "create_dir", 'POST', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
+        return Cnvrg::CLI.is_response_success(response, false)
+      end
 
-    def delete_dir(absolute_path, relative_path, commit_sha1)
-      response = Cnvrg::API.request(@base_resource + "delete_dir", 'DELETE', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
-      return Cnvrg::CLI.is_response_success(response, false)
-    end
+      def download_file_s3(absolute_path, relative_path, project_home, commit_sha1=nil, conflict=false)
+        begin
+          res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
+          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"]
+            uri = URI.parse(sts_path)
+            http_object = Net::HTTP.new(uri.host, uri.port)
+            http_object.use_ssl = true if uri.scheme == 'https'
+            request = Net::HTTP::Get.new(sts_path)
+
+            body = ""
+            http_object.start do |http|
+              response = http.request request
+              body = response.read_body
+            end
+            URLcrypt::key = [body].pack('H*')
+            s3 = Aws::S3::Client.new(
+                :access_key_id => URLcrypt.decrypt(download_resp["result"]["sts_a"]),
+                :secret_access_key => URLcrypt.decrypt(download_resp["result"]["sts_s"]),
+                :session_token => URLcrypt.decrypt(download_resp["result"]["sts_st"]),
+                :region => URLcrypt.decrypt(download_resp["result"]["region"]))
+            File.open(project_home+"/"+absolute_path, 'wb') do |file|
+              resp = s3.get_object({bucket: URLcrypt.decrypt(download_resp["result"]["bucket"]),
+                                    key: URLcrypt.decrypt(download_resp["result"]["key"])}, target: file)
+            end
+            return true
+          end
 
-    def create_dir(absolute_path, relative_path, commit_sha1)
-      response = Cnvrg::API.request(@base_resource + "create_dir", 'POST', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
-      return Cnvrg::CLI.is_response_success(response, false)
-    end
-    def download_file_s3(absolute_path, relative_path, project_home,commit_sha1=nil, conflict=false)
-      begin
-        res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path,commit_sha1:commit_sha1})
+        rescue => e
+          return false
+
+        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)
         if res["result"]
-          download_resp = res
-          filename = download_resp["result"]["filename"]
-
-          absolute_path += ".conflict" if conflict
-          sts_path = download_resp["result"]["path_sts"]
-        uri = URI.parse(sts_path)
-        http_object = Net::HTTP.new(uri.host, uri.port)
-        http_object.use_ssl = true if uri.scheme == 'https'
-        request = Net::HTTP::Get.new(sts_path)
-
-        body = ""
-        http_object.start do |http|
-          response = http.request request
-          body = response.read_body
-        end
-        URLcrypt::key = [body].pack('H*')
-        s3 = Aws::S3::Client.new(
-            :access_key_id => URLcrypt.decrypt(download_resp["result"]["sts_a"]),
-            :secret_access_key => URLcrypt.decrypt(download_resp["result"]["sts_s"]),
-            :session_token => URLcrypt.decrypt(download_resp["result"]["sts_st"]),
-            :region => URLcrypt.decrypt(download_resp["result"]["region"]))
-        File.open(project_home+"/"+absolute_path, 'wb') do |file|
-          resp = s3.get_object({ bucket:URLcrypt.decrypt(download_resp["result"]["bucket"]),
-                                 key:URLcrypt.decrypt(download_resp["result"]["key"])}, target: file)
-        end
-          return true
-        end
+          res = res["result"]
+          return false if res["link"].empty? or res["filename"].empty?
+          filename = res["filename"]
+          file_location = absolute_path.gsub(/#{filename}\/?$/, "")
 
-      rescue =>e
-        return false
+          FileUtils.mkdir_p project_home + "/" + file_location
+          filename += ".conflict" if conflict
 
-      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)
-      if res["result"]
-        res = res["result"]
-        return false if res["link"].empty? or res["filename"].empty?
-        filename = res["filename"]
-        file_location = absolute_path.gsub(/#{filename}\/?$/, "")
-
-        FileUtils.mkdir_p project_home + "/" + file_location
-        filename += ".conflict" if conflict
-
-        File.open("#{project_home}/#{file_location}/#{filename}", "wb") do |file|
-          file.write open(res["link"]).read
+          File.open("#{project_home}/#{file_location}/#{filename}", "wb") do |file|
+            file.write open(res["link"]).read
+          end
+        else
+          return false
         end
-      else
-        return false
+        return true
       end
-      return true
-    end
 
-    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 download_dir(absolute_path, relative_path, project_home)
+        FileUtils.mkdir_p("#{project_home}/#{absolute_path}")
+      end
 
-    def revoke_download_file(project_home,absolute_path,filename,conflict=false)
-      begin
-      file_location = absolute_path.gsub(/#{filename}\/?$/, "")
+      def revoke_download_dir(absolute_path, relative_path, project_home)
+        puts FileUtils.rmtree("#{absolute_path}")
+      end
 
-      filename += ".conflict" if conflict
-      FileUtils.remove("#{file_location}/#{filename}")
-        return true
-      rescue
-       return false
+      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
-    end
 
-    def start_commit(new_branch)
+      def start_commit(new_branch)
 
-      response = Cnvrg::API.request("#{base_resource}/commit/start", 'POST', {project_slug: @project_slug,new_branch:new_branch,
-                                                                              username: @owner})
-      Cnvrg::CLI.is_response_success(response)
-      return response
-    end
+        response = Cnvrg::API.request("#{base_resource}/commit/start", 'POST', {project_slug: @project_slug, new_branch: new_branch,
+                                                                                username: @owner})
+        Cnvrg::CLI.is_response_success(response,false)
+        return response
+      end
 
-    def end_commit(commit_sha1)
-      response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1})
-      return response
-    end
+      def end_commit(commit_sha1)
+        response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1})
+        return response
+      end
 
-    def rollback_commit(commit_sha1)
-      response = Cnvrg::API.request("#{base_resource}/commit/rollback", 'POST', {commit_sha1: commit_sha1})
-      Cnvrg::CLI.is_response_success(response, false)
+      def rollback_commit(commit_sha1)
+        response = Cnvrg::API.request("#{base_resource}/commit/rollback", 'POST', {commit_sha1: commit_sha1})
+        Cnvrg::CLI.is_response_success(response, false)
+      end
     end
   end
-end

data/lib/cnvrg/project.rb

@@ -23,9 +23,7 @@ module Cnvrg
       idx = YAML.load_file(@local_path + "/.cnvrg/idx.yml")
       return idx[:commit]
     end
-    def get_last_commit
 
-    end
 
     def url
       url = Cnvrg::Helpers.remote_url
@@ -293,7 +291,7 @@ module Cnvrg
 
         local_idx = self.generate_idx
         response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch, current_commit: commit})
-        CLI.is_response_success(response)
+        CLI.is_response_success(response,false)
         return response
       end
 
@@ -302,7 +300,7 @@ module Cnvrg
           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)
+        CLI.is_response_success(response,false)
         update_is_new_branch(response["result"]["new_branch"])
         return response["result"]["new_branch"]
       end

data/lib/cnvrg/version.rb

@@ -1,5 +1,5 @@
 module Cnvrg
-    VERSION = '0.0.1422'
+    VERSION = '0.0.1424'
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1422
+  version: 0.0.1424
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -315,6 +315,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI tool for interacting with cnvrg.io.
 email:
 - info@cnvrg.io