asker-tool 2.1.5 → 2.1.6

data/lib/asker/loader/code_loader.rb

@@ -3,7 +3,7 @@
 require 'rainbow'
 require 'rexml/document'
 require_relative '../logger'
-require_relative '../code/code'
+require_relative '../data/code'
 
 # Read XML info about Code input data
 module CodeLoader
@@ -24,7 +24,7 @@ module CodeLoader
   # @param xmldata (XML Object)
   # @param filename (String) File name that contains data
   # @return Code object
-  def self.read_codedata_from_xml(xmldata, filename)
+  private_class_method def self.read_codedata_from_xml(xmldata, filename)
     data = { path: '?', type: '?', features: [] }
     xmldata.elements.each do |i|
       data[:path] = i.text if i.name == 'path'
@@ -38,7 +38,7 @@ module CodeLoader
   # Read features data from XML input
   # @param xmldata (XML object)
   # @return Array with features (Strings)
-  def self.read_features(xmldata, filename)
+  private_class_method def self.read_features(xmldata, filename)
     features = []
     xmldata.elements.each do |i|
       if i.name == 'row'

data/lib/asker/loader/content_loader.rb

@@ -41,7 +41,7 @@ module ContentLoader
   ##
   # Read lang attr from input XML data
   # @param xmldata (XML Object)
-  def self.read_lang_attribute(xmldata)
+  private_class_method def self.read_lang_attribute(xmldata)
     begin
       lang = xmldata.root.attributes['lang']
     rescue StandardError
@@ -53,7 +53,7 @@ module ContentLoader
   ##
   # Read context attr from input XML data
   # @param xmldata (XML Object)
-  def self.read_context_attribute(xmldata)
+  private_class_method def self.read_context_attribute(xmldata)
     begin
       context = xmldata.root.attributes['context']
     rescue StandardError
@@ -68,7 +68,7 @@ module ContentLoader
   # @param filepath (String)
   # @param lang
   # @param context
-  def self.read_concept(xmldata, filepath, lang, context)
+  private_class_method def self.read_concept(xmldata, filepath, lang, context)
     project = Project.instance
     c = Concept.new(xmldata, filepath, lang, context)
     if [ File.basename(filepath), :default ].include? project.process_file
@@ -81,7 +81,7 @@ module ContentLoader
   # Read code from input XML data
   # @param xmldata (XML Object)
   # @param filepath (String)
-  def self.read_code(xmldata, filepath)
+  private_class_method def self.read_code(xmldata, filepath)
     project = Project.instance
     c = CodeLoader.load(xmldata, filepath)
     if [ File.basename(filepath), :default ].include? project.process_file
@@ -90,7 +90,11 @@ module ContentLoader
     c
   end
 
-  def self.raise_error_with(filepath, content)
+  ##
+  # Raise error and save content into error.file
+  # @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.verbose msg
     f = File.open('output/error.xml', 'w')

data/lib/asker/loader/file_loader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'haml'
 require_relative 'content_loader'
+require_relative 'haml_loader'
 require_relative '../logger'
 
 # Methods that load a filename and return list of concepts
@@ -11,7 +11,7 @@ module FileLoader
   # @param filename (String) File name to be load
   def self.load(filename)
     if File.extname(filename).casecmp('.haml').zero?
-      file_content = load_haml filename
+      file_content = HamlLoader.load filename
     elsif File.extname(filename).casecmp('.xml').zero?
       file_content = File.read(filename)
     else
@@ -21,13 +21,4 @@ module FileLoader
     end
     ContentLoader.load(filename, file_content)
   end
-
-  ##
-  # Load HAML file name
-  # @param filename (String) HAML file name
-  def self.load_haml(filename)
-    template = File.read(filename)
-    haml_engine = Haml::Engine.new(template)
-    haml_engine.render
-  end
 end

data/lib/asker/loader/haml_loader.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+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
+  end
+end

data/lib/asker/loader/image_url_loader.rb

@@ -1,8 +1,8 @@
 
 require 'net/http'
 require 'uri'
-require_relative '../project'
 require_relative '../application'
+require_relative '../logger'
 
 # Search URL images on Internet
 # Methods:
@@ -12,9 +12,6 @@ require_relative '../application'
 module ImageUrlLoader
   # Search "input" images on Google and return URL
   def self.load(input = [])
-    param = Application.instance.config['global']['internet'] || 'yes'
-    return [] unless param == 'yes'
-
     filters = []
     if input.class == String
       filters += sanitize_string(input.clone)
@@ -39,10 +36,10 @@ module ImageUrlLoader
         end
       end
     rescue
-      Project.instance.verboseln '[ERROR] ImageUrlLoader'
-      Project.instance.verboseln " => #{search_url}"
-      Project.instance.verboseln ' => Check Internet connections'
-      Project.instance.verboseln ' => Ensure URL is well formed'
+      Logger.verboseln '[ERROR] ImageUrlLoader'
+      Logger.verboseln " => #{search_url}"
+      Logger.verboseln ' => Check Internet connections'
+      Logger.verboseln ' => Ensure URL is well formed'
     end
     image_urls
   end

data/lib/asker/loader/input_loader.rb

@@ -11,10 +11,9 @@ module InputLoader
   # Load input data from every input directory
   # @param inputdirs (Array)
   def self.load(inputdirs)
-    data = { concepts: [], codes: [], world: nil, concepts_ai: [] }
+    data = { concepts: [], codes: [], world: nil,
+             concepts_ai: [], codes_ai: [] }
     Logger.verbose "\n[INFO] Loading input data"
-
-    # inputdirs = project.inputdirs.split(',')
     inputdirs.each do |dirname|
       temp = DirectoryLoader.load(dirname)
       data[:concepts] += temp[:concepts]
@@ -28,14 +27,14 @@ module InputLoader
     # * Calculate concept neighbours
     # * TO-DO: Calculate code neighbours
     data[:world] = World.new(data[:concepts])
-    # Create ConceptAI data and make concept questions
+    # Create ConceptAI data (ConceptAI = concept + questions)
     data[:concepts].each do |concept|
-      concept_ai = ConceptAI.new(concept, data[:world])
-      concept_ai.make_questions
-      data[:concepts_ai] << concept_ai
+      data[:concepts_ai] << ConceptAI.new(concept, data[:world])
+    end
+    # Create CodeAI data (CodeAI = code + questions)
+    data[:codes].each do |code|
+      data[:codes_ai] << CodeAIFactory.get(code)
     end
-    # Make code questions
-    data[:codes].each(&:make_questions)
     data
   end
 end

data/lib/asker/loader/project_loader.rb

@@ -40,9 +40,9 @@ module ProjectLoader
   def self.load_from_string(filepath)
     project = Project.instance
     unless File.exist?(filepath)
-      msg = Rainbow("[WARN] ProjectLoader.load: #{arg} dosn't exists!").yellow.bright
-      project.verbose msg
-      raise msg
+      msg = Rainbow("[ERROR] #{filepath} not found!").red.bright
+      Logger.verbose msg
+      exit 1
     end
 
     if File.extname(filepath) == '.haml' || File.extname(filepath) == '.xml'
@@ -52,7 +52,7 @@ module ProjectLoader
     elsif File.extname(filepath) == '.yaml'
       return load_from_yaml(filepath)
     else
-      load_error(filepath)
+      error_loading(filepath)
     end
   end
 
@@ -64,9 +64,11 @@ module ProjectLoader
     project
   end
 
-  def self.load_error(arg)
-    msg = Rainbow("[ERROR] ProjectLoader.Input unkown: #{arg}").red.bright
-    Project.instance.verbose msg
-    raise msg
+  ##
+  # Error found and exit application.
+  def self.error_loading(arg)
+    msg = Rainbow("[ERROR] Loading... #{arg}").red.bright
+    Logger.verbose msg
+    exit 1
   end
 end

data/lib/asker/logger.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'application'
 require_relative 'project'
 
 # Display and log project messages
@@ -7,9 +8,8 @@ module Logger
   ##
   # Display and log text
   def self.verbose(msg)
-    project = Project.instance
-    puts msg if project.get(:verbose)
-    project.get(:logfile)&.write("#{msg}\n")
+    puts msg if Application.instance.config['global']['verbose'] == 'yes'
+    Project.instance.get(:logfile)&.write("#{msg}\n")
   end
 
   ##

data/lib/asker/project.rb

@@ -2,7 +2,7 @@
 
 require 'singleton'
 require 'rainbow'
-require 'fileutils'
+# require 'fileutils'
 require_relative 'application'
 require_relative 'logger'
 
@@ -21,16 +21,8 @@ class Project
   # Reset project params
   def reset
     @default = { inputbasedir: FileUtils.pwd,
-                outputdir: 'output',
-                category: :none,
-                formula_weights: [1, 1, 1],
-                lang: 'en',
-                locales: %w[en es javascript math python ruby sql],
-                show_mode: :default,
-                verbose: true,
                 stages: { d: true, b: true, f: true, i: true, s: true, t: true },
-                threshold: 0.5,
-                color_output: true }
+                threshold: 0.5 }
     @param = {}
   end
 
@@ -59,33 +51,27 @@ class Project
   # * process_file
   # * inputdirs
   def open
-    ext = '.haml'
-    @param[:process_file] = @param[:process_file] ||
-                            get(:projectdir).split(File::SEPARATOR).last + ext
+    config = Application.instance.config
+    ext = File.extname(@param[:process_file]) || '.haml'
+    #@param[:process_file] = @param[:process_file] ||
+    #                        get(:projectdir).split(File::SEPARATOR).last + ext
     @param[:projectname] = @param[:projectname] ||
                            File.basename(@param[:process_file], ext)
-    @param[:inputdirs] = @param[:inputdirs] ||
-                         File.join(get(:inputbasedir), @param[:projectdir])
-
-    @param[:logname] = @param[:logname] ||
-                       "#{@param[:projectname]}-log.txt"
-    @param[:outputname] = @param[:outputname] ||
-                          "#{@param[:projectname]}-gift.txt"
-    @param[:lessonname] = @param[:lessonname] ||
-                          "#{@param[:projectname]}-doc.txt"
-    @param[:yamlname] = @param[:yamlname] ||
-                        "#{@param[:projectname]}.yaml"
-
-    @param[:logpath] = @param[:logpath] ||
-                       File.join(get(:outputdir), @param[:logname])
-    @param[:outputpath] = @param[:outputpath] ||
-                          File.join(get(:outputdir), @param[:outputname])
-    @param[:lessonpath] = @param[:lessonpath] ||
-                          File.join(get(:outputdir), @param[:lessonname])
-    @param[:yamlpath] = @param[:yamlpath] ||
-                        File.join(get(:outputdir), @param[:yamlname])
-
-    Dir.mkdir(get(:outputdir)) unless Dir.exist?(get(:outputdir))
+    #@param[:inputdirs] = @param[:inputdirs] ||
+    #                     File.join(get(:inputbasedir), @param[:projectdir])
+
+    @param[:logname] = "#{@param[:projectname]}-log.txt"
+    @param[:outputname] = "#{@param[:projectname]}-gift.txt"
+    @param[:lessonname] = "#{@param[:projectname]}-doc.txt"
+    @param[:yamlname] = "#{@param[:projectname]}.yaml"
+
+    outputdir = config['global']['outputdir']
+    @param[:logpath] = File.join(outputdir, get(:logname))
+    @param[:outputpath] = File.join(outputdir, get(:outputname))
+    @param[:lessonpath] = File.join(outputdir, get(:lessonname))
+    @param[:yamlpath] = File.join(outputdir, get(:yamlname))
+
+    Dir.mkdir(outputdir) unless Dir.exist?(outputdir)
     create_log_file
     create_output_file
     create_lesson_file
@@ -101,20 +87,6 @@ class Project
     get(:yamlfile).close
   end
 
-  ##
-  # Display and log text
-  def verbose(msg)
-    puts msg if get(:verbose)
-    get(:logfile).write(msg.to_s + "\n") if get(:logfile)
-    raise "verbose"
-  end
-
-  ##
-  # Display and log text line
-  def verboseln(msg)
-    verbose(msg + "\n")
-  end
-
   def method_missing(method, *_args, &_block)
     get(method)
   end
@@ -140,6 +112,7 @@ class Project
 
   # Create or reset output file
   def create_output_file
+    config = Application.instance.config
     @param[:outputfile] = File.open(get(:outputpath), 'w')
     f = get(:outputfile)
     f.write('// ' + ('=' * 50) + "\n")
@@ -149,7 +122,8 @@ class Project
     f.write("// Time       : #{Time.new}\n")
     f.write("// Author     : David Vargas Ruiz\n")
     f.write('// ' + ('=' * 50) + "\n\n")
-    f.write("$CATEGORY: $course$/#{get(:category)}\n") unless get(:category) == :none
+    category = config['questions']['category']
+    f.write("$CATEGORY: $course$/#{category}\n") unless category.nil?
   end
 
   # Create or reset lesson file

data/lib/asker/skeleton.rb

@@ -12,27 +12,36 @@ require 'rainbow'
 module Skeleton
   ##
   # Create skeleton for asker input files
-  # @param dirpath (String) Folder path to save example files
-  def self.create(dirpath)
-    puts "\n[INFO] Creating #{Rainbow(dirpath).bright} project skeleton"
+  # @param inputpath (String)
+  # rubocop:disable Metrics/MethodLength
+  def self.create_input(inputpath)
+    puts "\n[INFO] Creating example input #{Rainbow(inputpath).bright}"
+    if File.extname(inputpath) == '.haml'
+      dirpath = File.dirname(inputpath)
+      filename = File.basename(inputpath)
+    else
+      dirpath = inputpath
+      filename = 'example-concept.haml'
+    end
     create_dir dirpath
-    copy_files_into(dirpath)
+    source = File.join(File.dirname(__FILE__), 'files/example-concept.haml')
+    copyfile(source, File.join(dirpath, filename))
   end
+  # rubocop:enable Metrics/MethodLength
 
   ##
-  # Copy lib/asker/files into Folder
-  # @param dirpath (String)
-  def self.copy_files_into(dirpath)
-    # Directory and files: example-concept.haml
-    source = File.join(File.dirname(__FILE__), 'files/example-concept.haml')
-    target = File.join(dirpath, 'example-concept.haml')
-    copyfile(source, target)
+  # Create default configuration files
+  def self.create_configuration
+    puts "\n[INFO] Creating configuration files"
+    src = File.join(File.dirname(__FILE__), 'files', 'config.ini')
+    dst = File.join('config.ini')
+    copyfile(src, dst)
   end
 
   ##
   # Create folder
   # @param dirpath (String)
-  def self.create_dir(dirpath)
+  private_class_method def self.create_dir(dirpath)
     if Dir.exist? dirpath
       puts "* Exists dir!       => #{Rainbow(dirpath).yellow}"
     else
@@ -49,7 +58,7 @@ module Skeleton
   # Copy target file to dest
   # @param target (String)
   # @param dest (String)
-  def self.copyfile(target, dest)
+  private_class_method def self.copyfile(target, dest)
     if File.exist? dest
       puts "* Exists file!      => #{Rainbow(dest).yellow}"
       return true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -130,14 +130,21 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
+- LICENSE.txt
 files:
-- LICENSE
+- LICENSE.txt
 - README.md
 - bin/asker
 - lib/asker.rb
 - lib/asker/ai/ai.rb
 - lib/asker/ai/ai_calculate.rb
+- lib/asker/ai/code/base_code_ai.rb
+- lib/asker/ai/code/code_ai_factory.rb
+- lib/asker/ai/code/javascript_code_ai.rb
+- lib/asker/ai/code/problem_code_ai.rb
+- lib/asker/ai/code/python_code_ai.rb
+- lib/asker/ai/code/ruby_code_ai.rb
+- lib/asker/ai/code/sql_code_ai.rb
 - lib/asker/ai/concept_ai.rb
 - lib/asker/ai/question.rb
 - lib/asker/ai/stages/base_stage.rb
@@ -151,13 +158,7 @@ files:
 - lib/asker/application.rb
 - lib/asker/checker.rb
 - lib/asker/cli.rb
-- lib/asker/code/ai/base_code_ai.rb
-- lib/asker/code/ai/code_ai_factory.rb
-- lib/asker/code/ai/javascript_code_ai.rb
-- lib/asker/code/ai/python_code_ai.rb
-- lib/asker/code/ai/ruby_code_ai.rb
-- lib/asker/code/ai/sql_code_ai.rb
-- lib/asker/code/code.rb
+- lib/asker/data/code.rb
 - lib/asker/data/column.rb
 - lib/asker/data/concept.rb
 - lib/asker/data/data_field.rb
@@ -177,6 +178,31 @@ files:
 - lib/asker/files/config.ini
 - lib/asker/files/example-code.haml
 - lib/asker/files/example-concept.haml
+- lib/asker/files/language/du/templates.yaml
+- lib/asker/files/language/en/connectors.yaml
+- lib/asker/files/language/en/mistakes.yaml
+- lib/asker/files/language/en/templates.yaml
+- lib/asker/files/language/es/connectors.yaml
+- lib/asker/files/language/es/mistakes.yaml
+- lib/asker/files/language/es/templates.yaml
+- lib/asker/files/language/fr/connectors.yaml
+- lib/asker/files/language/fr/mistakes.yaml
+- lib/asker/files/language/fr/templates.yaml
+- lib/asker/files/language/javascript/connectors.yaml
+- lib/asker/files/language/javascript/mistakes.yaml
+- lib/asker/files/language/javascript/templates.yaml
+- lib/asker/files/language/math/connectors.yaml
+- lib/asker/files/language/math/mistakes.yaml
+- lib/asker/files/language/math/templates.yaml
+- lib/asker/files/language/python/connectors.yaml
+- lib/asker/files/language/python/mistakes.yaml
+- lib/asker/files/language/python/templates.yaml
+- lib/asker/files/language/ruby/connectors.yaml
+- lib/asker/files/language/ruby/mistakes.yaml
+- lib/asker/files/language/ruby/templates.yaml
+- lib/asker/files/language/sql/connectors.yaml
+- lib/asker/files/language/sql/mistakes.yaml
+- lib/asker/files/language/sql/templates.yaml
 - lib/asker/formatter/code_string_formatter.rb
 - lib/asker/formatter/concept_doc_formatter.rb
 - lib/asker/formatter/concept_string_formatter.rb
@@ -186,36 +212,12 @@ files:
 - lib/asker/formatter/rb2haml_formatter.rb
 - lib/asker/lang/lang.rb
 - lib/asker/lang/lang_factory.rb
-- lib/asker/lang/locales/du/templates.yaml
-- lib/asker/lang/locales/en/connectors.yaml
-- lib/asker/lang/locales/en/mistakes.yaml
-- lib/asker/lang/locales/en/templates.yaml
-- lib/asker/lang/locales/es/connectors.yaml
-- lib/asker/lang/locales/es/mistakes.yaml
-- lib/asker/lang/locales/es/templates.yaml
-- lib/asker/lang/locales/fr/connectors.yaml
-- lib/asker/lang/locales/fr/mistakes.yaml
-- lib/asker/lang/locales/fr/templates.yaml
-- lib/asker/lang/locales/javascript/connectors.yaml
-- lib/asker/lang/locales/javascript/mistakes.yaml
-- lib/asker/lang/locales/javascript/templates.yaml
-- lib/asker/lang/locales/math/connectors.yaml
-- lib/asker/lang/locales/math/mistakes.yaml
-- lib/asker/lang/locales/math/templates.yaml
-- lib/asker/lang/locales/python/connectors.yaml
-- lib/asker/lang/locales/python/mistakes.yaml
-- lib/asker/lang/locales/python/templates.yaml
-- lib/asker/lang/locales/ruby/connectors.yaml
-- lib/asker/lang/locales/ruby/mistakes.yaml
-- lib/asker/lang/locales/ruby/templates.yaml
-- lib/asker/lang/locales/sql/connectors.yaml
-- lib/asker/lang/locales/sql/mistakes.yaml
-- lib/asker/lang/locales/sql/templates.yaml
 - lib/asker/lang/text_actions.rb
 - lib/asker/loader/code_loader.rb
 - lib/asker/loader/content_loader.rb
 - lib/asker/loader/directory_loader.rb
 - lib/asker/loader/file_loader.rb
+- lib/asker/loader/haml_loader.rb
 - lib/asker/loader/image_url_loader.rb
 - lib/asker/loader/input_loader.rb
 - lib/asker/loader/project_loader.rb
@@ -234,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="