teuton 3.2.0 → 3.2.1

data/lib/teuton/utils/logger.rb

@@ -3,30 +3,35 @@ require "rainbow"
 class Logger
   @verbose = true
 
-  def self.verbose=(value)
-    @verbose = value
+  class << self
+    attr_writer :verbose
   end
 
-  def self.verbose
-    @verbose
+  class << self
+    attr_reader :verbose
+  end
+
+  def self.puts(message)
+    Kernel.puts message if @verbose
   end
 
   def self.info(message)
-    puts message if @verbose
+    text = Rainbow("Info | #{message}").white
+    Kernel.puts text if @verbose
   end
 
   def self.warn(message)
-    text = Rainbow(message).bright.yellow
-    info(text)
+    text = Rainbow("Warn | #{message}").bright.yellow
+    Kernel.warn text if @verbose
   end
 
   def self.error(message)
-    text = Rainbow(message).bright.red
-    info(text)
+    text = Rainbow("Error | #{message}").bright.red
+    Kernel.warn text if @verbose
   end
 
   def self.debug(message)
     text = Rainbow(message).white
-    info(text)
+    puts text if @verbose
   end
 end

data/lib/teuton/utils/name_file_finder.rb

@@ -1,4 +1,4 @@
-require "rainbow"
+require_relative "logger"
 
 class NameFileFinder
   attr_reader :options, :project_path, :script_path, :config_path, :testname
@@ -33,10 +33,7 @@ class NameFileFinder
     # Find project filenames into directory <folder path>
     # COMPLEX MODE: main RB file is <start.rb>
     script_path = File.join(folder_path, "start.rb")
-    unless File.exist? script_path
-      warn Rainbow("[ERROR] Main script file not found! <#{script_path}>").bright.red
-      exit 1
-    end
+    raise Teuton::MainScriptNotFoundError, script_path unless File.exist? script_path
 
     @project_path = folder_path
     @script_path = script_path
@@ -66,12 +63,7 @@ class NameFileFinder
   def find_filenames_from_rb(script_path)
     # SIMPLE MODE: We use script_path as main RB file
     # This must be fullpath to DSL script file
-    if File.extname(script_path) != ".rb"
-      warn Rainbow("[ERROR] Main script file not found!").bright.red
-      warn Rainbow("[ERROR] Not found <#{script_path}/start.rb>").white
-      warn Rainbow("[ERROR] Not found <#{script_path}.rb>").white
-      exit 1
-    end
+    raise Teuton::MainScriptNotFoundError, script_path if File.extname(script_path) != ".rb"
 
     @project_path = File.dirname(script_path)
     @script_path = script_path

data/lib/teuton/version.rb

@@ -1,5 +1,5 @@
 module Teuton
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.1".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/errors"
 
 module Teuton
   def self.create(path_to_new_dir)
@@ -36,15 +36,10 @@ module Teuton
   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 => e
-      warn Rainbow("[ERROR] #{e}").bright.red
-      e.backtrace&.first(3)&.each do |line|
-        warn Rainbow("[ERROR]   #{line}").white
-      end
-      exit 1
-    end
+
+    mainscriptfile = Project.value[:script_path]
+    raise MainScriptNotFoundError.new(mainscriptfile) unless File.exist?(mainscriptfile)
+
+    require_relative mainscriptfile
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - David Vargas Ruiz
@@ -252,6 +252,7 @@ files:
 - docs/more.md
 - docs/tutorial/es/nginx/README.md
 - lib/teuton.rb
+- lib/teuton/case/action.rb
 - lib/teuton/case/builtin/main.rb
 - lib/teuton/case/builtin/package.rb
 - lib/teuton/case/builtin/service.rb
@@ -305,12 +306,15 @@ files:
 - lib/teuton/check/dsl/run.rb
 - lib/teuton/check/main.rb
 - lib/teuton/check/show.rb
-- lib/teuton/cli.rb
+- lib/teuton/cli/app.rb
+- lib/teuton/cli/run.rb
 - lib/teuton/deprecated/utils.rb
+- lib/teuton/errors.rb
 - lib/teuton/files/config.yaml
 - lib/teuton/files/start.rb
 - lib/teuton/files/template/case.html
 - lib/teuton/files/template/resume.html
+- lib/teuton/readme/action.rb
 - lib/teuton/readme/dsl/all.rb
 - lib/teuton/readme/dsl/expect.rb
 - lib/teuton/readme/dsl/getset.rb

data/lib/teuton/cli.rb

@@ -1,120 +0,0 @@
-require "thor"
-require_relative "version"
-require_relative "../teuton"
-
-class CLI < Thor
-  map ["h", "-h", "--help"] => "help"
-
-  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 :onlyconfig, type: :boolean
-  option :color, 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 , Check content of start.rb and config.yaml files.
-
-    (2) teuton check PATH/TO/DIR --cname=demo , Check content of start.rb and demo.yaml files:
-
-    (3) teuton check PATH/TO/DIR --onlyconfig  , Only show config file recomendations
-
-    (4) teuton check PATH/TO/DIR/foo.rb , Check content of foo.rb and foo.yaml files.
-
-    (5) teuton check PATH/TO/DIR/foo.rb --cname=demo , Check content of foo.rb and demo.yaml files.
-
-  LONGDESC
-  def check(projectpath)
-    Teuton.check(projectpath, options)
-  end
-
-  map ["co", "-co", "--config"] => "config"
-  desc "config [OPTIONS] DIRECTORY", "Suggest configuration."
-  long_desc <<~LONGDESC
-    config DIRECTORY, "Suggest the content of the configuration file based on the test"
-  LONGDESC
-  def config(projectpath)
-    # Check Test: suggest the content of the configuration file based on the test
-    opt = {"onlyconfig" => true}
-    Teuton.check(projectpath, opt)
-  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
-
-  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 ["v", "-v", "--version"] => "version"
-  desc "version", "Show the program version"
-  def version
-    puts "#{Teuton::APPNAME} version #{Teuton::VERSION}"
-  end
-
-  ##
-  # These inputs are equivalents:
-  # * teuton dir/foo
-  # * teuton run 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
-
-  def self.exit_on_failure?
-    true
-  end
-end