use and set config file value

Author: takkanm

lib/td/command/connector.rb

@@ -139,19 +139,19 @@ def connector_issue(op)
       database, table, config_file = args
     end
 
-    required('database', database)
-    required('table', table)
-
     config = prepare_bulkload_job_config(config_file)
-    (config['out'] ||= {})['time_column'] = time_column if time_column  # TODO will not work once embulk implements multi-job
+    overwrite_out_config(config, 'database' => database, 'table' => table, 'time_column' => time_column)
 
     client = get_client()
 
+    required('database', config['out']['database'])
+    required('table', config['out']['table'])
+
     if auto_create
-      create_database_and_table_if_not_exist(client, database, table)
+      create_database_and_table_if_not_exist(client, config['out']['database'], config['out']['table'])
     end
 
-    job_id = client.bulk_load_issue(database, table, config: config)
+    job_id = client.bulk_load_issue(config['out']['database'], config['out']['table'], config: config)
 
     $stdout.puts "Job #{job_id} is queued."
     $stdout.puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job_id}' to show the status."
@@ -161,6 +161,15 @@ def connector_issue(op)
     end
   end
 
+  def overwrite_out_config(config, out_args)
+    # TODO will not work once embulk implements multi-job
+    config['out'] ||= {}
+
+    out_args.each do |key, value|
+      config['out'][key] = value if value
+    end
+  end
+
   def connector_list(op)
     set_render_format_option(op)
     op.cmd_parse

spec/td/command/connector_spec.rb

@@ -83,27 +83,55 @@ module TreasureData::Command
       describe 'database and table arguments' do
         let(:database) { 'database' }
         let(:table)    { 'table' }
-        let(:config)   { {} }
 
         before do
           client = double(:client)
           command.stub(:get_client).and_return(client)
           command.stub(:create_database_and_table_if_not_exist)
           command.stub(:prepare_bulkload_job_config).and_return(config)
           client.should_receive(:bulk_load_issue).with(database, table, {config: expect_config}).and_return(1234)
+        end
+
+        context 'set from config file' do
+          let(:expect_config) {
+            {'out' => {'database' => database, 'table' => table}}
+          }
+
+          context 'without arguments' do
+            let(:option) {
+              List::CommandParser.new("connector:issue", ["config"], [], nil, [File.join("spec", "td", "fixture", "bulk_load.yml")], true)
+            }
+            let(:config) {
+              {'out' => {'database' => database, 'table' => table}}
+            }
+
+            it { expect { subject }.not_to raise_error }
+          end
+
+          context 'with arguments' do
+            let(:option) {
+              List::CommandParser.new("connector:issue", ["config"], ['database', 'table'], nil, [File.join("spec", "td", "fixture", "bulk_load.yml"), '--database', database, '--table', table], true)
+            }
+            let(:config) {
+              {'out' => {'database' => 'config_database', 'table' => 'config_table'}}
+            }
 
-          subject
+            it { expect { subject }.not_to raise_error }
+          end
         end
 
         context 'set --database and --table' do
           let(:option) {
             List::CommandParser.new("connector:issue", ["config"], ['database', 'table'], nil, [File.join("spec", "td", "fixture", "bulk_load.yml"), '--database', database, '--table', table], true)
           }
+          let(:config)   { {} }
           let(:expect_config) {
             {'out' => {'database' => database, 'table' => table}}
           }
 
           it 'show warning' do
+            subject
+
             expect(stderr_io.string).to include '--database is obsolete option'
             expect(stderr_io.string).to include '--table is obsolete option'
           end
@@ -113,11 +141,14 @@ module TreasureData::Command
           let(:option) {
             List::CommandParser.new("connector:issue", ["config", 'database', 'table'], [], nil, [database, table, File.join("spec", "td", "fixture", "bulk_load.yml")], true)
           }
+          let(:config)   { {} }
           let(:expect_config) {
             {'out' => {'database' => database, 'table' => table}}
           }
 
           it 'no warning' do
+            subject
+
             expect(stderr_io.string).not_to include '--database is obsolete option'
             expect(stderr_io.string).not_to include '--table is obsolete option'
           end