cnvrg 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4fccd072cdc474ad9026a8e1e5236c46bc8499
-  data.tar.gz: 25b637b549743301d8f585b16e07d0cdcd34c571
+  metadata.gz: eb4b853a67475534a61610e890c94802f3b39c3b
+  data.tar.gz: adc7c333392de2f38b0312a44486bbc407f96595
 SHA512:
-  metadata.gz: a82144ff4a9fb1dd56e43b49079ec095746e3b9a291a27e88d14b602b6366145a5a1f5d1fcc39628918f16258ef77287659014ed15e05d3c9e1f4745f23e4713
-  data.tar.gz: d306d2f0efba9ddb0221705b97830dd4f4ef9378a032662b83a3dc47022140620217000db1c43ee0d9ae91f937f9a45a44551ffc74c95b15fb7f63c8ea40ed65
+  metadata.gz: 8b4e0264f34a93148eb9050c5ac6d49803551ca8fa6f7c42a08f8ca3538b5d25244834489083620f46977ca162e835320d7f4bea13a09cd32c28de05f946c283
+  data.tar.gz: c110cdf4315e1c723b4724e7d8c1fbdef3034467e0f917b4ad3aa06c05e2f9faa167a6c4564358af218f42824df4376582e231abbca5fd2b5621c90793cf71e4

data/lib/cnvrg/cli.rb

@@ -811,7 +811,7 @@ module Cnvrg
         dataset_name = response["result"]["name"]
 
         if (Dir.exists? dataset_name)
-          log_messgae("Error: Conflict with dir #{dataset_name}", Thor::Shell::Color::RED)
+          log_message("Error: Conflict with dir #{dataset_name}", Thor::Shell::Color::RED)
           if no? "Sync to repository anyway? (current data might lost)", Thor::Shell::Color::YELLOW
             log_message("Remove dir in order to clone #{dataset_name}", Thor::Shell::Color::RED)
             exit(1)
@@ -2074,7 +2074,14 @@ module Cnvrg
 
               relative_path = f.gsub(/^#{@project.local_path}/, "")
               log_message("downloading: #{f}.conflict", Thor::Shell::Color::BLUE, options["verbose"])
-
+              if relative_path.eql? ".cnvrgignore"
+                if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=false)
+                  f
+                else
+                  log_message("Couldn't download: #{f}", Thor::Shell::Color::RED)
+                  raise Parallel::Kill
+                end
+              else
               if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=true)
                 f
               else
@@ -2082,6 +2089,7 @@ module Cnvrg
                 raise Parallel::Kill
 
               end
+              end
             end
           rescue Interrupt
 

data/lib/cnvrg/version.rb

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

metadata

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