arvados-cli 0.1.20140905091847 → 0.1.20140905115707
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/crunch-job +17 -5
- 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: de0abc3f548c562fc95df1bbee5b62514ec2f614
|
4
|
+
data.tar.gz: d78f56a84efee56f3bf7cdf74e0cec6d6cb0f845
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 52ada2ab28d11b3e443be98f40f49c3a3d218b59ec9b7ea42057c09dfb490bcebcba826b3f6a05c26897f3923403aa729270a66d28880d7219dfee63b24783c4
|
7
|
+
data.tar.gz: d00cae2d8e8db8fe22787572c1c2650ad46786bbf490a66b6d92c1988b8fde62b566b4b3e1e00c04ed113fac2af2e71762c265e6d786037a1bbecbaae648f8cd
|
data/bin/crunch-job
CHANGED
@@ -1465,14 +1465,26 @@ sub find_docker_image {
|
|
1465
1465
|
# If so, return its stream name and Docker hash.
|
1466
1466
|
# If not, return undef for both values.
|
1467
1467
|
my $locator = shift;
|
1468
|
+
my ($streamname, $filename);
|
1468
1469
|
if (my $image = $arv->{collections}->{get}->execute(uuid => $locator)) {
|
1469
|
-
my
|
1470
|
-
|
1471
|
-
|
1472
|
-
|
1470
|
+
foreach my $line (split(/\n/, $image->{manifest_text})) {
|
1471
|
+
my @tokens = split(/\s+/, $line);
|
1472
|
+
next if (!@tokens);
|
1473
|
+
$streamname = shift(@tokens);
|
1474
|
+
foreach my $filedata (grep(/^\d+:\d+:/, @tokens)) {
|
1475
|
+
if (defined($filename)) {
|
1476
|
+
return (undef, undef); # More than one file in the Collection.
|
1477
|
+
} else {
|
1478
|
+
$filename = (split(/:/, $filedata, 3))[2];
|
1479
|
+
}
|
1480
|
+
}
|
1473
1481
|
}
|
1474
1482
|
}
|
1475
|
-
|
1483
|
+
if (defined($filename) and ($filename =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
|
1484
|
+
return ($streamname, $1);
|
1485
|
+
} else {
|
1486
|
+
return (undef, undef);
|
1487
|
+
}
|
1476
1488
|
}
|
1477
1489
|
|
1478
1490
|
__DATA__
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: arvados-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.20140905115707
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arvados Authors
|
@@ -166,7 +166,7 @@ dependencies:
|
|
166
166
|
- - "<"
|
167
167
|
- !ruby/object:Gem::Version
|
168
168
|
version: 1.0.0
|
169
|
-
description: This is the Arvados SDK CLI gem, git revision
|
169
|
+
description: This is the Arvados SDK CLI gem, git revision f94f97fe63d3d860d373a25d3539d559b53542c5
|
170
170
|
email: gem-dev@curoverse.com
|
171
171
|
executables:
|
172
172
|
- arv
|