netsoul 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d7e890a2801a29cd2835cf4528573cbf0ad4a1
-  data.tar.gz: 58b5fd02eb6dd305dc57fc4d9c40bc41ecc20a47
+  metadata.gz: b43af38649f019edff2b067bc66257487e243e2f
+  data.tar.gz: b0633c0e8827bce922e290cc79fc401dd9c081fb
 SHA512:
-  metadata.gz: bd4c9bf443fe70f1cd359bf8b2c165e69167c542a27b7979dd679222a8b7b69f5387b9e706006159664c3fc786d6d703b818b460b551a7ff8546963f0ec857b3
-  data.tar.gz: d67b8225613e175b8c73af662894a7864ea2942cb2f8c786c6d60f2e4f5b2601e52cb6071dcfbe55a88fecc84a805360eb3a8f4b618ccba4563461522189acca
+  metadata.gz: 8e1bff48bdd2697033abc87d4cde2a0f5748c362fe36a0dc35b27aef055f0ca29a2da13707c85a2c234db10a125a2fc3c8cc8cb023b8b31ddf081f7670b0e702
+  data.tar.gz: 50973addb57c1e059eaee7617a52f13cbf454d72506d3052dea556df1ffcb8a9032c599726ba9712bd5d64fbc55eabbf1e02482fee79a3f5400d8415cae6f3af

data/bin/netsoul-ruby

@@ -51,10 +51,13 @@ module Netsoul
       @sock = TCPSocket.new(@config.server_host, @config.server_port)
       fail Netsoul::SocketError, 'Could not open a socket. Connection is unavailable.'.freeze unless @sock
       _cmd, _socket_num, md5_hash, client_ip, client_port, _server_timestamp = sock_get.split
+
       @config.build_user_connection_info md5_hash: md5_hash, client_ip: client_ip, client_port: client_port
+
       auth_ag
       auth_method
       auth_status
+
       @started = true
     end
 
@@ -75,8 +78,8 @@ module Netsoul
       sock, = IO.select([@sock], nil, nil, SOCKET_READ_TIMEOUT)
       fail Netsoul::SocketError, 'Timeout or fail on read socket' if sock.nil? || sock.empty?
       res = sock.first.gets
-      log :info, "[get ] #{res.chomp}"
-      res
+      log :info, "[get ] #{res.chomp}" if res
+      res || ''
     end
 
     def sock_close
@@ -99,12 +102,7 @@ OptionParser.new do |opts|
   opts.separator 'Netsoul-Ruby options:'.freeze
 
   opts.on('-c'.freeze, '--config FILE'.freeze, 'Configuration file in YAML'.freeze) do |file|
-    options[:config] = file
-    unless File.file?(options[:config])
-      puts '[ERROR] Configuration is not a valid file'
-      exit
-    end
-    options[:user_opts] = YAML.load_file(options[:config])
+    options[:user_opts] = YAML.load_file(file) if File.file?(file)
   end
 
   opts.on('-h', '--help', 'Display this screen') do
@@ -113,8 +111,9 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-unless options.include?(:config)
-  puts '[ERROR] Configuration file is not provided'
+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
 end
 

data/lib/netsoul/config.rb

@@ -17,20 +17,33 @@ module Netsoul
 
     attr_reader :client_name
 
-    # rubocop:disable Metrics/AbcSize
+    # Supported environment variables:
+    #
+    # +NETSOUL_SERVER_HOST+: Netsoul server host, default 'ns-server.epita.fr'
+    # +NETSOUL_SERVER_PORT+: Netsoul server port, default 4242
+    # +NETSOUL_LOGIN+: IONIS account name
+    # +NETSOUL_SOCKS_PASSWORD+: IONIS socks password
+    # +NETSOUL_UNIX_PASSWORD+: IONIS unix password
+    # +NETSOUL_AUTH_METHOD+: Authentication method, default :std. Valid options are => @see +Config::AUTH_METHODS+
+    # +NETSOUL_STATE+: User status, default is :none. Valid options are => @see +Config::USER_STATES+
+    # +NETSOUL_LOCATION+: User location is free text of your position. If you ar in IONIS network an automatic mapping is proceed to detect your location
+    # +NETSOUL_USER_GROUP+: Free text specifying your promo or whatever else
+    # +NETSOUL_CLIENT_NAME+: Redefine the client name exposed to the Netsoul server
+    #
+    # rubocop:disable all
     def initialize(opts = {})
-      @server_host = opts.fetch(:server_host, 'ns-server.epita.fr'.freeze)
-      @server_port = Integer(opts.fetch(:server_port, 4242))
-      @login = opts.fetch(:login, 'ionis'.freeze)
-      @socks_password = opts.fetch(:socks_password, 'socks_password'.freeze)
-      @unix_password = opts.fetch(:unix_password, 'unix_password'.freeze)
-      @auth_method = AUTH_METHODS.include?(opts[:auth_method]) ? opts[:auth_method] : :std
-      @state = USER_STATES.include?(opts[:state]) ? opts[:state] : :none
-      @location = opts.fetch(:location, 'Home'.freeze)
-      @user_group = opts.fetch(:user_group, 'ETNA_2008'.freeze)
+      @server_host = ENV['NETSOUL_SERVER_HOST'] || opts.fetch(:server_host, 'ns-server.epita.fr'.freeze)
+      @server_port = Integer(ENV['NETSOUL_SERVER_PORT'] || opts.fetch(:server_port, 4242))
+      @login = ENV['NETSOUL_LOGIN'] || opts.fetch(:login, 'ionis'.freeze)
+      @socks_password = ENV['NETSOUL_SOCKS_PASSWORD'] || opts.fetch(:socks_password, 'socks_password'.freeze)
+      @unix_password = ENV['NETSOUL_UNIX_PASSWORD'] || opts.fetch(:unix_password, 'unix_password'.freeze)
+      @auth_method = (ENV['NETSOUL_AUTH_METHOD'] || (AUTH_METHODS.include?(opts[:auth_method]) ? opts[:auth_method] : :std)).to_sym
+      @state = (ENV['NETSOUL_STATE'] || (USER_STATES.include?(opts[:state]) ? opts[:state] : :none)).to_sym
+      @location = ENV['NETSOUL_LOCATION'] || opts.fetch(:location, 'Home'.freeze)
+      @user_group = ENV['NETSOUL_USER_GROUP'] || opts.fetch(:user_group, 'ETNA_2008'.freeze)
       @user_connection_info = {}
 
-      @client_name = opts.fetch(:client_name, '(Netsoul-Ruby) -> { Christian Kakesa, since 2009}'.freeze)
+      @client_name = ENV['NETSOUL_CLIENT_NAME'] || opts.fetch(:client_name, '(Netsoul-Ruby) -> { Christian Kakesa, since 2009}'.freeze)
     end
 
     def build_user_connection_info(opts = {})

data/lib/netsoul/version.rb

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

metadata

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