asker-tool 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a17926e45cfc0549f76ae3d8ec9c5313565847e3615653f7520344e03eea63f7
-  data.tar.gz: 717620e1a5d56c65dc0ec601de61ffef208f3e21087e71e84a4c421e9e65c67f
+  metadata.gz: cb2119553ee0f5bce53f1aebe3468aabb5488ce02c54004c09df4d1256867cf5
+  data.tar.gz: 29bc8b727e10beb791eac5a113751f6d26ec9036cf3158aec583a93505fb3ba5
 SHA512:
-  metadata.gz: 9ec3c2b84781c6c723edfbb0e5570edaabb8e26fd0d732bb9fa155d7b6fb5762115a44ba75899af7e0e0b399d6b764562de77dd31b0b2fe128c5dd97b39caf7d
-  data.tar.gz: 3f1aa7b3ce5a9f59f3c373bd246f5fd8e8000a163ec539f943f32144fff057f80b44ae06bc127a31eb3ad71de0bb431d010a737491e57695c202e97534674a69
+  metadata.gz: b3f277896c860c2987c25b4088922328f922fa52c8e2bb32ba92b6d90c6b86e05f2c0c9a056f3c69139148266f6bd4443192ca4d6892ee6e6884fb1e6cb3bad4
+  data.tar.gz: f9bb53fa2c7d5ee05566eb19657e4997d84dea2f521e1445a64fb658b06a7b6b1326e8b3d010fa21b5758c8538fc33ed1f675752493db4a366be9ac881944057

data/README.md

@@ -1,9 +1,10 @@
-# ASKER (version 2.2)
+[![Gem Version](https://badge.fury.io/rb/asker-tool.svg)](https://badge.fury.io/rb/asker-tool)
 
-Generate a lot of questions from an _input file_ base on your own _definitions_.
+# ASKER (devel 2.3)
 
----
-# Description
+Generate a lot of questions from an _input_ text file with on your own _definitions_. In a way, this _input file_ is a concept map.
+
+![logo](./docs/images/logo.png)
 
 ASKER helps trainers to create a huge amount of questions, from a definitions (_conceptual entities_) input file.
 
@@ -11,32 +12,29 @@ ASKER helps trainers to create a huge amount of questions, from a definitions (_
 * Multiplatform.
 * Ruby program.
 
----
-# Installation
+## Installation
 
 1. Install Ruby on your system.
 2. `gem install asker-tool`
 
----
-# Usage
+## Usage
 
 Steps:
 
 1. Create an input file with your definitions (_conceptual entities_).
 1. Run _asker_ and get the results into `output` directory.
 
-Example: Running `asker` with our example input file as argument (`jedi.haml`):
+Example: Running `asker` with our example input file as argument (`acdc.haml`):
 
 ```
-asker docs/examples/starwars/jedi.haml
+asker docs/examples/bands/acdc.haml
 ```
 
 * Output files created into the `output` folder.
-* More [example input files](https://github.com/dvarrui/asker/tree/devel/docs/examples).
+* More [example input files](./docs/examples).
 * More asker input files at `github/dvarrui/asker-inputs` repository.
 
----
-# Documentation
+## Documentation
 
 * [Installation](https://github.com/dvarrui/asker/blob/devel/docs/install/README.md)
 * [Inputs](https://github.com/dvarrui/asker/blob/devel/docs/inputs/README.md)
@@ -45,8 +43,7 @@ asker docs/examples/starwars/jedi.haml
 * [Base idea](https://github.com/dvarrui/asker/blob/devel/docs/idea.md)
 * [History](https://github.com/dvarrui/asker/blob/devel/docs/history.md)
 
----
-# Contact
+## Contact
 
 * **Email**: `teuton.software@protonmail.com`
 * **Twitter**: `@SoftwareTeuton`

data/lib/asker/ai/concept_ai.rb

@@ -46,7 +46,7 @@ class ConceptAI
   ##
   # Generates random image URL
   def random_image_for(_conceptname)
-    return '' if rand <= Project.instance.get(:threshold)
+    return '' if rand <= ProjectData.instance.get(:threshold)
 
     keys = @world.image_urls.keys
     keys.shuffle!

data/lib/asker/application.rb

@@ -8,23 +8,16 @@ require 'rainbow'
 class Application
   include Singleton
 
-  VERSION = '2.2.0'        # Application version
-  NAME = 'asker'           # Application name
-  HOMEPAGE = "https://github.com/dvarrui/#{NAME}/tree/v2.2"
-  GEM = 'asker-tool'       # Gem name
-  CONFIGFILE = 'asker.ini' # Config filename
+  VERSION = '2.2.1'
+  NAME = 'asker'
+  GEM = 'asker-tool'
+  CONFIGFILE = 'asker.ini'
   attr_reader :config
 
-  ##
-  # Initialize Application singleton
   def initialize
     reset
   end
 
-  ##
-  # Initialize config values from external "config.ini" file.
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
   def reset
     filename = File.join(Dir.pwd, CONFIGFILE)
     filename = File.join(File.dirname(__FILE__), 'files', CONFIGFILE) unless File.exist? filename
@@ -42,6 +35,4 @@ class Application
     Rainbow.enabled = false
     Rainbow.enabled = true if @config['global']['color'].downcase == 'yes'
   end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
 end

data/lib/asker/cli.rb

@@ -8,18 +8,16 @@ require_relative '../asker'
 ##
 # Command Line User Interface
 class CLI < Thor
-  map ['h', '-h', '--help'] => 'help'
+  map ['--help'] => 'help'
 
-  map ['v', '-v', '--version'] => 'version'
+  map ['--version'] => 'version'
   desc 'version', 'Show the program version'
-  ##
-  # Show current version
   def version
     puts "#{Application::NAME} version #{Application::VERSION}"
   end
 
   map ['f', '-f', '--file'] => 'file'
-  desc 'file NAME', 'Build output files, from HAML/XML input file.'
+  desc '[file] FILEPATH', 'Build output files, from HAML/XML input file.'
   long_desc <<-LONGDESC
 
   Build questions about contents defined into input file specified.
@@ -35,19 +33,13 @@ class CLI < Thor
   (3) #{Rainbow('asker projects/foo/foo.yaml').aqua}, Build questions from YAML project file.
 
   LONGDESC
-  ##
-  # Create questions from input file
-  # @param filename (String) Path to input file
   def file(filename)
     # Asker start processing input file
     Asker.start(filename)
   end
 
-  map ['c', '-c', '--check'] => 'check'
-  desc 'check', 'Check input HAML file syntax'
-  ##
-  # Check input file syntax
-  # @param filename (String) Path to input file
+  map ['--check'] => 'check'
+  desc 'check FILEPATH', 'Check input HAML file syntax'
   def check(filename)
     # Enable/disable color output
     Rainbow.enabled = false if options['color'] == false
@@ -55,29 +47,19 @@ class CLI < Thor
     Asker.check(filename)
   end
 
-  map ['h', '-h', '--homepage', 'homepage'] => 'show_homepage'
-  desc 'homepage', 'Documentation homepage'
-  ##
-  # Show documentation homepage
-  def show_homepage()
-    puts Application::HOMEPAGE
-  end
-
-  map ['i', '-i', '--init'] => 'init'
+  map ['--init'] => 'init'
   desc 'init', 'Create default INI config file'
-  ##
-  # Create default INI config file
   def init
-    Asker.create_configuration
+    Asker.init
   end
 
-  map ['n', '-n', '--new', 'new'] => 'create_input'
-  desc 'new [FOLDER]', 'Create Asker demo input files'
+  map ['new','--new'] => 'new_input'
+  desc 'new DIRPATH', 'Create Asker demo input files'
   ##
   # Create Asker demo input files
   # @param dirname (String) Path to folder
-  def create_input(dirname)
-    Asker.create_input(dirname)
+  def new_input(dirname)
+    Asker.new_input(dirname)
   end
 
   ##

data/lib/asker/data/code.rb

@@ -1,22 +1,12 @@
 # frozen_string_literal: true
 
 require_relative '../ai/code/code_ai_factory'
-require_relative '../project'
-require_relative '../logger'
-require_relative '../formatter/code_string_formatter'
 
-##
-# Code data object
 class Code
   attr_reader :dirname, :filename, :type
   attr_accessor :process, :features
   attr_reader :lines, :questions
 
-  ##
-  # Initialize Code object
-  # @param dirname (String)
-  # @param filename (String)
-  # @param type (String)
   def initialize(dirname, filename, type)
     @dirname = dirname
     @filename = filename
@@ -40,17 +30,13 @@ class Code
     out
   end
 
-  def debug
-    Logger.verbose CodeStringFormatter.to_s(self)
-  end
-
   private
 
   def load(filepath)
     return if filepath.nil?
 
     unless File.exist? filepath
-      Logger.verboseln Rainbow("[ERROR] Unkown file #{filepath}").red.bright
+      puts Rainbow("[ERROR] Unkown file #{filepath}").red.bright
       return
     end
     content = File.read(filepath)

data/lib/asker/data/concept.rb

@@ -3,8 +3,6 @@
 require 'rainbow'
 require 'rexml/document'
 
-require_relative '../application'
-require_relative '../logger'
 require_relative '../lang/lang_factory'
 require_relative '../loader/embedded_file'
 require_relative 'table'
@@ -24,7 +22,7 @@ class Concept
   attr_reader :data      # Data about this concept
   attr_accessor :process # (Boolean) if it is necesary generate questions
 
-  @@id = 0 # Global Concept counter
+  @@id = 0 # Global Concept counter (concept identifier)
 
   ##
   # Initilize Concept
@@ -93,7 +91,8 @@ class Concept
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/CyclomaticComplexity
   def calculate_nearness_to_concept(other)
-    a = Application.instance.config['ai']['formula_weights']
+    a = ProjectData.instance.get(:weights)
+    #Application.instance.config['ai']['formula_weights']
     weights = a.split(',').map(&:to_f)
 
     max1 = @context.count
@@ -180,7 +179,7 @@ class Concept
         @data[:tables] << Table.new(self, i)
       else
         text = "   [ERROR] Concept #{name} with unkown attribute: #{i.name}"
-        Logger.verboseln Rainbow(text).color(:red)
+        puts Rainbow(text).color(:red)
       end
     end
   end
@@ -195,7 +194,7 @@ class Concept
 
   def process_tags(value)
     if value.text.nil? || value.text.size.zero?
-      Logger.verboseln Rainbow("[ERROR] Concept #{name} has tags empty!").red.briht
+      puts Rainbow("[ERROR] Concept #{name} has tags empty!").red.briht
       exit 1
     end
 
@@ -208,14 +207,16 @@ class Concept
   def process_def(value)
     case value.attributes['type']
     when 'image_url'
+      # Link with remote image
       @data[:images] << EmbeddedFile.load(value.text.strip, File.dirname(@filename))
     when 'file'
+      # Load local images and text files
       @data[:images] << EmbeddedFile.load(value.text.strip, File.dirname(@filename))
     when nil
       @data[:texts] << value.text.strip
     else
       msg = "[ERROR] Unknown type: #{value.attributes['type']}"
-      Logger.verboseln Rainbow(msg).red.bright
+      puts Rainbow(msg).red.bright
       exit 1
     end
   end

data/lib/asker/{project.rb → data/project_data.rb}

@@ -1,43 +1,30 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require 'rainbow'
-require_relative 'application'
-require_relative 'logger'
 
-# Contains Project data and methods
-class Project
+class ProjectData
   include Singleton
   attr_reader :default, :param
 
-  ##
-  # Initialize
   def initialize
     reset
   end
 
-  ##
-  # Reset project params
   def reset
     @default = { inputbasedir: FileUtils.pwd,
                  stages: { d: true, b: true, f: true, i: true, s: true, t: true },
-                 threshold: 0.5 }
+                 threshold: 0.5,
+                 outputdir: 'output',
+                 weights: '1, 1, 1' }
     @param = {}
   end
 
-  ##
-  # Get value param
-  # @param key (Symbol) key
   def get(key)
     return @param[key] unless @param[key].nil?
 
     @default[key]
   end
 
-  ##
-  # Set value param
-  # @param key (Symbol) key
-  # @param value (String) value
   def set(key, value)
     @param[key] = value
   end
@@ -52,7 +39,6 @@ class Project
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def open
-    config = Application.instance.config
     ext = File.extname(@param[:process_file]) || '.haml'
     @param[:projectname] = @param[:projectname] ||
                            File.basename(@param[:process_file], ext)
@@ -63,7 +49,7 @@ class Project
     @param[:yamlname] = "#{@param[:projectname]}.yaml"
     @param[:moodlename] = "#{@param[:projectname]}-moodle.xml"
 
-    outputdir = config['output']['folder']
+    outputdir = get(:outputdir)
     @param[:logpath] = File.join(outputdir, get(:logname))
     @param[:outputpath] = File.join(outputdir, get(:outputname))
     @param[:lessonpath] = File.join(outputdir, get(:lessonname))
@@ -71,10 +57,6 @@ class Project
     @param[:moodlepath] = File.join(outputdir, get(:moodlename))
 
     Dir.mkdir(outputdir) unless Dir.exist?(outputdir)
-    Logger.create(self) # Create log file where to save log messages
-    Logger.verboseln '[INFO] Project open'
-    Logger.verboseln '   ├── inputdirs    = ' + Rainbow(get(:inputdirs)).bright
-    Logger.verboseln '   └── process_file = ' + Rainbow(get(:process_file)).bright
   end
   # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize

data/lib/asker/data/world.rb

@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
 require_relative '../loader/image_url_loader'
-require_relative '../project'
-require_relative '../logger'
 
-##
-# World data
 class World
   attr_reader :concepts, :filenames, :contexts, :image_urls
 
-  ##
-  # Initialize World object
-  # @param concepts (Array)
-  # @param show_progress (Boolean)
-  def initialize(concepts, show_progress = true)
+  def initialize(concepts, internet = true)
     find_neighbors_for_every_concept(concepts)
     @concepts, @filenames, @contexts = get_lists_from(concepts)
-    @image_urls = find_url_images_from_internet(show_progress)
+    @image_urls = find_url_images_from_internet(internet)
   end
 
   ##
@@ -57,10 +49,9 @@ class World
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/CyclomaticComplexity
   # rubocop:disable Metrics/PerceivedComplexity
-  def find_url_images_from_internet(show_progress)
-    return {} unless Application.instance.config['global']['internet'] == 'yes'
+  def find_url_images_from_internet(internet)
+    return {} unless internet
 
-    Logger.verbose "\n[INFO] Loading data from Internet" if show_progress
     threads = []
     searchs = []
     urls = {}
@@ -68,11 +59,9 @@ class World
     @concepts&.each_key { |key| searchs << key }
     @contexts.each { |filter| searchs << filter.join(' ').to_s }
     searchs.each do |search|
-      Logger.verbose('.') if show_progress
       threads << Thread.new { urls[search] = ImageUrlLoader.load(search) }
     end
     threads.each(&:join) # wait for all threads to finish
-    Logger.verbose("\n") if show_progress
     urls
   end
   # rubocop:enable Metrics/MethodLength

data/lib/asker/displayer/concept_ai_displayer.rb

@@ -39,6 +39,7 @@ class ConceptAIDisplayer
       next unless concept_ai.concept.process?
 
       e = concept_ai.concept.texts.size
+      e += concept_ai.concept.images.size
       concept_ai.concept.tables.each { |t| e += t.fields.size * t.rows.size }
 
       sd = sb = sf = 0

data/lib/asker/files/language/en/templates.yaml

@@ -13,7 +13,7 @@
 :f2: 'The next items are "<%=text2%>".<br/>Choose the option that not belongs concept <b><%=text1%></b>.'
 :f3: 'The next items are "<%=text2%>" from <b><%=text1%></b> concept:<br><p><%=text3%></p>(Put every word into the right position)'
 :i1: '<%=text1%><br/>Choose the best association for the previous image.<br/>'
-:i2: '<%=text1%><br/>The previous image corresponds to <b><%=text2%></b>.'
+:i2: '<%=text1%><br/>The previous image/text corresponds to <b><%=text2%></b>.'
 :i3: '<%=text1%><br/>Write the best answer <%=text2%>, for the previous image.<br/>'
 :i4: '<%=text1%><br/>Definition:<br/> <i><%=text2%></i><br/><br/>(Put every word in the right text position)'
 :s1: "About <b><%=text1%></b> concept, sort every \"<%=text2%>\", so It is true that \"<%=text3%>\".<br/>"

data/lib/asker/files/language/es/templates.yaml

@@ -13,7 +13,7 @@
 :f2: 'Los siguientes elementos son "<%=text2%>".<br/>Selecciona la opción que no pertenezca al concepto <b><%=text1%></b>.'
 :f3: 'Los siguientes elementos son "<%=text2%>" del concepto <b><%=text1%></b>:<br><p><%=text3%></p>(Coloca cada palabra en su posición correcta dentro del texto)'
 :i1: '<%=text1%><br/>Elige la opción que mejor se corresponda con la imagen anterior.<br/>'
-:i2: '<%=text1%><br/>La imagen anterior corresponde a <b><%=text2%></b>.'
+:i2: '<%=text1%><br/>La imagen/texto anterior corresponde a <b><%=text2%></b>.'
 :i3: '<%=text1%><br/>Escribe la opción <%=text2%>, que mejor corresponda con la imagen anterior.<br/>'
 :i4: '<%=text1%><br/>Definición: <i><%=text2%></i><br/><br/>(Coloca cada palabra en su posición correcta dentro del texto)'
 :s1: 'En relación al concepto <b><%=text1%></b>, ordena cada/las/los "<%=text2%>" de modo que se cumpla el criterio "<%=text3%>".<br/>'

data/lib/asker/formatter/concept_doc_formatter.rb

@@ -3,10 +3,6 @@
 require 'rainbow'
 require 'terminal-table'
 
-require_relative '../project'
-
-##
-# Formatter Concept to Doc
 module ConceptDocFormatter
   ##
   # Formatter Concept into Doc

data/lib/asker/{checker.rb → input_checker.rb}

@@ -4,41 +4,36 @@ require 'rainbow'
 
 ##
 # Check HAML file syntax
-module Checker
-  ##
-  # Check:
-  # * file exist
-  # * filename extension
-  # * and HAML syntax
-  # @param filepath (String)
-  def self.check(filepath)
+module InputChecker
+
+  def self.check(filepath, verbose = true)
+    exist = check_file_exist(filepath, verbose)
+    return false unless exist
+    check_file_content(filepath, verbose)
+  end
+
+  def self.check_file_exist(filepath, verbose = true)
     unless File.exist? filepath
-      puts Rainbow('File not found!').red.bright
+      puts Rainbow('File not found!').red.bright if verbose
       return false
     end
     unless File.extname(filepath) == '.haml'
-      puts Rainbow('Only check HAML files!').yellow.bright
+      puts Rainbow('Only check HAML files!').yellow.bright if verbose
       return false
     end
-    check_filepath(filepath)
+    true
   end
 
-  ##
-  # Check HAML syntax
-  # @param filepath (String)
-  def self.check_filepath(filepath)
+  def self.check_file_content(filepath, verbose = true)
     data = Data.new(filepath)
     data.check
-    data.show_errors
+    data.show_errors if verbose
     data.ok?
   end
 
-  ##
-  # Internal class that revise syntax
   # rubocop:disable Metrics/ClassLength
   class Data
-    attr_reader :inputs
-    attr_reader :outputs
+    attr_reader :inputs, :outputs
 
     # rubocop:disable Metrics/MethodLength
     def initialize(filepath)
@@ -67,8 +62,6 @@ module Checker
       end
     end
 
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
     def show_errors
       errors = 0
       # puts "Line : Error description"
@@ -78,7 +71,9 @@ module Checker
         errors += 1
         if errors < 11
           data = { id: i[:id], msg: i[:msg], source: i[:source][0, 40] }
-          puts format(' %<id>03d : %<msg>s. => %<source>s', data)
+          order = i[:id] + 1
+          data = { order: order, msg: i[:msg], source: i[:source][0, 40] }
+          puts format(' %<order>03d : %<msg>s. => %<source>s', data)
         end
         puts '...' if errors == 11
       end
@@ -259,14 +254,15 @@ module Checker
       @outputs[index][:type] = :row
       @outputs[index][:state] = :ok
 
-      if count_spaces(line) == 6
+      case count_spaces(line)
+      when 6
         @outputs[index][:level] = 3
         parent = find_parent(index)
         unless %i[table features].include? parent
           @outputs[index][:state] = :err
           @outputs[index][:msg] = 'Parent(table/features) not found!'
         end
-      elsif count_spaces(line) == 8
+      when 8
         @outputs[index][:level] = 4
         if find_parent(index) != :template
           @outputs[index][:state] = :err
@@ -288,13 +284,14 @@ module Checker
 
       @outputs[index][:type] = :col
       @outputs[index][:state] = :ok
-      if count_spaces(line) == 8
+      case count_spaces(line)
+      when 8
         @outputs[index][:level] = 4
         if find_parent(index) != :row
           @outputs[index][:state] = :err
           @outputs[index][:msg] = 'Parent(row) not found!'
         end
-      elsif count_spaces(line) == 10
+      when 10
         @outputs[index][:level] = 5
         if find_parent(index) != :row
           @outputs[index][:state] = :err

data/lib/asker/loader/content_loader.rb

@@ -4,8 +4,7 @@ require 'rainbow'
 require 'rexml/document'
 require_relative '../data/concept'
 require_relative 'code_loader'
-require_relative '../logger'
-require_relative '../project'
+require_relative '../data/project_data'
 
 # Define methods that load data from XML contents
 module ContentLoader
@@ -33,7 +32,7 @@ module ContentLoader
       when 'code'
         codes << read_code(xmldata, filepath)
       else
-        Logger.verboseln Rainbow("[ERROR] Unkown tag <#{xmldata.name}>").red
+        puts Rainbow("[ERROR] Unkown tag <#{xmldata.name}>").red
       end
     end
 
@@ -49,7 +48,7 @@ module ContentLoader
     begin
       lang = xmldata.root.attributes['lang']
     rescue StandardError
-      lang = Project.instance.lang
+      lang = ProjectData.instance.lang
     end
     lang
   end
@@ -73,7 +72,7 @@ module ContentLoader
   # @param lang
   # @param context
   private_class_method def self.read_concept(xmldata, filepath, lang, context)
-    project = Project.instance
+    project = ProjectData.instance
     c = Concept.new(xmldata, filepath, lang, context)
     c.process = true if [File.basename(filepath), :default].include? project.get(:process_file)
     c
@@ -84,7 +83,7 @@ module ContentLoader
   # @param xmldata (XML Object)
   # @param filepath (String)
   private_class_method def self.read_code(xmldata, filepath)
-    project = Project.instance
+    project = ProjectData.instance
     c = CodeLoader.load(xmldata, filepath)
     c.process = true if [File.basename(filepath), :default].include? project.get(:process_file)
     c
@@ -95,8 +94,7 @@ module ContentLoader
   # @param filepath (String)
   # @param content (String)
   private_class_method def self.raise_error_with(filepath, content)
-    msg = Rainbow("[ERROR] ContentLoader: Format error in #{filepath}").red.bright
-    Logger.verboseln msg
+    puts Rainbow("[ERROR] ContentLoader: Format error in #{filepath}").red.bright
     f = File.open('output/error.xml', 'w')
     f.write(content)
     f.close

data/lib/asker/loader/directory_loader.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'file_loader'
-require_relative '../logger'
 
 # Load input data from one directory
 module DirectoryLoader
@@ -13,7 +12,6 @@ module DirectoryLoader
     files = (Dir.new(dirname).entries - ['.', '..']).sort
     # Accept only HAML or XML files
     accepted = files.select { |f| %w[.xml .haml].include? File.extname(f) }
-    Logger.verboseln " * Input directory  = #{Rainbow(dirname).bright}"
     DirectoryLoader.load_files(accepted, dirname)
   end
 
@@ -24,7 +22,7 @@ module DirectoryLoader
     return if Dir.exist? dirname
 
     msg = Rainbow("[ERROR] #{dirname} directory dosn't exist!").color(:red)
-    Logger.verboseln msg
+    puts msg
     raise msg
   end
 
@@ -48,11 +46,6 @@ module DirectoryLoader
   # @param filepath (String) Path to input file
   # @param last (Boolean) True if it is the last filename
   def self.load_file(filepath, last = false)
-    if last
-      Logger.verboseln "   └── Input file   = #{Rainbow(filepath).bright}"
-    else
-      Logger.verboseln "   ├── Input file   = #{Rainbow(filepath).bright}"
-    end
     FileLoader.load(filepath)
   end
 end

data/lib/asker/loader/file_loader.rb

@@ -2,7 +2,6 @@
 
 require_relative 'content_loader'
 require_relative 'haml_loader'
-require_relative '../logger'
 
 # Methods that load a filename and return list of concepts
 module FileLoader
@@ -15,8 +14,7 @@ module FileLoader
     elsif File.extname(filename).casecmp('.xml').zero?
       file_content = File.read(filename)
     else
-      msg = "[ERROR] FileLoader: Format error #{filename}"
-      Logger.verboseln msg
+      puts "[ERROR] FileLoader: Format error #{filename}"
       raise msg
     end
     ContentLoader.load(filename, file_content)

data/lib/asker/loader/image_url_loader.rb

@@ -1,8 +1,6 @@
 
 require 'net/http'
 require 'uri'
-require_relative '../application'
-require_relative '../logger'
 
 # Search URL images on Internet
 # Methods:
@@ -36,10 +34,10 @@ module ImageUrlLoader
         end
       end
     rescue
-      Logger.verboseln '[ERROR] ImageUrlLoader'
-      Logger.verboseln " => #{search_url}"
-      Logger.verboseln ' => Check Internet connections'
-      Logger.verboseln ' => Ensure URL is well formed'
+      puts '[ERROR] ImageUrlLoader'
+      puts " => #{search_url}"
+      puts ' => Check Internet connections'
+      puts ' => Ensure URL is well formed'
     end
     image_urls
   end

data/lib/asker/loader/input_loader.rb

@@ -3,30 +3,29 @@
 require_relative 'directory_loader'
 require_relative '../ai/concept_ai'
 require_relative '../data/world'
-require_relative '../logger'
 
 # Load DATA defined into our Project
 module InputLoader
   ##
   # Load input data from every input directory
   # @param inputdirs (Array)
-  def self.load(inputdirs)
+  def self.load(inputdirs, internet = true)
     data = { concepts: [], codes: [], world: nil,
              concepts_ai: [], codes_ai: [] }
-    Logger.verboseln "\n[INFO] Loading input data"
+    #Logger.verboseln "\n[INFO] Loading input data"
     inputdirs.each do |dirname|
       temp = DirectoryLoader.load(dirname)
       data[:concepts] += temp[:concepts]
       data[:codes] += temp[:codes]
     end
-    create_questions(data)
+    create_questions(data, internet)
   end
 
-  private_class_method def self.create_questions(data)
+  private_class_method def self.create_questions(data, internet)
     # Create World data
     # * Calculate concept neighbours
     # * TO-DO: Calculate code neighbours
-    data[:world] = World.new(data[:concepts])
+    data[:world] = World.new(data[:concepts], internet)
     # Create ConceptAI data (ConceptAI = concept + questions)
     data[:concepts].each do |concept|
       data[:concepts_ai] << ConceptAI.new(concept, data[:world])

data/lib/asker/loader/project_loader.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require_relative '../project'
-require_relative '../logger'
+require_relative '../data/project_data'
 
 # Load params into Project class using arg input
 # * load
@@ -16,7 +15,7 @@ module ProjectLoader
   # @param args (String or Hash)
   # rubocop:disable Metrics/MethodLength
   def self.load(args)
-    project = Project.instance
+    project = ProjectData.instance
 
     if args.class == Hash
       project.param.merge!(args)
@@ -30,7 +29,7 @@ module ProjectLoader
 
     msg = '[ERROR] ProjectLoader:'
     msg += "Configuration params format is <#{pArgs.class}>!"
-    Logger.verboseln Rainbow(msg).red
+    puts Rainbow(msg).red
     raise msg
   end
   # rubocop:enable Metrics/MethodLength
@@ -44,10 +43,10 @@ module ProjectLoader
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def self.load_from_string(filepath)
-    project = Project.instance
+    project = ProjectData.instance
     unless File.exist?(filepath)
       msg = Rainbow("[ERROR] #{filepath} not found!").red.bright
-      Logger.verboseln msg
+      puts msg
       exit 1
     end
 
@@ -65,7 +64,7 @@ module ProjectLoader
 
   # rubocop:disable Security/YAMLLoad
   def self.load_from_yaml(arg)
-    project = Project.instance
+    project = ProjectData.instance
     project.param.merge!(YAML.load(File.open(arg)))
     project.set(:configfilename, arg)
     project.set(:projectdir, File.dirname(arg))
@@ -77,7 +76,7 @@ module ProjectLoader
   # Error found and exit application.
   def self.error_loading(arg)
     msg = Rainbow("[ERROR] Loading... #{arg}").red.bright
-    Logger.verboseln msg
+    puts msg
     exit 1
   end
 end

data/lib/asker/logger.rb

@@ -6,39 +6,41 @@ require_relative 'application'
 # Display and log project messages
 class Logger
   include Singleton
+  @attr_verbose = 'yes'
 
-  def initialize
-    @logfile = null
+  def set_verbose(value)
+    @attr_verbose = value
   end
 
-  ##
-  # Display and log text
   def self.verbose(msg)
-    print msg if Application.instance.config['global']['verbose'] == 'yes'
+    print msg if @attr_verbose == 'yes'
     @logfile&.write(msg)
   end
 
-  ##
-  # Display and log text line
   def self.verboseln(msg)
     verbose(msg + "\n")
   end
 
+  def log(msg)
+    verbose(msg)
+  end
+
+  def logln(msg)
+    verboseln(msg)
+  end
   ##
   # Create or reset logfile
-  def self.create(project)
-    @logfile = File.open(project.get(:logpath), 'w')
+  def self.create(logpath, logname)
+    @logfile = File.open(logpath, 'w')
     @logfile.write('=' * 50 + "\n")
     @logfile.write("Created by : #{Application::NAME}")
     @logfile.write(" (version #{Application::VERSION})\n")
-    @logfile.write("File       : #{project.get(:logname)}\n")
+    @logfile.write("File       : #{logname}\n")
     @logfile.write("Time       : #{Time.new}\n")
     @logfile.write("Author     : David Vargas Ruiz\n")
     @logfile.write('=' * 50 + "\n\n")
   end
 
-  ##
-  # Close Log file
   def self.close
     @logfile.close
   end

data/lib/asker.rb

@@ -2,61 +2,66 @@
 
 require 'rainbow'
 
+require_relative 'asker/skeleton'
+require_relative 'asker/input_checker'
+
 require_relative 'asker/displayer/concept_displayer'
 require_relative 'asker/displayer/stats_displayer'
 require_relative 'asker/exporter/output_file_exporter'
+require_relative 'asker/logger'
+
 require_relative 'asker/loader/project_loader'
 require_relative 'asker/loader/input_loader'
-require_relative 'asker/checker'
-require_relative 'asker/logger'
-require_relative 'asker/skeleton'
 
-##
-# Asker main class
 class Asker
-  ##
-  # Create asker input demo files
-  # @param dirpath (String)
-  def self.create_input(dirpath)
-    Skeleton.create_input(dirpath)
+  def self.init
+    Skeleton.create_configuration
   end
 
-  ##
-  # Create asker configuration files
-  def self.create_configuration
-    Skeleton.create_configuration
+  def self.new_input(dirpath)
+    Skeleton.create_input(dirpath)
   end
 
-  ##
-  # Checking input file syntax
-  # @param filepath (String)
   def self.check(filepath)
-    Checker.check(filepath)
+    InputChecker.check(filepath)
   end
 
-  ##
-  # Start working
-  # @param filepath (String) HAML or XML filepath
   def self.start(filepath)
-    project, data = load_input(filepath)
+    project_data, data = load_input(filepath)
     ConceptDisplayer.show(data[:concepts])
-    create_output(project, data)
+    create_output(project_data, data)
   end
 
-  ##
-  # Load input data
-  # @param args (Hash)
   private_class_method def self.load_input(args)
-    project = ProjectLoader.load(args)
-    data = InputLoader.load(project.get(:inputdirs).split(','))
-    [project, data]
+    init_project_data
+    project_data = ProjectLoader.load(args)
+    init_logger(project_data)
+
+    inputdirs = project_data.get(:inputdirs).split(',')
+    internet = Application.instance.config['global']['internet'] == 'yes'
+    data = InputLoader.load(inputdirs, internet)
+    [project_data, data]
+  end
+
+  private_class_method def self.init_project_data()
+    project_data = ProjectData.instance
+    outputdir = Application.instance.config['output']['folder']
+    project_data.set(:outputdir, outputdir)
+
+    formula_weights = Application.instance.config['ai']['formula_weights']
+    project_data.set(:weights, formula_weights)
+  end
+
+  private_class_method def self.init_logger(project_data)
+    # Create log file where to save log messages
+    Logger.create(project_data.get(:logpath),
+                  project_data.get(:logname))
+    Logger.instance.set_verbose(Application.instance.config['verbose'])
+    Logger.verboseln '[INFO] Project open'
+    Logger.verboseln '   ├── inputdirs    = ' + Rainbow(project_data.get(:inputdirs)).bright
+    Logger.verboseln '   └── process_file = ' + Rainbow(project_data.get(:process_file)).bright
   end
 
-  ##
-  # Create output files: Gift, YAML, TXT Doc
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/PerceivedComplexity
   private_class_method def self.create_output(project, data)
     Logger.verboseln "\n[INFO] Creating output files"
     m = '   ├── Gift questions file => '
@@ -94,7 +99,4 @@ class Asker
     StatsDisplayer.show(data)
     Logger.close
   end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/PerceivedComplexity
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -142,12 +142,12 @@ files:
 - lib/asker/ai/stages/stage_s.rb
 - lib/asker/ai/stages/stage_t.rb
 - lib/asker/application.rb
-- lib/asker/checker.rb
 - lib/asker/cli.rb
 - lib/asker/data/code.rb
 - lib/asker/data/column.rb
 - lib/asker/data/concept.rb
 - lib/asker/data/data_field.rb
+- lib/asker/data/project_data.rb
 - lib/asker/data/row.rb
 - lib/asker/data/table.rb
 - lib/asker/data/template.rb
@@ -206,6 +206,7 @@ files:
 - lib/asker/formatter/question_moodle_formatter.rb
 - lib/asker/formatter/question_moodlexml_formatter.rb
 - lib/asker/formatter/rb2haml_formatter.rb
+- lib/asker/input_checker.rb
 - lib/asker/lang/lang.rb
 - lib/asker/lang/lang_factory.rb
 - lib/asker/lang/text_actions.rb
@@ -219,9 +220,8 @@ files:
 - lib/asker/loader/input_loader.rb
 - lib/asker/loader/project_loader.rb
 - lib/asker/logger.rb
-- lib/asker/project.rb
 - lib/asker/skeleton.rb
-homepage: https://github.com/dvarrui/asker/tree/v2.2
+homepage: https://github.com/teuton-software/asker/tree/v2.2
 licenses:
 - GPL-3.0
 metadata: {}
@@ -233,14 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Asker generates questions from input definitions file.