arvados-cli 0.1.20140508132447 → 0.1.20140509041244

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/arv-run-pipeline-instance +37 -7
  3. data/bin/crunch-job +1 -0
  4. metadata +30 -30
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d0b625126b0539a5c8c878c0aaeeb211508c1573
4
- data.tar.gz: 2930818b533aeb33c97c692980ce8631c03bc9c7
3
+ metadata.gz: 5ad7594634176db11a17d4c7635960785fe02e08
4
+ data.tar.gz: 7c4eb86160833339988f7cc70d4d80bc7621c3fd
5
5
  SHA512:
6
- metadata.gz: 6ee01641003f4828d5f0f4e114b577410dbfe1df61b89b199eb46838a997427725a971a1015983312da0f0c9ff62e27a267d7298ae6c9c761264553e68ae0140
7
- data.tar.gz: 26e344439c946ab0318feef5370215b8c894f66725a8f14b3f72c48fca0c21851c6e990a7a9b49cbbb5d9789fa1066bd9f9853167e18afe03e65f96210d92918
6
+ metadata.gz: c5097bc964f2a120b645133d5d6913efdaf39e301c8b0fcc3101c89795cccf0dc6bbe27e6eda2ef9ef6b43584fbcf85486dd294169441b571fbdc059386a2259
7
+ data.tar.gz: b4efc09da3ae1b1e1fd9a104027711d1fb15b0555ec79da47cae117be3244a59d59f109ecfa66f8878ee475817dc8920798ec1efebb442ddd8c4d4e2485a6b89
data/bin/arv-run-pipeline-instance CHANGED
@@ -413,15 +413,24 @@ class WhRunPipelineInstance
413
413
  end
414
414
 
415
415
  def setup_instance
416
- @instance ||= PipelineInstance.
417
- create(:components => @components,
416
+ if $options[:submit]
417
+ @instance ||= PipelineInstance.
418
+ create(:components => @components,
419
+ :pipeline_template_uuid => @template[:uuid],
420
+ :state => 'New')
421
+ else
422
+ @instance ||= PipelineInstance.
423
+ create(:components => @components,
418
424
  :pipeline_template_uuid => @template[:uuid],
419
- :active => true)
425
+ :state => 'RunningOnClient')
426
+ end
420
427
  self
421
428
  end
422
429
 
423
430
  def run
424
431
  moretodo = true
432
+ interrupted = false
433
+
425
434
  while moretodo
426
435
  moretodo = false
427
436
  @components.each do |cname, c|
@@ -544,7 +553,9 @@ class WhRunPipelineInstance
544
553
  sleep 10
545
554
  rescue Interrupt
546
555
  debuglog "interrupt", 0
547
- abort
556
+ interrupted = true
557
+ break
558
+ #abort
548
559
  end
549
560
  end
550
561
  end
@@ -565,11 +576,30 @@ class WhRunPipelineInstance
565
576
  end
566
577
  end
567
578
 
568
- if ended == @components.length or failed > 0
569
- @instance[:active] = false
570
- @instance[:success] = (succeeded == @components.length)
579
+ success = (succeeded == @components.length)
580
+
581
+ if interrupted
582
+ if success
583
+ @instance[:active] = false
584
+ @instance[:success] = success
585
+ @instance[:state] = "Complete"
586
+ else
587
+ @instance[:active] = nil
588
+ @instance[:success] = nil
589
+ @instance[:state] = 'Paused'
590
+ end
591
+ else
592
+ if ended == @components.length or failed > 0
593
+ @instance[:active] = false
594
+ @instance[:success] = success
595
+ @instance[:state] = success ? "Complete" : "Failed"
596
+ end
571
597
  end
572
598
 
599
+ # set components_summary
600
+ components_summary = {"todo" => @components.length - ended, "done" => succeeded, "failed" => failed}
601
+ @instance[:components_summary] = components_summary
602
+
573
603
  @instance.save
574
604
  end
575
605
 
data/bin/crunch-job CHANGED
@@ -1296,6 +1296,7 @@ sub save_meta
1296
1296
  . quotemeta($local_logfile->filename);
1297
1297
  my $loglocator = `$cmd`;
1298
1298
  die "system $cmd failed: $?" if $?;
1299
+ chomp($loglocator);
1299
1300
 
1300
1301
  $local_logfile = undef; # the temp file is automatically deleted
1301
1302
  Log (undef, "log manifest is $loglocator");
metadata CHANGED
@@ -1,152 +1,152 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20140508132447
4
+ version: 0.1.20140509041244
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-05-08 00:00:00.000000000 Z
11
+ date: 2014-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arvados
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.1.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.1.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: google-api-client
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.6.3
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.6.3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: activesupport
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '3.2'
48
- - - '>='
48
+ - - ">="
49
49
  - !ruby/object:Gem::Version
50
50
  version: 3.2.13
51
51
  type: :runtime
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
- - - ~>
55
+ - - "~>"
56
56
  - !ruby/object:Gem::Version
57
57
  version: '3.2'
58
- - - '>='
58
+ - - ">="
59
59
  - !ruby/object:Gem::Version
60
60
  version: 3.2.13
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: json
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - ~>
65
+ - - "~>"
66
66
  - !ruby/object:Gem::Version
67
67
  version: '1.7'
68
- - - '>='
68
+ - - ">="
69
69
  - !ruby/object:Gem::Version
70
70
  version: 1.7.7
71
71
  type: :runtime
72
72
  prerelease: false
73
73
  version_requirements: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - ~>
75
+ - - "~>"
76
76
  - !ruby/object:Gem::Version
77
77
  version: '1.7'
78
- - - '>='
78
+ - - ">="
79
79
  - !ruby/object:Gem::Version
80
80
  version: 1.7.7
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: trollop
83
83
  requirement: !ruby/object:Gem::Requirement
84
84
  requirements:
85
- - - ~>
85
+ - - "~>"
86
86
  - !ruby/object:Gem::Version
87
87
  version: '2.0'
88
88
  type: :runtime
89
89
  prerelease: false
90
90
  version_requirements: !ruby/object:Gem::Requirement
91
91
  requirements:
92
- - - ~>
92
+ - - "~>"
93
93
  - !ruby/object:Gem::Version
94
94
  version: '2.0'
95
95
  - !ruby/object:Gem::Dependency
96
96
  name: andand
97
97
  requirement: !ruby/object:Gem::Requirement
98
98
  requirements:
99
- - - ~>
99
+ - - "~>"
100
100
  - !ruby/object:Gem::Version
101
101
  version: '1.3'
102
- - - '>='
102
+ - - ">="
103
103
  - !ruby/object:Gem::Version
104
104
  version: 1.3.3
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - ~>
109
+ - - "~>"
110
110
  - !ruby/object:Gem::Version
111
111
  version: '1.3'
112
- - - '>='
112
+ - - ">="
113
113
  - !ruby/object:Gem::Version
114
114
  version: 1.3.3
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: oj
117
117
  requirement: !ruby/object:Gem::Requirement
118
118
  requirements:
119
- - - ~>
119
+ - - "~>"
120
120
  - !ruby/object:Gem::Version
121
121
  version: '2.0'
122
- - - '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: 2.0.3
125
125
  type: :runtime
126
126
  prerelease: false
127
127
  version_requirements: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: '2.0'
132
- - - '>='
132
+ - - ">="
133
133
  - !ruby/object:Gem::Version
134
134
  version: 2.0.3
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: curb
137
137
  requirement: !ruby/object:Gem::Requirement
138
138
  requirements:
139
- - - ~>
139
+ - - "~>"
140
140
  - !ruby/object:Gem::Version
141
141
  version: '0.8'
142
142
  type: :runtime
143
143
  prerelease: false
144
144
  version_requirements: !ruby/object:Gem::Requirement
145
145
  requirements:
146
- - - ~>
146
+ - - "~>"
147
147
  - !ruby/object:Gem::Version
148
148
  version: '0.8'
149
- description: This is the Arvados SDK CLI gem, git revision 16af0b22def5b80a1861788907a2fc45b14e3273
149
+ description: This is the Arvados SDK CLI gem, git revision 179c431787943f3711f2127d127c33a831378b06
150
150
  email: gem-dev@curoverse.com
151
151
  executables:
152
152
  - arv
@@ -171,17 +171,17 @@ require_paths:
171
171
  - lib
172
172
  required_ruby_version: !ruby/object:Gem::Requirement
173
173
  requirements:
174
- - - '>='
174
+ - - ">="
175
175
  - !ruby/object:Gem::Version
176
176
  version: '0'
177
177
  required_rubygems_version: !ruby/object:Gem::Requirement
178
178
  requirements:
179
- - - '>='
179
+ - - ">="
180
180
  - !ruby/object:Gem::Version
181
181
  version: '0'
182
182
  requirements: []
183
183
  rubyforge_project:
184
- rubygems_version: 2.2.1
184
+ rubygems_version: 2.2.2
185
185
  signing_key:
186
186
  specification_version: 4
187
187
  summary: Arvados SDK CLI