dsl_evaluator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93e3439b6133c0d201856d61afcfe5360d0c6f8a821a00c2eb551612553a969
-  data.tar.gz: 6d074772c6075e1aea243072fcf83e2deb1e2de69bb7d3341177f1458fe417f8
+  metadata.gz: 38416a5462223f8c1b87c303e81c02d7410e76c371fde03eb03de37a9f455a90
+  data.tar.gz: 264bb6cc47c4c02a047dea7812810b741be48eca5f6298bce98510a568b3be26
 SHA512:
-  metadata.gz: 687b819d01e035f8c5e32048776af5048932283415e9f49c08193c98f58e058e346a39c6af1f18167fc49a0f7aaa41e06db64ffcc2a89592f9e2e667cab937e3
-  data.tar.gz: 7cf6d15da7ac2debb4a04ab0dd4ca8236f97e1670a597127bcf471554bf59d72b027ed1c03a4850f1557a831a71b473cb76926f48acfcacdd5e1078028337c6c
+  metadata.gz: 76d9c1b745ce57961e5d8458e0037c16709617e821f43ce6ee6b4072b54cae60e117ea6a9540ee1fde97fca86276b7498a184a77fefc5cab9b8a603103e80042
+  data.tar.gz: bc0e3ec881d84a2ef80b16b05dbbed1c3f63877a394e9027bb409372501a557af5c08b352631ece2d49e262cde1733f7b69637bb2ca1fefce29291626501b84c

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.1.2]
+- #1 get line info from error message also
+
 ## [0.1.1]
 -  make module methods availables
 

data/dsl_evaluator.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_dependency "rainbow"
 end

data/lib/dsl_evaluator.rb

@@ -1,13 +1,16 @@
 require "dsl_evaluator/version"
+require "rainbow/ext/string"
 
 module DslEvaluator
+  autoload :Printer, "dsl_evaluator/printer"
+
   class Error < StandardError; end
 
   def evaluate_file(path)
     return unless path && File.file?(path)
     instance_eval(IO.read(path), path)
   rescue Exception => e
-    evaluation_error(e)
+    Printer.new(e).print
     puts "\nFull error:"
     raise
   end
@@ -21,31 +24,5 @@ module DslEvaluator
     @@backtrace_reject = v
   end
 
-  # Prints out a user friendly task_definition error message
-  def evaluation_error(e)
-    lines = e.backtrace
-    lines = lines.reject { |l| l.include?(backtrace_reject) } if backtrace_reject
-    error_info = lines.first
-    path, line_no, _ = error_info.split(':')
-    line_no = line_no.to_i
-    puts "Error evaluating #{path}:".color(:red)
-    puts e.message
-    puts "Here's the line in #{path} with the error:\n\n"
-
-    contents = IO.read(path)
-    content_lines = contents.split("\n")
-    context = 5 # lines of context
-    top, bottom = [line_no-context-1, 0].max, line_no+context-1
-    spacing = content_lines.size.to_s.size
-    content_lines[top..bottom].each_with_index do |line_content, index|
-      line_number = top+index+1
-      if line_number == line_no
-        printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
-      else
-        printf("%#{spacing}d %s\n", line_number, line_content)
-      end
-    end
-  end
-
   extend self
 end

data/lib/dsl_evaluator/printer.rb

@@ -0,0 +1,61 @@
+module DslEvaluator
+  class Printer
+    def initialize(error)
+      @error = error
+    end
+
+    def message
+      @error.message
+    end
+
+    # Prints out a user friendly task_definition error message
+    def print
+      print_source(info)
+    end
+
+    def info
+      @error.message.include?("syntax") ? info_from_message : info_from_backtrace
+    end
+
+    def info_from_message
+      error_info = @error.message
+      path, line_number, _ = error_info.split(':')
+      {path: path, line_number: line_number}
+    end
+
+    def info_from_backtrace
+      lines = @error.backtrace
+
+      backtrace_reject = DslEvaluator.backtrace_reject
+      lines = lines.reject { |l| l.include?(backtrace_reject) } if backtrace_reject
+      lines = lines.reject { |l| l.include?("lib/dsl_evaluator") } # ignore internal lib/dsl_evaluator backtrace lines
+
+      error_info = lines.first
+      path, line_number, _ = error_info.split(':')
+      {path: path, line_number: line_number}
+    end
+
+    def print_source(info={})
+      path = info[:path]
+      line_number = info[:line_number].to_i
+
+      puts "Error evaluating #{path}:".color(:red)
+      puts @error.message
+      puts "Here's the line in #{path} with the error:\n\n"
+
+      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), line_number, line_content)
+        else
+          printf("%#{lpad}d %s\n", line_number, line_content)
+        end
+      end
+    end
+  end
+end

data/lib/dsl_evaluator/version.rb

@@ -1,3 +1,3 @@
 module DslEvaluator
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dsl_evaluator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
-dependencies: []
+date: 2020-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - tongueroo@gmail.com
@@ -29,6 +43,7 @@ files:
 - bin/setup
 - dsl_evaluator.gemspec
 - lib/dsl_evaluator.rb
+- lib/dsl_evaluator/printer.rb
 - lib/dsl_evaluator/version.rb
 homepage: https://github.com/tongueroo/dsl_evaluator
 licenses: