teuton-server 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15fe4d2fa0cccafe29a60ee452af6e7db3b58a61fe4799eba47edb2cd9ec6dd1
-  data.tar.gz: b1a98d7814bb3318aa067a3608d2ca4e9736bf2e097549458471bdd6db4246f6
+  metadata.gz: 3eb8184096b8e41fa039d349c8050072d9cc95db54b7b3bde613064c6e0a176e
+  data.tar.gz: 7d6a326cc2a53846afd5a2ee6786d25d5255efa30ec3f4bfb32a074d6b5fcfa2
 SHA512:
-  metadata.gz: a6550725b816d13a70ccde29633ec40ff0014117d516c821cb5c913f1cfcb4694e67f57e4164e78b25e6fe20ae31565048eef8904d0fada4e6400986ba220d52
-  data.tar.gz: 867ce95370866a43f9644c47fff485166141f191aad4754a2fce82473f75b2e606cd648fae8866f6edb630f38310a731b0cefd3f53add939722b086f27cb1f19
+  metadata.gz: 50ef0a75bbdf2ae4f84dd130322b013ee29a43f5f7dfc2f6e3490605353aa8f30761f139737cae8a8a661d180378d246e58a7d786d81f59000c3d275443ea654
+  data.tar.gz: 7330c7c18bb912e45be34eb70cb8a8423c98a70c2f02a76de99aca84f8e5071b942a4a8e445d1c21d7b1fa3ae4a41e11db4216956ae71c75daa59e3e922047f1

data/docs/installation.md

@@ -4,4 +4,4 @@
 > **WARNING**: First, ensure [Teuton Software](https://github.com/teuton-software/teuton) is installed.
 
 * `gem install teuton-server`, to install TeutonServer.
-* `teuton-server version`, wil display TeutonServer version.
+* `teuton-server version`, display TeutonServer version.

data/docs/start.md

@@ -1,15 +1,20 @@
-[<<back](../README.md)
 
-# Starting TeutonServer
+# Starting teutonServer
 
 Resume:
 
-| Command       | Configfile        | Location                      |
-| ------------- | ----------------- | ----------------------------- |
-| teuton-server | teuton-sever.yaml | Config into current directory |
-| teuton-server foo | teuton-server.yaml | Config into foo directory |
-| teuton-server foo/config.yaml | config.yaml | Config into foo directory |
-| teuton-server foo/config.yaml X.X.X.X | config.yaml | Config into foo directory and server liste IP=X.X.X.X |
+* Default config file into current directory
+    * Command: `teuton-server`
+    * Configfile: `teuton-sever.yaml`
+* Default config file into `foo` directory:
+    * Command: `teuton-server foo`
+    * Configfile: `teuton-server.yaml`
+* Config file into `foo` directory:
+    * Command: `teuton-server foo/config.yaml`
+    * Configfile: `foo/config.yaml`
+* Config file into `foo` directory and force server listening IP to X.X.X.X.
+    * Command: `teuton-server foo/config.yaml X.X.X.X`
+    * Configfile: `foo/config.yaml`
 
 ## Default config file
 
@@ -57,7 +62,7 @@ teuton-server => Starting...
 teuton-server => service [1] listening on '16001'...
 ```
 
-## Change listen IP on fly
+## Force listening IP on fly
 
 TeutonServer reads params from config file, but it's posible to overwrite listen IP server on fly.
 

data/lib/teuton-server/application.rb

@@ -1,7 +1,7 @@
 # This module groups some global configuration params.
 module Application
   NAME = 'teuton-server'
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
   CONFIGFILE = 'teuton-server.yaml'
   PORT = 16000
 end

data/lib/teuton-server/input_loader.rb

@@ -3,10 +3,10 @@ require_relative 'application'
 
 # This module reads input configuration
 module InputLoader
-  # Read input configuration
+  # Read configuration
   # @param args [Array] List of arguments
   # @return [Hash]
-  def self.read_input_args(args)
+  def self.read_configuration(args)
     input = (args.size.zero? ? [Application::CONFIGFILE] : args)
     param = {}
     param = read_yaml(input[0])

data/lib/teuton-server/service_manager.rb

@@ -7,43 +7,47 @@ require_relative 'service'
 # * service 2 listen on port PORT+2, client 2 requests.
 # * etc.
 module ServiceManager
-  # Start one service for every client.
-  # @param app_param [Hash] Application configuration params
-  # @return [Exit status] Exit 0 = OK. Exit 1 = ERROR
-  def self.start_services(app_param)
-    show_starting(app_param)
-    services_param = split_app_param_into_services_param(app_param)
-    services = []
-    begin
-      services_param.each do |param|
-        services << Thread.new{ Service.new.run(param) }
+  class << self
+    # Start one service for every client.
+    # @param app_param [Hash] Application configuration params
+    # @return [Exit status] Exit 0 = OK. Exit 1 = ERROR
+    def start_services(app_param)
+      show_starting(app_param)
+      services_param = split_app_param_into_services_param(app_param)
+      services = []
+      begin
+       services_param.each do |param|
+          services << Thread.new{ Service.new.run(param) }
+        end
+        services.each { |service| service.join }
+      rescue SystemExit, Interrupt
+        puts Rainbow("\nteuton-server => Closing...").bright
+        exit 0
       end
-      services.each { |service| service.join }
-    rescue SystemExit, Interrupt
-      puts Rainbow("\nteuton-server => Closing...").bright
-      exit 0
     end
-  end
 
-  def self.show_starting(param)
-    puts Rainbow("teuton-server => Starting...").bright
-    puts "                 Configfile : #{param[:server][:configfile]}"
-    puts "                 Listen on  : #{param[:server][:ip]}:#{param[:server][:port]}"
-    puts "                 Test list  : #{param[:server][:testunits].join(',')}"
-    puts Rainbow("                 (CTRL+C to exit)").bright.yellow
-  end
+    private
 
-  def self.split_app_param_into_services_param(app_param)
-    services_param = []
-    app_param[:clients].each_with_index do |client, index|
-      param = { server: {}, client: {} }
-      param[:server].merge! app_param[:server] if app_param[:server]
-      param[:server][:hostname] = param[:server][:ip]
-      param[:client].merge! client
-      param[:client][:id] = index + 1
-      param[:server][:port] += param[:client][:id]
-      services_param << param
+    def show_starting(param)
+      puts Rainbow("teuton-server => Starting...").bright
+      puts "                 Configfile : #{param[:server][:configfile]}"
+      puts "                 Listen on  : #{param[:server][:ip]}:#{param[:server][:port]}"
+      puts "                 Test list  : #{param[:server][:testunits].join(',')}"
+      puts Rainbow("                 (CTRL+C to exit)").bright.yellow
+    end
+
+    def split_app_param_into_services_param(app_param)
+      services_param = []
+      app_param[:clients].each_with_index do |client, index|
+        param = { server: {}, client: {} }
+        param[:server].merge! app_param[:server] if app_param[:server]
+        param[:server][:hostname] = param[:server][:ip]
+        param[:client].merge! client
+        param[:client][:id] = index + 1
+        param[:server][:port] += param[:client][:id]
+        services_param << param
+      end
+      services_param
     end
-    services_param
   end
 end

data/lib/teuton-server.rb

@@ -8,7 +8,7 @@ module TeutonServer
   # Start TeutonServer
   # @param args [Array] List of arguments
   def self.start(args)
-    param = InputLoader.read_input_args(args)
+    param = InputLoader.read_configuration(args)
     ServiceManager.start_services(param)
   end
 
@@ -49,7 +49,7 @@ module TeutonServer
     puts "teuton-server => " + Rainbow("Init \'#{dest}\' done!").yellow
     exit 0
     # TODO:
-    # Add testunits list by default 
+    # Add testunits list by default
     # a = Dir.glob(File.join('projects/gnulinux-basic/**','start.rb'))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teuton-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,7 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
-description: TeutonServer listens and responds TeutonClients request
+description: |2
+    TeutonServer listen requests from TeutonClients.
+    Responds executing Teuton evaluation for that client.
 email: teuton.software@protonmail.com
 executables:
 - teuton-server
@@ -56,7 +58,6 @@ files:
 - docs/start.md
 - lib/teuton-server.rb
 - lib/teuton-server/application.rb
-- lib/teuton-server/files/teuton-server.yaml
 - lib/teuton-server/input_loader.rb
 - lib/teuton-server/service.rb
 - lib/teuton-server/service_manager.rb
@@ -82,5 +83,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: TeutonServer (Teuton Software)
+summary: TeutonServer (Teuton Software project)
 test_files: []

data/lib/teuton-server/files/teuton-server.yaml

@@ -1,9 +0,0 @@
----
-:server:
-  :ip: 127.0.0.1
-  :port: 16000
-  :testunits:
-    - testname01
-:clients:
-- :members: client01
-  :ip: 127.0.0.1