cnvrg 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb4b853a67475534a61610e890c94802f3b39c3b
-  data.tar.gz: adc7c333392de2f38b0312a44486bbc407f96595
+  metadata.gz: 17942c336608306042bc9744c306d7761dc7e641
+  data.tar.gz: 3e931700b1a8c96abf593077d585980fcb89afc1
 SHA512:
-  metadata.gz: 8b4e0264f34a93148eb9050c5ac6d49803551ca8fa6f7c42a08f8ca3538b5d25244834489083620f46977ca162e835320d7f4bea13a09cd32c28de05f946c283
-  data.tar.gz: c110cdf4315e1c723b4724e7d8c1fbdef3034467e0f917b4ad3aa06c05e2f9faa167a6c4564358af218f42824df4376582e231abbca5fd2b5621c90793cf71e4
+  metadata.gz: 64ae69b8efac75486edc8911f99db1c5563c84e38f2eeb33e0dcc24b75ae470782b7a3352c4b8f4e7aaf6dae3261ec71b2bd287963c396998dd1e0e876fd41d7
+  data.tar.gz: 2fecd443628c87027559088293215ef007d144a5b9dd7aef3a1ff791f3391b33f4e4b426f2b890f32a60d31ec352f2e1c0851ef8b5c1a32fd3f671b575e8cf37

data/lib/cnvrg/cli.rb

@@ -1234,9 +1234,10 @@ module Cnvrg
           exit(1)
         end
         log_message("Checking dataset", Thor::Shell::Color::BLUE)
-        local_idx = @dataset.generate_idx
-        result = @dataset.compare_idx(false, commit=@dataset.last_local_commit, local_idx= local_idx)
+        ignore_list = @dataset.get_ignore_list()
+        local_idx = @dataset.generate_idx(ignore_list)
 
+        result = @dataset.compare_idx(false, commit=@dataset.last_local_commit, local_idx= local_idx)
 
         commit = result["result"]["commit"]
         if commit != @dataset.last_local_commit and !@dataset.last_local_commit.nil? and !result["result"]["tree"]["updated_on_server"].empty?
@@ -1287,11 +1288,18 @@ module Cnvrg
           tar_files_path = "#{home_dir}/.cnvrg/tmp/#{@dataset.slug}_#{commit_sha1}.txt"
           tar_files = (result["added"] + result["updated_on_local"]).join("\n")
           File.open(tar_files_path, 'w') { |f| f.write tar_files }
-          is_tar = create_tar(dataset_dir, tar_path, tar_files_path, no_compression)
+          ignore_files_path = nil
+          if !ignore_list.nil?
+            ignore_files_path = "#{home_dir}/.cnvrg/tmp/#{@dataset.slug}_#{commit_sha1}_ignore.txt"
+            File.open(ignore_files_path, 'w') { |f| f.write ignore_list.join("\n") }
+          end
+          is_tar = create_tar(dataset_dir, tar_path, tar_files_path, no_compression,ignore_files_path)
           if !is_tar
             log_message("ERROR: Couldn't compress data", Thor::Shell::Color::RED)
             FileUtils.rm_rf([tar_path]) if File.exist? tar_path
             FileUtils.rm_rf([tar_files_path]) if File.exist? tar_files_path
+            FileUtils.rm_rf([ignore_files_path]) if !ignore_files_path.nil? and File.exist? ignore_files_path
+
             @files.rollback_commit(commit_sha1)
             log_message("Rolling Back all changes.", Thor::Shell::Color::RED)
             exit(1)
@@ -5548,13 +5556,17 @@ module Cnvrg
           return $?.success?
         end
 
-        def create_tar(path_in, path_out, tar_files, no_compression=false)
+        def create_tar(path_in, path_out, tar_files, no_compression=false,ignore_files_path)
           #The cd is meant for cases when running cnvrg data uplaod not in the main folder
           begin
+            ignore=""
+            if !ignore_files_path.nil?
+              ignore="--exclude-from=#{ignore_files_path}"
+            end
             if no_compression
-              `cd #{path_in} && tar -cf #{path_out} -T #{tar_files}`
+              `cd #{path_in} && tar -cf #{path_out} -T #{tar_files} #{ignore}`
             else
-              `cd #{path_in} && tar -czf #{path_out} -T #{tar_files}`
+              `cd #{path_in} && tar -czf #{path_out} -T #{tar_files} #{ignore}`
             end
           rescue => e
             puts "Exception while compressing data: #{e.message}"

data/lib/cnvrg/dataset.rb

@@ -178,7 +178,7 @@ module Cnvrg
       url = Cnvrg::Helpers.remote_url
       "#{url}/#{self.owner}/datasets/#{self.slug}"
     end
-    def generate_idx
+    def generate_idx(list_ignore)
       if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
         old_idx = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
       else
@@ -188,7 +188,10 @@ module Cnvrg
       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\/*/) }
+    if list_ignore.nil?
       list_ignore = self.get_ignore_list()
+    end
+
       list.each do |e|
         label = e.gsub(self.local_path + "/", "")
         if File.directory? e

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-14 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler