td 0.16.10 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a372eaff21645cac711c4df4fe0faeba64a8fffed0af8d9de4367f5bdf3d4dae
-  data.tar.gz: b4f0c3751f57780008be2162c78853003b138d9ed691f1c7eef756a8ce6f7237
+  metadata.gz: 7ed6a6e5934d927122c94bd28a5e356e6d422cacf182e97b30d83b9d453c1a29
+  data.tar.gz: eab2f179e910311ac9e0e45325cb366fadfb053268c7707cf4336b8f91e8150d
 SHA512:
-  metadata.gz: 3f332bc9d0cc8659e31d2f737aec26c827a6eda4c980dd0d21ddf0df749fae5595b16950a9ba3195e76361925d190bf8aa5e016dee6f25cf49bdf139e8606363
-  data.tar.gz: af1d0421633676a8938be8cf77474681f05e863006c56561db18b377853ee9f8529c168d1d176a2e4f3156a1eb4acd582241765f52a8aac6ecce0e3e158e1ddf
+  metadata.gz: 74843a395778c6fba9bf45d625ecdccbdaf956a7dabc08f4fe0fc1832e567fef60b6600c38aefcffddbd619cddaeb05a45ad71d457df9c31c02ee95ffa934fd5
+  data.tar.gz: 0f629764b2006b045235c7e836c0f51edceaa620679833182aba1ce2ce1538e27c6bae28804e913e51f805f1e535f27e6bb5e2eb24a2aade58dc450ad67b011b

data/.circleci/config.yml

@@ -2,8 +2,8 @@ version: 2.1
 
 
 orbs:
-  ruby: circleci/ruby@1.1.4 
-  win: circleci/windows@2.4.0
+  ruby: circleci/ruby@2.0.0
+  win: circleci/windows@5.0.0
 
 
 commands:
@@ -12,7 +12,7 @@ commands:
     steps:
       - run:
           name: "Install MSYS2"
-          command: choco install msys2
+          command: choco install msys2 -y
       - run:
           name: "Install Ruby devkit"
           command: ridk install 2 3
@@ -21,7 +21,7 @@ commands:
     steps:
       - run:
           name: Which bundler?
-          command: bundle -v
+          command: ruby -v; bundle -v
       - run:
           name: Bundle install
           command: bundle install
@@ -41,36 +41,28 @@ commands:
 
 jobs:
 
-  ruby_25:
-    machine:
-      image: ubuntu-1604:202004-01
+  ruby_27:
+    docker:
+      - image: cimg/ruby:2.7-browsers
     steps:
-      - ruby/install:
-          version: '2.5'
       - run-tests-flow
 
-  ruby_26:
-    machine:
-      image: ubuntu-1604:202004-01
+  ruby_30:
+    docker:
+      - image: cimg/ruby:3.0-browsers
     steps:
-      - ruby/install:
-          version: '2.6'
       - run-tests-flow
 
-  ruby_27:
-    machine:
-      image: ubuntu-1604:202004-01
+  ruby_31:
+    docker:
+      - image: cimg/ruby:3.1-browsers
     steps:
-      - ruby/install:
-          version: '2.7'
       - run-tests-flow
 
-  ruby_30:
-    machine:
-      image: ubuntu-1604:202004-01
+  ruby_32:
+    docker:
+      - image: cimg/ruby:3.2-browsers
     steps:
-      - ruby/install:
-          version: '3.0'
       - run-tests-flow
 
   win_ruby:
@@ -89,8 +81,8 @@ jobs:
 workflows:
   tests:
     jobs:
-      - ruby_25
-      - ruby_26
       - ruby_27
       - ruby_30
-      # - win_ruby # Not testing on windows for now due to old version of ridk. Testing in Appveyor instead, will reconsider when CircleCI update ridk in their windows image.
+      - ruby_31
+      - ruby_32
+      - win_ruby

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '29 4 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

data/.gitignore

@@ -1,9 +1,11 @@
 .bundle
 .DS_Store
+bundler
 build/td-import-java
 Gemfile.lock
 vendor/*
 /pkg/
 build/*
 coverage/
+dist/resources/pkg/ruby*.pkg
 *~

data/ChangeLog

@@ -1,3 +1,12 @@
+== 2023-03-18 version 0.17.1
+
+* Fix account command error on windows (for Ruby 3) #262
+
+== 2023-03-28 version 0.17.0
+
+* Show job's start & end time for td job:show [job_id] #253
+* Support Ruby 3.2 by updating deprecated File.exists? to File.exist? #260
+
 == 2020-09-16 version 0.16.10
 
 * Support proxy with username and password

data/Rakefile

@@ -50,9 +50,12 @@ def install_use_gems(target_dir)
         puts "Copy local gem #{ENV['TD_TOOLBELT_LOCAL_CLIENT_GEM']} to #{Dir.pwd}"
         FileUtils.cp File.expand_path(ENV['TD_TOOLBELT_LOCAL_CLIENT_GEM']), Dir.pwd
       end
-      Gem::GemRunner.new.run ["install", gem, "--no-rdoc", "--no-ri"]
+      Gem::GemRunner.new.run ["install", gem, "--no-document"] # Use one of two commands bellow. Gem::GemRunner on ruby 3.0.5 has some weird bug
+      # sh "gem install \"#{gem}" --no-document"
+      # sh "/usr/local/td/ruby/bin/gem install \"#{gem}\" --no-document" # On OSX
     rescue Gem::SystemExitException => e
       unless e.exit_code.zero?
+        puts e, e.backtrace.join("\n")
         raise e
       end
     end

data/lib/td/command/account.rb

@@ -113,12 +113,16 @@ module Command
 
   private
   if Helpers.on_windows?
-    require 'Win32API'
+    require 'fiddle'
 
     def get_char
-      Win32API.new('msvcrt', '_getch', [], 'L').Call
+      msvcrt = Fiddle.dlopen('msvcrt')
+      getch = Fiddle::Function.new(msvcrt['_getch'], [], Fiddle::TYPE_CHAR)
+      getch.call()
     rescue Exception
-      Win32API.new('crtdll', '_getch', [], 'L').Call
+      crtdll = Fiddle.dlopen('crtdll')
+      getch = Fiddle::Function.new(crtdll['_getch'], [], Fiddle::TYPE_CHAR)
+      getch.call()
     end
 
     def get_password

data/lib/td/command/job.rb

@@ -173,6 +173,8 @@ private
     $stdout.puts "Status      : #{job.status}"
     $stdout.puts "Type        : #{job.type}"
     $stdout.puts "Database    : #{job.db_name}"
+    $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)
       $stdout.puts "Priority    : #{job_priority_name_of(job.priority)}"
@@ -404,7 +406,7 @@ private
       raise "Unknown format #{format.inspect}"
     end
 
-    if tempfile && File.exists?(tempfile)
+    if tempfile && File.exist?(tempfile)
       FileUtils.mv(tempfile, output.respond_to?(:path) ? output.path : output)
     end
   end

data/lib/td/command/workflow.rb

@@ -96,7 +96,7 @@ module TreasureData
     def workflow_version(op)
       op.cmd_parse # to show help
 
-      unless File.exists?(digdag_cli_path)
+      unless File.exist?(digdag_cli_path)
         $stderr.puts('Workflow module not yet installed.')
         return 1
       end
@@ -246,7 +246,7 @@ EOF
         return false
       end
       if output =~ /openjdk version/ or output =~ /java version/
-        m = output.match(/version "(\d+)\.(\d+)\.(\d+)(?:_(\d+))?"/)
+        m = output.match(/version "(\d+)\.(\d+)\.(\d+)(\.\d+)?(?:_(\d+))?"/)
         if not m or m.size < 4
           return false
         end
@@ -309,7 +309,7 @@ EOF
 
     private
     def download_java
-      if File.exists?(digdag_jre_dir)
+      if File.exist?(digdag_jre_dir)
         return
       end
 
@@ -427,7 +427,7 @@ EOF
     def check_digdag_cli
       check_system_java unless bundled_java?
 
-      unless File.exists?(digdag_cli_path)
+      unless File.exist?(digdag_cli_path)
         $stderr.puts 'Workflow module not yet installed, download now? [Y/n]'
         line = $stdin.gets
         line.strip!

data/lib/td/helpers.rb

@@ -11,7 +11,7 @@ module TreasureData
     end
 
     def on_windows?
-      RUBY_PLATFORM =~ /mswin32|mingw32/
+      RUBY_PLATFORM =~ /mswin32|mingw32|mingw-ucrt/
     end
 
     def on_mac?

data/lib/td/updater.rb

@@ -21,7 +21,7 @@ module ModuleDefinition
   end
 
   def on_windows?
-    RUBY_PLATFORM =~ /mswin32|mingw32/
+    RUBY_PLATFORM =~ /mswin32|mingw32|mingw-ucrt/
   end
 
   def on_mac?
@@ -82,7 +82,7 @@ module ModuleDefinition
 
   def wait_for_lock(path, wait_for = 5, check_every = 0.5)
     start = Time.now.to_i
-    while File.exists?(path)
+    while File.exist?(path)
       sleep check_every
       if (Time.now.to_i - start) > wait_for
         raise_error "Unable to acquire update lock"
@@ -142,14 +142,15 @@ module ModuleDefinition
   end
 
   def version_endpoint
-    "#{endpoint_root}/latest_version_0_16.#{package_category}"
+    "#{endpoint_root}/latest_version_0_17.#{package_category}"
   end
 
   def update_package_endpoint
-    "#{endpoint_root}/td-update-#{package_category}-0-16.zip"
+    "#{endpoint_root}/td-update-#{package_category}-0-17.zip"
   end
 
   def update(autoupdate = false)
+    FileUtils.mkdir_p File.dirname(updating_lock_path)
     wait_for_lock(updating_lock_path, 5) do
       require "td"
       require 'open-uri'
@@ -305,7 +306,7 @@ end # module ModuleDefinition
     last_updated = existent_jar_updated_time
 
     if updated > last_updated
-      FileUtils.mkdir_p(Updater.jarfile_dest_path) unless File.exists?(Updater.jarfile_dest_path)
+      FileUtils.mkdir_p(Updater.jarfile_dest_path) unless File.exist?(Updater.jarfile_dest_path)
       Dir.chdir(Updater.jarfile_dest_path) do
         status = nil
         indicator = Command::TimeBasedDownloadProgressIndicator.new(
@@ -334,7 +335,7 @@ end # module ModuleDefinition
         else
           $stdout.puts "Update of td-import.jar failed."
           $stdout.puts "Please execute 'td import:jar_update' later to update td-import.jar correctly."
-          File.delete 'td-import.jar.new' if File.exists? 'td-import.jar.new'
+          File.delete 'td-import.jar.new' if File.exist? 'td-import.jar.new'
         end
       end
     else
@@ -359,7 +360,7 @@ end # module ModuleDefinition
         end
       end
 
-      if File.exists?(last_jar_autoupdate_timestamp) && \
+      if File.exist?(last_jar_autoupdate_timestamp) && \
        (Time.now - File.mtime(last_jar_autoupdate_timestamp)).to_i < (60 * 60 * 1) # every hour
         return
       end

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.16.10'
+  TOOLBELT_VERSION = '0.17.1'
 end

data/spec/td/command/account_spec.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require "tempfile"
+require 'td/command/common'
+require 'td/command/account'
+require 'td/command/list'
+require 'td/helpers'
+
+module TreasureData::Command
+  describe 'account command' do
+    let :command do
+      Class.new { include TreasureData::Command }.new
+    end
+    let(:client) { double(:client) }
+    let(:conf_file) { Tempfile.new("td.conf").tap {|s| s.close } }
+    let(:conf_expect) {
+"""[account]
+  user = test@email.com
+  apikey = 1/xxx
+"""
+    }
+
+    before do
+      TreasureData::Config.path = conf_file.path
+    end
+
+    it 'is called without any option' do
+      expect(STDIN).to receive(:gets).and_return('test@email.com')
+      if TreasureData::Helpers.on_windows?
+        'password'.chars.each { |c| expect(command).to receive(:get_char).and_return(c) }
+        expect(command).to receive(:get_char).and_return(nil)
+      else
+        expect(STDIN).to receive(:gets).and_return('password')
+      end
+      expect(TreasureData::Client).to receive(:authenticate).and_return(client)
+      expect(client).to receive(:apikey).and_return("1/xxx")
+
+      op = List::CommandParser.new("account", %w[], %w[], false, [], true)
+      command.account(op)
+
+      expect(File.read(conf_file.path)).to eq(conf_expect)
+    end
+
+    it 'is called with -f option' do
+      if TreasureData::Helpers.on_windows?
+        'password'.chars.each { |c| expect(command).to receive(:get_char).and_return(c) }
+        expect(command).to receive(:get_char).and_return(nil)
+      else
+        expect(STDIN).to receive(:gets).and_return('password')
+      end
+      expect(TreasureData::Client).to receive(:authenticate).and_return(client)
+      expect(client).to receive(:apikey).and_return("1/xxx")
+
+      op = List::CommandParser.new("account", %w[-f], %w[], false, ['test@email.com'], true)
+      command.account(op)
+
+      expect(File.read(conf_file.path)).to eq(conf_expect)
+    end
+
+    it 'is called with username password mismatched' do
+      if TreasureData::Helpers.on_windows?
+        3.times do
+          'password'.chars.each { |c| expect(command).to receive(:get_char).and_return(c) }
+          expect(command).to receive(:get_char).and_return(nil)
+        end
+      else
+        expect(STDIN).to receive(:gets).and_return('password').thrice
+      end
+      expect(TreasureData::Client).to receive(:authenticate).thrice.and_raise(TreasureData::AuthError)
+      expect(STDERR).to receive(:puts).with('User name or password mismatched.').thrice
+
+      op = List::CommandParser.new("account", %w[-f], %w[], false, ['test@email.com'], true)
+      command.account(op)
+
+      expect(File.read(conf_file.path)).to eq("")
+    end
+  end
+end

data/spec/td/command/job_spec.rb

@@ -271,6 +271,8 @@ text
 
     describe '#job_show' do
       let(:job_id) { "12345" }
+      let(:start_at) { Time.now.strftime('%Y-%m-%d %H:%M:%S UTC') }
+      let(:end_at) { (Time.now + 60).strftime('%Y-%m-%d %H:%M:%S UTC') }
 
       let :job_classs do
         Struct.new(:job_id,
@@ -278,6 +280,8 @@ text
                    :type,
                    :db_name,
                    :priority,
+                   :start_at,
+                   :end_at,
                    :retry_limit,
                    :result_url,
                    :query,
@@ -292,6 +296,8 @@ text
                        :hive,
                        "db_name",
                        1,
+                       start_at,
+                       end_at,
                        1,
                        "test_url",
                        "test_qury",
@@ -410,7 +416,7 @@ ACTUAL
       end
 
       let(:line_separator) {
-        if RUBY_PLATFORM =~ /mswin32|mingw32/
+        if RUBY_PLATFORM =~ /mswin32|mingw32|mingw-ucrt/
           "\r\n"
         else
           "\n"

data/spec/td/fixture/testRootCA.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBDCCAewCCQCQdq0wStTtITANBgkqhkiG9w0BAQsFADBEMR0wGwYDVQQDDBR3
+d3cudHJlYXN1cmVkYXRhLmNvbTELMAkGA1UEBhMCVVMxFjAUBgNVBAcMDVNhbiBG
+cmFuc2lzY28wHhcNMjIxMDE0MDQzNjA0WhcNMzIwNzEzMDQzNjA0WjBEMR0wGwYD
+VQQDDBR3d3cudHJlYXN1cmVkYXRhLmNvbTELMAkGA1UEBhMCVVMxFjAUBgNVBAcM
+DVNhbiBGcmFuc2lzY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCU
+4RbAD5pop+AUYyJT0L4r/ZwOFz72TqQwyPh8EbpPlkvErWPP07kLO1gmfPHPH6zE
+4sAd8Pl5HZ29Z3fF9zO4ZaOehO+kMHp3jp1nq6vURzMjxDj42CyP+M7DOLrov98m
+uwcZMdVjJlz9ZWt7P4x/F5cyqnzmFYxefi0xbgFFXKaWL1W3Fmq1dKMCgbCVWxlA
+cufRFQmmO+OOcKfJTpcZZXH+VKai81OLjjoBkEERqZU8ySv2zR3gLBMAU3x/VL6/
+AxcAi6ZbxQ29O28VTojQ44dA0op5wDtbI3reH9cMgALI1Swo2DyxXejYoZJYKqk3
+AH2BiM0dbPnzOoufxjm/AgMBAAEwDQYJKoZIhvcNAQELBQADggEBACLeA1a/TU4E
+8bKVEr8X9CMROG2j5lsmPLZRTDUQT50iu5MBZzCNQi2tzUC+QHWC8m/xrhsg4b4t
+r52dQuZlPSEGbzdiltrzQPODnSkA6tmgPeaea5wKG8abDgVQRbMBiamwgJruIi1s
+ynX2yD4qdo07fTAC9CyKd9kogMRMXaqVppfIrob+HL3KQJ4MQPRJb+IN3K14Bdq8
+/XL+8zH4zsWxPCkJyKlcUwGx3M0NHnYX0l8Enap65McTiaPIiCgr5TnkJmctDKBm
+Zrv+c1sb69oJtlayGKWNymxdU+1f79IVioQf4qCa7ZB1//ON60KrQ9cRsmObJtnE
+KD6Oett1Kto=
+-----END CERTIFICATE-----

data/spec/td/fixture/testServer.crt

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID2jCCAsKgAwIBAgIJALE6L1U9f459MA0GCSqGSIb3DQEBCwUAMEQxHTAbBgNV
+BAMMFHd3dy50cmVhc3VyZWRhdGEuY29tMQswCQYDVQQGEwJVUzEWMBQGA1UEBwwN
+U2FuIEZyYW5zaXNjbzAeFw0yMjEwMTQwOTU3NDdaFw0zMjEwMTEwOTU3NDdaMGwx
+CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4g
+RnJhbnNpc2NvMRYwFAYDVQQKDA1UcmVhc3VyZSBEYXRhMQwwCgYDVQQLDANFbmcx
+CjAIBgNVBAMMASowggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6TBzz
+TnMXEwQhmsF9ggvyjzhsVQRQnVafPjR45mKgN5+4QmkW+t1RUv93ysz2UOXM1XfN
+HptcrgbdsEmhDDWopsPgfJrSdN6O44oxplZOTusn20lJDG4Ogm0Kdn2k0P6Cj1bG
+PmFLgw4BeXqhMWI60rbQw/HtFDMx6MWU555wr//jJNPIPOVBzVOiGhmoWYJY8ARB
+WlplKeW0BkQ2J+650Q4dcqrrq4R6UbnyTjf9pqxSa2qP5y9ZQr+69COveX26ZSmA
+76PRzGE1oohsB37OCcQMwU+CuIHZkS9CMEGgkYfmfKaGtrsGtG52eGGwiYoAwSGJ
+BJ/v53Pp3BGKWo9tAgMBAAGjgaYwgaMwXgYDVR0jBFcwVaFIpEYwRDEdMBsGA1UE
+AwwUd3d3LnRyZWFzdXJlZGF0YS5jb20xCzAJBgNVBAYTAlVTMRYwFAYDVQQHDA1T
+YW4gRnJhbnNpc2NvggkAkHatMErU7SEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqG
+SIb3DQEBCwUAA4IBAQBQkwlcEc98Pj9NB9NjhwZalgI36ptmj7vxyD8GXaJQWh7P
+BKnOTxwbqhY68B7QgQ+NTusltnWsiO2IBAZR3MZGeLh4rFUUi4daww7fCLbYQD0t
+YKOjUv8C4rlp8lRs/IMDMl1i2w1R6x78+RKSy1OhIvxT3qV9Zxx8RfqINboyDlbo
+6lOEQlLYGGUJutIbkUoPCo3TO3/oaLfwlFhnxgEwf+lX/qHoqTkz16JRzil6yFOx
+qc5ugRF0S34lpnBd6qfbhV1QFY17WvSbbXmpBPONI2SLs0WSwwCTFVRg8Z+Y90oG
+oGH+JdWsxn+9e8JTB/UOpxr+vWTyQ63wLaElPOyC
+-----END CERTIFICATE-----

data/spec/td/fixture/testServer.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAukwc805zFxMEIZrBfYIL8o84bFUEUJ1Wnz40eOZioDefuEJp
+FvrdUVL/d8rM9lDlzNV3zR6bXK4G3bBJoQw1qKbD4Hya0nTejuOKMaZWTk7rJ9tJ
+SQxuDoJtCnZ9pND+go9Wxj5hS4MOAXl6oTFiOtK20MPx7RQzMejFlOeecK//4yTT
+yDzlQc1TohoZqFmCWPAEQVpaZSnltAZENifuudEOHXKq66uEelG58k43/aasUmtq
+j+cvWUK/uvQjr3l9umUpgO+j0cxhNaKIbAd+zgnEDMFPgriB2ZEvQjBBoJGH5nym
+hra7BrRudnhhsImKAMEhiQSf7+dz6dwRilqPbQIDAQABAoIBAF8IKpB2yUDRA398
+6Qz0BNIz+u1QJQZWbHSJD81IgLEIDuK4hdEiITm14/mgqxNPSxpFHnq1DT2mzHvT
+zItppgmlIDBof7WxxkIPklQnbMk/erd3JhgsTgv6vlLjBM7JibriEbrI4WrarI9V
+/5cwkNI+4OD3w3ZTopXoDroZuPnz/v0EKhDz05E4jHijfiRL3OxaAvZ2zWVKifVh
+elilbCeLR2KgKG6jPrBzub2Yll9C7Xxt7emIMvyTg5jEOkmm7IWfAZ6uIraI7pAs
+5MlwQDIb/Ypby4gHJ0CPWy2AhdybF2Y+hm5jXY1aD7xjlG8pjudidYtnrpWO1kPV
+bbqIvUUCgYEA3G5JQvcA9ZTiHculyW/6O++NXrOkznXI04JhhKN6JvdTdp3xC61k
+H+gnP0e2/FeqqZWF6KWlmPBuonofEQqyCwJdHRZESaixgw7iKqN2t11Z9EhWzoGq
+UGc1oMT90AIHxsGUBbUIZdlj1D8KDx/qymlsKp8ozTKwyCqNesiYet8CgYEA2FvQ
+94zgOauOCwfOwDipwivrJ9nblykMfcp8NCC2jLxI3rjH30EhRWBZrc0V55erjfrz
+QgJYlj4kN/3GwLVq2Agr5EczjePScRlkpPNHdfAfXKvg7dHHsgrYf9lP6j2Adz8B
+mhyYs1gfo6ekeHLoqKBlSn08AosfSTpETuIdizMCgYBFATFmCTT/rA/tC+dmW+uV
+/7PdxZb+Gtk3fUVR5GtE73/tThw7b5g8dMx0ftrFvBvs4qX84n4olnvL2TcIerSp
+xZ+oj2PpOyn2wR4EAxAS7uJOGqcyFl1etjCPl5ttFnWgvtC7yKRMXfVmaCWZ/n/d
+xYra/OAk/I1i3A9WNJ2nOQKBgD83jLZYPkf7fXRxopJ9u/RVOs+ZE1V2lATJPkNI
+763tcelJ2nS8JgmMXoeu7eCOa3z/v0YhQ1sa6yBFEWbLW12l/ZUkzMZ/s8SCI+si
+flXShIdiXUV/zzaRfrLUf0o1EC1HhqNOCbwVWqFJ4X+kK6DhxNbgAsHHfqu5z62w
+2esLAoGAbIbd5Xd+lRXbuNTyIqAONf4KgH529hU4W9tw+kR5OFqadC557Jvs33nn
+iSqGgET+DZTxaOZk8KeCKZys8IcIxvWyhq22/Pd0BKl1ozWj4w/bkDlqO2V9I9NY
+32DBk4iAHljJqkmxnJkSXgGypf4guPZlNGPbTijXw3oHaIpvPl0=
+-----END RSA PRIVATE KEY-----

data/spec/td/updater_spec.rb

@@ -8,7 +8,7 @@ require 'logger'
 
 module TreasureData::Updater
 
- %w(x86_64-darwin14 x64-mingw32).each do |platform|
+  %w(x86_64-darwin14 x64-mingw32).each do |platform|
     describe "RUBY_PLATFORM is '#{platform}'" do
       before do
         stub_const('RUBY_PLATFORM', platform)
@@ -128,7 +128,7 @@ module TreasureData::Updater
             subject
           end
           tmpfile = File.join(TreasureData::Updater.jarfile_dest_path, 'td-import.jar.new')
-          expect(File.exists?(tmpfile)).to eq false
+          expect(File.exist?(tmpfile)).to eq false
         end
       end
 
@@ -171,7 +171,7 @@ module TreasureData::Updater
       @proxy_server = WEBrick::HTTPProxyServer.new(
         :BindAddress => "localhost",
         :Logger => logger,
-        :Port => 0,
+        :Port => 1000 + rand(1000),
         :AccessLog => []
       )
       @proxy_server_thread = start_server_thread(@proxy_server)
@@ -185,13 +185,13 @@ module TreasureData::Updater
       @server = WEBrick::HTTPServer.new(
         :BindAddress => "localhost",
         :Logger => logger,
-        :Port => 0,
+        :Port => 1000 + rand(1000),
         :AccessLog => [],
         :DocumentRoot => '.',
         :SSLEnable => true,
-        :SSLCACertificateFile => fixture_file('ca.cert'),
-        :SSLCertificate => cert('server.cert'),
-        :SSLPrivateKey => key('server.key')
+        :SSLCACertificateFile => fixture_file('testRootCA.crt'),
+        :SSLCertificate => cert('testServer.crt'),
+        :SSLPrivateKey => key('testServer.key')
       )
       @serverport = @server.config[:Port]
       @server.mount(

data/td.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "msgpack"
   gem.add_dependency "rexml"
-  gem.add_dependency "yajl-ruby", "~> 1.3.1"
+  gem.add_dependency "yajl-ruby", ">= 1.3.1", "< 2.0"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 1.20.0"
   gem.add_dependency "td-client", ">= 1.0.8", "< 2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.16.10
+  version: 0.17.1
 platform: ruby
 authors:
 - Treasure Data, Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -42,16 +42,22 @@ dependencies:
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +248,7 @@ files:
 - ".circleci/config.yml"
 - ".coveralls.yml"
 - ".github/CODEOWNERS"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ChangeLog
 - Gemfile
@@ -297,6 +304,7 @@ files:
 - spec/file_reader/shared_context.rb
 - spec/file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/td/command/account_spec.rb
 - spec/td/command/connector_spec.rb
 - spec/td/command/export_spec.rb
 - spec/td/command/import_spec.rb
@@ -314,6 +322,9 @@ files:
 - spec/td/fixture/ca.cert
 - spec/td/fixture/server.cert
 - spec/td/fixture/server.key
+- spec/td/fixture/testRootCA.crt
+- spec/td/fixture/testServer.crt
+- spec/td/fixture/testServer.key
 - spec/td/fixture/tmp.zip
 - spec/td/helpers_spec.rb
 - spec/td/updater_spec.rb
@@ -323,7 +334,7 @@ homepage: http://treasure-data.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -338,8 +349,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 test_files:
@@ -350,6 +361,7 @@ test_files:
 - spec/file_reader/shared_context.rb
 - spec/file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/td/command/account_spec.rb
 - spec/td/command/connector_spec.rb
 - spec/td/command/export_spec.rb
 - spec/td/command/import_spec.rb
@@ -367,6 +379,9 @@ test_files:
 - spec/td/fixture/ca.cert
 - spec/td/fixture/server.cert
 - spec/td/fixture/server.key
+- spec/td/fixture/testRootCA.crt
+- spec/td/fixture/testServer.crt
+- spec/td/fixture/testServer.key
 - spec/td/fixture/tmp.zip
 - spec/td/helpers_spec.rb
 - spec/td/updater_spec.rb