bio-grid 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.1
1
+ 0.2.2
data/bio-grid.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "bio-grid"
8
- s.version = "0.2.1"
8
+ s.version = "0.2.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Francesco Strozzi"]
data/lib/bio/grid.rb CHANGED
@@ -14,7 +14,6 @@ module Bio
14
14
  groups = grid.prepare_input_groups
15
15
  inputs = groups.keys.sort
16
16
  groups[inputs.shift].each_with_index do |input1,index|
17
-
18
17
  if options[:cmd]=~/<(\d+),(\d+)(,\d+)*>/
19
18
  step = ($3) ? $3.tr(",","").to_i : 1
20
19
  range = Range.new($1.to_i,$2.to_i,false).step(step).to_a
@@ -37,7 +36,7 @@ module Bio
37
36
  groups = Hash.new {|h,k| h[k] = [] }
38
37
  self.input.each_with_index do |location,index|
39
38
  if self.number == "all"
40
- groups["input"] << Dir.glob(location).sort
39
+ groups["input#{index+1}"] = [Dir.glob(location).sort]
41
40
  else
42
41
  Dir.glob(location).sort.each_slice(self.number.to_i) {|subgroup| groups["input#{index+1}"] << subgroup}
43
42
  end
data/lib/bio/grid/job.rb CHANGED
@@ -14,6 +14,7 @@ module Bio
14
14
 
15
15
  def set_commandline(cmd_line,inputs,input1,groups,index)
16
16
  commandline = cmd_line.gsub(/<input1>|<input>/,input1.join(self.options[:sep]))
17
+ p groups
17
18
  inputs.each do |input|
18
19
  commandline.gsub!(/<#{input}>/,groups[input][index].join(self.options[:sep]))
19
20
  end
@@ -50,7 +51,6 @@ module Bio
50
51
  out = File.open(Dir.pwd+"/"+filename,"w")
51
52
  out.write(self.instructions+"\n")
52
53
  out.close
53
- p filename
54
54
  end
55
55
 
56
56
  def run(filename)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bio-grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
114
114
  version: '0'
115
115
  segments:
116
116
  - 0
117
- hash: -3618052432547713784
117
+ hash: 1395497113467924292
118
118
  required_rubygems_version: !ruby/object:Gem::Requirement
119
119
  none: false
120
120
  requirements: