arvados-cli 0.1.20140929162939 → 0.1.20141001020051

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 69b4027c01a1b3a5cee716a56161e5ba5d06a764
4
- data.tar.gz: 959a4ab66e0a9ec832e6574d016de4b9bfa4390d
3
+ metadata.gz: 47cf9aa2a62cb15beff76144bb02e95796887242
4
+ data.tar.gz: f54ef766f3575fed9d638e2b1d62c435e70ab964
5
5
  SHA512:
6
- metadata.gz: fa88fb8efbe3eb686622af79f39a7a80ef77055d86b4b015d39e96807f9a005af9f2533b6f253fe4edfff0d80c3a3f297f77b0bfbb270d1a87c29afe96309d65
7
- data.tar.gz: f752d3c966bc6714d712c7d1aeac0257e3f68cf3f7d2cad0b4b9d11c5df7fa6b3277d3330150179ecc21d7d1f20e683f8885617a1d91e3fd12b15cf1648ccc7c
6
+ metadata.gz: 7814c28f8f66931d89d98caeeb0919a14341aba27d04da7801e3e0a45c420aacb86fa157cce11598ac7ec049955c2175533e52c244b078cb0dd60cc2968dc26f
7
+ data.tar.gz: e88521696a86b63e673261fc856752ecaf5204ead6a65503321ca2b3c9b9f25b24443a39d63ee8b21963a0a83a005c9a6e724c9107ed269ce5cd01c70c700249
@@ -652,8 +652,9 @@ class WhRunPipelineInstance
652
652
  end
653
653
  end
654
654
  end
655
- elsif c[:job][:state] == "Running"
656
- # Job is still running
655
+ elsif ["Queued", "Running"].include? c[:job][:state]
656
+ # Job is running or queued to run, so indicate that pipeline
657
+ # should continue to run
657
658
  moretodo = true
658
659
  elsif c[:job][:state] == "Cancelled"
659
660
  debuglog "component #{cname} job #{c[:job][:uuid]} cancelled."
@@ -686,11 +687,11 @@ class WhRunPipelineInstance
686
687
  end
687
688
  end
688
689
 
689
- c_in_state = @components.values.group_by { |c|
690
+ c_in_state = @components.values.group_by { |c|
690
691
  c[:job] and c[:job][:state]
691
692
  }
692
- succeeded = c_in_state["Complete"].count
693
- failed = c_in_state["Failed"].count + c_in_state["Cancelled"].count
693
+ succeeded = c_in_state["Complete"].andand.count || 0
694
+ failed = (c_in_state["Failed"].andand.count || 0) + (c_in_state["Cancelled"].andand.count || 0)
694
695
  ended = succeeded + failed
695
696
 
696
697
  success = (succeeded == @components.length)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20140929162939
4
+ version: 0.1.20141001020051
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-29 00:00:00.000000000 Z
11
+ date: 2014-10-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arvados
@@ -178,7 +178,7 @@ dependencies:
178
178
  - - "<"
179
179
  - !ruby/object:Gem::Version
180
180
  version: 1.0.0
181
- description: Arvados command line tools, git commit f1c20b66097f1bb37c0ffc8808b4a5831e91f87b
181
+ description: Arvados command line tools, git commit e6fbedf93f4db7325872537e36c4175c8fea0bea
182
182
  email: gem-dev@curoverse.com
183
183
  executables:
184
184
  - arv