td 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf59038a7741d3ab97da16cc2cb5d017a15e6a98564eac31c9cf6505710aba6
-  data.tar.gz: 87783cf3e0c522354472a60e154d0c9a3695f41d0ecf3e5b0540e35f8ae756b2
+  metadata.gz: 07bd70e5cee714b760756d94558404b9ecc4598c9c9c5a16794f4e15cb61a8a5
+  data.tar.gz: ddc1af1f1076065a2e71e7f52b0efb7494cd1c85d3262bcafee94224c039821c
 SHA512:
-  metadata.gz: 7ca06116ebddd6217595865455533d93da3d98438ef4a4fb2dda6a52cae85575405676634095dff8e221ac30f72a008ccb5b607350789bfa2a1d5ce84f0d4b99
-  data.tar.gz: 5f90407907760f8e108d5eda9a2f06461510e474a9d33a59a61351724c9188d57bc268e56bd56a08f29596a0be36be0cd0098503375fa292a486823717f96b35
+  metadata.gz: 93357bcda065b255b1e8d4f2e1318c05f5a00981a85fae7bfaf6c2c80cc9e81e55def7153323a7e2376ea5faff67273ff4e3bf24bdd2e71d7d5d0852989ecf2b
+  data.tar.gz: b8ad6a5ad0c55fe8b06edb55468b58c1f0ef2d5c59ee1f97f0e25b40cf4670b43f41574303dea9a065388f7ad8f2c258de0a605137ce2b84ca2989496a1ad7f7

data/.travis.yml

@@ -5,9 +5,10 @@ jdk:
 
 rvm:
   - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
   - ruby-head
 
 gemfile:

data/ChangeLog

@@ -1,3 +1,13 @@
+== 2018-11-21 version 0.16.3
+
+* Support running status of job for td export:result command #207
+* Support eu01 region #211
+* Use Ruby 2.4.5 #215
+
+== 2018-04-24 version 0.16.2
+
+* repackage Windows td-toolbelt (no code change)
+
 == 2018-04-17 version 0.16.1
 
 * Use x64 binary #206

data/README.rdoc

@@ -8,7 +8,7 @@ to interact with the REST API in managing databases and jobs on the Treasure Dat
 
 For more info about Treasure Data, see <http://treasure-data.com/>.
 
-For full documentation see <http://docs.treasure-data.com/>.
+For full documentation see <https://support.treasuredata.com/hc/en-us>.
 
 = Getting Started
 
@@ -43,6 +43,8 @@ And then run following commands:
     $ /usr/local/td/ruby/bin/bundle install
     $ /usr/local/td/ruby/bin/rake pkg:build
 
+It uses https://github.com/treasure-data/ruby-osx-packager
+
 == Windows
 
 Install following binary packages:
@@ -69,7 +71,7 @@ The Bulk Import CLI is downloaded automatically at the first call to any of the
 need internet connectivity in order to fetch the Bulk Import CLI JAR file from the
 {Central Maven repository}[http://central.maven.org/maven2/com/treasuredata/td-import/]
 and take advantage of these advanced features. If you need to setup a proxy, please consult this
-{documentation}[http://docs.treasuredata.com/articles/faq#how-can-i-use-the-td-command-through-a-proxy] page.
+{documentation}[https://support.treasuredata.com/hc/en-us/articles/360001502527-Legacy-Bulk-Import-Tips-and-Tricks#How%20to%20use%20a%20proxy%20server] page.
 
 The log levels and properties of the Bulk Import CLI can be configured in a +logging.properties+ file. A default
 configuration is provided in a file within the gem or Toolbelt folder root, in the +java/+ folder. If you wish to

data/Rakefile

@@ -14,10 +14,6 @@ def version
   TreasureData::TOOLBELT_VERSION
 end
 
-task "jar" do
-  system('./build/update-td-import-java.sh')
-end
-
 def project_root_path(path)
   "#{PROJECT_ROOT}/#{path}"
 end

data/lib/td/command/account.rb

@@ -41,7 +41,7 @@ module Command
       end
     end
 
-    $stdout.puts "Enter your Treasure Data credentials. For Google SSO user, please see https://docs.treasuredata.com/articles/command-line#google-sso-users"
+    $stdout.puts "Enter your Treasure Data credentials. For Google SSO user, please see https://support.treasuredata.com/hc/en-us/articles/360000720048-Treasure-Data-Toolbelt-Command-line-Interface#Google%20SSO%20Users"
     unless user_name
       begin
         $stdout.print "Email: "

data/lib/td/command/export.rb

@@ -32,8 +32,15 @@ module Command
       retry_limit: retry_limit,
       priority: priority,
     }
-    job = client.result_export(target_job_id, opts)
+    if wait
+      job = client.job(target_job_id)
+      if !job.finished?
+        $stderr.puts "target job #{target_job_id} is still running..."
+        wait_job(job)
+      end
+    end
 
+    job = client.result_export(target_job_id, opts)
     $stderr.puts "result export job #{job.job_id} is queued."
     $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job.job_id}' to show the status."
 

data/lib/td/command/job.rb

@@ -196,6 +196,7 @@ private
     end
 
     if wait && !job.finished?
+      $stderr.puts "the job #{job.job_id} is still running..."
       wait_job(job)
       if [:hive, :pig, :impala, :presto].include?(job.type) && !exclude
         show_result_with_retry(job, output, limit, format, render_opts)
@@ -227,8 +228,6 @@ private
   end
 
   def wait_job(job, first_call = false, wait = nil)
-    $stderr.puts "queued..."
-
     cmdout_lines = 0
     stderr_lines = 0
     max_error_counts = JOB_WAIT_MAX_RETRY_COUNT_ON_NETWORK_ERROR

data/lib/td/command/table.rb

@@ -40,7 +40,7 @@ module Command
     if HIVE_RESERVED_KEYWORDS.include?(table_name.upcase)
       $stderr.puts "* WARNING *"
       $stderr.puts "  '#{table_name}' is a reserved keyword in Hive. We recommend renaming the table."
-      $stderr.puts "  For a list of all reserved keywords, see our FAQ: http://docs.treasure-data.com/articles/faq"
+      $stderr.puts "  For a list of all reserved keywords, see our FAQ: https://support.treasuredata.com/hc/en-us/articles/360009531173/"
     end
 
     client = get_client
@@ -348,6 +348,7 @@ module Command
     $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job.job_id}' to show the status."
 
     if wait
+      $stderr.puts "queued..."
       wait_job(job)
       $stdout.puts "Status     : #{job.status}"
     end

data/lib/td/config.rb

@@ -166,18 +166,8 @@ class Config
 
   def self.workflow_endpoint
     case self.endpoint_domain
-    when 'api.treasuredata.com'
-      'https://api-workflow.treasuredata.com'
-    when /\Aapi-([^.]*).connect.treasuredata.com\z/
-      "https://api-workflow-#{$1}.connect.treasuredata.com"
-    when 'api-staging.treasuredata.com'
-      'https://api-staging-workflow.treasuredata.com'
-    when 'api.treasuredata.co.jp'
-      'https://api-workflow.treasuredata.co.jp'
-    when /\Aapi-([^.]*).connect.treasuredata.co.jp\z/
-      "https://api-workflow-#{$1}.connect.treasuredata.co.jp"
-    when 'api-staging.treasuredata.co.jp'
-      'https://api-staging-workflow.treasuredata.co.jp'
+    when /\Aapi(-(?:staging|development))?(-[a-z]+)?.(connect\.)?(eu01\.)?treasuredata.(com|co\.jp)\z/
+      "https://api#{$1}-workflow#{$2}.#{$3}#{$4}treasuredata.#{$5}"
     else
       raise ConfigError, "Workflow is not supported for '#{self.endpoint}'"
     end

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.16.1'
+  TOOLBELT_VERSION = '0.16.3'
 end

data/spec/td/command/export_spec.rb

@@ -146,12 +146,15 @@ module TreasureData::Command
       let(:option_with_wrong_priority) {
         List::CommandParser.new("export:result", ["target_job_id", "result_url"], [], nil, ['-P', '3'] + option_list, true)
       }
+      let(:option_with_wait) {
+        List::CommandParser.new("export:result", ["target_job_id", "result_url"], [], nil, ['-w'] + option_list, true)
+      }
       let(:option_list) { [110, 'mysql://user:pass@host.com/database/table'] }
       let(:job_id)    { 111 }
+      let(:client)    { double(:client) }
+      let(:job)       { double(:job, job_id: job_id) }
 
       before do
-        client = double(:client)
-        job = double(:job, job_id: job_id)
         allow(client).to receive(:result_export).and_return(job)
 
         allow(command).to receive(:get_client).and_return(client)
@@ -180,6 +183,18 @@ module TreasureData::Command
           command.export_result(option_with_wrong_priority)
         }.to raise_exception
       end
+
+      it 'detects wait option' do
+        target_job = double('target_job')
+        expect(client).to receive(:job).and_return(target_job)
+        count_target_job_finished_p = 0
+        expect(target_job).to receive(:finished?).and_return(false)
+        allow(target_job).to receive(:wait)
+        allow(target_job).to receive(:status)
+        allow(job).to receive(:wait)
+        allow(job).to receive(:status)
+        command.export_result(option_with_wait)
+      end
     end
   end
 end

data/spec/td/config_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tempfile'
 require 'td/config'
 
 describe TreasureData::Config do
@@ -19,18 +20,24 @@ describe TreasureData::Config do
         it { is_expected.to eq 'https://api-workflow.treasuredata.com' }
       end
     end
-    context 'api-hoge.connect.treasuredata.com' do
-      let(:api_endpoint){ 'api-hoge.connect.treasuredata.com' }
-      it { is_expected.to eq 'https://api-workflow-hoge.connect.treasuredata.com' }
-    end
     context 'api.treasuredata.co.jp' do
       let(:api_endpoint){ 'api.treasuredata.co.jp' }
       it { is_expected.to eq 'https://api-workflow.treasuredata.co.jp' }
     end
+    context 'api.eu01.treasuredata.com' do
+      let(:api_endpoint){ 'api.eu01.treasuredata.com' }
+      it { is_expected.to eq 'https://api-workflow.eu01.treasuredata.com' }
+    end
+
+    context 'api-hoge.connect.treasuredata.com' do
+      let(:api_endpoint){ 'api-hoge.connect.treasuredata.com' }
+      it { is_expected.to eq 'https://api-workflow-hoge.connect.treasuredata.com' }
+    end
     context 'api-hoge.connect.treasuredata.co.jp' do
       let(:api_endpoint){ 'api-hoge.connect.treasuredata.co.jp' }
       it { is_expected.to eq 'https://api-workflow-hoge.connect.treasuredata.co.jp' }
     end
+
     context 'api-staging.treasuredata.com' do
       let(:api_endpoint){ 'api-staging.treasuredata.com' }
       it { is_expected.to eq 'https://api-staging-workflow.treasuredata.com' }
@@ -39,6 +46,24 @@ describe TreasureData::Config do
       let(:api_endpoint){ 'api-staging.treasuredata.co.jp' }
       it { is_expected.to eq 'https://api-staging-workflow.treasuredata.co.jp' }
     end
+    context 'api-staging.eu01.treasuredata.com' do
+      let(:api_endpoint){ 'api-staging.eu01.treasuredata.com' }
+      it { is_expected.to eq 'https://api-staging-workflow.eu01.treasuredata.com' }
+    end
+
+    context 'api-development.treasuredata.com' do
+      let(:api_endpoint){ 'api-development.treasuredata.com' }
+      it { is_expected.to eq 'https://api-development-workflow.treasuredata.com' }
+    end
+    context 'api-development.treasuredata.co.jp' do
+      let(:api_endpoint){ 'api-development.treasuredata.co.jp' }
+      it { is_expected.to eq 'https://api-development-workflow.treasuredata.co.jp' }
+    end
+    context 'api-development.eu01.treasuredata.com' do
+      let(:api_endpoint){ 'api-development.eu01.treasuredata.com' }
+      it { is_expected.to eq 'https://api-development-workflow.eu01.treasuredata.com' }
+    end
+
     context 'ybi.jp-east.idcfcloud.com' do
       let(:api_endpoint){ 'ybi.jp-east.idcfcloud.com' }
       it 'raise error' do
@@ -46,4 +71,26 @@ describe TreasureData::Config do
       end
     end
   end
+
+  describe '#read' do
+    it 'sets @conf' do
+      Tempfile.create('td.conf') do |f|
+        f << <<-EOF
+# This is comment
+[section1]
+# This is comment
+key=val
+foo=bar
+        EOF
+
+        f.close
+
+        config = TreasureData::Config.new
+        config.read(f.path)
+
+        expect(config["section1.key"]).to eq "val"
+        expect(config["section1.foo"]).to eq "bar"
+      end
+    end
+  end
 end

data/td.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.version               = TreasureData::TOOLBELT_VERSION
   gem.authors               = ["Treasure Data, Inc."]
   gem.email                 = "support@treasure-data.com"
-  gem.has_rdoc              = false
   gem.files                 = `git ls-files`.split("\n").select { |f| !f.start_with?('dist') }
   gem.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack