sibit 0.32.4 → 0.32.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: addf1c76d3af290c3cdbdaae049db0e9f81fab3b71aed128cd8d284b4b3377e5
-  data.tar.gz: d4654c29684e00847a317bf7203a295f018036438a3c64ac93ba6477c84e1a52
+  metadata.gz: 9fd0f078031f164079de39c2fd14dcd8ac8675861ff74bec96fac105525110cd
+  data.tar.gz: 7f77f659da2b18be975c7587915f5aa875a21e55237d06582cdac36c8ccda6f8
 SHA512:
-  metadata.gz: 4405e4c542199ea6a4e99e401cb33321ef6048a8d3e7ff424c99f31718d17e8d03928f9922afd80b02e33f1a447a6e7c0042c038226e50078a35b5c237e16801
-  data.tar.gz: 235aa484a4719cdab76cbff47da26b949b25513990b88b12096c8d7081bde1c8bb3331808e144e34b3f2302f1fe462896aff5a60d3a0fcc9a955d9525e58db57
+  metadata.gz: 072721e3965d7e0719332cdf970f32be79d2b266c5807bad9c56d00a8e2fbd5ba4ca7817c876d093e57873dd6393486e9c3d2052147315dd64ff0b1a565c7f6f
+  data.tar.gz: bd3727fef02c55442ed256fa836baf422fe9352f58eff4b755f2f87da45a7bf0fd3ba424d54e29da3c9a9f1d8fcd4e6cc913dd4f557de52374ee9ffa29842256

data/Gemfile.lock

@@ -57,7 +57,7 @@ GEM
       cucumber-messages (>= 31, < 32)
     cucumber-html-formatter (22.3.0)
       cucumber-messages (> 23, < 33)
-    cucumber-messages (31.1.0)
+    cucumber-messages (31.2.0)
     cucumber-tag-expressions (8.1.0)
     date (3.5.1)
     decoor (0.1.0)
@@ -67,7 +67,7 @@ GEM
       backtrace (~> 0.3)
       os (~> 1.1)
       qbash (~> 0.3)
-    elapsed (0.2.1)
+    elapsed (0.2.2)
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)

data/features/cli.feature

@@ -24,6 +24,14 @@ Feature: Command Line Processing
     When I run bin/sibit with "create 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1"
     Then Exit code is zero
 
+  Scenario: Bitcoin address can be created with base58 option at the end
+    When I run bin/sibit with "create 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 --base58"
+    Then Exit code is zero
+
+  Scenario: Bitcoin address can be created with base58 option before command
+    When I run bin/sibit with "--base58 create 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1"
+    Then Exit code is zero
+
   Scenario: Bitcoin balance can be checked
     When I run bin/sibit with "balance 1MZT1fa6y8H9UmbZV6HqKF4UY41o9MGT5f --verbose --api=blockchain,btc"
     Then Exit code is zero
@@ -36,3 +44,8 @@ Feature: Command Line Processing
     When I run bin/sibit with "pay --help"
     Then Exit code is zero
     And Stdout contains "--skip-utxo"
+
+  Scenario: Unknown option shows error message
+    When I run bin/sibit with "generate --foo"
+    Then Exit code is not zero
+    And Stdout contains "Unknown option"

data/features/step_definitions/steps.rb

@@ -27,7 +27,7 @@ end
 
 When(%r{^I run bin/sibit with "([^"]*)"$}) do |arg|
   home = File.join(File.dirname(__FILE__), '../..')
-  @stdout = `ruby -I#{home}/lib #{home}/bin/sibit #{arg}`
+  @stdout = `ruby -I#{home}/lib #{home}/bin/sibit #{arg} 2>&1`
   @exitstatus = $CHILD_STATUS.exitstatus
 end
 

data/lib/sibit/bin.rb

@@ -20,23 +20,35 @@ class Sibit
   #   Sibit::Bin.start(['price'])
   #   Sibit::Bin.start(['balance', '1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa'])
   class Bin < Thor
-    class_option :proxy, type: :string, desc: 'HTTPS proxy for all requests, e.g. "localhost:3128"'
+    stop_on_unknown_option!
+
+    class_option :proxy, type: :string,
+      desc: 'HTTPS proxy for all requests, e.g. "localhost:3128"'
     class_option :attempts, type: :numeric, default: 1,
       desc: 'How many times should we try before failing'
     class_option :dry, type: :boolean, default: false,
       desc: "Don't send a real payment, run in a read-only mode"
-    class_option :verbose, type: :boolean, default: false, desc: 'Print all possible debug messages'
-    class_option :quiet, type: :boolean, default: false, desc: 'Print only informative messages'
+    class_option :verbose, type: :boolean, default: false,
+      desc: 'Print all possible debug messages'
+    class_option :quiet, type: :boolean, default: false,
+      desc: 'Print only informative messages'
     class_option :api, type: :array, default: %w[blockchain btc bitcoinchain blockchair cex],
       desc: 'Ordered List of APIs to use, e.g. "blockchain,btc,bitcoinchain"'
+    class_option :base58, type: :boolean, default: false,
+      desc: 'Use base58 address format instead of bech32'
 
     def self.exit_on_failure?
       true
     end
 
     def self.handle_argument_error(command, error, args, _arity)
-      raise error unless args.include?('--help') || args.include?('-h')
-      new.help(command.name)
+      return new.help(command.name) if args.include?('--help') || args.include?('-h')
+      unknown = args.find { |a| a.start_with?('-') }
+      if unknown
+        warn "Unknown option: #{unknown}"
+        exit 1
+      end
+      raise error
     end
 
     desc 'price', 'Get current price of BTC in USD'
@@ -69,7 +81,8 @@ class Sibit
     desc 'create KEY', 'Create a public Bitcoin address from the private key'
     def create(key)
       log.debug("Private key provided: #{key.ellipsized(8).inspect}")
-      log.info(client.create(key))
+      k = Sibit::Key.new(key)
+      log.info(options[:base58] ? k.base58 : k.bech32)
     end
 
     desc 'balance ADDRESS', 'Check the balance of the Bitcoin address'
@@ -82,8 +95,6 @@ class Sibit
       'Send a new Bitcoin transaction (AMOUNT can be "MAX" to use full balance)'
     option :skip_utxo, type: :array, default: [],
       desc: 'List of UTXO that must be skipped while paying'
-    option :base58, type: :boolean, default: false,
-      desc: 'Convert private addresses to public in base58'
     option :yes, type: :boolean, default: false,
       desc: 'Skip confirmation prompt and send the payment immediately'
     def pay(amount, fee, sources, target, change)
@@ -117,8 +128,8 @@ class Sibit
 
     def log
       @log ||= begin
-        verbose = !ARGV.include?('--quiet') &&
-                  (ARGV.include?('--verbose') || ENV.fetch('SIBIT_VERBOSE', nil))
+        verbose = !options[:quiet] &&
+                  (options[:verbose] || ENV.fetch('SIBIT_VERBOSE', nil))
         verbose ? Loog::VERBOSE : Loog::REGULAR
       end
     end

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.32.4' unless defined?(VERSION)
+  VERSION = '0.32.6' unless defined?(VERSION)
 end

data/lib/sibit.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'ellipsized'
 require 'loog'
 require_relative 'sibit/base58'
 require_relative 'sibit/key'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.32.4
+  version: 0.32.6
 platform: ruby
 authors:
 - Yegor Bugayenko