teuton 3.0.2 → 3.1.0

data/lib/teuton/utils/name_file_finder.rb

@@ -1,18 +1,14 @@
 require "rainbow"
 
 class NameFileFinder
-  attr_reader :options
-  attr_reader :project_path
-  attr_reader :script_path
-  attr_reader :config_path
-  attr_reader :test_name
+  attr_reader :options, :project_path, :script_path, :config_path, :testname
 
   def initialize(options = {})
     @options = options
     @project_path = nil
     @script_path = nil # Path to DSL script file
     @config_path = nil # Path to YAML config file
-    @test_name = nil
+    @testname = nil
   end
 
   ##
@@ -44,7 +40,7 @@ class NameFileFinder
 
     @project_path = folder_path
     @script_path = script_path
-    @test_name = folder_path.split(File::SEPARATOR)[-1]
+    @testname = folder_path.split(File::SEPARATOR)[-1]
 
     find_configfilename_from_directory(folder_path)
   end
@@ -59,9 +55,7 @@ class NameFileFinder
       # Config name file is introduced by cname arg option from teuton command
       config_name = options["cname"] unless options["cname"].nil?
       config_path = File.join(folder_path, "#{config_name}.json")
-      unless File.exist? config_path
-        config_path = File.join(folder_path, "#{config_name}.yaml")
-      end
+      config_path = File.join(folder_path, "#{config_name}.yaml") unless File.exist? config_path
     else
       # Config path file is introduced by cpath arg option from teuton command
       config_path = options["cpath"]
@@ -81,7 +75,7 @@ class NameFileFinder
 
     @project_path = File.dirname(script_path)
     @script_path = script_path
-    @test_name = File.basename(script_path, ".rb")
+    @testname = File.basename(script_path, ".rb")
     find_configfilenames_from_rb(script_path)
   end
 
@@ -95,9 +89,7 @@ class NameFileFinder
       config_name = options["cname"] unless options["cname"].nil?
 
       config_path = File.join(@project_path, config_name + ".json")
-      unless File.exist? config_path
-        config_path = File.join(@project_path, config_name + ".yaml")
-      end
+      config_path = File.join(@project_path, config_name + ".yaml") unless File.exist? config_path
     else
       # Config path file is introduced by cpath arg option from teuton command
       config_path = options["cpath"]

data/lib/teuton/utils/project.rb

@@ -7,6 +7,7 @@ class Project
     @project = {}
     @project[:running_basedir] = Dir.getwd
     @project[:output_basedir] = "var"
+    @project[:output_dir] = @project[:output_basedir]
     @project[:name] = "teuton"
     @project[:format] = :txt # Default export format
     @project[:debug] = false # Disable/enable local executions
@@ -42,7 +43,7 @@ class Project
   # Preprocess input options:
   # * Convert input case options String to an Array of integers
   # * Read color input option
-  def self.add_input_params(projectpath, options)
+  def self.add_options(projectpath, options)
     value[:options].merge! options
     Rainbow.enabled = value[:options]["color"]
 
@@ -51,7 +52,7 @@ class Project
     value[:project_path] = finder.project_path
     value[:script_path] = finder.script_path
     value[:config_path] = finder.config_path
-    value[:test_name] = finder.test_name
+    value[:testname] = finder.testname
 
     return if value[:options]["case"].nil?
 
@@ -59,6 +60,19 @@ class Project
     value[:options]["case"] = numbers.collect!(&:to_i)
   end
 
+  def self.add_config(configdata)
+    # Load configurations from config file
+    value[:ialias] = configdata[:alias] || {}
+    value[:global] = configdata[:global] || {}
+    value[:global][:tt_sequence] = false if value[:global][:tt_sequence].nil?
+    running_basedir = "#{value[:running_basedir]}/"
+    value[:global][:tt_script_path] = value[:script_path].gsub(running_basedir, "")
+    value[:global][:tt_config_path] = value[:config_path].gsub(running_basedir, "")
+
+    value[:testname] = value[:global][:tt_testname] if value[:global][:tt_testname]
+    value[:output_dir] = (value[:global][:tt_output_dir] || File.join(value[:output_basedir], value[:testname]))
+  end
+
   def self.relative_path(filepath)
     if filepath.start_with?(Dir.pwd)
       filepath[Dir.pwd.length + 1, filepath.length]

data/lib/teuton/version.rb

@@ -1,5 +1,5 @@
 module Teuton
-  VERSION = "3.0.2".freeze
+  VERSION = "3.1.0".freeze
   APPNAME = "teuton".freeze
   GEMNAME = "teuton".freeze
   DOCKERNAME = "dvarrui/#{GEMNAME}".freeze

data/lib/teuton.rb

@@ -1,5 +1,5 @@
 require_relative "teuton/utils/project"
-require_relative "teuton/version"
+# require_relative "teuton/version"
 
 module Teuton
   def self.create(path_to_new_dir)
@@ -8,7 +8,7 @@ module Teuton
   end
 
   def self.check(projectpath, options = {})
-    Project.add_input_params(projectpath, options)
+    Project.add_options(projectpath, options)
     require_dsl_and_script("teuton/check/main")
     require_relative "teuton/check/checker"
     checker = Checker.new(
@@ -19,12 +19,12 @@ module Teuton
   end
 
   def self.run(projectpath, options = {})
-    Project.add_input_params(projectpath, options)
+    Project.add_options(projectpath, options)
     require_dsl_and_script("teuton/case_manager/dsl")
   end
 
   def self.readme(projectpath, options = {})
-    Project.add_input_params(projectpath, options)
+    Project.add_options(projectpath, options)
     require_dsl_and_script("teuton/readme/main")
     readme = Readme.new(
       Project.value[:script_path],
@@ -33,18 +33,13 @@ module Teuton
     readme.show
   end
 
-  def self.server(projectpath)
-    require_relative "teuton/config/server"
-    ConfigServer.configure_project(projectpath)
-  end
-
   private_class_method def self.require_dsl_and_script(dslpath)
     # Load DSL file and then load script file
     require_relative dslpath
     begin
       mainscriptfile = Project.value[:script_path]
       require_relative mainscriptfile
-    rescue StandardError => e
+    rescue => e
       warn Rainbow("[ERROR] #{e}").bright.red
       e.backtrace&.first(3)&.each do |line|
         warn Rainbow("[ERROR]   #{line}").red

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - David Vargas Ruiz
@@ -349,7 +349,7 @@ files:
 - lib/teuton/version.rb
 homepage: https://github.com/teuton-software/teuton
 licenses:
-- MPL-2.0
+- AGPL-3.0
 metadata: {}
 rdoc_options: []
 require_paths: