dsl_evaluator 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641dfdf2c67b8959300970f5bc19894204a2d55a58d9652d7eccd6e18632c5e2
-  data.tar.gz: 1e47b3a332e0af2f7fdaaaccfa7b561b53843d7e576f1f24eb9f11a00ea48d90
+  metadata.gz: 69172b455f5ffdc6c918bafdc703e588e2b1c30957e7e7613a6a8e77f705f77c
+  data.tar.gz: a6fd5725e5a190dcad901d0a7b4027e37ea4a3c5ab6b7162ecbd0212dbcf6749
 SHA512:
-  metadata.gz: 7cb86de8092865008528a23d1e1762a8883a8c69af372c254c01fc6e5a46441ddeadb8ba4467fc7433fbce4f4ae613879b4a76412e6ca2b7f09bba60c47ac87b
-  data.tar.gz: 9319047be3502508e571151109d3c11760050dc03f5eb97775409ce6bdc9025bf764680daec19b6c6ee2bb047eb8a453446d5003b2705febf52d0ca3e8f4bd71
+  metadata.gz: 574dcc68a1d64ab3c63580044b575e2dac4d5e2e5e192305755f49b4c9748126a9d7c74982dd9333ac140dad84a269d62bcc86ecad477f42cc951362240a79a1
+  data.tar.gz: b989216c8abf1ac4a0fa9dd93c1416393ec7f0500a4ddca07416f275226712a9019153ce447299672aca4b57c60a355e236ba2113950a79b703276d127e0f7ba

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.2] - 2024-04-22
+- [#9](https://github.com/tongueroo/dsl_evaluator/pull/9) call line number in case of no color
+- standardrb
+
 ## [0.3.1] - 2022-07-11
 - [#8](https://github.com/tongueroo/dsl_evaluator/pull/8) fix select pattern when not set
 

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/dsl_evaluator.gemspec

@@ -1,25 +1,25 @@
-require_relative 'lib/dsl_evaluator/version'
+require_relative "lib/dsl_evaluator/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "dsl_evaluator"
-  spec.version       = DslEvaluator::VERSION
-  spec.authors       = ["Tung Nguyen"]
-  spec.email         = ["tongueroo@gmail.com"]
+  spec.name = "dsl_evaluator"
+  spec.version = DslEvaluator::VERSION
+  spec.authors = ["Tung Nguyen"]
+  spec.email = ["tongueroo@gmail.com"]
 
-  spec.summary       = "DSL evaluation library. It produces a human-friendly backtrace error"
-  spec.homepage      = "https://github.com/tongueroo/dsl_evaluator"
-  spec.license       = "MIT"
+  spec.summary = "DSL evaluation library. It produces a human-friendly backtrace error"
+  spec.homepage = "https://github.com/tongueroo/dsl_evaluator"
+  spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"

data/lib/dsl_evaluator/app.rb

@@ -15,7 +15,7 @@ module DslEvaluator
 
       config.logger = default_logger
       config.logger.formatter = Logger::Formatter.new
-      config.logger.level = ENV['DSL_EVALUATOR_LOG_LEVEL'] || :info
+      config.logger.level = ENV["DSL_EVALUATOR_LOG_LEVEL"] || :info
 
       config.on_exception = :raise
 
@@ -29,7 +29,7 @@ module DslEvaluator
     end
 
     def default_logger
-      Logger.new(ENV['DSL_EVALUATOR_LOG_PATH'] || $stderr)
+      Logger.new(ENV["DSL_EVALUATOR_LOG_PATH"] || $stderr)
     end
     memoize :default_logger
 

data/lib/dsl_evaluator/autoloader.rb

@@ -4,7 +4,7 @@ module DslEvaluator
   class Autoloader
     class Inflector < Zeitwerk::Inflector
       def camelize(basename, _abspath)
-        map = { cli: "CLI", version: "VERSION" }
+        map = {cli: "CLI", version: "VERSION"}
         map[basename.to_sym] || super
       end
     end

data/lib/dsl_evaluator/logger.rb

@@ -3,7 +3,7 @@ module DslEvaluator
     def initialize(*args)
       super
       self.formatter = Formatter.new
-      self.level = ENV['DSL_EVALUATOR_LOG_LEVEL'] || :info # note: only respected when config.logger not set in config/app.rb
+      self.level = ENV["DSL_EVALUATOR_LOG_LEVEL"] || :info # note: only respected when config.logger not set in config/app.rb
     end
 
     def format_message(severity, datetime, progname, msg)
@@ -12,7 +12,7 @@ module DslEvaluator
       else
         super # use the configured formatter
       end
-      line =~ /\n$/ ? line : "#{line}\n"
+      /\n$/.match?(line) ? line : "#{line}\n"
     end
 
     # Used to allow output to always go to stdout

data/lib/dsl_evaluator/printer/concern.rb

@@ -12,26 +12,26 @@ class DslEvaluator::Printer
         #   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(':')
+        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]
+        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 "Here's the original caller line #{line_number} 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
+      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
+        current_line = top + index + 1
         if current_line == line_number
           printf("%#{lpad}d %s\n".color(:red), current_line, line_content)
         else
@@ -39,7 +39,7 @@ class DslEvaluator::Printer
         end
       end
 
-      logger.info "Rerun with FULL_BACKTRACE=1 to see full backtrace" unless ENV['FULL_BACKTRACE']
+      logger.info "Rerun with FULL_BACKTRACE=1 to see full backtrace" unless ENV["FULL_BACKTRACE"]
     end
 
     def check_line_number!(line_number)
@@ -53,13 +53,12 @@ class DslEvaluator::Printer
     end
 
     def pretty_path(path)
-      path.sub("#{Dir.pwd}/",'').sub(/^\.\//,'')
+      path.sub("#{Dir.pwd}/", "").sub(/^\.\//, "")
     end
 
     # Replace HOME with ~ - different from the main pretty_path
     def pretty_home(path)
-      path.sub(ENV['HOME'], '~')
+      path.sub(ENV["HOME"], "~")
     end
   end
 end
-

data/lib/dsl_evaluator/printer.rb

@@ -11,7 +11,7 @@ module DslEvaluator
       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"
+      logger.error "Here's line #{line_number} with the error:\n\n"
       print_code(path, line_number)
     end
 
@@ -25,7 +25,7 @@ module DslEvaluator
 
     def info_from_message
       error_info = @error.message
-      path, line_number, _ = error_info.split(':')
+      path, line_number, _ = error_info.split(":")
       {path: path, line_number: line_number}
     end
 
@@ -38,7 +38,7 @@ module DslEvaluator
     #
     def info_from_backtrace
       lines = @error.backtrace
-      if ENV['FULL_BACKTRACE']
+      if ENV["FULL_BACKTRACE"]
         logger.error @error.message.color(:red)
         logger.error lines.join("\n")
       else
@@ -47,7 +47,7 @@ module DslEvaluator
       end
 
       error_info = lines.first
-      parts = error_info.split(':')
+      parts = error_info.split(":")
       windows = error_info.match(/^[a-zA-Z]:/)
       path = windows ? parts[1] : parts[0]
       line_number = windows ? parts[2] : parts[1]
@@ -86,7 +86,7 @@ module DslEvaluator
     end
 
     def pretty_path(path)
-      path.sub("#{config.root}/",'')
+      path.sub("#{config.root}/", "")
     end
 
     def logger
@@ -101,4 +101,4 @@ module DslEvaluator
       @error.message
     end
   end
-end
+end

data/lib/dsl_evaluator/version.rb

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

data/lib/dsl_evaluator.rb

@@ -1,10 +1,10 @@
-require 'active_support'
-require 'active_support/core_ext/class'
-require 'active_support/core_ext/hash'
-require 'active_support/core_ext/string'
-require 'dsl_evaluator/version'
-require 'memoist'
-require 'rainbow/ext/string'
+require "active_support"
+require "active_support/core_ext/class"
+require "active_support/core_ext/hash"
+require "active_support/core_ext/string"
+require "dsl_evaluator/version"
+require "memoist"
+require "rainbow/ext/string"
 
 require "dsl_evaluator/autoloader"
 DslEvaluator::Autoloader.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_evaluator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: DSL evaluation library. It produces a human-friendly backtrace error