asker-tool 2.1.2 → 2.1.7

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,10 +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") if project.get(:logfile)
-    # project.get(:logfile)&.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,8 +2,9 @@
 
 require 'singleton'
 require 'rainbow'
-require 'fileutils'
+# require 'fileutils'
 require_relative 'application'
+require_relative 'logger'
 
 # Contains Project data and methods
 class Project
@@ -20,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
 
@@ -58,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
@@ -100,19 +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)
-  end
-
-  ##
-  # Display and log text line
-  def verboseln(msg)
-    verbose(msg + "\n")
-  end
-
   def method_missing(method, *_args, &_block)
     get(method)
   end
@@ -131,13 +105,14 @@ class Project
     f.write("Author     : David Vargas Ruiz\n")
     f.write('=' * 50 + "\n\n")
 
-    verbose '[INFO] Project open'
-    verbose '   ├── inputdirs    = ' + Rainbow(get(:inputdirs)).bright
-    verbose '   └── process_file = ' + Rainbow(get(:process_file)).bright
+    Logger.verbose '[INFO] Project open'
+    Logger.verbose '   ├── inputdirs    = ' + Rainbow(get(:inputdirs)).bright
+    Logger.verbose '   └── process_file = ' + Rainbow(get(:process_file)).bright
   end
 
   # 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")
@@ -147,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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'rainbow'
+
+# Skeleton: create skeleton for asker input files
+# * create
+# * create_main_dir_and_files
+# * create_dir
+# * create_dirs
+# * copyfile
+module Skeleton
+  ##
+  # Create skeleton for asker input files
+  # @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
+    source = File.join(File.dirname(__FILE__), 'files/example-concept.haml')
+    copyfile(source, File.join(dirpath, filename))
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  ##
+  # 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)
+  private_class_method def self.create_dir(dirpath)
+    if Dir.exist? dirpath
+      puts "* Exists dir!       => #{Rainbow(dirpath).yellow}"
+    else
+      begin
+        FileUtils.mkdir_p(dirpath)
+        puts "* Create dir        => #{Rainbow(dirpath).green}"
+      rescue StandardError
+        puts "* Create dir  ERROR => #{Rainbow(dirpath).red}"
+      end
+    end
+  end
+
+  ##
+  # Copy target file to dest
+  # @param target (String)
+  # @param dest (String)
+  private_class_method def self.copyfile(target, dest)
+    if File.exist? dest
+      puts "* Exists file!      => #{Rainbow(dest).yellow}"
+      return true
+    end
+    begin
+      FileUtils.cp(target, dest)
+      puts "* Create file       => #{Rainbow(dest).green}"
+    rescue StandardError
+      puts "* Create file ERROR => #{Rainbow(dest).red}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.7
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: base64_compatible
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -116,70 +130,21 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
-- docs/idea.md
-- docs/changelog/v2.1.md
-- docs/revise/buenas-practicas/05-reproducir.md
-- docs/revise/buenas-practicas/04-resultados.md
-- docs/revise/buenas-practicas/01-convocatoria.md
-- docs/revise/buenas-practicas/02-formulario.md
-- docs/revise/buenas-practicas/03-descripcion.md
-- docs/revise/ejemplos/01/README.md
-- docs/revise/ejemplos/04/README.md
-- docs/revise/ejemplos/06/README.md
-- docs/revise/ejemplos/02/README.md
-- docs/revise/ejemplos/05/README.md
-- docs/revise/ejemplos/03/README.md
-- docs/revise/ejemplos/README.md
-- docs/revise/asker-file.md
-- docs/revise/projects.md
-- docs/commands.md
-- docs/contributions.md
-- docs/install/scripts.md
-- docs/install/README.md
-- docs/install/manual.md
-- docs/inputs/concepts.md
-- docs/inputs/tables.md
-- docs/inputs/code.md
-- docs/inputs/jedi.md
-- docs/inputs/templates.md
-- docs/inputs/README.md
-- docs/history.md
+- LICENSE.txt
 files:
-- LICENSE
+- LICENSE.txt
 - README.md
 - bin/asker
-- docs/changelog/v2.1.md
-- docs/commands.md
-- docs/contributions.md
-- docs/history.md
-- docs/idea.md
-- docs/inputs/README.md
-- docs/inputs/code.md
-- docs/inputs/concepts.md
-- docs/inputs/jedi.md
-- docs/inputs/tables.md
-- docs/inputs/templates.md
-- docs/install/README.md
-- docs/install/manual.md
-- docs/install/scripts.md
-- docs/revise/asker-file.md
-- docs/revise/buenas-practicas/01-convocatoria.md
-- docs/revise/buenas-practicas/02-formulario.md
-- docs/revise/buenas-practicas/03-descripcion.md
-- docs/revise/buenas-practicas/04-resultados.md
-- docs/revise/buenas-practicas/05-reproducir.md
-- docs/revise/ejemplos/01/README.md
-- docs/revise/ejemplos/02/README.md
-- docs/revise/ejemplos/03/README.md
-- docs/revise/ejemplos/04/README.md
-- docs/revise/ejemplos/05/README.md
-- docs/revise/ejemplos/06/README.md
-- docs/revise/ejemplos/README.md
-- docs/revise/projects.md
 - 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
@@ -193,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
@@ -207,15 +166,43 @@ files:
 - lib/asker/data/table.rb
 - lib/asker/data/template.rb
 - lib/asker/data/world.rb
+- lib/asker/displayer/code_displayer.rb
+- lib/asker/displayer/concept_ai_displayer.rb
+- lib/asker/displayer/concept_displayer.rb
+- lib/asker/displayer/stats_displayer.rb
 - lib/asker/exporter/code_gift_exporter.rb
-- lib/asker/exporter/code_screen_exporter.rb
 - lib/asker/exporter/concept_ai_gift_exporter.rb
-- lib/asker/exporter/concept_ai_screen_exporter.rb
 - lib/asker/exporter/concept_ai_yaml_exporter.rb
 - lib/asker/exporter/concept_doc_exporter.rb
-- lib/asker/exporter/concept_screen_exporter.rb
-- lib/asker/exporter/main.rb
+- lib/asker/exporter/output_file_exporter.rb
 - 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
@@ -230,12 +217,14 @@ files:
 - 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
 - lib/asker/logger.rb
 - lib/asker/project.rb
-homepage: https://github.com/dvarrui/asker
+- lib/asker/skeleton.rb
+homepage: https://github.com/dvarrui/asker/tree/devel
 licenses:
 - GPL-3.0
 metadata: {}
@@ -247,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:
   - - ">="

data/docs/changelog/v2.1.md

@@ -1,99 +0,0 @@
-
-# version 2.1
-
-Things/ideas to do for 2.1 Asker version.
-
-## GUI
-
-Create a graphic fron end to execute asker and edit input files.
-
-## Videos
-
-* Documentation: Revise documentation
-* Perhaps, videos on youtube explaining all this: (1) Get documentation, (2) Installation, (3) Consult demo input, (4) Create our input file usign def, (5) Add tables to our input file.
-
-## Languages
-
-* Language support: French, Dutch, Catalán and Esperanto.
-
----
-
-## Better table keyword
-
-* Process tables definitions with more than 2 fields.
-
-## info keyword
-
-* Add new keyword called info. Example:
-```
-%map{ :lang => 'en', :context => 'rock, bands', :version => '1'}
-  %info Generic text about music, rock, bands, concerts, etc.
-  %info more...
-```
-* When AI create new question may use (randomly) info text to be included into it. Example:
-```
-Rock music style was created for ....
-
-Definition of [*]: Australian rock band formed by Scottish-born brothers Malcolm and Angus Young.
-
-Select right option:
-a. Led Zepellin
-b. Beatles
-c. ACDC
-d. None
-```
-
-## Code inputs
-
-Let's take a look at the [issues](https://github.com/dvarrui/asker/issues)
-
-Actually we are experimenting with new keywords: code, type, path, features.
-
-Example:
-
-```
-  %code
-    %type ruby
-    %path files/string1.rb
-    %features
-      %row Muestra en pantalla "Hola Mundo!"
-```
-
-Where `type` could be: ruby, python or sql.
-
-> Also bash, math, crontab, fstab, etc.
-
-## More output formats
-
-* Images
-    * Questions with images, sounds or other files embebed.
-    * Embeded images into question texts
-* Work on other export formats (Perhaps Moodle format)
-
-## Etc
-
-* Texts
-    * Concept name drop and fill...
-* Question types
-    * crossword
-    * type hangmann
-* Dictionary
-    * Diccionario de sinónimos, antónimos
-    * Learn about the words or better download dictonary from RAE?
-
-## Quizzer
-
-* Export questions to YAML format then use them with app quizzer to create PDF exams.
-* For example:
-```
-# Create output/funiture-questions.yaml
-asker en/home/furniture.haml
-
-# Create 3 PDF exams with 10 questions every one
-quizzer 3x10 output/furniture-questions.yaml  
-```
-
-## Develop more Tests
-
-* minitest for every class into lib directory
-* Apply rubocop rules to all them.