cnvrg 0.2.8 → 0.2.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cnvrg/cli.rb +10 -2
- data/lib/cnvrg/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: eb4b853a67475534a61610e890c94802f3b39c3b
|
4
|
+
data.tar.gz: adc7c333392de2f38b0312a44486bbc407f96595
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8b4e0264f34a93148eb9050c5ac6d49803551ca8fa6f7c42a08f8ca3538b5d25244834489083620f46977ca162e835320d7f4bea13a09cd32c28de05f946c283
|
7
|
+
data.tar.gz: c110cdf4315e1c723b4724e7d8c1fbdef3034467e0f917b4ad3aa06c05e2f9faa167a6c4564358af218f42824df4376582e231abbca5fd2b5621c90793cf71e4
|
data/lib/cnvrg/cli.rb
CHANGED
@@ -811,7 +811,7 @@ module Cnvrg
|
|
811
811
|
dataset_name = response["result"]["name"]
|
812
812
|
|
813
813
|
if (Dir.exists? dataset_name)
|
814
|
-
|
814
|
+
log_message("Error: Conflict with dir #{dataset_name}", Thor::Shell::Color::RED)
|
815
815
|
if no? "Sync to repository anyway? (current data might lost)", Thor::Shell::Color::YELLOW
|
816
816
|
log_message("Remove dir in order to clone #{dataset_name}", Thor::Shell::Color::RED)
|
817
817
|
exit(1)
|
@@ -2074,7 +2074,14 @@ module Cnvrg
|
|
2074
2074
|
|
2075
2075
|
relative_path = f.gsub(/^#{@project.local_path}/, "")
|
2076
2076
|
log_message("downloading: #{f}.conflict", Thor::Shell::Color::BLUE, options["verbose"])
|
2077
|
-
|
2077
|
+
if relative_path.eql? ".cnvrgignore"
|
2078
|
+
if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=false)
|
2079
|
+
f
|
2080
|
+
else
|
2081
|
+
log_message("Couldn't download: #{f}", Thor::Shell::Color::RED)
|
2082
|
+
raise Parallel::Kill
|
2083
|
+
end
|
2084
|
+
else
|
2078
2085
|
if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=true)
|
2079
2086
|
f
|
2080
2087
|
else
|
@@ -2082,6 +2089,7 @@ module Cnvrg
|
|
2082
2089
|
raise Parallel::Kill
|
2083
2090
|
|
2084
2091
|
end
|
2092
|
+
end
|
2085
2093
|
end
|
2086
2094
|
rescue Interrupt
|
2087
2095
|
|
data/lib/cnvrg/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cnvrg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yochay Ettun
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2018-01-
|
12
|
+
date: 2018-01-14 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|