cnvrg 0.0.1540000 → 0.0.1550000

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021cf92b7a10351f3e2b5dffb061acbba7e335e2
-  data.tar.gz: 087dac2c6aacf82f7ca15c9e51f4858e7cfd1035
+  metadata.gz: 0db2e4b87b2b283664175d5ee07d48d94ecf6ed2
+  data.tar.gz: c3d6b02f906f594d279a2ff5a359bb9c6b5fe5fb
 SHA512:
-  metadata.gz: 34b286d7d0c4e9c3d93acc09c3f857674d0b75f575730bfa7bae48b8fa5396cf631714b53bb7c99b48d5e7603925574011cef44801e235e208b2992fcf9ef2bb
-  data.tar.gz: 44dacf68e883b199b0ceabc6921a5c1d853155942d8ad5dadb207effeb4e7096ae54e61edf819ca2385a5142b1b49a274648da7ab259faac5da721d4dd154e1c
+  metadata.gz: f70c877f7896944f384bfd775ea5ff43c5d1e5f9c10997d921ff9f62579030be84a55dfcd5e7d7182f4efc9709f25363ef5c472bfff5187eaf8eb53468bbd7c5
+  data.tar.gz: 2fd2431db382ab7e89d115cadcd615ce6aa3827ea0bfff22042790594a2fcb048445636996657e127a567477d526ebba5bd097f33b80a1d1bc874e5f9ed63420

data/lib/cnvrg/cli.rb

@@ -1629,6 +1629,7 @@ module Cnvrg
       begin
         log_start(__method__, args, options)
         @project = Project.new(get_project_home)
+        ignore_list = @project.get_ignore_list()
 
         result = @project.compare_idx(false)["result"]
         result = result["tree"]
@@ -1685,6 +1686,7 @@ module Cnvrg
             new_branch = new_branch_exp
           end
         end
+
         result = @project.compare_idx(new_branch)
         commit = result["result"]["commit"]
         if !link

data/lib/cnvrg/datafiles.rb

@@ -578,8 +578,8 @@ module Cnvrg
       return response
     end
 
-    def end_commit(commit_sha1)
-      response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1})
+    def end_commit(commit_sha1,ignore_list)
+      response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1,ignore:ignore_list})
       return response
     end
 

data/lib/cnvrg/dataset.rb

@@ -71,19 +71,17 @@ module Cnvrg
       ignore_list = []
       File.open(self.local_path+"/.cnvrgignore", "r").each_line do |line|
         line = line.strip
-
-        if line.start_with? "#" or ignore_list.include? line
+        if line.start_with? "#" or ignore_list.include? line or line.empty?
           next
         end
         if line.end_with? "/" or File.directory?(line)
-          if line.end_with? "/"
-            ignore_list << line.chop
-          else
-            ignore_list << line
-          end
+          ignore_list << line
           all_sub = Dir.glob("#{line}/**/*", File::FNM_DOTMATCH).flatten
+
           ignore_list << all_sub.flatten
-          ignore_list << line
+        elsif line.include? "*"
+          regex_list = Dir.glob("**/*#{line}", File::FNM_DOTMATCH).flatten
+          ignore_list << regex_list
         else
           ignore_list << line
         end
@@ -232,6 +230,7 @@ module Cnvrg
       return response
     end
     def compare_idx(new_branch, commit=last_local_commit,local_idx=nil)
+
       if local_idx.nil?
         local_idx =  self.generate_idx
       end

data/lib/cnvrg/project.rb

@@ -55,15 +55,30 @@ module Cnvrg
         if line.start_with? "#" or ignore_list.include? line or line.empty?
           next
         end
-        if line.end_with? "/" or File.directory?(line)
-          if line.end_with? "/"
-            ignore_list << line.chop
-          else
-            ignore_list << line
+        if line.ends_with? "*"
+          list_regex = Dir.glob("**/#{line}",File::FNM_DOTMATCH).flatten
+          list_regex.each do |l|
+            ignore_list << l
+            if File.directory?(l)
+              all_sub = Dir.glob("#{line}/**/*", File::FNM_DOTMATCH).flatten
+
+              ignore_list << all_sub.flatten
+            end
+
           end
+        elsif line.ends_with? "/*"
+          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
+        elsif line.end_with? "/" or File.directory?(line)
+            ignore_list << line
             all_sub = Dir.glob("#{line}/**/*", File::FNM_DOTMATCH).flatten
 
           ignore_list << all_sub.flatten
+
         else
           ignore_list << line
         end
@@ -147,7 +162,7 @@ module Cnvrg
           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 File.exist? ".cnvrgignore"
+          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
           if !File.exist? "README" and !File.exist? "README.md"
             FileUtils.touch [ "README.md" ]
             File.open("README.md", "w+") { |f| f.write cnvrgreadme }
@@ -244,23 +259,18 @@ module Cnvrg
         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\/*/) }
+        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}\/\.cnvrgignore.conflict*/) and not (x =~/^#{self.local_path}\/\.cnvrgignore/) }
         list_ignore = self.get_ignore_list()
         list.each do |e|
           label = e.gsub(self.local_path + "/", "")
-
+          ignore_label = label.gsub("/","//")
+          if list_ignore.include? ignore_label
+            next
+          end
           if File.directory? e
-            if list_ignore.include? label
-              next
-            end
 
             tree_idx[label+"/"] = nil
           else
-            if list_ignore.include? label
-              next
-            end
-
             sha1 = Digest::SHA1.file(e).hexdigest
             if old_idx.nil? or old_idx.to_h[:tree].nil?
               tree_idx[label] = {sha1: sha1, commit_time: nil}
@@ -289,7 +299,9 @@ module Cnvrg
       def compare_idx(new_branch, commit=last_local_commit)
 
         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})
+        ignore_list = self.get_ignore_list()
+        response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch,
+                                                                                                   current_commit: commit,ignore:ignore_list})
         CLI.is_response_success(response,false)
         return response
       end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.0.1540000'
+  VERSION = '0.0.1550000'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1540000
+  version: 0.0.1550000
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler