sushi_fabric 0.3.5 → 0.3.6

data/bin/sushi_fabric

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20150326-155111'
+# Version = '20150327-011934'
 
 require 'sushi_fabric'
 
@@ -13,6 +13,7 @@ Usage:
   o.on(:class_name, '-c class_name', '--class', "SushiApp class name (\e[31mrequired\e[0m)")
   o.on(:dataset_id, '-i dataset_id', '--dataset_id', Integer, 'DataSet ID in Sushi DB')
   o.on(:dataset_tsv, '-d dataset_tsv', '--dataset', String, 'DataSet file (.tsv) (This option is prior to dataset_id option)')
+  o.on(:dataset_name, '-s dataset_name', '--dataset_name', String, 'DataSet name in Sushi (This will be used with --dataset option, default: tsv file base name)')
   o.on(:parameterset_tsv, '-m parameterset_tsv', '--parameterset', String, 'Parameterset file (.tsv)')
   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')
   o.on(:project, '1001', '-p project', '--project', String, 'Project Number (default: 1001)')
@@ -63,6 +64,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.dataset_name
+  usecase.dataset_name = opt.dataset_name
+end
 if opt.next_dataset_name
   usecase.next_dataset_name = opt.next_dataset_name
 end

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20150326-150304'
+# Version = '20150327-011855'
 
 require 'csv'
 require 'fileutils'
@@ -178,6 +178,7 @@ class SushiApp
   attr_accessor :project
   attr_accessor :user
   attr_accessor :next_dataset_name
+  attr_accessor :dataset_name
   attr_accessor :next_dataset_comment
   def initialize
     @gstore_dir = GSTORE_DIR
@@ -203,11 +204,16 @@ class SushiApp
         @dataset << row.to_hash
       end
 
-      # save in sushi db
+      # save in sushi db unless it is saved in sushi db
       data_set_arr = []
       headers = []
       rows = []
-      data_set_arr = {'DataSetName'=>File.basename(@dataset_tsv_file).gsub(/.tsv/, ''), 'ProjectNumber'=>@project.gsub(/p/,'')}
+      dataset_name = if @dataset_name
+                       @dataset_name
+                     else
+                       File.basename(@dataset_tsv_file).gsub(/.tsv/, '')
+                     end
+      data_set_arr = {'DataSetName'=>dataset_name, 'ProjectNumber'=>@project.gsub(/p/,'')}
       csv = CSV.readlines(@dataset_tsv_file, :col_sep=>"\t")
       csv.each do |row|
         if headers.empty?

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler