teuton-server 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb8184096b8e41fa039d349c8050072d9cc95db54b7b3bde613064c6e0a176e
-  data.tar.gz: 7d6a326cc2a53846afd5a2ee6786d25d5255efa30ec3f4bfb32a074d6b5fcfa2
+  metadata.gz: ec933cb05436596fafa3db82ed125be0fb80201098cac2840798a794f8af4736
+  data.tar.gz: e95c6c46ccb016feacbf42f2083d2106384a6a9f7f01735904365ecf0d7b4d27
 SHA512:
-  metadata.gz: 50ef0a75bbdf2ae4f84dd130322b013ee29a43f5f7dfc2f6e3490605353aa8f30761f139737cae8a8a661d180378d246e58a7d786d81f59000c3d275443ea654
-  data.tar.gz: 7330c7c18bb912e45be34eb70cb8a8423c98a70c2f02a76de99aca84f8e5071b942a4a8e445d1c21d7b1fa3ae4a41e11db4216956ae71c75daa59e3e922047f1
+  metadata.gz: 7499a9387e09c676eea03818686693c27bdd19aa709334d3de919990420ecf64af96e916979e4350043fc1b3f47157942f4ae4fae8aece6a72e50f065bca2c74
+  data.tar.gz: c1cfffaf08176150a1cab549e725746e19209aed1a527d60c7643dcd79f8890712a8bfac921b3729eb3d31c2c388f5fc9c2e672cd9f1f2a490b803a2c3c947ab

data/README.md

@@ -11,7 +11,7 @@ But with TeutonServer, T-NODE host listen to evaluation requests from S-NODE hos
 
 * `gem install teuton-server`, to install TeutonServer.
 
-> Ensure [Teuton Software](https://github.com/teuton-software/teuton) is installed too.
+> Ensure [Teuton Software (version => 2.1)](https://github.com/teuton-software/teuton) is installed too.
 
 ## Running
 

data/bin/teuton-server

@@ -9,5 +9,5 @@ require 'teuton-server'
 # * start   => Start Teuton Server
 TeutonServer.show_help if ARGV.first == 'help'
 TeutonServer.show_version if ARGV.first == 'version'
-TeutonServer.init(ARGV) if ARGV.first == 'init'
+TeutonServer.init(ARGV.slice(1,ARGV.size)) if ARGV.first == 'init'
 TeutonServer.start(ARGV)

data/lib/teuton-server/application.rb

@@ -1,7 +1,8 @@
+##
 # This module groups some global configuration params.
 module Application
-  NAME = 'teuton-server'
-  VERSION = '0.0.6'
-  CONFIGFILE = 'teuton-server.yaml'
-  PORT = 16000
+  NAME = 'teuton-server'            # Application name
+  VERSION = '0.0.8'                 # Application version
+  CONFIGFILE = 'teuton-server.yaml' # Default config file name
+  PORT = 16000                      # Default base port
 end

data/lib/teuton-server/service.rb

@@ -1,6 +1,11 @@
 require 'socket'
 
+##
+# This class wake up service to respond request from 1 client.
 class Service
+  ##
+  # Run 1 service to respond request from 1 client.
+  # @param param [Hash] Service params
   def run(param)
     service = TCPServer.open(param[:server][:port])
     accept_clients service, param
@@ -25,7 +30,10 @@ class Service
   end
 
   def authorized_request?(client, param)
-    return true if param[:client][:ip] == :allow
+    if param[:client][:ip] == :allow
+      param[:client][:ip] = client.peeraddr[2]
+      return true
+    end
     return false if param[:client][:ip] == :deny
     return param[:client][:ip] == client.peeraddr[2]
   end
@@ -58,6 +66,7 @@ class Service
     ok = system(command)
     action = {}
     action[:timestamp] = Time.now
+    action[:testname] = testname
     action[:cmd] = command
     action[:grade] = Rainbow('FAIL!').red
     action[:grade] = get_grade_from_report(param, testindex) if ok
@@ -92,7 +101,7 @@ class Service
     puts output
     client.puts("Connection : #{src} -> #{dest} ")
     client.puts("Timestamp  : #{action[:timestamp]}")
-    client.puts("Action     : #{action[:cmd]}")
+    client.puts("Test Name  : #{action[:testname]}")
     client.puts("Grade      : #{action[:grade]}")
     client.close
   end

data/lib/teuton-server.rb

@@ -4,8 +4,18 @@ require_relative 'teuton-server/application'
 require_relative 'teuton-server/input_loader'
 require_relative 'teuton-server/service_manager'
 
+##
+# TeutonServer has these main actions:
+# * help    => show_help
+# * version => show_version
+# * init    => init or create server config file
+# * start   => Start Teuton Server
 module TeutonServer
-  # Start TeutonServer
+  ##
+  # Start TeutonServer arguments:
+  # * No arguments => start server with default config file (teuton-server.yaml).
+  # * Directory => start server with default config file (DIR/teuton-server.yaml).
+  # * YAML file => start server with config file (file.yaml).
   # @param args [Array] List of arguments
   def self.start(args)
     param = InputLoader.read_configuration(args)
@@ -22,8 +32,10 @@ module TeutonServer
     puts "    init      , Create server.yaml config file"
     puts "    CONFIGFILE, YAML server configuration file"
     puts "Example:"
-    puts "    Start TeutonServer using 192.168.1.16 IP:"
-    puts "          teuton-server server.yaml 192.168.1.16"
+    puts "    teuton-server server.yaml 192.168.1.16 " +
+              "# Start TeutonServer using 192.168.1.16 IP:"
+    puts "    teuton-server init foo/config.yaml     " +
+              "# Create config file"
     exit 0
   end
 
@@ -33,14 +45,21 @@ module TeutonServer
     exit 0
   end
 
-  # Create default configuration file
+  # Create default configuration file. Arguments:
+  # * "" => Create default config file (teuton-server.yaml)
+  # * "DIR" => Create DIR/teuton-server.yaml config file.
+  # * "FILE.yaml" => Create FILE.yaml config file.
   # @param args [Array] List of arguments, where args.first = 'init'
   def self.init(args)
-    folder = '.'
-    folder = args[1] if args.size > 1
     src = File.join(File.dirname(__FILE__),
           'teuton-server', 'files', Application::CONFIGFILE)
-    dest = File.join(folder, Application::CONFIGFILE)
+    dest = File.join(Application::CONFIGFILE)
+
+    if args.size > 0
+      file = args.first
+      dest = File.join(file) if File.extname(file) == '.yaml'
+      dest = File.join(file, Application::CONFIGFILE) if File.directory? file
+    end
     if File.exists? dest
       puts "teuton-server => " + Rainbow("File \'#{dest}\' exists!").red
       exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teuton-server
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: teuton
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -47,9 +61,9 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- docs/configfile.md
-- docs/installation.md
 - docs/start.md
+- docs/installation.md
+- docs/configfile.md
 files:
 - README.md
 - bin/teuton-server
@@ -80,7 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: TeutonServer (Teuton Software project)