asker-tool 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2778b9791cbe75e5ad0c0a0b31161ccb7c439e30361c5f0df4b468edd5f3b326
-  data.tar.gz: 9d5eaff6548c67073b246da034468402f0c34e4e494c0bb5256805eed661a512
+  metadata.gz: e2f9eaec9a8bb085529b1b131f6e7184b769796f452096c7e9813da191425a70
+  data.tar.gz: 25d938ce101b69c2171de314270207d17d1783008968fb0be7c21f228070c44f
 SHA512:
-  metadata.gz: ac1889c5e960b2cb2d879ec46506fd9adbd7cbcf122ac8047b9d72306e16ecc3636cbddab63f79ece8d0ab235f59da86fef821537e8a7125cee6a36b23603a60
-  data.tar.gz: 31ecb2d5d68d4f630d5ab71712d72177f7b9eebcf0c1546015c0fc9d29ac1202ec69d6d26c38bcc6a4e3c74b4f1db722394f63d3519e15d2da2fc25e330a092e
+  metadata.gz: f62278acb1f78b567aae35e41256d36ff76503fd3c46939f2f0f83a414b3b817ddb515d79ee9cb557352555683cc1918af02001ada4d2f44343a0be9850cc7d6
+  data.tar.gz: d27246c82c93285ff411ff73fd3d265e7503efce6c9037f2462147103c24e15db728553363f565043dc5443b78d3d3e73ac114f27d0ef66245ff72e333d85ee1

data/lib/asker/check_input/check_haml_data.rb

@@ -1,8 +1,8 @@
-# frozen_string_literal: true
 
-require 'rainbow'
-require 'colorize'
-require_relative 'check_table'
+# require 'rainbow'
+require "debug"
+require "colorize"
+require_relative "check_table"
 
 class CheckHamlData
   include CheckTable
@@ -117,9 +117,10 @@ class CheckHamlData
     if find_parent(index) != :map
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(map) not found!'
-    elsif line != '  %concept'
+    elsif !line.match(/^\s\s%concept\s*$/)
+      binding.break
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 2 spaces before %concept'
+      @outputs[index][:msg] = 'Write 2 spaces before %concept, and no text after'
     end
   end
 
@@ -134,6 +135,7 @@ class CheckHamlData
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(concept) not found!'
     elsif !line.start_with? '    %names'
+    elsif !line.match(/^\s\s\s\s%names\s/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 4 spaces before %names'
     end
@@ -149,7 +151,7 @@ class CheckHamlData
     if find_parent(index) != :concept
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(concept) not found!'
-    elsif !line.start_with? '    %tags'
+    elsif !line.match(/^\s\s\s\s%tags\s/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 4 spaces before %tags'
     end
@@ -165,7 +167,7 @@ class CheckHamlData
     if find_parent(index) != :concept
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(concept) not found!'
-    elsif !line.start_with? '    %def'
+    elsif !line.match(/^\s\s\s\s%def\s/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 4 spaces before %def'
     end
@@ -181,9 +183,9 @@ class CheckHamlData
     if find_parent(index) != :map
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(map) not found!'
-    elsif line != '  %code'
+    elsif !line.match(/^\s\s%code\s*$/)
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 2 spaces before %code'
+      @outputs[index][:msg] = 'Write 2 spaces before %code, and no text after'
     end
   end
 
@@ -197,7 +199,7 @@ class CheckHamlData
     if find_parent(index) != :code
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(code) not found!'
-    elsif !line.start_with? '    %type'
+    elsif !line.match(/^\s\s\s\s%type\s/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 4 spaces before %type'
     end
@@ -213,7 +215,7 @@ class CheckHamlData
     if find_parent(index) != :code
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(code) not found!'
-    elsif !line.start_with? '    %path'
+    elsif !line.match(/^\s\s\s\s%path\s/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 4 spaces before %type'
     end
@@ -229,9 +231,9 @@ class CheckHamlData
     if find_parent(index) != :code
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(code) not found!'
-    elsif !line.start_with? '    %features'
+    elsif !line.match(/^\s\s\s\s%features\s*$/)
       @outputs[index][:state] = :err
-      @outputs[index][:msg] = 'Write 4 spaces before %features'
+      @outputs[index][:msg] = 'Write 4 spaces before %features, and no text after'
     end
   end
 

data/lib/asker/check_input/check_table.rb

@@ -11,7 +11,7 @@ module CheckTable
     if find_parent(index) != :concept
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(concept) not found!'
-    elsif !line.start_with? '    %table'
+    elsif !line.match(/^\s\s\s\s%table\s*/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 4 spaces before %table'
     end
@@ -25,12 +25,6 @@ module CheckTable
       @outputs[index][:state] = :err
       @outputs[index][:msg] = "fields must be next to : (Without spaces)"
     end
-
-    # TODO
-    #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)
@@ -109,7 +103,7 @@ module CheckTable
     if find_parent(index) != :table
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Parent(concept) not found!'
-    elsif !line.start_with? '      %template'
+    elsif !line.match(/^\s\s\s\s\s\s%template\s*/)
       @outputs[index][:state] = :err
       @outputs[index][:msg] = 'Write 6 spaces before %template'
     end

data/lib/asker/version.rb

@@ -1,8 +1,8 @@
 
 class Asker
-  VERSION = '2.5.3'
-  NAME = 'asker'
-  GEM = 'asker-tool'
-  CONFIGFILE = 'asker.ini'
+  VERSION = "2.5.4"
+  NAME = "asker"
+  GEM = "asker-tool"
+  CONFIGFILE = "asker.ini"
   HOMEPAGE = "https://github.com/teuton-software/#{NAME}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asker-tool
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml