td 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39aaf12ff04af9701e21625ab329b422a890edfe295f450ee3b36e7cdbc3e94b
-  data.tar.gz: c3d8a021e9b4c0b2c599882ee4ca109c691f81d2d2777e085ffcff1326628876
+  metadata.gz: 7ed6a6e5934d927122c94bd28a5e356e6d422cacf182e97b30d83b9d453c1a29
+  data.tar.gz: eab2f179e910311ac9e0e45325cb366fadfb053268c7707cf4336b8f91e8150d
 SHA512:
-  metadata.gz: 55d1ffecf734507573af5d49c8e3f6a70bf9f4859465722ed9a05f07ab405660e6e4c6c395404699ea9b09a426cfe2fb15f2f59cbe0363349b293f29c70a6566
-  data.tar.gz: 36d7f0ddec937b81ed7a7f08e5f9e88638e96e1545af529b42eaae11152ce51459408363cbf96d6be7b53cf0ce9829d75a881b7d7e677a33a8fa18080200cf46
+  metadata.gz: 74843a395778c6fba9bf45d625ecdccbdaf956a7dabc08f4fe0fc1832e567fef60b6600c38aefcffddbd619cddaeb05a45ad71d457df9c31c02ee95ffa934fd5
+  data.tar.gz: 0f629764b2006b045235c7e836c0f51edceaa620679833182aba1ce2ce1538e27c6bae28804e913e51f805f1e535f27e6bb5e2eb24a2aade58dc450ad67b011b

data/ChangeLog

@@ -1,3 +1,7 @@
+== 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

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/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.17.0'
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -304,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
@@ -360,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