teuton 2.1.10 → 2.3.1

data/lib/teuton/case_manager/export_manager.rb

@@ -9,9 +9,12 @@ module ExportManager
   # Run export function
   # @param main_report (Report)
   # @param cases (Array)
-  # @param args (Hash) Selected export options
-  # rubocop: disable Metrics/AbcSize
-  def self.run(main_report, cases, args)
+  # @param input (Hash) Selected export options
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/CyclomaticComplexity
+  def self.run(main_report, cases, input)
+    args = strings2symbols(input)
+
     # default :mode=>:all, :format=>:txt
     format = args[:format] || Application.instance.default[:format]
     mode = args[:mode] || :all
@@ -27,12 +30,29 @@ module ExportManager
     preserve_files if args[:preserve] == true
   end
   # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/CyclomaticComplexity
+
+  ##
+  # Convert Hash String values into Symbol values
+  # @param input (Hash)
+  # rubocop:disable Style/ConditionalAssignment
+  private_class_method def self.strings2symbols(input)
+    args = {}
+    input.each_pair do |key, value|
+      if value.class == String
+        args[key] = value.to_sym
+      else
+        args[key] = value
+      end
+    end
+    args
+  end
+  # rubocop:enable Style/ConditionalAssignment
 
   ##
   # Preserve output files for current project
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Layout/LineLength
   private_class_method def self.preserve_files
     app = Application.instance
     t = Time.now
@@ -48,5 +68,4 @@ module ExportManager
   end
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Layout/LineLength
 end

data/lib/teuton/case_manager/utils.rb

@@ -26,7 +26,7 @@ module Utils
       text = ec.convert(text)
     rescue StandardError => e
       puts "[ERROR] #{e}: Declare text encoding..."
-      puts "        goto :host, :exec => 'command', :encoding => 'ISO-8859-1'"
+      puts "        run 'command', on: :host, :encoding => 'ISO-8859-1'"
     end
 
     text.split("\n")

data/lib/teuton/{project/laboratory → check}/dsl.rb

@@ -1,36 +1,27 @@
-# Laboratory
-# * target
-# * request (development)
-# * tempfile
-# * goto
-# * run
-# * expect
-# * get
-# * unique
-# * log
-# * set
+# frozen_string_literal: true
+
+##
+# Include Teuton DSL keywords into Laboratory class
 class Laboratory
+  ##
+  # Execute Teuton DSL readme keyword
   def readme(_text)
     # Usefull for "teuton readme" command action.
   end
 
+  ##
+  # Execute Teuton DSL target keyword
   def target(desc, args = {})
     @stats[:targets] += 1
     @targetid += 1
     weight = args[:weight] || 1.0
-    verboseln '(%03d' % @targetid + ") target      #{desc}"
+    verboseln format('(%03<targetid>d) target      %<desc>s', targetid: @targetid, desc: desc)
     verboseln "      weight      #{weight}"
   end
   alias goal target
 
-#  def request(text)
-#    @requests << text.to_s
-#  end
-
-  def tempfile(_tempfile = nil)
-    'tempfile'
-  end
-
+  ##
+  # Execute Teuton DSL run keyword
   def run(command, args = {})
     args[:exec] = command
     host = :localhost
@@ -38,6 +29,8 @@ class Laboratory
     goto(host, args)
   end
 
+  ##
+  # Execute Teuton DSL goto keyword
   def goto(host = :localhost, args = {})
     result.reset
     args[:on] = host unless args[:on]
@@ -50,24 +43,32 @@ class Laboratory
     verboseln "      run         '#{args[:exec]}' on #{args[:on]}"
   end
 
-  def expect(_cond, args = {})
+  ##
+  # Execute Teuton DSL expect keyword
+  def expect(cond)
     verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
-    verboseln "      expect      #{_cond} (#{_cond.class})"
+    verboseln "      expect      #{cond} (#{cond.class})"
     verboseln ''
   end
 
-  def expect_one(_cond, args = {})
+  ##
+  # Execute Teuton DSL expect_one keyword
+  def expect_one(cond)
     verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
-    verboseln "      expect_one  #{_cond} (#{_cond.class})"
+    verboseln "      expect_one  #{cond} (#{cond.class})"
     verboseln ''
   end
 
-  def expect_none(_cond, args = {})
+  ##
+  # Execute Teuton DSL expect_none keyword
+  def expect_none(cond)
     verboseln "      alter       #{result.alterations}" unless result.alterations.empty?
-    verboseln "      expect_none #{_cond} (#{_cond.class})"
+    verboseln "      expect_none #{cond} (#{cond.class})"
     verboseln ''
   end
 
+  ##
+  # Execute Teuton DSL get keyword
   def get(varname)
     @stats[:gets] += 1
 
@@ -80,17 +81,24 @@ class Laboratory
     "get(#{varname})"
   end
 
-  # If a method call is missing, then delegate to concept parent.
+  # If a method call is missing, then try to call get(var)
+  # rubocop:disable Style/MissingRespondToMissing
   def method_missing(method)
     a = method.to_s
-    instance_eval("get(:#{a[0, a.size - 1]})") if a[a.size - 1] == '?'
+    instance_eval("get(:#{a[0, a.size - 1]})", __FILE__, __LINE__) if a[a.size - 1] == '?'
   end
+  # rubocop:enable Style/MissingRespondToMissing
 
+  ##
+  # Execute Teuton DSL gett keyword
+  # Same as get keyword, but show pretty output when used by readme command.
   def gett(option)
     value = get(option)
     value
   end
 
+  ##
+  # Execute Teuton DSL unique keyword
   def unique(key, _value)
     @stats[:uniques] += 1
 
@@ -98,11 +106,15 @@ class Laboratory
     verboseln ''
   end
 
+  ##
+  # Execute Teuton DSL log keyword
   def log(text = '', type = :info)
     @stats[:logs] += 1
     verboseln "      log    [#{type}]: " + text.to_s
   end
 
+  ##
+  # Execute Teuton DSL set keyword
   def set(key, value)
     @stats[:sets] += 1
 

data/lib/teuton/{project/laboratory → check}/laboratory.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-require 'terminal-table'
-require 'rainbow'
-
-require_relative '../../application'
-require_relative '../../case_manager/case/result/result'
+require_relative '../application'
+require_relative '../case_manager/case/result/result'
 require_relative 'show'
 require_relative 'dsl'
 require_relative 'builtin'
@@ -35,7 +32,7 @@ alias task group
 # DSL start: Define main teuton test execution
 # @param block (Proc)
 def start(&block)
-  # don't do nothing
+  # Don't do nothing. We are checking test not running it
 end
 alias play start
 
@@ -54,8 +51,6 @@ class Laboratory
     reset
   end
 
-  ##
-  # Set attibutes to default values
   def reset
     @result = Result.new
     @targetid = 0

data/lib/teuton/{project/laboratory → check}/show.rb

@@ -1,8 +1,8 @@
 require 'terminal-table'
 require 'rainbow'
 
-require_relative '../../application'
-require_relative '../configfile_reader'
+require_relative '../application'
+require_relative '../utils/configfile_reader'
 
 # Laboratory
 # * show_dsl
@@ -10,68 +10,23 @@ require_relative '../configfile_reader'
 # * show_config
 class Laboratory
   ##
-  # Display DSL on screen
-  def show_dsl
+  # Display DSL checking on screen
+  def show
     @verbose = true
     process_content
     show_stats
-    show_config
-  end
-
-  ##
-  # Display stats on screen
-  def show_stats
-    @stats[:hosts] = 0
-    @hosts.each_pair { |_k, v| @stats[:hosts] += v }
-
-    my_screen_table = Terminal::Table.new do |st|
-      st.add_row ['DSL Stats', 'Count']
-      st.add_separator
-      st.add_row ['Groups', @stats[:groups]]
-      st.add_row ['Targets', @stats[:targets]]
-      st.add_row ['Goto', @stats[:hosts]]
-      @hosts.each_pair { |k, v| st.add_row [" * #{k}", v] }
-      st.add_row ['Uniques', @stats[:uniques]]
-      st.add_row ['Logs', @stats[:uniques]]
-      st.add_row [' ', ' ']
-
-      st.add_row ['Gets', @stats[:gets]]
-      if @gets.count > 0
-        list = @gets.sort_by { |_k, v| v }
-        list.reverse_each { |item| st.add_row [" * #{item[0]}", item[1].to_s] }
-      end
-
-      st.add_row ['Sets', @stats[:sets]]
-      if @sets.count > 0
-        @sets.each_pair { |k, v| st.add_row [" * #{k}", v.to_s] }
-      end
-    end
-    verboseln my_screen_table.to_s + "\n"
+    revise_config_content
   end
 
   ##
-  # Display config on screen
-  def show_config
+  # Display config for teuton panel on screen
+  def show_panelconfig
     @verbose = false
     process_content
     @verbose = true
-    revise_config_content
+    recomended_panelconfig_content
   end
 
-#  def show_requests
-#    @verbose = false
-#    process_content
-#    @verbose = true
-#    my_screen_table = Terminal::Table.new do |st|
-#      st.add_row ['Lines', 'REQUEST description']
-#      st.add_separator
-#      @requests.each_with_index do |line, index|
-#        st.add_row ['%03d' % index, line]
-#      end
-#    end
-#    verboseln my_screen_table
-#  end
-
   private
 
   def verbose(text)
@@ -84,14 +39,16 @@ class Laboratory
 
   def process_content
     groups = Application.instance.groups
+    option = Application.instance.options
+
     verboseln ''
     groups.each do |t|
       @stats[:groups] += 1
-
-      msg = "GROUP: #{t[:name]}"
-      my_screen_table = Terminal::Table.new { |st| st.add_row [msg] }
-      verboseln my_screen_table
-
+      unless option[:panel]
+        msg = "GROUP: #{t[:name]}"
+        my_screen_table = Terminal::Table.new { |st| st.add_row [msg] }
+        verboseln my_screen_table
+      end
       instance_eval(&t[:block])
     end
   end
@@ -127,10 +84,16 @@ class Laboratory
     verboseln YAML.dump(output)
   end
 
+  def recomended_panelconfig_content
+    output = { global: {}, cases: nil }
+    script_vars = find_script_vars
+    script_vars.each { |i| output[:global][i] = 'VALUE' }
+    verboseln YAML.dump(output)
+  end
+
   ##
   # Revive and check config content
   def revise_config_content
-    @verbose = true
     my_screen_table = Terminal::Table.new do |st|
       st.add_row ['Revising CONFIG file']
     end
@@ -166,4 +129,35 @@ class Laboratory
       end
     end
   end
+
+  ##
+  # Display stats on screen
+  def show_stats
+    @stats[:hosts] = 0
+    @hosts.each_pair { |_k, v| @stats[:hosts] += v }
+
+    my_screen_table = Terminal::Table.new do |st|
+      st.add_row ['DSL Stats', 'Count']
+      st.add_separator
+      st.add_row ['Groups', @stats[:groups]]
+      st.add_row ['Targets', @stats[:targets]]
+      st.add_row ['Goto', @stats[:hosts]]
+      @hosts.each_pair { |k, v| st.add_row [" * #{k}", v] }
+      st.add_row ['Uniques', @stats[:uniques]]
+      st.add_row ['Logs', @stats[:uniques]]
+      st.add_row [' ', ' ']
+
+      st.add_row ['Gets', @stats[:gets]]
+      if @gets.count > 0
+        list = @gets.sort_by { |_k, v| v }
+        list.reverse_each { |item| st.add_row [" * #{item[0]}", item[1].to_s] }
+      end
+
+      st.add_row ['Sets', @stats[:sets]]
+      if @sets.count > 0
+        @sets.each_pair { |k, v| st.add_row [" * #{k}", v.to_s] }
+      end
+    end
+    verboseln my_screen_table.to_s + "\n"
+  end
 end

data/lib/teuton/cli.rb

@@ -1,39 +1,110 @@
+
 require 'thor'
-require_relative 'application'
-require_relative 'project/project'
-require_relative 'project/skeleton.rb'
-require_relative 'cli/main'
+require_relative 'version'
+require_relative '../teuton'
 
-##
-# Command Line User Interface
 class CLI < Thor
   map ['h', '-h', '--help'] => 'help'
 
-  map ['c', '-c', '--create', 'create'] => 'new'
+  map ['v', '-v', '--version'] => 'version'
+  desc 'version', 'Show the program version'
+  def version
+    puts "#{Teuton::APPNAME} (version #{Teuton::VERSION})"
+  end
+
+  map ['n', '-n', '--new'] => 'new'
   desc 'new DIRECTORY', 'Create skeleton for a new project'
   long_desc <<-LONGDESC
   Create files for a new project.
+  LONGDESC
+  def new(projectpath)
+    Teuton.create(projectpath)
+  end
+
+  map ['c', '-c', '--check'] => 'check'
+  option :panelconfig, type: :boolean
+  option :cname, type: :string
+  option :cpath, type: :string
+  desc 'check [OPTIONS] DIRECTORY',
+       'Check test and config file content'
+  long_desc <<-LONGDESC
+
+  (1) teuton check path/to/dir/foo
+  , Check content of start.rb and config.yaml files.
 
-  Example:
+  (2) teuton check path/to/dir/foo --cname=demo
+  , Check content of start.rb and demo.yaml files.
+
+  (3) teuton check path/to/file/foo.rb
+  , Check content of foo.rb and foo.yaml files.
+
+  (4) teuton check path/to/file/foo.rb --cname=demo
+  , Check content of foo.rb and demo.yaml files.
 
-  #{$PROGRAM_NAME} create dir/foo
   LONGDESC
-  ##
-  # Command: create new Teuton project
-  def new(path_to_new_dir)
-    Skeleton.create(path_to_new_dir)
+  def check(projectpath)
+    Teuton.check(projectpath, options)
+  end
+
+  map ['--run', 'run'] => 'play'
+  option :export, type: :string
+  option :cname, type: :string
+  option :cpath, type: :string
+  option :case, type: :string
+  option :color, type: :boolean
+  option :quiet, type: :boolean
+  desc '[run] [OPTIONS] DIRECTORY',
+       'Run test from directory'
+  long_desc <<-LONGDESC
+  This function execute challenge from specified directory.
+  By default, show progress on the screen.
+
+  Let's see others options:
+
+  (1) teuton foo, run challenge from foo/start.rb with foo/config.yaml config file.
+
+  (2) teuton run foo, same as (1).
+
+  (3) teuton run --export=json foo, run challenge and export using json format.
+  Others output formats availables are: txt, html, yaml, json and colored_text.
+
+  (4) teuton run --cname=demo foo, run challenge from foo/start.rb with foo/demo.yaml config file.
+
+  (5) teuton foo/demo.rb, Run challenge from foo/demo.rb with foo/demo.yaml config file.
+
+  LONGDESC
+  def play(filepath)
+    Teuton.run(filepath, options)
+  end
+
+  map ['--readme'] => 'readme'
+  option :lang, type: :string
+  desc 'readme DIRECTORY',
+       'Show README extracted from test contents'
+  long_desc <<-LONGDESC
+
+  (1) teuton readme foo
+  , Create README.md from foo/start.rb.
+
+  (2) teuton readme foo/demo.rb
+  , Create README.md from foo/demo.rb.
+  LONGDESC
+
+  def readme(projectpath)
+    # Create README from teuton test
+    Teuton.readme(projectpath, options)
   end
 
   ##
   # These inputs are equivalents:
   # * teuton dir/foo
   # * teuton run dir/foo
-  # * teuton play dir/foo
   def method_missing(method, *_args, &_block)
     play(method.to_s)
   end
 
   def respond_to_missing?(method_name, include_private = false)
+    # Respond to missing methods name
     super
   end
 end

data/lib/teuton/{project/readme → readme}/lang.rb

@@ -1,5 +1,5 @@
 
-require_relative '../../application'
+require_relative '../application'
 
 module Lang
   def self.get(key)

data/lib/teuton/{project/readme → readme}/readme.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../application'
-require_relative '../configfile_reader'
-require_relative '../../case_manager/case/result/result'
+require_relative '../application'
+require_relative '../utils/configfile_reader'
+require_relative '../case_manager/case/result/result'
 require_relative 'dsl'
 require_relative 'lang'
 
@@ -44,6 +44,19 @@ class Readme
     reset
   end
 
+  ##
+  # Show README on screen
+  def show
+    process_content
+    show_head
+    show_content
+    show_tail
+  end
+
+  private
+
+  ##
+  # Reset attributes
   def reset
     app = Application.instance
     @config = ConfigFileReader.read(app.config_path)
@@ -73,13 +86,6 @@ class Readme
     @action = { readme: [] }
   end
 
-  def show
-    process_content
-    show_head
-    show_content
-    show_tail
-  end
-
   ##
   # Show README head
   def show_head
@@ -97,23 +103,21 @@ class Readme
       puts Lang::get(:hosts)
       puts "\n"
       puts '| ID | Host | Configuration |'
-      puts '| -- | ---- | ------------- |'
+      puts '| --- | --- | --- |'
       @required_hosts.each_pair do |k, v|
         c = []
         v.each_pair { |k2,v2| c << "#{k2}=#{v2}" }
-        puts "|#{i}|#{k.upcase}|#{c.join(', ')}|"
+        puts "| #{i} | #{k.upcase} | #{c.join(', ')} |"
         i += 1
       end
       puts "\n> NOTE: SSH Service installation is required on every host."
     end
 
     unless @cases_params.empty?
-      @cases_params.uniq!.sort!
+      @cases_params.sort!
       puts Lang::get(:params)
       @cases_params.uniq.each { |i| puts format('* %s', i) }
-      puts "\n> NOTE:"
-      puts "> * Teuton software must known this information!"
-      puts "> * Save every ':param: value' into config file."
+      puts "\n> NOTE: Save every ':param: value' into config file."
     end
   end
 
@@ -156,13 +160,13 @@ class Readme
     puts Lang::get(:global)
     puts "\n"
     puts '| Global param | Value |'
-    puts '| ------------ | ----- |'
+    puts '| --- | --- |'
     @global_params.each_pair { |k,v| puts "|#{k}|#{v}|" }
     puts "\n\#\# Created params"
     puts Lang::get(:created)
     puts "\n"
     puts '| Created params | Value |'
-    puts '| -------------- | ----- |'
+    puts '| --- | --- |'
     @setted_params.each_pair { |k,v| puts "|#{k}|#{v}|" }
   end
 end

data/lib/teuton/report/formatter/array_formatter.rb

@@ -2,13 +2,19 @@
 
 require_relative 'base_formatter'
 
+##
 # ArrayFormatter class: format report data into an array
 class ArrayFormatter < BaseFormatter
+  ##
+  # Initialize class
+  # @param report (Report) Format report data into Array
   def initialize(report)
     super(report)
     @data = {}
   end
 
+  ##
+  # Execute format action
   def process
     build_data
     w @data.to_s # Write data into ouput file
@@ -28,6 +34,8 @@ class ArrayFormatter < BaseFormatter
     @data[:config] = head
   end
 
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
   def build_history_data
     @data[:logs] = []
     groups = []
@@ -46,7 +54,8 @@ class ArrayFormatter < BaseFormatter
         end
 
         target = {}
-        target[:target_id]   = format('%02d', i[:id])
+        # target[:target_id]   = format('%02d', i[:id])
+        target[:target_id]   = format('%<id>02d', id: i[:id])
         target[:check]       = i[:check]
         target[:score]       = value
         target[:weight]      = i[:weight]
@@ -66,6 +75,8 @@ class ArrayFormatter < BaseFormatter
     groups << { title: title, targets: targets } unless title.nil?
     @data[:groups] = groups
   end
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/MethodLength
 
   def build_final_data
     tail = {}
@@ -77,6 +88,7 @@ class ArrayFormatter < BaseFormatter
     app = Application.instance
     @data[:hall_of_fame] = {}
     return if app.options[:case_number] < 3
+
     fame = {}
     app.hall_of_fame.each { |line| fame[line[0]] = line[1] }
     @data[:hall_of_fame] = fame