betterp 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea0ef4e30131dd17a73ccf0a81c9597b78f5d7538bbaf17e5aae17eae0216d6
-  data.tar.gz: 3546052c741f0687e386488a4e6e435344dffb8d725ec6d9270006434b453d44
+  metadata.gz: 38943c3f0f9baf276c68d39efa2229a6a93546ed347c658c71175b70a314153f
+  data.tar.gz: f9ecb8dd7a3cd930d08ddd4125e33816b07b263cb89438002d9b29a5a0880ff6
 SHA512:
-  metadata.gz: 2776e06b838c9f24a3a62828cb1a0994ebb1971bc86ca1e551d7833cd5617a97e7da7ba196982767248a7916214336ef759ad16ff9a222b69d74a9ad9c1908da
-  data.tar.gz: 71c3479e6eabe34c9bacefb184a58dec62e7c5e68cb2e0ec426ff985ad180a0b404a82c3b1b7cd35507fbc06b398fae2a30fe44e39a963db9a675913028a09cb
+  metadata.gz: 6001d2655ad45bbe85d8263e541a2865fa8ab0e83ea932927f3818deab82d57c49f813dcd1c9c3b98b2b0b0d45f41961a8c3d2f02ef79933b0671e7eb3d22039
+  data.tar.gz: dce5f9cce1aa13ac4791fe7300c5c61b85e532f3d0061c1b29cdecea8037ed6dc56f19b8e0095ece45aecfe92580deda30c8e8d01b57fad474e69d57bf2542bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    betterp (0.1.8)
+    betterp (0.1.10)
       paintbrush (~> 0.1.3)
       rouge (~> 4.2)
 

data/Makefile

@@ -1,6 +1,14 @@
+project=betterp
+
 .PHONY: test
 test:
 	bin/rspec
 	bin/rubocop
 	bin/strong_versions
 	bundle exec rspec-documentation
+
+.PHONY: publish
+publish:
+	@RSPEC_DOCUMENTATION_URL_ROOT='/$(project)' rspec-documentation
+	@rsync --delete -r rspec-documentation/bundle/ docs.bob.frl:/var/www/html/$(project)/
+	@echo 'Published.'

data/lib/betterp/output.rb

@@ -14,10 +14,15 @@ module Betterp
       @pretty = options.fetch(:pretty, false)
     end
 
-    def formatted(args)
-      (@pretty ? args : args.map(&:inspect)).map do |arg|
+    def formatted(args) # rubocop:disable Metrics/MethodLength
+      args.map do |arg|
         output = [
-          header, colorized_prefix, colorized_duration, caller_code, highlighted(pretty(arg))
+          header,
+          colorized_prefix,
+          colorized_duration,
+          highlighted(caller_code),
+          Paintbrush.paintbrush { cyan_b '=>' },
+          return_value(arg)
         ].compact.join(' ').chomp
         "#{output}\n"
       end
@@ -25,10 +30,24 @@ module Betterp
 
     private
 
+    def return_value(val)
+      return normalized_highlighted(val) unless @pretty
+
+      highlighted(pretty(val))
+    end
+
     def highlighted(output)
       formatter = Rouge::Formatters::Terminal256.new
       lexer = Rouge::Lexers::Ruby.new
-      formatter.format(lexer.lex(output))
+      formatter.format(lexer.lex(output.nil? ? '' : output))
+    end
+
+    def normalized_highlighted(val)
+      pretty_squashed = pretty(val).split("\n")
+                                   .map { |string| string.gsub(/^\s+/, '') }
+                                   .join("\n")
+
+      highlighted(pretty_squashed).split("\n").join(' ')
     end
 
     def colorized_duration
@@ -39,13 +58,7 @@ module Betterp
       Paintbrush.paintbrush { "[#{send color, "#{Float(format('%.2g', duration))}ms"}]" }
     end
 
-    def colorized_pretty(arg)
-      Paintbrush.paintbrush { cyan pretty(arg) }
-    end
-
     def pretty(arg)
-      return arg unless @pretty
-
       io = StringIO.new
       PP.pp(arg, io)
       return io.string unless io.string.include?("\n")
@@ -59,9 +72,7 @@ module Betterp
       path, line, *_rest = @raw.split(':')
       return nil unless Pathname.new(path).readable? && line.to_i.positive?
 
-      Paintbrush.paintbrush do
-        white "{ #{blue find_caller(line.to_i, path).to_s.strip} }"
-      end
+      find_caller(line.to_i, path).to_s.strip
     end
 
     def find_caller(line_number, path)

data/lib/betterp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Betterp
-  VERSION = '0.1.8'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterp
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paintbrush