bio-grid 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/bio-grid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "bio-grid"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesco Strozzi"]

data/lib/bio/grid.rb

@@ -2,15 +2,17 @@ module Bio
 	
 	class Grid
 	
-		attr_accessor :input,:number
+		attr_accessor :input,:number,:uuid
 		def initialize(input,number)
 			@input = input
 			@number = number
+			@uuid = UUID.new.generate.split("-").first
 		end
 
 		def self.run(options)
 			options[:number] = 1 unless options[:number]
 			grid = self.new options[:input], options[:number]
+			options[:uuid] = grid.uuid
 			groups = grid.prepare_input_groups
 			inputs = groups.keys.sort
 			groups[inputs.shift].each_with_index do |input1,index|

data/lib/bio/grid/job.rb

@@ -6,7 +6,6 @@ module Bio
 			def initialize(options)
 				@options = options
 				self.instructions = []
-				self.uuid = UUID.new.generate.split("-").first
 			end
 
 			def	set_output_dir
@@ -22,12 +21,12 @@ module Bio
 				job_output = ""
 				if commandline =~/<output>\.(\S+)/
 					extension = $1
-					job_output = self.options[:output]+"/#{self.uuid}_"+self.options[:name]+"_output_%03d" % (index+1).to_s + "#{self.options[:parameter_value]}"
+					job_output = self.options[:output]+"/#{options[:uuid]}_"+self.options[:name]+"_output_%03d" % (index+1).to_s + "#{self.options[:parameter_value]}"
 					commandline.gsub!(/<output>/,job_output)	
 					job_output << ".#{extension}"
 				else
 					self.options[:output_folder] = true
-					job_output = self.options[:output]+"/#{self.uuid}_"+self.options[:name]
+					job_output = self.options[:output]+"/#{options[:uuid]}_"+self.options[:name]
 					commandline.gsub!(/<output>/,job_output)
 				end
 				self.instructions << commandline+"\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bio-grid
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4333638046284412790
+      hash: 3769977352097433669
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: