td 0.15.9 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f678ed9a6f000112a64bd9a86cd05d7d4bb0382e
-  data.tar.gz: ba6f79ddbf05bc67dccec2201c536eb4f508ff35
+SHA256:
+  metadata.gz: 236d538e66d7f11f77ff46593d7b3b78355585120a9f5f542aa0bb536e645da6
+  data.tar.gz: 63943d8db85010b46c2618e87c18f447da27b9d94c079372483d412c55fd220f
 SHA512:
-  metadata.gz: 6ee3352ff5b7d72a3573365e8b23d2331a9f50cf60499be207ec393098f30368dd2f35dd4717cf248fad959fc23debde14f0018657733f671b4b57c2d335a65f
-  data.tar.gz: 2ca8f66b7e4311be225f8fe8456a935a7db785331135878986e5de7e9b493198690b9cd01cf4d774e3a2e77cbe8fc4dd1d60a1b60237fd309bf259b49cc72eee
+  metadata.gz: ca2fdf5e60e84bd33b86a4ab6004de7c499a94a6abace2ef0a8d348fa2879223bc72533f1a2f91571bebcf8dd064f497d9f2844e3837c35586a7f265ae167ac9
+  data.tar.gz: d748e199e3efd292fe97d887161149f41caa23f2ffeb49c2e025962c30d20d5b40538e7eadb75a05f9fca9eee0bd24958d4a331905c7d0dfa27c51bec17342f0

data/lib/td/command/export.rb

@@ -7,17 +7,31 @@ module Command
 
   def export_result(op)
     wait = false
+    priority = nil
+    retry_limit = nil
 
     op.on('-w', '--wait', 'wait until the job is completed', TrueClass) {|b|
       wait = b
     }
+    op.on('-P', '--priority PRIORITY', 'set priority') {|s|
+      priority = job_priority_id_of(s)
+      unless priority
+        raise "unknown priority #{s.inspect} should be -2 (very-low), -1 (low), 0 (normal), 1 (high) or 2 (very-high)"
+      end
+    }
+    op.on('-R', '--retry COUNT', 'automatic retrying count', Integer) {|i|
+      retry_limit = i
+    }
 
     target_job_id, result = op.cmd_parse
 
     client = get_ssl_client
 
-    opts = {}
-    opts['result'] = result
+    opts = {
+      result: result,
+      retry_limit: retry_limit,
+      priority: priority,
+    }
     job = client.result_export(target_job_id, opts)
 
     $stderr.puts "result export job #{job.job_id} is queued."

data/lib/td/updater.rb

@@ -142,11 +142,11 @@ module ModuleDefinition
   end
 
   def version_endpoint
-    "#{endpoint_root}/latest_version.#{package_category}"
+    "#{endpoint_root}/latest_version_0_16.#{package_category}"
   end
 
   def update_package_endpoint
-    "#{endpoint_root}/td-update-#{package_category}.zip"
+    "#{endpoint_root}/td-update-#{package_category}-0-16.zip"
   end
 
   def update(autoupdate = false)
@@ -181,7 +181,7 @@ module ModuleDefinition
               zip.extract(entry, target) { true }
             end
           end
-          $stdout.print "done\n"
+          $stdout.print " done\n"
 
           FileUtils.rm "#{download_dir}/td-update.zip"
 
@@ -221,30 +221,6 @@ module ModuleDefinition
       end
       load('td/updater.rb') # reload updated updater
     end
-
-    # check every hour if the toolbelt can be updated.
-    # => If so, update in the background
-    if File.exists?(last_toolbelt_autoupdate_timestamp)
-      return if (Time.now.to_i - File.mtime(last_toolbelt_autoupdate_timestamp).to_i) < 60 * 60 * 1 # every 1 hours
-    end
-    log_path = File.join(home_directory, '.td', 'autoupdate.log')
-    FileUtils.mkdir_p File.dirname(log_path)
-    td_binary = File.expand_path($0)
-    pid = if defined?(RUBY_VERSION) and RUBY_VERSION =~ /^1\.8\.\d+/
-      fork do
-        exec("#{Shellwords.escape(td_binary)} update &> #{Shellwords.escape(log_path)} 2>&1")
-      end
-    else
-      log_file = File.open(log_path, "w")
-      spawn(td_binary, 'update', :err => log_file, :out => log_file)
-    end
-    Process.detach(pid)
-    FileUtils.mkdir_p File.dirname(last_toolbelt_autoupdate_timestamp)
-    FileUtils.touch last_toolbelt_autoupdate_timestamp
-  end
-
-  def last_toolbelt_autoupdate_timestamp
-    File.join(home_directory, ".td", "autoupdate.last")
   end
 
   #

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.15.9'
+  TOOLBELT_VERSION = '0.16.0'
 end

data/spec/td/command/export_spec.rb

@@ -137,6 +137,15 @@ module TreasureData::Command
       let(:option) {
         List::CommandParser.new("export:result", ["target_job_id", "result_url"], [], nil, option_list, true)
       }
+      let(:option_with_retry) {
+        List::CommandParser.new("export:result", ["target_job_id", "result_url"], [], nil, ['-R', '3'] + option_list, true)
+      }
+      let(:option_with_priority) {
+        List::CommandParser.new("export:result", ["target_job_id", "result_url"], [], nil, ['-P', '-2'] + option_list, true)
+      }
+      let(:option_with_wrong_priority) {
+        List::CommandParser.new("export:result", ["target_job_id", "result_url"], [], nil, ['-P', '3'] + option_list, true)
+      }
       let(:option_list) { [110, 'mysql://user:pass@host.com/database/table'] }
       let(:job_id)    { 111 }
 
@@ -153,6 +162,24 @@ module TreasureData::Command
           command.export_result(option)
         }.not_to raise_exception
       end
+
+      it 'works with retry option' do
+        expect {
+          command.export_result(option_with_retry)
+        }.not_to raise_exception
+      end
+
+      it 'works with priority option' do
+        expect {
+          command.export_result(option_with_priority)
+        }.not_to raise_exception
+      end
+
+      it 'detects wrong priority option' do
+        expect {
+          command.export_result(option_with_wrong_priority)
+        }.to raise_exception
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.15.9
+  version: 0.16.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing