cnvrg 0.0.1560000 → 0.0.1570000

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48f214b59ed173095641866a5bb2cfc4aafcb393
-  data.tar.gz: de943b0cdca172f5ce041bfcdb39c527effe3ab9
+  metadata.gz: 8e559eaa6bf4bb6a7fa9145cfcd74ee01e0eb1d6
+  data.tar.gz: 33bb846ac39af39eb0541ff69746374ce33a6a80
 SHA512:
-  metadata.gz: 8a8c1bd7085bf89d4f502753ca95116941d4135af582de70266a5e9df0c17435baf8f520f91cc2082d5945141a45ad2c69f85b2760d3819d89f5892ca25515fe
-  data.tar.gz: 829f925eb8edc4dd874da669e4b877eed2f1b445abc2ddbc20df13f40ebfadf0f6c0728c164aea7fa7b6e3d93969445b64c4403e84470ef347e8c2f14e14c0dd
+  metadata.gz: fa97a3c98be2139c2a121d4bd6ef52dfe980ae4f8066c1e1e911c87c0d8635c9bd48dd8ad7bb5a54a61c3b32ca655d376d9aab2cf51efffd1921924986345f66
+  data.tar.gz: 77c0c6827e7e487b3922f717a9c63d751b2daf8bdf0543315cc1da357a82e8d4b634b4ec61f2733e033d60247dfeac5a5b370b3532b6740df7e17a9a559da535

data/lib/cnvrg/cli.rb

@@ -1757,6 +1757,8 @@ module Cnvrg
                 absolute_path = "#{@project.local_path}/#{f}"
                 relative_path = f.gsub(/^#{@project.local_path + "/"}/, "")
                 if File.directory?(absolute_path)
+                  log_message("uploading dir: #{f}", Thor::Shell::Color::RED, options["verbose"])
+
                   resDir = @files.create_dir(absolute_path, relative_path, commit_sha1)
                   if resDir
                     f
@@ -1770,6 +1772,7 @@ module Cnvrg
                   end
 
                 else
+                  log_message("uploading: #{f}", Thor::Shell::Color::RED, options["verbose"])
 
                   res = @files.upload_file(absolute_path, relative_path, commit_sha1)
                   if res
@@ -1805,6 +1808,8 @@ module Cnvrg
 
               relative_path = f.gsub(/^#{@project.local_path + "/"}/, "")
               if relative_path.end_with?("/")
+                log_message("deleting dir: #{f}", Thor::Shell::Color::RED, options["verbose"])
+
                 if @files.delete_dir(f, relative_path, commit_sha1)
                   f
                 else
@@ -1812,6 +1817,8 @@ module Cnvrg
 
                 end
               else
+                log_message("deleteing file: #{f}", Thor::Shell::Color::RED, options["verbose"])
+
                 if @files.delete_file(f, relative_path, commit_sha1)
                   f
                 else
@@ -2007,6 +2014,8 @@ module Cnvrg
             conflicts_result = Parallel.map(result["conflicts"], in_processes: ParallelProcesses, in_thread: ParallelThreads) do |f|
 
               relative_path = f.gsub(/^#{@project.local_path}/, "")
+              log_message("downloading: #{f}.conflict", Thor::Shell::Color::RED, options["verbose"])
+
               if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=true)
                 f
               else
@@ -2033,6 +2042,8 @@ module Cnvrg
               relative_path = f.gsub(/^#{@project.local_path}/, "")
               if f.end_with? "/"
                 # dir
+                log_message("downloading dir: #{f}", Thor::Shell::Color::RED, options["verbose"])
+
                 if @files.download_dir(f, relative_path, project_home)
                   f
                 else
@@ -2044,6 +2055,8 @@ module Cnvrg
 
               else
                 # blob
+                log_message("downloading file: #{f}", Thor::Shell::Color::RED, options["verbose"])
+
                 if @files.download_file_s3(f, relative_path, project_home)
                   f
                 else

data/lib/cnvrg/files.rb

@@ -26,17 +26,19 @@ 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,
-                                                                                      new_version:true})
+                                                                                      new_version:true,only_large:true})
 
 
       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
-          s3_res = upload_large_files_s3(upload_resp, absolute_path)
-        else
-          s3_res = upload_small_files_s3(path, absolute_path, content_type)
-        end
+        s3_res = upload_large_files_s3(upload_resp, absolute_path)
+
+        # if file_size.to_f>= Cnvrg::Files::LARGE_FILE.to_f
+        #   s3_res = upload_large_files_s3(upload_resp, absolute_path)
+        # else
+        #   s3_res = upload_small_files_s3(path, absolute_path, content_type)
+        # 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"],
@@ -285,7 +287,6 @@ module Cnvrg
 
       rescue => e
         puts e
-        puts e.backtrace
         return false
 
         end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.0.1560000'
+  VERSION = '0.0.1570000'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1560000
+  version: 0.0.1570000
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -402,9 +402,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.
 test_files: []
-has_rdoc: