netsoul 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43af38649f019edff2b067bc66257487e243e2f
-  data.tar.gz: b0633c0e8827bce922e290cc79fc401dd9c081fb
+  metadata.gz: 2d274d3247bb4ca9fe3bcd6470ce972df31a202b
+  data.tar.gz: 910ed29d27347a72a60810e4ad0ee3f8357baaa3
 SHA512:
-  metadata.gz: 8e1bff48bdd2697033abc87d4cde2a0f5748c362fe36a0dc35b27aef055f0ca29a2da13707c85a2c234db10a125a2fc3c8cc8cb023b8b31ddf081f7670b0e702
-  data.tar.gz: 50973addb57c1e059eaee7617a52f13cbf454d72506d3052dea556df1ffcb8a9032c599726ba9712bd5d64fbc55eabbf1e02482fee79a3f5400d8415cae6f3af
+  metadata.gz: 4a84e494c128cbcb213f044ea1bef5210565987995ee4b19b930532a8ebd49229704cae6c89a867bfc24242d1add7e2a81a99b5072e54166bfdaa06609204d87
+  data.tar.gz: a8ce1612fe46fd0fd986436c31d6299f83098a75f5ba8f9478121e586f8a844548c49310a620bf3c4297220a37ec2584f5e5d2ba3b1887ce88ab7d63ae9f91ed

data/bin/netsoul-ruby

@@ -13,12 +13,10 @@ require 'socket'
 module Netsoul
   class Client
     include Logging
-
+    attr_reader :started
     SOCKET_READ_TIMEOUT = 12 * 60
     SOCKET_WRITE_TIMEOUT = 10
 
-    attr_reader :started
-
     def initialize(*args)
       opts = args.last.is_a?(Hash) ? args.last : {}
       @config = Config.new(opts)
@@ -37,7 +35,7 @@ module Netsoul
       else
         sock_send(Message.standard_auth(@config))
       end
-      fail Netsoul::AuthenticationError, 'Authentication failed.'.freeze unless sock_get.split(' ')[1] == '002'
+      fail Netsoul::AuthenticationError, 'Authentication failed. See your config file or environment variables'.freeze unless sock_get.split(' ')[1] == '002'
     end
     private :auth_method
 
@@ -111,10 +109,11 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-unless ENV.to_a.count { |k, _v| %w(NETSOUL_LOGIN NETSOUL_SOCKS_PASSWORD).include?(k) } == 2 ||
-       ENV.to_a.count { |k, _v| %w(NETSOUL_LOGIN NETSOUL_UNIX_PASSWORD NETSOUL_AUTH_METHOD).include?(k) } == 3
-  puts '[ERROR] You have to specify a configuration file or environment variables'
-  exit
+if options.empty? || options[:user_opts].size == 0
+  unless ENV.to_a.count { |k, _v| %w(NETSOUL_LOGIN NETSOUL_SOCKS_PASSWORD NETSOUL_LOGIN NETSOUL_UNIX_PASSWORD NETSOUL_AUTH_METHOD).include?(k) } >= 2
+    puts '[ERROR] You have to specify a configuration file or environment variables'
+    exit
+  end
 end
 
 retry_count = 10

data/lib/netsoul/version.rb

@@ -1,3 +1,3 @@
 module Netsoul
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netsoul
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Christian Kakesa