sushi_fabric 0.3.3 → 0.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/sushi_fabric +3 -3
- data/lib/sushi_fabric/sushiApp.rb +18 -1
- data/lib/sushi_fabric/version.rb +1 -1
- metadata +1 -1
data/bin/sushi_fabric
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
# encoding: utf-8
|
3
|
-
# Version = '
|
3
|
+
# Version = '20150326-155111'
|
4
4
|
|
5
5
|
require 'sushi_fabric'
|
6
6
|
|
@@ -15,8 +15,8 @@ Usage:
|
|
15
15
|
o.on(:dataset_tsv, '-d dataset_tsv', '--dataset', String, 'DataSet file (.tsv) (This option is prior to dataset_id option)')
|
16
16
|
o.on(:parameterset_tsv, '-m parameterset_tsv', '--parameterset', String, 'Parameterset file (.tsv)')
|
17
17
|
o.on(:run_mode, '-r', '--run', 'Real run mode. without this option, it runs with test run mode which checks only DataSet and Parameters and no submittion')
|
18
|
-
o.on(:project, '1001', '-p', '--project', String, 'Project Number (default: 1001)')
|
19
|
-
o.on(:user, 'sushi_lover', '-u', '--user', String, 'Submit user (default: sushi_lover)')
|
18
|
+
o.on(:project, '1001', '-p project', '--project', String, 'Project Number (default: 1001)')
|
19
|
+
o.on(:user, 'sushi_lover', '-u user', '--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
21
|
o.on(:next_dataset_name, '-n next_dataset_name', '--next_dataset_name', 'Next DataSet Name (default: Analysis_Category+ID+Date )')
|
22
22
|
o.parse!(ARGV)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
# encoding: utf-8
|
3
|
-
# Version = '20150326-
|
3
|
+
# Version = '20150326-150304'
|
4
4
|
|
5
5
|
require 'csv'
|
6
6
|
require 'fileutils'
|
@@ -202,6 +202,23 @@ class SushiApp
|
|
202
202
|
@dataset_hash << row.to_hash
|
203
203
|
@dataset << row.to_hash
|
204
204
|
end
|
205
|
+
|
206
|
+
# save in sushi db
|
207
|
+
data_set_arr = []
|
208
|
+
headers = []
|
209
|
+
rows = []
|
210
|
+
data_set_arr = {'DataSetName'=>File.basename(@dataset_tsv_file).gsub(/.tsv/, ''), 'ProjectNumber'=>@project.gsub(/p/,'')}
|
211
|
+
csv = CSV.readlines(@dataset_tsv_file, :col_sep=>"\t")
|
212
|
+
csv.each do |row|
|
213
|
+
if headers.empty?
|
214
|
+
headers = row
|
215
|
+
else
|
216
|
+
rows << row
|
217
|
+
end
|
218
|
+
end
|
219
|
+
unless NO_ROR
|
220
|
+
@dataset_sushi_id = save_data_set(data_set_arr.to_a.flatten, headers, rows)
|
221
|
+
end
|
205
222
|
elsif @dataset_sushi_id
|
206
223
|
@dataset_hash = []
|
207
224
|
@dataset = []
|
data/lib/sushi_fabric/version.rb
CHANGED