sushi_fabric 0.2.8 → 0.3.1

data/bin/sushi_fabric

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20140315-210244'
+# Version = '20141222-172420'
 
 require 'sushi_fabric'
 
@@ -18,6 +18,7 @@ Usage:
   o.on(:project, '1001', '-p', '--project', String, 'Project Number (default: 1001)')
   o.on(:user, 'sushi_lover', '-u', '--user', String, 'Submit user (default: sushi_lover)')
   o.on(:load_path, '-I load_path', '--load_path', 'Add path where SushiApp class is located (default: ./lib)')
+  o.on(:next_dataset_name, '-n next_dataset_name', '--next_dataset_name', 'Next DataSet Name (default: Analysis_Category+ID+Date )')
   o.parse!(ARGV)
 end
 opt.project = 'p' + opt.project
@@ -62,6 +63,9 @@ usecase.user = opt.user
 usecase.dataset_sushi_id = opt.dataset_id
 usecase.dataset_tsv_file = opt.dataset_tsv
 usecase.parameterset_tsv_file = opt.parameterset_tsv
+if opt.next_dataset_name
+  usecase.next_dataset_name = opt.next_dataset_name
+end
 if opt.run_mode
   usecase.run
 else

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20141009-135300'
+# Version = '20141202-095124'
 
 require 'csv'
 require 'fileutils'
@@ -317,10 +317,10 @@ set -o pipefail
 #### SET THE STAGE
 SCRATCH_DIR=#{@scratch_dir}
 GSTORE_DIR=#{@gstore_dir}
-mkdir $SCRATCH_DIR || exit 1
-cd $SCRATCH_DIR || exit 1
 echo "Job runs on `hostname`"
 echo "at $SCRATCH_DIR"
+mkdir $SCRATCH_DIR || exit 1
+cd $SCRATCH_DIR || exit 1
 
     EOF
   end
@@ -411,24 +411,24 @@ rm -rf #{@scratch_dir} || exit 1
     end
     file_path
   end
-  def copy_commands(org_dir, dest_parent_dir)
-    @workflow_manager.copy_commands(org_dir, dest_parent_dir)
+  def copy_commands(org_dir, dest_parent_dir, now=nil)
+    @workflow_manager.copy_commands(org_dir, dest_parent_dir, now)
   end
   def copy_inputdataset_parameter_jobscripts
     org = @scratch_result_dir
     dest = @gstore_project_dir
-    copy_commands(org, dest).each do |command|
+    copy_commands(org, dest, 'now').each do |command|
       puts command
       unless system command
         raise "fails in copying input_dataset, parameters and jobscript files from /scratch to /gstore"
       end
     end
-    sleep 1
+    #sleep 1
   end
   def copy_nextdataset
     org = @next_dataset_tsv_path
     dest = File.join(@gstore_project_dir, @result_dir_base)
-    copy_commands(org, dest).each do |command|
+    copy_commands(org, dest, 'now').each do |command|
       puts command
       unless system command
         raise "fails in copying next_dataset files from /scratch to /gstore"

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.2.8"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler