connector:issue recommend use arugument

now `--database` and `--table` is obsolete

Author: takkanm

lib/td/command/connector.rb

@@ -104,28 +104,43 @@ def connector_preview(op)
     $stdout.puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format, :resize => false)
 
     $stdout.puts "Update #{config_file} and use '#{$prog} " + Config.cl_options_string + "connector:preview #{config_file}' to preview again."
-    $stdout.puts "Use '#{$prog} " + Config.cl_options_string + "connector:issue #{config_file}' to run Server-side bulk load."
+    $stdout.puts "Use '#{$prog} " + Config.cl_options_string + "connector:issue database_name table_name #{config_file}' to run Server-side bulk load."
   end
 
   def connector_issue(op)
-    database = table = nil
-    time_column      = nil
-    wait = exclude   = false
-    auto_create      = false
-
-    op.on('--database DB_NAME', "destination database") { |s| database = s }
-    op.on('--table TABLE_NAME', "destination table") { |s| table = s }
+    option_database = option_table = nil
+    time_column     = nil
+    wait = exclude  = false
+    auto_create     = false
+
+    op.on('--database DB_NAME', "(obsoleted)") { |s|
+      $stderr.puts '--database is obsolete option'
+      option_database = s
+    }
+    op.on('--table TABLE_NAME', "(obsoleted)") { |s|
+      $stderr.puts '--table is obsolete option'
+      option_table = s
+    }
     op.on('--time-column COLUMN_NAME', "data partitioning key") { |s| time_column = s }  # unnecessary but for backward compatibility
     op.on('-w', '--wait', 'wait for finishing the job', TrueClass) { |b| wait = b }
     op.on('-x', '--exclude', 'do not automatically retrieve the job result', TrueClass) { |b| exclude = b }
     op.on('--auto-create-table', "Create table and database if doesn't exist", TrueClass) { |b|
       auto_create = b
     }
 
-    config_file = op.cmd_parse
+    database, table, config_file = nil
+    args = op.cmd_parse
+
+    if args.instance_of? String
+      config_file = args
+      database    = option_database
+      table       = option_table
+    else
+      database, table, config_file = args
+    end
 
-    required('--database', database)
-    required('--table', table)
+    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

lib/td/command/list.rb

@@ -345,7 +345,7 @@ def self.finishup
   add_list 'connector:guess', %w[config?], 'Run guess to generate connector config file', ["connector:guess config.yml -o td-bulkload.yml\n\nexample config.yml:#{connector_guess_example_config}"]
   add_list 'connector:preview', %w[config], 'Show preview of connector execution', ['connector:preview td-bulkload.yml']
 
-  add_list 'connector:issue', %w[config], 'Run one time connector execution', ['connector:issue td-bulkload.yml']
+  add_list 'connector:issue', %w[config database table], 'Run one time connector execution', ['connector:issue example_db event_logs td-bulkload.yml']
 
   add_list 'connector:list', %w[], 'Show list of connector sessions', ['connector:list']
   add_list 'connector:create', %w[name cron database table config], 'Create new connector session', ['connector:create connector1 "0 * * * *" connector_database connector_table td-bulkload.yml']

spec/td/command/connector_spec.rb

@@ -80,6 +80,44 @@ module TreasureData::Command
         end
       end
 
+      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: config}).and_return(1234)
+
+          subject
+        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)
+          }
+
+          it 'show warning' do
+            expect(stderr_io.string).to include '--database is obsolete option'
+            expect(stderr_io.string).to include '--table is obsolete option'
+          end
+        end
+
+        context 'set arguments' do
+          let(:option) {
+            List::CommandParser.new("connector:issue", ["config", 'database', 'table'], [], nil, [database, table, File.join("spec", "td", "fixture", "bulk_load.yml")], true)
+          }
+
+          it 'no warning' do
+            expect(stderr_io.string).not_to include '--database is obsolete option'
+            expect(stderr_io.string).not_to include '--table is obsolete option'
+          end
+        end
+      end
+
       describe 'queueing job' 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)