dsl_evaluator 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d545085cadd9e96a305d3eab1b5bd023586dca9450b9f42e36f262afd64fdfac
-  data.tar.gz: e0591f7b24d9daedbc3ecebad3af6ffedbdcfa5f14bf8c0f828ffc51495aef2d
+  metadata.gz: 641dfdf2c67b8959300970f5bc19894204a2d55a58d9652d7eccd6e18632c5e2
+  data.tar.gz: 1e47b3a332e0af2f7fdaaaccfa7b561b53843d7e576f1f24eb9f11a00ea48d90
 SHA512:
-  metadata.gz: f9490aaa42fb6171259500137cddafb2f646292a3e3d1b0838af734a6b57a0099b65df75cacda37631248b49a8d12da4b29afa0493505a0c14494058c54ac3ce
-  data.tar.gz: fdd9c4bdf362824a67bec2bb3e2b8b58d9e5838a02872020f9e20f93714f68e222e5d9bc7085217cec9464ecb04873382eb58963b3763a06cac72fd8b54c5249
+  metadata.gz: 7cb86de8092865008528a23d1e1762a8883a8c69af372c254c01fc6e5a46441ddeadb8ba4467fc7433fbce4f4ae613879b4a76412e6ca2b7f09bba60c47ac87b
+  data.tar.gz: 9319047be3502508e571151109d3c11760050dc03f5eb97775409ce6bdc9025bf764680daec19b6c6ee2bb047eb8a453446d5003b2705febf52d0ca3e8f4bd71

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.3.1] - 2022-07-11
+- [#8](https://github.com/tongueroo/dsl_evaluator/pull/8) fix select pattern when not set
+
+## [0.3.0] - 2022-03-14
+- [#7](https://github.com/tongueroo/dsl_evaluator/pull/7) Print code improvements
+
+## [0.2.5] - 2022-03-06
+- [#6](https://github.com/tongueroo/dsl_evaluator/pull/6) DslEvaluator.print_code public method
+
 ## [0.2.4] - 2022-03-03
 - print error message as part of trace
 

data/README.md

@@ -14,7 +14,6 @@ DslEvaluator.configure do |config|
   config.root = Lono.root
 end
 
-
 class Dsl
   include DslEvaluator
   def build
@@ -24,6 +23,27 @@ class Dsl
 end
 ```
 
+## Print Code Helper
+
+For other libraries where printing the code and context lines around the code is useful, you can use `DslEvaluator.print_code`.
+
+The `print_code` method understands "polymorphic" arguments.
+
+1. If the caller line info is part of a standard ruby backtrace line. Example of this is in ufo [helpers/ecr.rb](https://github.com/boltops-tools/ufo/blob/master/lib/ufo/task_definition/helpers/ecr.rb)
+
+```ruby
+call_line = ufo_config_call_line
+DslEvaluator.print_code(call_line)
+```
+
+2. If the caller line info is custom.  Example of this is in ufo [erb/yaml.rb](https://github.com/boltops-tools/ufo/blob/9247b77c6ad2a3a6307155a2a130308a24668333/lib/ufo/task_definition/erb/yaml.rb#L16)
+
+```ruby
+path = "replace with path to file"
+line_number = "replace with line number. usually can get the exception.message"
+DslEvaluator.print_code(path, line_number)
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/dsl_evaluator/printer/concern.rb

@@ -0,0 +1,65 @@
+class DslEvaluator::Printer
+  module Concern
+    # So other libraries can use this method
+    # The `print_code` method understands "polymorphic" arguments.
+    # See README.md
+    def print_code(*args)
+      if args.size == 2 # print_code(path, line_number)
+        path, line_number = args
+      else # print_code(caller_line)
+        # IE: .ufo/config/web/dev.rb:10:in `block in evaluate_file'
+        # User passed in a "standard" ruby backtrace call line
+        #   windows: "C:/Ruby31-x64/lib/ruby/gems/3.1.0/gems/terraspace-1.1.1/lib/terraspace/builder.rb:34:in `build'"
+        #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/terraspace-1.1.1/lib/terraspace/compiler/dsl/syntax/mod.rb:4:in `<module:Mod>'"
+        caller_line = args[0]
+        parts = caller_line.split(':')
+        is_windows = caller_line.match(/^[a-zA-Z]:/)  # windows vs linux
+        calling_file = is_windows ? parts[1] : parts[0]
+        line_number  = is_windows ? parts[2] : parts[1]
+        path = calling_file
+      end
+
+      check_line_number!(line_number)
+      line_number = line_number.to_i
+
+      logger.info "Here's the original caller line from:"
+      logger.info pretty_path(path).color(:green)
+
+      contents = IO.read(path)
+      content_lines = contents.split("\n")
+      context = 5 # lines of context
+      top, bottom = [line_number-context-1, 0].max, line_number+context-1
+      lpad = content_lines.size.to_s.size
+      content_lines[top..bottom].each_with_index do |line_content, index|
+        current_line = top+index+1
+        if current_line == line_number
+          printf("%#{lpad}d %s\n".color(:red), current_line, line_content)
+        else
+          printf("%#{lpad}d %s\n", current_line, line_content)
+        end
+      end
+
+      logger.info "Rerun with FULL_BACKTRACE=1 to see full backtrace" unless ENV['FULL_BACKTRACE']
+    end
+
+    def check_line_number!(line_number)
+      return line_number unless line_number.is_a?(String)
+      integer = line_number.to_i
+      if integer == 0
+        logger.error "ERROR: Think you accidentally passed in a String for the line_number: #{line_number}".color(:red)
+        puts caller
+        exit 1
+      end
+    end
+
+    def pretty_path(path)
+      path.sub("#{Dir.pwd}/",'').sub(/^\.\//,'')
+    end
+
+    # Replace HOME with ~ - different from the main pretty_path
+    def pretty_home(path)
+      path.sub(ENV['HOME'], '~')
+    end
+  end
+end
+

data/lib/dsl_evaluator/printer.rb

@@ -9,26 +9,14 @@ module DslEvaluator
       info = error_info
       path = info[:path]
       line_number = info[:line_number].to_i
-
       logger.error "ERROR: #{@error.message}".color(:red)
       logger.error "Error evaluating #{pretty_path(path)}".color(:red)
       logger.error "Here's the line with the error:\n\n"
+      print_code(path, line_number)
+    end
 
-      contents = IO.read(path)
-      content_lines = contents.split("\n")
-      context = 5 # lines of context
-      top, bottom = [line_number-context-1, 0].max, line_number+context-1
-      lpad = content_lines.size.to_s.size
-      content_lines[top..bottom].each_with_index do |line_content, index|
-        current_line = top+index+1
-        if current_line == line_number
-          printf("%#{lpad}d %s\n".color(:red), current_line, line_content)
-        else
-          printf("%#{lpad}d %s\n", current_line, line_content)
-        end
-      end
-
-      logger.info "Rerun with FULL_BACKTRACE=1 to see full backtrace" unless ENV['FULL_BACKTRACE']
+    def print_code(path, line_number)
+      DslEvaluator.print_code(path, line_number)
     end
 
     def error_info
@@ -86,7 +74,7 @@ module DslEvaluator
 
     def select(lines)
       pattern = config.backtrace.select_pattern
-      return unless pattern
+      return lines unless pattern
 
       lines.select do |l|
         if pattern.is_a?(String)

data/lib/dsl_evaluator/version.rb

@@ -1,3 +1,3 @@
 module DslEvaluator
-  VERSION = "0.2.4"
+  VERSION = "0.3.1"
 end

data/lib/dsl_evaluator.rb

@@ -11,6 +11,7 @@ DslEvaluator::Autoloader.setup
 
 module DslEvaluator
   extend Memoist
+  include Printer::Concern
 
   class Error < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_evaluator
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -89,6 +89,7 @@ files:
 - lib/dsl_evaluator/autoloader.rb
 - lib/dsl_evaluator/logger.rb
 - lib/dsl_evaluator/printer.rb
+- lib/dsl_evaluator/printer/concern.rb
 - lib/dsl_evaluator/version.rb
 homepage: https://github.com/tongueroo/dsl_evaluator
 licenses:
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: DSL evaluation library. It produces a human-friendly backtrace error