asker-tool 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ce9d640d7af95956ae17f28a2acdffba7ca6f31437fbf7d18b6de30d5fd73a
-  data.tar.gz: d62bc1fd0380f141dda9e17bd11beb24da62b99be7b4eed13e5206c265589f52
+  metadata.gz: 04d190919a7d7b95571b648c9c265903acdeae0ca4b698139218de32cfe0ee3c
+  data.tar.gz: fcb0b10af1a109958c8ff04dde61ff484ffbed75443a41898b97b9d633d915f3
 SHA512:
-  metadata.gz: 3f35ecee5e80950d66c57b039e39d9be4eb1a06b87b9fc6ca19b0cc2fa8ca99769467fba7608c55e8d1a1e408e17088723c014d8b677fad506896669e65060f1
-  data.tar.gz: 99b0da9a849a8d78802f70b03046d98df35f936086dd2f1eeca86a3655c5b8d5b1bbd5c221c291b19db5fafc802fd6202fb117ad8dd78f2f0fd57c907d98213d
+  metadata.gz: 022d75e6c3d4a2fedb183e60d86d64ab3b6494decd2ca5e1e8741824947bc2e3dadc902e6f7543978666d1833a29b7305794b33a84bfcfc07da6139c95f3009f
+  data.tar.gz: 713a78b38a4155700ad1e11cb562638b43bbbc479d2ffa2ef9726befa1b5e6b49283795cd141aee5871a8dbd37e04652c51cd98c1e0489b0c8cfa429b2002c42

data/lib/asker/application.rb

@@ -3,15 +3,11 @@
 require 'singleton'
 require 'inifile'
 require 'rainbow'
+require_relative 'version'
 
 # Global parameters
 class Application
   include Singleton
-
-  VERSION = '2.2.2'
-  NAME = 'asker'
-  GEM = 'asker-tool'
-  CONFIGFILE = 'asker.ini'
   attr_reader :config
 
   def initialize
@@ -19,8 +15,11 @@ class Application
   end
 
   def reset
-    filename = File.join(Dir.pwd, CONFIGFILE)
-    filename = File.join(File.dirname(__FILE__), 'files', CONFIGFILE) unless File.exist? filename
+    filename = File.join(Dir.pwd,
+                         Version::CONFIGFILE)
+    filename = File.join(File.dirname(__FILE__),
+                         'files',
+                          Version::CONFIGFILE) unless File.exist? filename
 
     begin
       @config = IniFile.load(filename)

data/lib/asker/check_input/{input_data.rb → check_haml_data.rb}

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 require 'rainbow'
+require 'colorize'
+require_relative 'check_table'
 
-class InputData
+class CheckHamlData
+  include CheckTable
   attr_reader :inputs, :outputs
 
   def initialize(filepath)
@@ -33,6 +36,7 @@ class InputData
   def show_errors
     errors = 0
     # puts "Line : Error description"
+    puts "\n"
     @outputs.each do |i|
       next if i[:state] == :ok
 
@@ -41,16 +45,16 @@ class InputData
         data = { id: i[:id], msg: i[:msg], source: i[:source][0, 40] }
         order = i[:id] + 1
         data = { order: order, msg: i[:msg], source: i[:source][0, 40] }
-        puts format(' %<order>03d : %<msg>s. => %<source>s', data)
+        print format(' %<order>03d : %<msg>32s. => '.white, data)
+        puts format('%<source>s'.light_yellow, data)
       end
       puts '...' if errors == 11
     end
 
     if errors.positive?
-      puts Rainbow("[ERROR] #{errors} errors " \
-                   "from #{@inputs.size} lines!").red.bright
+      puts "\n[ ASKER ] Please! Revise #{errors.to_s.light_red} error/s\n"
     end
-    puts Rainbow('Syntax OK!').green if errors.zero?
+    puts 'Syntax OK!'.green if errors.zero?
   end
 
   def check
@@ -167,104 +171,6 @@ class InputData
     end
   end
 
-  def check_table(line, index)
-    return unless @outputs[index][:state] == :none
-    return unless line.include? '%table'
-
-    @outputs[index][:type] = :table
-    @outputs[index][:level] = 2
-    @outputs[index][:state] = :ok
-    if find_parent(index) != :concept
-      @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Parent(concept) not found!'
-    elsif !line.start_with? '    %table'
-      @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 4 spaces before %table'
-    end
-  end
-
-  def check_row(line, index)
-    return unless @outputs[index][:state] == :none
-    return unless line.include? '%row'
-
-    @outputs[index][:type] = :row
-    @outputs[index][:state] = :ok
-
-    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
-    when 8
-      @outputs[index][:level] = 4
-      if find_parent(index) != :template
-        @outputs[index][:state] = :err
-        @outputs[index][:msg] = 'Parent(template) not found!'
-      end
-    else
-      @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 6 or 8 spaces before %row'
-    end
-  end
-
-  def check_col(line, index)
-    return unless @outputs[index][:state] == :none
-    return unless line.include? '%col'
-
-    @outputs[index][:type] = :col
-    @outputs[index][:state] = :ok
-    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
-    when 10
-      @outputs[index][:level] = 5
-      if find_parent(index) != :row
-        @outputs[index][:state] = :err
-        @outputs[index][:msg] = 'Parent(row) not found!'
-      end
-    else
-      @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 8 or 10 spaces before %col'
-    end
-    check_text(line, index)
-  end
-
-  def check_text(line, index)
-    return unless @outputs[index][:state] == :ok
-
-    ok = ''
-    %w[< >].each do |char|
-      ok = char if line.include? char
-    end
-    return if ok == ''
-
-    @outputs[index][:state] = :err
-    @outputs[index][:msg] = "Char #{ok} not allow!"
-  end
-
-  def check_template(line, index)
-    return unless @outputs[index][:state] == :none
-    return unless line.include? '%template'
-
-    @outputs[index][:type] = :template
-    @outputs[index][:level] = 3
-    @outputs[index][:state] = :ok
-    if find_parent(index) != :table
-      @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Parent(concept) not found!'
-    elsif !line.start_with? '      %template'
-      @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 6 spaces before %template'
-    end
-  end
-
   def check_code(line, index)
     return unless @outputs[index][:state] == :none
     return unless line.include? '%code'

data/lib/asker/check_input/check_table.rb

@@ -0,0 +1,104 @@
+
+module CheckTable
+
+  def check_table(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? '%table'
+
+    @outputs[index][:type] = :table
+    @outputs[index][:level] = 2
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :concept
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = 'Parent(concept) not found!'
+    elsif !line.start_with? '    %table'
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = 'Write 4 spaces before %table'
+    #else not /\s+%table{\s?fields:\s?'[A-Za-z,áéíóú]*'\s?}/.match(line)
+    #  @outputs[index][:state] = :err
+    #  @outputs[index][:msg] = 'Table#fields malformed!'
+    end
+  end
+
+  def check_row(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? '%row'
+
+    @outputs[index][:type] = :row
+    @outputs[index][:state] = :ok
+
+    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
+    when 8
+      @outputs[index][:level] = 4
+      if find_parent(index) != :template
+        @outputs[index][:state] = :err
+        @outputs[index][:msg] = 'Parent(template) not found!'
+      end
+    else
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = 'Write 6 or 8 spaces before %row'
+    end
+  end
+
+  def check_col(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? '%col'
+
+    @outputs[index][:type] = :col
+    @outputs[index][:state] = :ok
+    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
+    when 10
+      @outputs[index][:level] = 5
+      if find_parent(index) != :row
+        @outputs[index][:state] = :err
+        @outputs[index][:msg] = 'Parent(row) not found!'
+      end
+    else
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = 'Write 8 or 10 spaces before %col'
+    end
+    check_text(line, index)
+  end
+
+  def check_text(line, index)
+    return unless @outputs[index][:state] == :ok
+
+    ok = ''
+    %w[< >].each do |char|
+      ok = char if line.include? char
+    end
+    return if ok == ''
+
+    @outputs[index][:state] = :err
+    @outputs[index][:msg] = "Char #{ok} not allow!"
+  end
+
+  def check_template(line, index)
+    return unless @outputs[index][:state] == :none
+    return unless line.include? '%template'
+
+    @outputs[index][:type] = :template
+    @outputs[index][:level] = 3
+    @outputs[index][:state] = :ok
+    if find_parent(index) != :table
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = 'Parent(concept) not found!'
+    elsif !line.start_with? '      %template'
+      @outputs[index][:state] = :err
+      @outputs[index][:msg] = 'Write 6 spaces before %template'
+    end
+  end
+end

data/lib/asker/check_input.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rainbow'
-require_relative 'check_input/input_data'
+require_relative 'check_input/check_haml_data'
 
 class CheckInput
   def initialize(verbose = true)
@@ -43,7 +43,7 @@ class CheckInput
   end
 
   def check_file_content
-    data = InputData.new(@filepath)
+    data = CheckHamlData.new(@filepath)
     data.check
     data.show_errors if @verbose
     data.ok?

data/lib/asker/cli.rb

@@ -2,7 +2,7 @@
 
 require 'rainbow'
 require 'thor'
-require_relative 'application'
+require_relative 'version'
 require_relative '../asker'
 
 ##
@@ -13,7 +13,34 @@ class CLI < Thor
   map ['--version'] => 'version'
   desc 'version', 'Show the program version'
   def version
-    puts "#{Application::NAME} version #{Application::VERSION}"
+    puts "#{Version::NAME} version #{Version::VERSION}"
+    exit 0
+  end
+
+  map ['--init'] => 'init'
+  desc 'init', 'Create default INI config file'
+  def init
+    Asker.init
+    exit 0
+  end
+
+  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 new_input(dirname)
+    Asker.new_input(dirname)
+    exit 0
+  end
+
+  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
+    # Asker start processing input file
+    Asker.check(filename)
   end
 
   map ['f', '-f', '--file'] => 'file'
@@ -38,30 +65,6 @@ class CLI < Thor
     Asker.start(filename)
   end
 
-  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
-    # Asker start processing input file
-    Asker.check(filename)
-  end
-
-  map ['--init'] => 'init'
-  desc 'init', 'Create default INI config file'
-  def init
-    Asker.init
-  end
-
-  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 new_input(dirname)
-    Asker.new_input(dirname)
-  end
-
   ##
   # This actions are equals:
   # * asker demo/foo.haml

data/lib/asker/exporter/concept_ai_moodle_exporter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../formatter/question_moodle_formatter'
+require_relative '../version'
 
 # Export ConceptIA data to gift to moodlefile
 module ConceptAIMoodleExporter
@@ -13,8 +14,8 @@ module ConceptAIMoodleExporter
     file.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
     file.write("<quiz>\n")
     file.write("<!--\n#{('=' * 50)}\n")
-    file.write(" Created by : #{Application::NAME}")
-    file.write(" (version #{Application::VERSION})\n")
+    file.write(" Created by : #{Version::NAME}")
+    file.write(" (version #{Version::VERSION})\n")
     file.write(" File       : #{project.get(:moodlename)}\n")
     file.write(" Time       : #{Time.new}\n")
     file.write(" Author     : David Vargas Ruiz\n")

data/lib/asker/exporter/concept_doc_exporter.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
 require_relative '../formatter/concept_doc_formatter'
+require_relative '../version'
 
 ##
 # Export Concept to Doc file
 module ConceptDocExporter
   ##
-  # Export arrya of concepts to doc
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
+  # Export array of concepts to doc
   def self.export_all(concepts, project)
     file = File.new(project.get(:lessonpath), 'w')
     file.write('=' * 50 + "\n")
-    file.write("Created by : #{Application::NAME} (version #{Application::VERSION})\n")
+    file.write("Created by : #{Version::NAME} (version #{Version::VERSION})\n")
     file.write("File       : #{project.get(:lessonname)}\n")
     file.write("Time       : #{Time.new}\n")
     file.write("Author     : David Vargas Ruiz\n")
@@ -23,6 +22,4 @@ module ConceptDocExporter
     end
     file.close
   end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
 end

data/lib/asker/exporter/data_gift_exporter.rb

@@ -2,6 +2,8 @@
 
 require_relative 'concept_ai_gift_exporter'
 require_relative 'code_gift_exporter'
+require_relative '../version'
+require_relative '../application'
 
 # Export Data (ConceptIA and Code) to gift to outputfile
 module DataGiftExporter
@@ -12,8 +14,8 @@ module DataGiftExporter
   def self.export_all(data, project)
     file = File.open(project.get(:outputpath), 'w')
     file.write('// ' + ('=' * 50) + "\n")
-    file.write("// Created by : #{Application::NAME}")
-    file.write(" (version #{Application::VERSION})\n")
+    file.write("// Created by : #{Version::NAME}")
+    file.write(" (version #{Version::VERSION})\n")
     file.write("// File       : #{project.get(:outputname)}\n")
     file.write("// Time       : #{Time.new}\n")
     file.write("// Author     : David Vargas Ruiz\n")

data/lib/asker/loader/file_loader.rb

@@ -5,9 +5,6 @@ require_relative 'haml_loader'
 
 # Methods that load a filename and return list of concepts
 module FileLoader
-  ##
-  # Load asker data from file
-  # @param filename (String) File name to be load
   def self.load(filename)
     if File.extname(filename).casecmp('.haml').zero?
       file_content = HamlLoader.load filename

data/lib/asker/loader/haml_loader.rb

@@ -4,12 +4,16 @@ require 'haml'
 
 # HAML file loader
 module HamlLoader
-  ##
-  # Load HAML file name
-  # @param filename (String) HAML file name
   def self.load(filename)
     template = File.read(filename)
-    haml_engine = Haml::Engine.new(template)
-    haml_engine.render
+    begin
+      haml_engine = Haml::Engine.new(template)
+      return haml_engine.render
+    rescue StandardError => e
+      puts "[ERROR] HamlLoader: Can't load <#{filename}> file!"
+      puts "  => #{e}"
+      exit 0
+    end
   end
+
 end

data/lib/asker/logger.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require_relative 'application'
+require_relative 'version'
 
 # Display and log project messages
 class Logger
@@ -33,8 +33,8 @@ class Logger
   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("Created by : #{Version::NAME}")
+    @logfile.write(" (version #{Version::VERSION})\n")
     @logfile.write("File       : #{logname}\n")
     @logfile.write("Time       : #{Time.new}\n")
     @logfile.write("Author     : David Vargas Ruiz\n")

data/lib/asker/skeleton.rb

@@ -2,7 +2,7 @@
 
 require 'fileutils'
 require 'rainbow'
-require_relative 'application'
+require_relative 'version'
 
 # Skeleton: create skeleton for asker input files
 # * create
@@ -34,8 +34,8 @@ module Skeleton
   # Create default configuration files
   def self.create_configuration
     puts "\n[INFO] Creating configuration files"
-    src = File.join(File.dirname(__FILE__), 'files', Application::CONFIGFILE)
-    dst = File.join(Application::CONFIGFILE)
+    src = File.join(File.dirname(__FILE__), 'files', Version::CONFIGFILE)
+    dst = File.join(Version::CONFIGFILE)
     copyfile(src, dst)
   end
 

data/lib/asker/version.rb

@@ -0,0 +1,9 @@
+
+# Global parameters
+module Version
+  VERSION = '2.2.3'
+  NAME = 'asker'
+  GEM = 'asker-tool'
+  CONFIGFILE = 'asker.ini'
+  HOMEPAGE = "https://github.com/teuton-software/#{NAME}/tree/v2.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +185,8 @@ files:
 - lib/asker/ai/stages/stage_t.rb
 - lib/asker/application.rb
 - lib/asker/check_input.rb
-- lib/asker/check_input/input_data.rb
+- lib/asker/check_input/check_haml_data.rb
+- lib/asker/check_input/check_table.rb
 - lib/asker/cli.rb
 - lib/asker/data/code.rb
 - lib/asker/data/column.rb
@@ -250,6 +265,7 @@ files:
 - lib/asker/loader/project_loader.rb
 - lib/asker/logger.rb
 - lib/asker/skeleton.rb
+- lib/asker/version.rb
 homepage: https://github.com/teuton-software/asker/tree/v2.2
 licenses:
 - GPL-3.0
@@ -269,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Asker generates questions from input definitions file.