sparoid 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9949f3421911f8f9d588b87ba8955407b68ac62bae5ad7f53ef5b707077ef60
-  data.tar.gz: 06b115e1db22eb0222dd9f7a439024e18d8579255324aaff1bb1c935e35c10f4
+  metadata.gz: 594f1917e9cea3e563dcb027f0fb0ddc9fc41e4a0240a405b7fbba8445de61d9
+  data.tar.gz: 7d39ad302157dfce633b339338e6564d407074556614422efc71b3e645272ac2
 SHA512:
-  metadata.gz: d6ef1abb4e1c01d435f771ffbf779aeced9a04a2384a309c623fef0546d8cf8adae7ab76a86ba60b485c49ddbd386e545ecc9ce7c62efdcec465732c23cd1f59
-  data.tar.gz: f616bb367217c07aa36865be2c1eaeeecce685c260911aaf6a97f1e8cb80f8652d906944edca1954d1f161a123bcf333945947992c40ea289be0911e40be7c29
+  metadata.gz: 7c037f995e1fd41822c9b726e7d79e2fc065a75dff5697df4182b6e6294889c305f2d224bf6436bd4f26e4e790316d507cffd2dc58d7f6041cf6e4a6484e3098
+  data.tar.gz: 2478cbdb04f16035a93c37711a1bb7eaab1cd7482a6c80418ba71f60c276d356513d1210b51615ea984167ba9b654cc1bf51c4d4899e37894a348abdfaa7e76a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.3] - 2021-03-17
+
+- Nicer error handling in CLI, remove --fdpass option
+
 ## [1.0.2] - 2021-03-15
 
 - `sparoid send` renamed to `sparoid auth`

data/lib/sparoid/cli.rb

@@ -8,23 +8,22 @@ module Sparoid
   class CLI < Thor
     desc "auth HOST [PORT]", "Send a authorization packet"
     method_option :config, desc: "Path to a config file, INI format, with key and hmac-key"
-    method_option :fdpass,
-                  type: :numeric,
-                  desc: "After sending, open a TCP connection and pass the FD back to the calling process. \
-                         For use with OpenSSH ProxyCommand and ProxyUseFdpass"
     def auth(host, port = 8484)
       config = File.expand_path(options[:config] || "~/.sparoid.ini")
       abort "Config '#{config}' not found" unless File.exist? config
 
       key, hmac_key = get_keys(parse_ini(config))
       Sparoid.auth(key, hmac_key, host, port.to_i)
-      Sparoid.fdpass(host, options[:fdpass]) if options[:fdpass]
+    rescue StandardError => e
+      abort e.message
     end
 
-    desc "connect", "Send a SPA, TCP connect, and then pass the FD back to the parent"
+    desc "connect HOST PORT [SPA-PORT]", "Send a SPA, TCP connect, and then pass the FD back to the parent"
     def connect(host, port, spa_port = 8484)
       auth(host, spa_port)
       Sparoid.fdpass(host, port)
+    rescue StandardError => e
+      abort e.message
     end
 
     desc "keygen", "Generate an encryption key and a HMAC key"

data/lib/sparoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sparoid
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor