dbg-rb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd12005e78ffa686afda779eabb3adf25011f8c2c53a8aeba8b34115f6fc481a
-  data.tar.gz: 4854bb2a74440292fb681b949dcbb44af0c25fb8fba074de45df923827c6f9dc
+  metadata.gz: dc71d393c746d79980c413057430f8f9e473d2746a343dc64ec3289dc6ea278e
+  data.tar.gz: 6de928faad269dfa03dedc2e0f0606444cd3df2f8ce1f8660dbbdcf580b4a6ca
 SHA512:
-  metadata.gz: 2cf2c64ce51787a3613c57a37c090166e22d26b23cf832e00ac1a087469f8eb77beb18a60f85665cd1b50222161a860b7de89383a8ac349667f833f0968922a0
-  data.tar.gz: 6be32da1ee94b9c02ad0be8156daceda13a775482d8f51a30150652b6e2b41d70cc4cb88169e00da3a519efd75fb25c342713b7a43376cd210d907beaaec310e
+  metadata.gz: a6c4ccb43238e5c47639339588589cdc4b175acf9cfb5ed62e332f03d9a738824891ce980f2ec8d3582ba66b7f9cc63fdb2b15868e2108f79b7dc3456810fa28
+  data.tar.gz: 6098cf547b0efce0ef4f0751e3ae4d067b0e19864315de0de515f644da367d86b520370778eb016d9b0722a6e312e948692b6006fd2d2cfafa6bfc80c08e65cc

data/Rakefile

@@ -7,6 +7,6 @@ desc "Run tests"
 task :default => :test
 
 task :test do
-  system("bundle exec rspec spec/gem_spec.rb")
+  system("bundle exec rspec spec/main_spec.rb")
   system("bundle exec rspec spec/inline_spec.rb")
 end

data/inline/dbg_rb.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Source https://github.com/pawurb/dbg-rb
+  # Source https://github.com/pawurb/dbg-rb
 # The MIT License (MIT)
 
 # Copyright © Paweł Urbanek 2024
@@ -59,28 +59,38 @@ module DbgRb
           loc.label
         end
 
-      file = loc.absolute_path.split(":").first
+      file = if (path = loc.absolute_path)
+          path.split(":").first
+        else
+          nil
+        end
 
       input = nil
 
-      File.open(file) do |f|
-        f.each_line.with_index do |line, i|
-          if i == loc.lineno - 1
-            input = line.split("dbg").last.chomp.strip
-            input = input.gsub(/[()]/, "").strip
+      if file
+        File.open(file) do |f|
+          f.each_line.with_index do |line, i|
+            if i == loc.lineno - 1
+              splitby, remove_parantheses = if line.include?("dbg(")
+                  ["dbg(", true]
+                else
+                  ["dbg ", false]
+                end
+              input = line.split(splitby).last.chomp.strip
+              input = input.sub(/\)[^)]*\z/, "") if remove_parantheses
+              input
+            end
           end
         end
-      end
-
-      if input.nil?
-        raise "It should never happen!"
+      else
+        input = nil
       end
 
       line = loc.lineno
       src = "[#{source_file}:#{line}]"
       value = format_val(value)
 
-      val = if input.to_s == value.to_s
+      val = if input.to_s == value.to_s || input.nil?
           "#{value}"
         else
           "#{input} = #{value}"

data/inline/sync.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+require "fileutils"
+
+FileUtils.cp("lib/dbg-rb.rb", "inline/dbg_rb.rb")
+
+license = <<~LICENSE
+  # Source https://github.com/pawurb/dbg-rb
+# The MIT License (MIT)
+
+# Copyright © Paweł Urbanek 2024
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+LICENSE
+
+File.write("inline/dbg_rb.rb", File.read("inline/dbg_rb.rb").sub(/\A# frozen_string_literal: true\n/, "# frozen_string_literal: true\n\n#{license}"))
+
+FileUtils.cp("spec/main_spec.rb", "spec/inline_spec.rb")
+
+File.write("spec/inline_spec.rb", File.read("spec/inline_spec.rb").gsub(/main_spec/, "inline_spec").gsub("require \"dbg-rb\"", "require_relative '../inline/dbg_rb'"))

data/lib/dbg-rb.rb

@@ -35,28 +35,38 @@ module DbgRb
           loc.label
         end
 
-      file = loc.absolute_path.split(":").first
+      file = if (path = loc.absolute_path)
+          path.split(":").first
+        else
+          nil
+        end
 
       input = nil
 
-      File.open(file) do |f|
-        f.each_line.with_index do |line, i|
-          if i == loc.lineno - 1
-            input = line.split("dbg").last.chomp.strip
-            input = input.gsub(/[()]/, "").strip
+      if file
+        File.open(file) do |f|
+          f.each_line.with_index do |line, i|
+            if i == loc.lineno - 1
+              splitby, remove_parantheses = if line.include?("dbg(")
+                  ["dbg(", true]
+                else
+                  ["dbg ", false]
+                end
+              input = line.split(splitby).last.chomp.strip
+              input = input.sub(/\)[^)]*\z/, "") if remove_parantheses
+              input
+            end
           end
         end
-      end
-
-      if input.nil?
-        raise "It should never happen!"
+      else
+        input = nil
       end
 
       line = loc.lineno
       src = "[#{source_file}:#{line}]"
       value = format_val(value)
 
-      val = if input.to_s == value.to_s
+      val = if input.to_s == value.to_s || input.nil?
           "#{value}"
         else
           "#{input} = #{value}"

data/lib/dbg_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DbgRb
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/inline_spec.rb

@@ -1,38 +1,39 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require "dbg-rb"
+require_relative '../inline/dbg_rb'
 require "ostruct"
 
 describe DbgRb do
   before do
     DbgRb.color_code = nil
+    DbgRb.highlight!(false)
   end
 
   it "constant values" do
     expect do
       dbg("123")
-    end.to output("[spec/inline_spec.rb:14] \"123\"\n").to_stdout
+    end.to output("[spec/inline_spec.rb:15] \"123\"\n").to_stdout
 
     expect do
       dbg(123)
-    end.to output("[spec/inline_spec.rb:18] 123\n").to_stdout
+    end.to output("[spec/inline_spec.rb:19] 123\n").to_stdout
 
     expect do
       dbg(nil)
-    end.to output("[spec/inline_spec.rb:22] nil\n").to_stdout
+    end.to output("[spec/inline_spec.rb:23] nil\n").to_stdout
 
     expect do
       dbg "123"
-    end.to output("[spec/inline_spec.rb:26] \"123\"\n").to_stdout
+    end.to output("[spec/inline_spec.rb:27] \"123\"\n").to_stdout
 
     expect do
       dbg 123
-    end.to output("[spec/inline_spec.rb:30] 123\n").to_stdout
+    end.to output("[spec/inline_spec.rb:31] 123\n").to_stdout
 
     expect do
       dbg nil
-    end.to output("[spec/inline_spec.rb:34] nil\n").to_stdout
+    end.to output("[spec/inline_spec.rb:35] nil\n").to_stdout
   end
 
   it "variables" do
@@ -40,19 +41,19 @@ describe DbgRb do
 
     expect do
       dbg(a)
-    end.to output("[spec/inline_spec.rb:42] a = 123\n").to_stdout
+    end.to output("[spec/inline_spec.rb:43] a = 123\n").to_stdout
 
     b = "123"
 
     expect do
       dbg(b)
-    end.to output("[spec/inline_spec.rb:48] b = \"123\"\n").to_stdout
+    end.to output("[spec/inline_spec.rb:49] b = \"123\"\n").to_stdout
 
     c = nil
 
     expect do
       dbg(c)
-    end.to output("[spec/inline_spec.rb:54] c = nil\n").to_stdout
+    end.to output("[spec/inline_spec.rb:55] c = nil\n").to_stdout
   end
 
   it "complex objects" do
@@ -60,42 +61,42 @@ describe DbgRb do
 
     expect do
       dbg(s)
-    end.to output("[spec/inline_spec.rb:62] s = #<OpenStruct a=1, b=2>\n").to_stdout
+    end.to output("[spec/inline_spec.rb:63] s = #<OpenStruct a=1, b=2>\n").to_stdout
   end
 
   it "hashes" do
     h = { a: 1, b: "2" }
     expect do
       dbg(h)
-    end.to output("[spec/inline_spec.rb:69] h = {\n  \"a\": 1,\n  \"b\": \"2\"\n}\n").to_stdout
+    end.to output("[spec/inline_spec.rb:70] h = {\n  \"a\": 1,\n  \"b\": \"2\"\n}\n").to_stdout
   end
 
   it "arrays" do
     a = [1, "str"]
     expect do
       dbg(a)
-    end.to output("[spec/inline_spec.rb:76] a = [\n  1,\n  \"str\"\n]\n").to_stdout
+    end.to output("[spec/inline_spec.rb:77] a = [\n  1,\n  \"str\"\n]\n").to_stdout
   end
 
   it "hash formatting" do
     h = { a: 1, b: "2", c: nil }
     expect do
       dbg(h)
-    end.to output("[spec/inline_spec.rb:83] h = {\n  \"a\": 1,\n  \"b\": \"2\",\n  \"c\": nil\n}\n").to_stdout
+    end.to output("[spec/inline_spec.rb:84] h = {\n  \"a\": 1,\n  \"b\": \"2\",\n  \"c\": nil\n}\n").to_stdout
   end
 
   it "highlight" do
     DbgRb.highlight!
     expect do
       dbg("123")
-    end.to output("!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/inline_spec.rb:90] \"123\"\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n").to_stdout
+    end.to output("!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/inline_spec.rb:91] \"123\"\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n").to_stdout
   end
 
   it "color_code" do
     DbgRb.color_code = 31
     expect do
       dbg(123)
-    end.to output("\e[31m!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/inline_spec.rb:97] 123\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\e[0m\n").to_stdout
+    end.to output("\e[31m[spec/inline_spec.rb:98] 123\e[0m\n").to_stdout
   end
 
   it "highlight and color_code" do
@@ -103,6 +104,16 @@ describe DbgRb do
     DbgRb.color_code = 31
     expect do
       dbg(123)
-    end.to output("\e[31m!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/inline_spec.rb:105] 123\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\e[0m\n").to_stdout
+    end.to output("\e[31m!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/inline_spec.rb:106] 123\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\e[0m\n").to_stdout
+  end
+
+  it "complex expression" do
+    expect do
+      dbg([1, 2, 3].reduce(0) { |i, agg| agg + i })
+    end.to output("[spec/inline_spec.rb:112] [1, 2, 3].reduce(0) { |i, agg| agg + i } = 6\n").to_stdout
+
+    expect do
+      dbg [1, 2, 3].reduce(0) { |i, agg| agg + i }
+    end.to output("[spec/inline_spec.rb:116] [1, 2, 3].reduce(0) { |i, agg| agg + i } = 6\n").to_stdout
   end
 end

data/spec/main_spec.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "dbg-rb"
+require "ostruct"
+
+describe DbgRb do
+  before do
+    DbgRb.color_code = nil
+    DbgRb.highlight!(false)
+  end
+
+  it "constant values" do
+    expect do
+      dbg("123")
+    end.to output("[spec/main_spec.rb:15] \"123\"\n").to_stdout
+
+    expect do
+      dbg(123)
+    end.to output("[spec/main_spec.rb:19] 123\n").to_stdout
+
+    expect do
+      dbg(nil)
+    end.to output("[spec/main_spec.rb:23] nil\n").to_stdout
+
+    expect do
+      dbg "123"
+    end.to output("[spec/main_spec.rb:27] \"123\"\n").to_stdout
+
+    expect do
+      dbg 123
+    end.to output("[spec/main_spec.rb:31] 123\n").to_stdout
+
+    expect do
+      dbg nil
+    end.to output("[spec/main_spec.rb:35] nil\n").to_stdout
+  end
+
+  it "variables" do
+    a = 123
+
+    expect do
+      dbg(a)
+    end.to output("[spec/main_spec.rb:43] a = 123\n").to_stdout
+
+    b = "123"
+
+    expect do
+      dbg(b)
+    end.to output("[spec/main_spec.rb:49] b = \"123\"\n").to_stdout
+
+    c = nil
+
+    expect do
+      dbg(c)
+    end.to output("[spec/main_spec.rb:55] c = nil\n").to_stdout
+  end
+
+  it "complex objects" do
+    s = OpenStruct.new(a: 1, b: 2)
+
+    expect do
+      dbg(s)
+    end.to output("[spec/main_spec.rb:63] s = #<OpenStruct a=1, b=2>\n").to_stdout
+  end
+
+  it "hashes" do
+    h = { a: 1, b: "2" }
+    expect do
+      dbg(h)
+    end.to output("[spec/main_spec.rb:70] h = {\n  \"a\": 1,\n  \"b\": \"2\"\n}\n").to_stdout
+  end
+
+  it "arrays" do
+    a = [1, "str"]
+    expect do
+      dbg(a)
+    end.to output("[spec/main_spec.rb:77] a = [\n  1,\n  \"str\"\n]\n").to_stdout
+  end
+
+  it "hash formatting" do
+    h = { a: 1, b: "2", c: nil }
+    expect do
+      dbg(h)
+    end.to output("[spec/main_spec.rb:84] h = {\n  \"a\": 1,\n  \"b\": \"2\",\n  \"c\": nil\n}\n").to_stdout
+  end
+
+  it "highlight" do
+    DbgRb.highlight!
+    expect do
+      dbg("123")
+    end.to output("!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/main_spec.rb:91] \"123\"\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n").to_stdout
+  end
+
+  it "color_code" do
+    DbgRb.color_code = 31
+    expect do
+      dbg(123)
+    end.to output("\e[31m[spec/main_spec.rb:98] 123\e[0m\n").to_stdout
+  end
+
+  it "highlight and color_code" do
+    DbgRb.highlight!
+    DbgRb.color_code = 31
+    expect do
+      dbg(123)
+    end.to output("\e[31m!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/main_spec.rb:106] 123\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\e[0m\n").to_stdout
+  end
+
+  it "complex expression" do
+    expect do
+      dbg([1, 2, 3].reduce(0) { |i, agg| agg + i })
+    end.to output("[spec/main_spec.rb:112] [1, 2, 3].reduce(0) { |i, agg| agg + i } = 6\n").to_stdout
+
+    expect do
+      dbg [1, 2, 3].reduce(0) { |i, agg| agg + i }
+    end.to output("[spec/main_spec.rb:116] [1, 2, 3].reduce(0) { |i, agg| agg + i } = 6\n").to_stdout
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbg-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -98,10 +98,11 @@ files:
 - dbg_base.png
 - dbg_emoji.png
 - inline/dbg_rb.rb
+- inline/sync.rb
 - lib/dbg-rb.rb
 - lib/dbg_rb/version.rb
-- spec/gem_spec.rb
 - spec/inline_spec.rb
+- spec/main_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/pawurb/dbg-rb
 licenses:

data/spec/gem_spec.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require "dbg-rb"
-require "ostruct"
-
-describe DbgRb do
-  before do
-    DbgRb.color_code = nil
-  end
-
-  it "constant values" do
-    expect do
-      dbg("123")
-    end.to output("[spec/gem_spec.rb:14] \"123\"\n").to_stdout
-
-    expect do
-      dbg(123)
-    end.to output("[spec/gem_spec.rb:18] 123\n").to_stdout
-
-    expect do
-      dbg(nil)
-    end.to output("[spec/gem_spec.rb:22] nil\n").to_stdout
-
-    expect do
-      dbg "123"
-    end.to output("[spec/gem_spec.rb:26] \"123\"\n").to_stdout
-
-    expect do
-      dbg 123
-    end.to output("[spec/gem_spec.rb:30] 123\n").to_stdout
-
-    expect do
-      dbg nil
-    end.to output("[spec/gem_spec.rb:34] nil\n").to_stdout
-  end
-
-  it "variables" do
-    a = 123
-
-    expect do
-      dbg(a)
-    end.to output("[spec/gem_spec.rb:42] a = 123\n").to_stdout
-
-    b = "123"
-
-    expect do
-      dbg(b)
-    end.to output("[spec/gem_spec.rb:48] b = \"123\"\n").to_stdout
-
-    c = nil
-
-    expect do
-      dbg(c)
-    end.to output("[spec/gem_spec.rb:54] c = nil\n").to_stdout
-  end
-
-  it "complex objects" do
-    s = OpenStruct.new(a: 1, b: 2)
-
-    expect do
-      dbg(s)
-    end.to output("[spec/gem_spec.rb:62] s = #<OpenStruct a=1, b=2>\n").to_stdout
-  end
-
-  it "hashes" do
-    h = { a: 1, b: "2" }
-    expect do
-      dbg(h)
-    end.to output("[spec/gem_spec.rb:69] h = {\n  \"a\": 1,\n  \"b\": \"2\"\n}\n").to_stdout
-  end
-
-  it "arrays" do
-    a = [1, "str"]
-    expect do
-      dbg(a)
-    end.to output("[spec/gem_spec.rb:76] a = [\n  1,\n  \"str\"\n]\n").to_stdout
-  end
-
-  it "hash formatting" do
-    h = { a: 1, b: "2", c: nil }
-    expect do
-      dbg(h)
-    end.to output("[spec/gem_spec.rb:83] h = {\n  \"a\": 1,\n  \"b\": \"2\",\n  \"c\": nil\n}\n").to_stdout
-  end
-
-  it "highlight" do
-    DbgRb.highlight!
-    expect do
-      dbg("123")
-    end.to output("!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/gem_spec.rb:90] \"123\"\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n").to_stdout
-  end
-
-  it "color_code" do
-    DbgRb.color_code = 31
-    expect do
-      dbg(123)
-    end.to output("\e[31m!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/gem_spec.rb:97] 123\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\e[0m\n").to_stdout
-  end
-
-  it "highlight and color_code" do
-    DbgRb.highlight!
-    DbgRb.color_code = 31
-    expect do
-      dbg(123)
-    end.to output("\e[31m!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n[spec/gem_spec.rb:105] 123\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!\e[0m\n").to_stdout
-  end
-end