cnvrg 1.10.7 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1232c4c81a6429fdf01484ba321224d3e9a03c19914a59575eb867d12b206bdd
-  data.tar.gz: 21ab04f21f6850fc6c9e7eddbcf807b6f7ac312f3c00a857be24cf38d710a784
+  metadata.gz: d9e8e76336bf9862fca95649740a7b5a5148565469ece725f4760041db28ffc4
+  data.tar.gz: f65852f97fb1294258c3c6b4b6941fb62248eeb1691d432e47bb4e2acb60a313
 SHA512:
-  metadata.gz: 27c2738e285408a315fa8384b230d7c3e108e0b98ecf6b6bb57ee5d7996cbcce37db94fb8b98846195535ac24d7539a7ccfb72ef94fdc82955de1cc2e6e60300
-  data.tar.gz: 470f1e94d6bbba179a637fdd9765c9b052f91bf1c37742d56541f592cb5a4fd38c11ffd12d554ed6d38b1a0d6f3eeacef84f3032afc175fc6a041880578c9e6e
+  metadata.gz: c5be8e6c872dd256560805d8146b3e2d7672a72844b932081dddc94c62e3fde4f9d7f66dd18d4f882c005c9e6e2183a91de689254b6dce07c265932058a4a1b0
+  data.tar.gz: 345eee06f18b24a30826665c7803b1275bdbc33d94779e5e37812cce7f95738bb819c5e2064871618145a27e72d133373e2493fb57f63b1c85ce8072c6057a54

data/lib/cnvrg/datafiles.rb

@@ -409,8 +409,6 @@ module Cnvrg
           tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads)
           results = request_upload_files(commit_sha1, tree, override, new_branch, partial_commit)
 
-          # puts "Got #{results['files'].size} files to upload from #{files_chunk.size} files"
-
           if results['files'].blank?
             progress_mutex.synchronize { progressbar.progress += tree.keys.length }
             next

data/lib/cnvrg/dataset.rb

@@ -544,8 +544,12 @@ module Cnvrg
     def generate_chunked_idx(list_files = [], threads: 15, prefix: '')
       tree = {}
       Parallel.map(list_files, in_threads: threads) do |file|
-        #check if prefix exists do prefix/path otherwise path
-        label = file.gsub(self.local_path + "/", "")
+
+        # Fix for root path issue
+        safe_path = file
+        safe_path = file[1..-1] if file.start_with? "/"
+
+        label = safe_path.gsub(self.local_path + "/", "")
         label = "#{prefix}/#{label}" if prefix.present?
         if not Cnvrg::Files.valid_file_name?(label)
           raise StandardError.new("#{label} is not a valid file name.")
@@ -558,9 +562,16 @@ module Cnvrg
           file_size = File.size(file).to_f
           mime_type = MimeMagic.by_path(file)
           content_type = !(mime_type.nil? or mime_type.text?) ? mime_type.type : "text/plain"
-          relative_path = file.gsub(/^#{@local_path + "/"}/, "")
+          relative_path = safe_path.gsub(/^#{@local_path + "/"}/, "")
           relative_path = "#{prefix}/#{relative_path}" if prefix.present?
-          tree[label] = {sha1: sha1, file_name: file_name, file_size: file_size, content_type: content_type, absolute_path: file, relative_path: relative_path}
+          tree[label] = {
+            sha1: sha1,
+            file_name: file_name,
+            file_size: file_size,
+            content_type: content_type,
+            absolute_path: file,
+            relative_path: relative_path
+          }
         end
       end
       if prefix.present? #add the prefix as dirs to the files

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.10.7'
+  VERSION = '1.10.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.10.8
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.