fancy_irb 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420f2bb457ec0eab47d8b118dc0579cc010060338406972fe53e9339411988ff
-  data.tar.gz: 7a6adaf799dd94809ed4c8c998827983a2d7105a22b42449fc3f7ffdff6c2a05
+  metadata.gz: 89cbb2934ed19ad839cdc15eda21b617c01eb2bd6e689a54012c8eeee98098b9
+  data.tar.gz: dcded533d53ac26e54bce266d2a80eea702c38b22173735b014e50b163f258c8
 SHA512:
-  metadata.gz: e61b4ad622dce35fccbfdb7f47beaa3aeed028d08aacbb051bb8d48b2a1140e1cc22686805fbab831968d09519947e0b9215686acc37fef495cb2d8ac8cc3b82
-  data.tar.gz: 89a2464bb36c7385792f3cb7dc7e9a3336c81249c9f07b80060dbf9248abc85ad97a21d35a050679107dd53b0899d029796c650d979a328b037c33777d4ee279
+  metadata.gz: ba416ba54282e7172fcd88035163fa9f809d3465c2f85f3c7fd858456d41988de8df81ec709d26ee32ed254f78d0d4429765aa561edb5cde3cbb90ba5c5ded5a
+  data.tar.gz: 58d7c084efe90a61fc67857c497279ada9dd739ec732bf235e21a50171624ec2f103bdda48ef33ee31f91a995af9e0969459122910398a10329696575e7d5916

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 2.1.0
+* Refactor IRB extension to accommodate IRB 1.8.2
+
 ## 2.0.0
 * Fix core functionality for newer IRB
 * Require Ruby 3.x / IRB 1.7+

data/lib/fancy_irb/irb_ext.rb

@@ -1,22 +1,12 @@
-module IRB
-  class Irb
+module FancyIrb
+  module IrbExtCommon
     def output_value
       FancyIrb.output_value(@context, @scanner)
     end
 
-    alias prompt_non_fancy prompt
-    def prompt(prompt_arg, ltype, indent, line_no)
-      FancyIrb.handle_prompt(
-        prompt_non_fancy(prompt_arg, ltype, indent, line_no),
-        IRB.conf[:AUTO_INDENT] ? indent * 2 : 0
-        # IRB.conf[:AUTO_INDENT] && IRB.conf[:PROMPT][IRB.conf[:PROMPT_MODE]][:PROMPT_C] == prompt_arg
-      )
-    end
-
-    alias signal_status_non_fancy signal_status
     def signal_status(name, *args, &block)
       FancyIrb.reset_line!
-      signal_status_non_fancy(name, *args, &block)
+      super(name, *args, &block)
     ensure
       if name == :IN_EVAL
         FancyIrb.present_and_clear_captured_error!
@@ -24,14 +14,48 @@ module IRB
     end
   end
 
-  class Context
-    alias evaluate_non_fancy evaluate
+  module IrbExtPrompt
+    private def format_prompt(format, ltype, indent, line_no)
+      FancyIrb.handle_prompt(
+        super(format, ltype, indent, line_no),
+        IRB.conf[:AUTO_INDENT] ? indent * 2 : 0
+        # IRB.conf[:AUTO_INDENT] && IRB.conf[:PROMPT][IRB.conf[:PROMPT_MODE]][:PROMPT_C] == format
+      )
+    end
+  end
 
+  module IrbExtPromptLegacy
+    def prompt(format, ltype, indent, line_no)
+      FancyIrb.handle_prompt(
+        super(format, ltype, indent, line_no),
+        IRB.conf[:AUTO_INDENT] ? indent * 2 : 0
+        # IRB.conf[:AUTO_INDENT] && IRB.conf[:PROMPT][IRB.conf[:PROMPT_MODE]][:PROMPT_C] == format
+      )
+    end
+  end
+
+  module ContextExt
     def evaluate(*args, **kwargs)
-      evaluate_non_fancy(*args, **kwargs)
+      super(*args, **kwargs)
     rescue Exception
       FancyIrb.register_error_capturer!
       raise
     end
   end
 end
+
+module IRB
+  class Irb
+    prepend FancyIrb::IrbExtCommon
+
+    if IRB::VERSION < "1.8.2"
+      prepend FancyIrb::IrbExtPromptLegacy
+    else
+      prepend FancyIrb::IrbExtPrompt
+    end
+  end
+
+  class Context
+    prepend FancyIrb::ContextExt
+  end
+end

data/lib/fancy_irb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FancyIrb
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fancy_irb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: Colors and rockets in IRB