td 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebe67b2367225f0f76628747040e690fcaeb12e6ac87b1f23942fab375c1b4b
-  data.tar.gz: 9dcb16a1c380e358228f0d0ec4a46278e558936426f9f72df569f9482ddcb255
+  metadata.gz: c5b298b2bc367af92e02a5c12b99851eb33241ccf1a695a273ddf3b9809a602f
+  data.tar.gz: aae07a24b93c4f728d982deb6be0b99741ccb8bf74c1d806cbf8f506746e188f
 SHA512:
-  metadata.gz: b2616cbddece9bc85c97144be570779a3b12abf640eb06811e40704d931f23ee5d1fe4c7bba479e45e5d9cac2b781a2fc248db2efe4faa9fd22091281bf9745f
-  data.tar.gz: 1d3e79c3f50093eefb7a43d91d4350d7b96f924d1eb38a1df67d486d2144e16d666d4b440c957bf7ded2b73326f57e5e2b3c184b548e358f4ae85b46ae825005
+  metadata.gz: 48f070f557923c3491dc2abe1125077b711ed5393c077a04345f80e2553a26e28dd1d04878712e5a47f4192f416ed049cc7aebcccab891c2e697ba0afaf1a208
+  data.tar.gz: c0c1ffa341bc4803c561c8852ba4b7cd51668fc0067faf2060644a9bd48d9c877a17165c7e79e32b28ffe8d03082cc43d524f58f4ec6395e3443f52a2468ae41

data/.circleci/config.yml

@@ -19,13 +19,13 @@ commands:
           shell: powershell.exe
           command: choco install msys2 -y
       - run:
-          name: "Install Ruby devkit"
+          name: "Install Ruby version"
           shell: powershell.exe
-          command: ridk install 2 3
+          command: choco install ruby --version=<<parameters.ruby_version>> --allow-downgrade --yes
       - run:
-          name: "Install Ruby version"
+          name: "Install Ruby devkit"
           shell: powershell.exe
-          command: choco install ruby --version=<<parameters.ruby_version>>
+          command: ridk install 2 3
       - run:
           name: "Install bundler"
           command: gem install bundler
@@ -54,12 +54,6 @@ commands:
 
 jobs:
 
-  ruby_27:
-    docker:
-      - image: cimg/ruby:2.7-browsers
-    steps:
-      - run-tests-flow
-
   ruby_30:
     docker:
       - image: cimg/ruby:3.0-browsers
@@ -103,7 +97,6 @@ jobs:
 workflows:
   tests:
     jobs:
-      - ruby_27
       - ruby_30
       - ruby_31
       - ruby_32

data/ChangeLog

@@ -1,3 +1,11 @@
+== 2026-11-04 version 0.20.0
+
+* Patch rubyzip v3.4
+
+== 2025-08-28 version 0.19.1
+
+* Update query command help text
+
 == 2025-08-05 version 0.19.0
 
 * Remove partial_delete api.

data/README.rdoc

@@ -51,7 +51,7 @@ Install following binary packages:
 
   * MinGW with MSYS Basic System and using mingw-get-inst
   * Git for Windows, with Windows Command Prompt support
-  * Ruby ruby-1.9.3p327 using RubyInstaller for Windows, with PATH update
+  * Ruby 3.0 or later using RubyInstaller for Windows, with PATH update
   * Inno Setup 5
 
 Then run following commands on MinGW Shell:

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler'
-require 'zip/zip'
+require 'zip'
 Bundler::GemHelper.install_tasks
 
 task :default => :build
@@ -133,7 +133,7 @@ def download_resource(url)
 end
 
 def zip_files(zip_name, target_dir)
-  Zip::ZipFile.open(zip_name, Zip::ZipFile::CREATE) do |zip|
+  Zip::File.open(zip_name, create: true) do |zip|
     Dir["#{target_dir}/**/*"].each do |file|
       zipped_path = file[target_dir.length + 1..-1]
       zip.add(zipped_path, file) { true }

data/appveyor.yml

@@ -1,17 +1,26 @@
 ---
 version: "{build}"
+image: Visual Studio 2022
 clone_depth: 10
 install:
+  - IF NOT EXIST C:\Ruby%ruby_version%\bin\ruby.exe EXIT /B 1
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby --version
+  - call ridk install 3
+  - call ridk enable
+  - gcc -dumpmachine
   - gem --version
   - bundle --version
+  # Ruby 3.1 callback declarations require pre-C23 semantics with modern GCC.
+  - bundle config set --local build.yajl-ruby "--with-cflags=-std=gnu17"
   - bundle install
 build_script:
   - bundle exec rake build
 test_script:
   - bundle exec rake spec
+on_failure:
+  - ps: Get-Content "C:\Ruby$env:ruby_version\lib\ruby\gems\*\extensions\*\*\msgpack-*\mkmf.log" -ErrorAction SilentlyContinue
 environment:
   matrix:
-    - ruby_version: "26"
-    - ruby_version: "26-x64"
+    - ruby_version: "31"
+    - ruby_version: "31-x64"

data/lib/td/command/job.rb

@@ -28,6 +28,8 @@ module Command
     /\A[\+]?2\z/ => 2,
   }
 
+  QUERY_JOB_TYPES = [:hive, :pig, :impala, :presto, :trino].freeze
+
   def job_list(op)
     page = 0
     skip = 0
@@ -176,7 +178,7 @@ private
     $stdout.puts "Start At    : #{job.start_at}"
     $stdout.puts "End At      : #{job.end_at}"
     # exclude some fields from bulk_import_perform type jobs
-    if [:hive, :pig, :impala, :presto].include?(job.type)
+    if QUERY_JOB_TYPES.include?(job.type)
       $stdout.puts "Priority    : #{job_priority_name_of(job.priority)}"
       $stdout.puts "Retry limit : #{job.retry_limit}"
       $stdout.puts "Output      : #{job.result_url}"
@@ -192,7 +194,7 @@ private
       if [:hive].include?(job.type)
         $stdout.puts "CPU time    : #{Command.humanize_time(job.cpu_time, true)}"
       end
-      if [:hive, :pig, :impala, :presto].include?(job.type)
+      if QUERY_JOB_TYPES.include?(job.type)
         $stdout.puts "Result size : #{Command.humanize_bytesize(job.result_size, 2)}"
       end
     end
@@ -200,11 +202,11 @@ private
     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
+      if QUERY_JOB_TYPES.include?(job.type) && !exclude
         show_result_with_retry(job, output, limit, format, render_opts)
       end
     else
-      if [:hive, :pig, :impala, :presto].include?(job.type) && !exclude && job.finished?
+      if QUERY_JOB_TYPES.include?(job.type) && !exclude && job.finished?
         show_result_with_retry(job, output, limit, format, render_opts)
       end
 

data/lib/td/command/query.rb

@@ -65,7 +65,7 @@ module Command
     op.on('-q', '--query PATH', 'use file instead of inline query') {|s|
       query = File.open(s) { |f| f.read.strip }
     }
-    op.on('-T', '--type TYPE', 'set query type (hive, presto)') {|s|
+    op.on('-T', '--type TYPE', 'set query type (hive, presto, trino)') {|s|
       type = s.to_sym
     }
     op.on('--sampling DENOMINATOR', 'OBSOLETE - enable random sampling to reduce records 1/DENOMINATOR', Integer) {|i|

data/lib/td/command/sched.rb

@@ -77,7 +77,7 @@ module Command
     op.on('-R', '--retry COUNT', 'automatic retrying count', Integer) {|i|
       retry_limit = i
     }
-    op.on('-T', '--type TYPE', 'set query type (hive)') {|s|
+    op.on('-T', '--type TYPE', 'set query type (hive, presto, trino)') {|s|
       type = s
     }
     op.on('--engine-version ENGINE_VERSION', 'EXPERIMENTAL: specify query engine version by name') {|s|
@@ -195,7 +195,7 @@ module Command
     op.on('-R', '--retry COUNT', 'automatic retrying count', Integer) {|i|
       retry_limit = i
     }
-    op.on('-T', '--type TYPE', 'set query type (hive)') {|s|
+    op.on('-T', '--type TYPE', 'set query type (hive, presto, trino)') {|s|
       type = s
     }
     op.on('--engine-version ENGINE_VERSION', 'EXPERIMENTAL: specify query engine version by name') {|s|

data/lib/td/command/workflow.rb

@@ -246,8 +246,8 @@ EOF
         return false
       end
       if output =~ /openjdk version/ or output =~ /java version/
-        m = output.match(/version "(\d+)\.(\d+)\.(\d+)(\.\d+)?(?:_(\d+))?"/)
-        if not m or m.size < 4
+        m = output.match(/version "(\d+)(?:\.(\d+))?(?:[._+-][^"]*)?"/)
+        if not m
           return false
         end
         major = m[1].to_i
@@ -357,17 +357,20 @@ EOF
     private
     def extract_zip(zip_archive, destination, strip)
       require 'fileutils'
-      require 'zip/zip'
-      Zip::ZipFile.open(zip_archive) { |zip_file|
+      require 'zip'
+      Zip::File.open(zip_archive) { |zip_file|
         zip_file.each { |f|
           stripped = strip_components(f.name, strip)
           if stripped.empty?
             next
           end
-          dest = File.join destination, stripped
+          dest = File.expand_path(stripped, destination)
+          unless dest.start_with?(File.expand_path(destination) + File::SEPARATOR)
+            raise Zip::EntryNameError, f.name
+          end
           FileUtils.rm_rf dest if File.exist? dest
           FileUtils.mkdir_p(File.dirname(dest))
-          zip_file.extract(f, dest)
+          f.extract(stripped, destination_directory: destination)
         }
       }
     end

data/lib/td/updater.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require "fileutils"
 require "shellwords"
-require "zip/zip"
+require "zip"
 
 module TreasureData
 module Updater
@@ -155,7 +155,7 @@ module ModuleDefinition
       require "td"
       require 'open-uri'
       require "tmpdir"
-      require "zip/zip"
+      require "zip"
 
       latest_version = fetch(version_endpoint)
 
@@ -175,11 +175,14 @@ module ModuleDefinition
           indicator.finish
 
           $stdout.print "Unpacking updated toolbelt package..."
-          Zip::ZipFile.open("#{download_dir}/td-update.zip") do |zip|
+          Zip::File.open("#{download_dir}/td-update.zip") do |zip|
             zip.each do |entry|
-              target = File.join(download_dir, entry.to_s)
+              target = File.expand_path(entry.name, download_dir)
+              unless target.start_with?(File.expand_path(download_dir) + File::SEPARATOR)
+                raise Zip::EntryNameError, entry.name
+              end
               FileUtils.mkdir_p(File.dirname(target))
-              zip.extract(entry, target) { true }
+              entry.extract(destination_directory: download_dir) { true }
             end
           end
           $stdout.print " done\n"

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.19.0'
+  TOOLBELT_VERSION = '0.20.0'
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
 require 'json'
+require 'td/helpers'
 
 if ENV['SIMPLE_COV']
   # SimpleCov
@@ -15,8 +16,8 @@ if ENV['SIMPLE_COV']
   end
 end
 
-# XXX skip coverage setting if run appveyor. Because, fail to push coveralls in appveyor.
-unless ENV['APPVEYOR']
+# Skip Coveralls on Windows because the legacy client's TLS 1.0 uploads fail.
+unless ENV['APPVEYOR'] || TreasureData::Helpers.on_windows?
   require 'coveralls'
   Coveralls.wear!('rails')
 end

data/spec/td/command/workflow_spec.rb

@@ -93,6 +93,28 @@ module TreasureData::Command
       FileUtils.rm_rf tmpdir
     }
 
+    describe '#detect_system_java' do
+      {
+        '1.8.0_472' => true,
+        '11.0.2' => true,
+        '17.0.17+10-LTS' => true,
+        '21' => true,
+        '25-ea' => true,
+        '1.7.0_80' => false,
+        '8' => false,
+        'invalid' => false,
+      }.each do |version, supported|
+        it "#{supported ? 'accepts' : 'rejects'} Java #{version} for system workflow execution" do
+          status = double(:success? => true)
+          allow(Open3).to receive(:capture2e).with('java', '-version').and_return(
+              ["openjdk version \"#{version}\"", status])
+          with_env('TD_WF_JAVA', '') do
+            expect(command.send(:detect_system_java)).to eq(supported)
+          end
+        end
+      end
+    end
+
     describe '#workflow' do
       let(:empty_option) {
         List::CommandParser.new("workflow", [], [], nil, [], true)

data/spec/td/zip_extraction_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+require 'td/command/common'
+require 'td/command/workflow'
+require 'td/updater'
+require 'tmpdir'
+
+describe 'ZIP extraction' do
+  include_context 'quiet_out'
+
+  around do |example|
+    Dir.mktmpdir do |directory|
+      @directory = directory
+      example.run
+    end
+  end
+
+  let(:destination) { File.join(@directory, 'upload') }
+  let(:archive) { File.join(@directory, 'archive.zip') }
+
+  def write_archive(name)
+    Zip::OutputStream.open(archive) do |zip|
+      zip.put_next_entry(name)
+      zip.write('new content')
+    end
+  end
+
+  shared_examples 'confined extraction' do
+    it 'extracts nested files into the destination' do
+      write_archive("#{prefix}bin/java")
+      extract
+      expect(File.read(File.join(destination, 'bin/java'))).to eq('new content')
+    end
+
+    it 'rejects sibling paths sharing the destination prefix before modifying files' do
+      sibling = File.join(@directory, 'upload_backup')
+      FileUtils.mkdir_p(sibling)
+      victim = File.join(sibling, 'owned.sh')
+      File.write(victim, 'keep')
+      write_archive("#{prefix}../upload_backup/owned.sh")
+
+      expect { extract }.to raise_error(Zip::EntryNameError)
+      expect(File.read(victim)).to eq('keep')
+    end
+  end
+
+  context 'workflow Java installation' do
+    let(:prefix) { 'jdk/' }
+    let(:command) { Class.new { include TreasureData::Command }.new }
+
+    def extract
+      command.send(:extract_zip, archive, destination, 1)
+    end
+
+    include_examples 'confined extraction'
+  end
+
+  context 'toolbelt update' do
+    let(:prefix) { '' }
+    let(:updater) { Object.new.extend(TreasureData::Updater::ModuleDefinition) }
+
+    before do
+      FileUtils.mkdir_p(destination)
+      allow(Dir).to receive(:mktmpdir).and_yield(destination)
+      allow(updater).to receive(:updating_lock_path).and_return(File.join(@directory, 'lock'))
+      allow(updater).to receive(:updated_client_path).and_return(File.join(@directory, 'updated'))
+      allow(updater).to receive(:latest_local_version).and_return('0.0.0')
+      allow(updater).to receive(:fetch).and_return('1.0.0')
+      allow(updater).to receive(:client_version_from_path).and_return('1.0.0')
+      allow(updater).to receive(:package_category).and_return('exe')
+      allow(updater).to receive(:stream_fetch) do |url, file|
+        IO.copy_stream(archive, file)
+      end
+    end
+
+    def extract
+      updater.update
+    end
+
+    include_examples 'confined extraction'
+  end
+end

data/td.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths         = ['lib']
-  gem.required_ruby_version = '>= 2.1'
+  gem.required_ruby_version = '>= 3.0'
   gem.licenses              = ["Apache-2.0"]
 
   gem.add_dependency "msgpack"
@@ -24,13 +24,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency "parallel", "~> 1.20.0"
   gem.add_dependency "td-client", ">= 1.0.8", "< 4"
   gem.add_dependency "td-logger", ">= 0.3.21", "< 2"
-  gem.add_dependency "rubyzip", "~> 1.3.0"
-  gem.add_dependency "zip-zip", "~> 0.3"
+  gem.add_dependency "rubyzip", "~> 3.4"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_dependency "csv"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency 'webrick'
   gem.add_development_dependency "simplecov"
-  gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'coveralls' unless Gem.win_platform?
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-05 00:00:00.000000000 Z
+date: 2026-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -132,28 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: zip-zip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +330,7 @@ files:
 - spec/td/helpers_spec.rb
 - spec/td/updater_spec.rb
 - spec/td/version_spec.rb
+- spec/td/zip_extraction_spec.rb
 - td.gemspec
 homepage: http://treasure-data.com/
 licenses:
@@ -357,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -401,3 +388,4 @@ test_files:
 - spec/td/helpers_spec.rb
 - spec/td/updater_spec.rb
 - spec/td/version_spec.rb
+- spec/td/zip_extraction_spec.rb