sushi_fabric 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed87d2fccd596f1751bfd355ee0b98b71dc2c64b
-  data.tar.gz: abca70f978344f35a75cdd906c50fe0b9e7f989a
+  metadata.gz: f0900a0fae84f67013fdd8eab2cad8b026bbdc25
+  data.tar.gz: b5c40a65c50b874dbc1a26815144810b16f67b26
 SHA512:
-  metadata.gz: 3d5f29f9110262aece8b223b1d3570b7f5d88cc5fc5a6ec039a6ebcfcec030be49a8612ee576ffb0c013a7e6983093e35789a049f1697b2ca624ce7d605a1ac2
-  data.tar.gz: 417c557bd12fa8c0ccbf79d0c315f4be3eee317cb3602d1640fd59a631d057cdde5473cc8e93e4173a90f1be91dd4afa555cb3d67ae2b7162771bd1a0c68c46a
+  metadata.gz: f134738fb2ee9bc6ea8f8ddbec62031d5abe2dea79467e4cbda3508162685ef6521fd29d0ee07f8b96109f7ae9ccd7ad1d6c366546e640b3c7456a00d06eff04
+  data.tar.gz: ed75ef4646c46a7120f4dfa8de4fd688e58e690704858e73cad23178a7cc0c570a85ce6da966d613f8fba44bb760295067b858bd4fa077ad45d32e0688e382bc

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20160930-163938'
+# Version = '20161103-080724'
 
 require 'csv'
 require 'fileutils'
@@ -335,7 +335,7 @@ class SushiApp
     @result_dir_base = if @next_dataset_name
                         [@next_dataset_name, Time.now.strftime("%Y-%m-%d--%H-%M-%S")].join("_")
                       else
-                        [@analysis_category, @name, @dataset_sushi_id.to_s, Time.now.strftime("%Y-%m-%d--%H-%M-%S")].join("_")
+                        [@name, @dataset_sushi_id.to_s, Time.now.strftime("%Y-%m-%d--%H-%M-%S")].join("_")
                       end
     @result_dir = File.join(@project, @result_dir_base)
     @scratch_result_dir = File.join(SCRATCH_DIR, @result_dir_base)
@@ -568,9 +568,9 @@ rm -rf #{@scratch_dir} || exit 1
       ## WRITE THE JOB SCRIPT
       sample_name = @dataset['Name']||@dataset.first
       @job_script = if @dataset_sushi_id and dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
-                      File.join(@job_script_dir, @analysis_category + '_' + sample_name) + '_' + dataset.name.gsub(/\s+/,'_') + '.sh'
+                      File.join(@job_script_dir, sample_name) + '_' + dataset.name.gsub(/\s+/,'_') + '.sh'
                     else 
-                      File.join(@job_script_dir, @analysis_category + '_' + sample_name) + '.sh'
+                      File.join(@job_script_dir, sample_name) + '.sh'
                     end
       make_job_script
       @job_scripts << @job_script
@@ -579,9 +579,9 @@ rm -rf #{@scratch_dir} || exit 1
   end
   def dataset_mode
     @job_script = if @dataset_sushi_id and dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
-                    File.join(@job_script_dir, @analysis_category + '_' + dataset.name.gsub(/\s+/,'_') + '.sh')
+                    File.join(@job_script_dir, dataset.name.gsub(/\s+/,'_') + '.sh')
                   else 
-                    File.join(@job_script_dir, @analysis_category + '_' + 'job_script.sh')
+                    File.join(@job_script_dir, 'job_script.sh')
                   end
     make_job_script
     @job_scripts << @job_script
@@ -589,9 +589,9 @@ rm -rf #{@scratch_dir} || exit 1
   end
   def batch_mode
     @job_script = if @dataset_sushi_id and dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
-                    File.join(@job_script_dir, @analysis_category + '_' + dataset.name.gsub(/\s+/,'_') + '.sh')
+                    File.join(@job_script_dir, dataset.name.gsub(/\s+/,'_') + '.sh')
                   else 
-                    File.join(@job_script_dir, @analysis_category + '_' + 'job_script.sh')
+                    File.join(@job_script_dir, 'job_script.sh')
                   end
     @dataset_hash.each do |row|
       @dataset = Hash[*row.map{|key,value| [key.gsub(/\[.+\]/,'').strip, value]}.flatten]
@@ -686,7 +686,7 @@ rm -rf #{@scratch_dir} || exit 1
       next_dataset_name = if name = @next_dataset_name
                             name.to_s
                           else
-                            "#{@analysis_category}_#{@name.gsub(/\s/,'').gsub(/_/,'')}_#{dataset.id}"
+                            "#{@name.gsub(/\s/,'').gsub(/_/,'')}_#{dataset.id}"
                           end
       data_set_arr = {'DataSetName'=>next_dataset_name, 'ProjectNumber'=>@project.gsub(/p/,''), 'ParentID'=>@dataset_sushi_id, 'Comment'=>@next_dataset_comment.to_s}
       csv = CSV.readlines(@next_dataset_tsv_path, :col_sep=>"\t")

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler