arvados-cli 0.1.20130925215701 → 0.1.20131021115720

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 (3) hide show
  1. data/bin/arv-run-pipeline-instance +1 -1
  2. data/bin/crunch-job +5 -5
  3. metadata +111 -95
data/bin/arv-run-pipeline-instance CHANGED
@@ -448,7 +448,7 @@ class WhRunPipelineInstance
448
448
  debuglog "component #{cname} new job."
449
449
  job = JobCache.create(:script => c[:script],
450
450
  :script_parameters => c[:script_parameters],
451
- :resource_limits => c[:resource_limits] || {},
451
+ :runtime_constraints => c[:runtime_constraints] || {},
452
452
  :script_version => c[:script_version] || 'master')
453
453
  if job
454
454
  debuglog "component #{cname} new job #{job[:uuid]}"
data/bin/crunch-job CHANGED
@@ -170,9 +170,9 @@ $job_id = $Job->{'uuid'};
170
170
 
171
171
 
172
172
 
173
- $Job->{'resource_limits'} ||= {};
174
- $Job->{'resource_limits'}->{'max_tasks_per_node'} ||= 0;
175
- my $max_ncpus = $Job->{'resource_limits'}->{'max_tasks_per_node'};
173
+ $Job->{'runtime_constraints'} ||= {};
174
+ $Job->{'runtime_constraints'}->{'max_tasks_per_node'} ||= 0;
175
+ my $max_ncpus = $Job->{'runtime_constraints'}->{'max_tasks_per_node'};
176
176
 
177
177
 
178
178
  Log (undef, "check slurm allocation");
@@ -452,7 +452,7 @@ else
452
452
 
453
453
 
454
454
 
455
- foreach (qw (script script_version script_parameters resource_limits))
455
+ foreach (qw (script script_version script_parameters runtime_constraints))
456
456
  {
457
457
  Log (undef,
458
458
  "$_ " .
@@ -494,9 +494,9 @@ update_progress_stats();
494
494
 
495
495
 
496
496
  THISROUND:
497
+ $main::please_continue = 0;
497
498
  for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
498
499
  {
499
- $main::please_continue = 0;
500
500
 
501
501
  my $id = $jobstep_todo[$todo_ptr];
502
502
  my $Jobstep = $jobstep[$id];
metadata CHANGED
@@ -1,148 +1,164 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
- version: !ruby/object:Gem::Version
4
- version: 0.1.20130925215701
3
+ version: !ruby/object:Gem::Version
4
+ hash: 40262042231435
5
5
  prerelease:
6
+ segments:
7
+ - 0
8
+ - 1
9
+ - 20131021115720
10
+ version: 0.1.20131021115720
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Arvados Authors
9
14
  autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
- date: 2013-09-25 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
17
+
18
+ date: 2013-10-21 00:00:00 Z
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
15
21
  name: google-api-client
16
- requirement: !ruby/object:Gem::Requirement
17
- none: false
18
- requirements:
19
- - - ! '>='
20
- - !ruby/object:Gem::Version
21
- version: 0.6.3
22
- type: :runtime
23
22
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
23
+ requirement: &id001 !ruby/object:Gem::Requirement
25
24
  none: false
26
- requirements:
27
- - - ! '>='
28
- - !ruby/object:Gem::Version
25
+ requirements:
26
+ - - ">="
27
+ - !ruby/object:Gem::Version
28
+ hash: 1
29
+ segments:
30
+ - 0
31
+ - 6
32
+ - 3
29
33
  version: 0.6.3
30
- - !ruby/object:Gem::Dependency
31
- name: activesupport
32
- requirement: !ruby/object:Gem::Requirement
33
- none: false
34
- requirements:
35
- - - ! '>='
36
- - !ruby/object:Gem::Version
37
- version: 3.2.13
38
34
  type: :runtime
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
37
+ name: activesupport
39
38
  prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
39
+ requirement: &id002 !ruby/object:Gem::Requirement
41
40
  none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
41
+ requirements:
42
+ - - ">="
43
+ - !ruby/object:Gem::Version
44
+ hash: 21
45
+ segments:
46
+ - 3
47
+ - 2
48
+ - 13
45
49
  version: 3.2.13
46
- - !ruby/object:Gem::Dependency
47
- name: json
48
- requirement: !ruby/object:Gem::Requirement
49
- none: false
50
- requirements:
51
- - - ! '>='
52
- - !ruby/object:Gem::Version
53
- version: 1.7.7
54
50
  type: :runtime
51
+ version_requirements: *id002
52
+ - !ruby/object:Gem::Dependency
53
+ name: json
55
54
  prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
55
+ requirement: &id003 !ruby/object:Gem::Requirement
57
56
  none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
57
+ requirements:
58
+ - - ">="
59
+ - !ruby/object:Gem::Version
60
+ hash: 5
61
+ segments:
62
+ - 1
63
+ - 7
64
+ - 7
61
65
  version: 1.7.7
62
- - !ruby/object:Gem::Dependency
63
- name: trollop
64
- requirement: !ruby/object:Gem::Requirement
65
- none: false
66
- requirements:
67
- - - ! '>='
68
- - !ruby/object:Gem::Version
69
- version: '2.0'
70
66
  type: :runtime
67
+ version_requirements: *id003
68
+ - !ruby/object:Gem::Dependency
69
+ name: trollop
71
70
  prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
- requirements:
75
- - - ! '>='
76
- - !ruby/object:Gem::Version
77
- version: '2.0'
78
- - !ruby/object:Gem::Dependency
79
- name: andand
80
- requirement: !ruby/object:Gem::Requirement
71
+ requirement: &id004 !ruby/object:Gem::Requirement
81
72
  none: false
82
- requirements:
83
- - - ! '>='
84
- - !ruby/object:Gem::Version
85
- version: 1.3.3
73
+ requirements:
74
+ - - ">="
75
+ - !ruby/object:Gem::Version
76
+ hash: 3
77
+ segments:
78
+ - 2
79
+ - 0
80
+ version: "2.0"
86
81
  type: :runtime
82
+ version_requirements: *id004
83
+ - !ruby/object:Gem::Dependency
84
+ name: andand
87
85
  prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
86
+ requirement: &id005 !ruby/object:Gem::Requirement
89
87
  none: false
90
- requirements:
91
- - - ! '>='
92
- - !ruby/object:Gem::Version
88
+ requirements:
89
+ - - ">="
90
+ - !ruby/object:Gem::Version
91
+ hash: 29
92
+ segments:
93
+ - 1
94
+ - 3
95
+ - 3
93
96
  version: 1.3.3
94
- - !ruby/object:Gem::Dependency
95
- name: oj
96
- requirement: !ruby/object:Gem::Requirement
97
- none: false
98
- requirements:
99
- - - ! '>='
100
- - !ruby/object:Gem::Version
101
- version: 2.0.3
102
97
  type: :runtime
98
+ version_requirements: *id005
99
+ - !ruby/object:Gem::Dependency
100
+ name: oj
103
101
  prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
102
+ requirement: &id006 !ruby/object:Gem::Requirement
105
103
  none: false
106
- requirements:
107
- - - ! '>='
108
- - !ruby/object:Gem::Version
104
+ requirements:
105
+ - - ">="
106
+ - !ruby/object:Gem::Version
107
+ hash: 9
108
+ segments:
109
+ - 2
110
+ - 0
111
+ - 3
109
112
  version: 2.0.3
110
- description: This is the Arvados SDK CLI gem, git revision 2c94aea83dbaac5825a00d26d753ae534795cd23
113
+ type: :runtime
114
+ version_requirements: *id006
115
+ description: This is the Arvados SDK CLI gem, git revision 7c4460b82b8abadc5144f758a9f36ce0f42893e8
111
116
  email: gem-dev@clinicalfuture.com
112
- executables:
117
+ executables:
113
118
  - arv
114
119
  - arv-run-pipeline-instance
115
120
  - arv-crunch-job
116
121
  extensions: []
122
+
117
123
  extra_rdoc_files: []
118
- files:
124
+
125
+ files:
119
126
  - bin/arv
120
127
  - bin/arv-run-pipeline-instance
121
128
  - bin/arv-crunch-job
122
129
  - bin/crunch-job
123
130
  homepage: http://arvados.org
124
- licenses:
131
+ licenses:
125
132
  - Apache License, Version 2.0
126
133
  post_install_message:
127
134
  rdoc_options: []
128
- require_paths:
135
+
136
+ require_paths:
129
137
  - lib
130
- required_ruby_version: !ruby/object:Gem::Requirement
138
+ required_ruby_version: !ruby/object:Gem::Requirement
131
139
  none: false
132
- requirements:
133
- - - ! '>='
134
- - !ruby/object:Gem::Version
135
- version: '0'
136
- required_rubygems_version: !ruby/object:Gem::Requirement
140
+ requirements:
141
+ - - ">="
142
+ - !ruby/object:Gem::Version
143
+ hash: 3
144
+ segments:
145
+ - 0
146
+ version: "0"
147
+ required_rubygems_version: !ruby/object:Gem::Requirement
137
148
  none: false
138
- requirements:
139
- - - ! '>='
140
- - !ruby/object:Gem::Version
141
- version: '0'
149
+ requirements:
150
+ - - ">="
151
+ - !ruby/object:Gem::Version
152
+ hash: 3
153
+ segments:
154
+ - 0
155
+ version: "0"
142
156
  requirements: []
157
+
143
158
  rubyforge_project:
144
- rubygems_version: 1.8.25
159
+ rubygems_version: 1.8.24
145
160
  signing_key:
146
161
  specification_version: 3
147
162
  summary: Arvados SDK CLI
148
163
  test_files: []
164
+