sparoid 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594f1917e9cea3e563dcb027f0fb0ddc9fc41e4a0240a405b7fbba8445de61d9
-  data.tar.gz: 7d39ad302157dfce633b339338e6564d407074556614422efc71b3e645272ac2
+  metadata.gz: 6bceab7682e1a59d1da6f51276f580f11c50456625ea57b1633dd8862f9045df
+  data.tar.gz: 97f3594df9310bd90472d6909e3a2f7ba719c43638d53cc12e5464cd2634bd8f
 SHA512:
-  metadata.gz: 7c037f995e1fd41822c9b726e7d79e2fc065a75dff5697df4182b6e6294889c305f2d224bf6436bd4f26e4e790316d507cffd2dc58d7f6041cf6e4a6484e3098
-  data.tar.gz: 2478cbdb04f16035a93c37711a1bb7eaab1cd7482a6c80418ba71f60c276d356513d1210b51615ea984167ba9b654cc1bf51c4d4899e37894a348abdfaa7e76a
+  metadata.gz: 668b9744c1f4e4c77cf91f5f351b23444f0e7a325fb6af0c834fe7d255273afa70b21455318c0979933dca994151ea17cb63f9db4ee5cc74d9e2b146f3e745b0
+  data.tar.gz: 040e356d56e371eb487079d6beb286b9dec64287f57301aa235e5cdadd8b6116839b564ffca7d894b93d151f2520a3af589b46962c0592974ca796363885242d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.4] - 2021-03-25
+
+- Only warn if config is missing when connecting with CLI
+
 ## [1.0.3] - 2021-03-17
 
 - Nicer error handling in CLI, remove --fdpass option

data/lib/sparoid/cli.rb

@@ -7,20 +7,23 @@ module Sparoid
   # CLI
   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 :config, desc: "Path to a config file, INI format, with key and hmac-key", default: "~/.sparoid.ini"
     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)
+      send_auth(host, port, options[:config])
+    rescue Errno::ENOENT
+      abort "Config not found"
     rescue StandardError => e
       abort e.message
     end
 
     desc "connect HOST PORT [SPA-PORT]", "Send a SPA, TCP connect, and then pass the FD back to the parent"
+    method_option :config, desc: "Path to a config file, INI format, with key and hmac-key", default: "~/.sparoid.ini"
     def connect(host, port, spa_port = 8484)
-      auth(host, spa_port)
+      begin
+        send_auth(host, spa_port, options[:config])
+      rescue Errno::ENOENT
+        warn "Config not found"
+      end
       Sparoid.fdpass(host, port)
     rescue StandardError => e
       abort e.message
@@ -37,8 +40,13 @@ module Sparoid
 
     private
 
+    def send_auth(host, port, config)
+      key, hmac_key = get_keys(parse_ini(config))
+      Sparoid.auth(key, hmac_key, host, port.to_i)
+    end
+
     def parse_ini(path)
-      File.readlines(path).map! { |l| l.split("=", 2).map!(&:strip) }.to_h
+      File.readlines(File.expand_path(path)).map! { |line| line.split("=", 2).map!(&:strip) }.to_h
     end
 
     def get_keys(config)

data/lib/sparoid/version.rb

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

metadata

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