sushi_fabric 0.2.8 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/sushi_fabric +5 -1
- data/lib/sushi_fabric/sushiApp.rb +8 -8
- data/lib/sushi_fabric/version.rb +1 -1
- metadata +2 -2
data/bin/sushi_fabric
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
# encoding: utf-8
|
3
|
-
# Version = '
|
3
|
+
# Version = '20141222-172420'
|
4
4
|
|
5
5
|
require 'sushi_fabric'
|
6
6
|
|
@@ -18,6 +18,7 @@ Usage:
|
|
18
18
|
o.on(:project, '1001', '-p', '--project', String, 'Project Number (default: 1001)')
|
19
19
|
o.on(:user, 'sushi_lover', '-u', '--user', String, 'Submit user (default: sushi_lover)')
|
20
20
|
o.on(:load_path, '-I load_path', '--load_path', 'Add path where SushiApp class is located (default: ./lib)')
|
21
|
+
o.on(:next_dataset_name, '-n next_dataset_name', '--next_dataset_name', 'Next DataSet Name (default: Analysis_Category+ID+Date )')
|
21
22
|
o.parse!(ARGV)
|
22
23
|
end
|
23
24
|
opt.project = 'p' + opt.project
|
@@ -62,6 +63,9 @@ usecase.user = opt.user
|
|
62
63
|
usecase.dataset_sushi_id = opt.dataset_id
|
63
64
|
usecase.dataset_tsv_file = opt.dataset_tsv
|
64
65
|
usecase.parameterset_tsv_file = opt.parameterset_tsv
|
66
|
+
if opt.next_dataset_name
|
67
|
+
usecase.next_dataset_name = opt.next_dataset_name
|
68
|
+
end
|
65
69
|
if opt.run_mode
|
66
70
|
usecase.run
|
67
71
|
else
|
@@ -1,6 +1,6 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
# encoding: utf-8
|
3
|
-
# Version = '
|
3
|
+
# Version = '20141202-095124'
|
4
4
|
|
5
5
|
require 'csv'
|
6
6
|
require 'fileutils'
|
@@ -317,10 +317,10 @@ set -o pipefail
|
|
317
317
|
#### SET THE STAGE
|
318
318
|
SCRATCH_DIR=#{@scratch_dir}
|
319
319
|
GSTORE_DIR=#{@gstore_dir}
|
320
|
-
mkdir $SCRATCH_DIR || exit 1
|
321
|
-
cd $SCRATCH_DIR || exit 1
|
322
320
|
echo "Job runs on `hostname`"
|
323
321
|
echo "at $SCRATCH_DIR"
|
322
|
+
mkdir $SCRATCH_DIR || exit 1
|
323
|
+
cd $SCRATCH_DIR || exit 1
|
324
324
|
|
325
325
|
EOF
|
326
326
|
end
|
@@ -411,24 +411,24 @@ rm -rf #{@scratch_dir} || exit 1
|
|
411
411
|
end
|
412
412
|
file_path
|
413
413
|
end
|
414
|
-
def copy_commands(org_dir, dest_parent_dir)
|
415
|
-
@workflow_manager.copy_commands(org_dir, dest_parent_dir)
|
414
|
+
def copy_commands(org_dir, dest_parent_dir, now=nil)
|
415
|
+
@workflow_manager.copy_commands(org_dir, dest_parent_dir, now)
|
416
416
|
end
|
417
417
|
def copy_inputdataset_parameter_jobscripts
|
418
418
|
org = @scratch_result_dir
|
419
419
|
dest = @gstore_project_dir
|
420
|
-
copy_commands(org, dest).each do |command|
|
420
|
+
copy_commands(org, dest, 'now').each do |command|
|
421
421
|
puts command
|
422
422
|
unless system command
|
423
423
|
raise "fails in copying input_dataset, parameters and jobscript files from /scratch to /gstore"
|
424
424
|
end
|
425
425
|
end
|
426
|
-
sleep 1
|
426
|
+
#sleep 1
|
427
427
|
end
|
428
428
|
def copy_nextdataset
|
429
429
|
org = @next_dataset_tsv_path
|
430
430
|
dest = File.join(@gstore_project_dir, @result_dir_base)
|
431
|
-
copy_commands(org, dest).each do |command|
|
431
|
+
copy_commands(org, dest, 'now').each do |command|
|
432
432
|
puts command
|
433
433
|
unless system command
|
434
434
|
raise "fails in copying next_dataset files from /scratch to /gstore"
|
data/lib/sushi_fabric/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sushi_fabric
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-12-22 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|