asker-tool 2.2.0 → 2.2.4

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

@@ -1,44 +1,46 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require_relative 'application'
+require_relative 'version'
 
 # 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("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")
     @logfile.write('=' * 50 + "\n\n")
   end
 
-  ##
-  # Close Log file
   def self.close
     @logfile.close
   end

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.4'
+  NAME = 'asker'
+  GEM = 'asker-tool'
+  CONFIGFILE = 'asker.ini'
+  HOMEPAGE = "https://github.com/teuton-software/#{NAME}/tree/v2.2\#readme"
+end

data/lib/asker.rb

@@ -2,61 +2,65 @@
 
 require 'rainbow'
 
+require_relative 'asker/skeleton'
+require_relative 'asker/check_input'
+
 require_relative 'asker/displayer/concept_displayer'
 require_relative 'asker/displayer/stats_displayer'
 require_relative 'asker/exporter/output_file_exporter'
-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
+require_relative 'asker/loader/project_loader'
+require_relative 'asker/loader/input_loader'
 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)
+    CheckInput.new.file(filepath).check
   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 +98,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.4
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -52,6 +52,34 @@ 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
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -142,12 +184,15 @@ 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/check_input.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
 - 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
@@ -219,9 +264,9 @@ 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
+- lib/asker/version.rb
+homepage: https://github.com/teuton-software/asker/tree/v2.2#readme
 licenses:
 - GPL-3.0
 metadata: {}
@@ -233,14 +278,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.6
 signing_key: 
 specification_version: 4
 summary: Asker generates questions from input definitions file.