rails_env_prompt 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c52c247346b9f37d8c766f78cbefd1b09f86a81a7178c35d783252314075ea9
-  data.tar.gz: 438890789491f250be29ac4d0673c2ed4ccb750a0ab483726b18842706aad9b0
+  metadata.gz: 38a8d4d69de6506f630f17bf0d4427246bce8640d280ccf3a765568a0ab2e4e3
+  data.tar.gz: 27237e643cf7b905e664ba67d1a88fe5988c5f8387fe9e07e059f932eb9254f2
 SHA512:
-  metadata.gz: 05bbe43b291cbc3ce8b220b204378ef6d938b2803e905960dcfd826ee32a4c4d4e295a0f4788b3684939cc0ea6a0ce3afddfcdfd4719d7bdcc0ad33f1f9797f9
-  data.tar.gz: a1f5c1da2d5ce4feb3f88540c9e267821594de20f6f7ad624ec035b33a82e3977a084a344326f75d97646135e1f5bd7d41fcc44b85aa674fce8cc3ed2f67f3b5
+  metadata.gz: 764346be500386598dffbcf9f42df420cd8e8fcbd6efbd3c221d997d49714bdc65c1f801bafc0bfa65b973afe2e074b66b1d02fc6bd84bc1c16ee3068b0f39f2
+  data.tar.gz: ab9737443f7ef3f543706e3a09475d289b45248e6aabe91d590cdd9eb6e879ceedeb911b529899b6a363bb4cc1cc12fb9723348e9c86afde46e312c21df1b811

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_env_prompt (1.0.3)
+    rails_env_prompt (1.0.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/rails_env_prompt/irb-190.rb

@@ -0,0 +1,15 @@
+require 'irb'
+
+if IRB::VERSION >= Gem::Version.new('1.9.0')
+  module IRB
+    class Irb
+      original_format_prompt = instance_method(:format_prompt)
+
+      define_method(:format_prompt) do |format, ltype, indent, line_no|
+        original_format_prompt.bind(self).(
+          "#{RailsEnvPrompt.to_s} #{format}", ltype, indent, line_no
+        )
+      end
+    end
+  end
+end

data/lib/rails_env_prompt/irb-pre-190.rb

@@ -0,0 +1,51 @@
+require 'irb'
+
+if IRB::VERSION < Gem::Version.new('1.9.0')
+  module IRB
+    class << self
+      def _patch
+        prompt = RailsEnvPrompt.template
+
+        prompts = {
+          normal: "#{prompt} %03n:%i> ",
+          for_continuated_strings: "#{prompt} %03n:%i%l ",
+          for_continuated_statements: "#{prompt} %03n:%i* "
+        }
+
+        # Some older versions store this value and call dup. We'll have to change it each time to have it include current
+        # tenant and possible other dynamic variables
+        %i[normal for_continuated_strings for_continuated_statements].each do |key|
+          prompts[key] = prompts[key].tap do |string|
+            def string.dup
+              RailsEnvPrompt.parse(self)
+            end
+          end
+        end
+
+        IRB.conf[:PROMPT][:RAILS_ENV_PROMPT] = {
+          PROMPT_I: prompts[:normal],
+          PROMPT_N: prompts[:normal],
+          PROMPT_S: prompts[:for_continuated_strings],
+          PROMPT_C: prompts[:for_continuated_statements],
+          RETURN: "=> %s\n"
+        }
+
+        IRB.conf[:PROMPT_MODE] = :RAILS_ENV_PROMPT
+      end
+
+      _setup = instance_method(:setup)
+
+      if _setup.arity == -2
+        define_method(:setup) do |ap_path, argv: ::ARGV|
+          _setup.bind(self).call(ap_path, argv: argv)
+          _patch
+        end
+      else
+        define_method(:setup) do |ap_path|
+          _setup.bind(self).call(ap_path)
+          _patch
+        end
+      end
+    end
+  end
+end

data/lib/rails_env_prompt/pry.rb

@@ -5,6 +5,6 @@ end
 
 if defined?(Pry)
   Pry.config.prompt = proc do |obj, nest_level, _|
-    "#{RailsEnvPrompt.template} #{obj}:#{nest_level}> "
+    "#{RailsEnvPrompt.to_s} #{obj}:#{nest_level}> "
   end
 end

data/lib/rails_env_prompt/version.rb

@@ -1,3 +1,3 @@
 module RailsEnvPrompt
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/lib/rails_env_prompt.rb

@@ -1,16 +1,6 @@
-require 'rails_env_prompt/irb'
-require 'rails_env_prompt/pry'
 require 'rails_env_prompt/version'
 
 module RailsEnvPrompt
-  def self.template
-    [
-      app_name,
-      environment_name,
-      tenant_prompt
-    ].compact.join('/') + ' '
-  end
-
   def self.app_name
     @app_name ||= begin
       application_class = Rails.application.class
@@ -23,14 +13,28 @@ module RailsEnvPrompt
     end
   end
 
-  def self.environment_name
-    colored(Rails.env, environment_color)
+  def self.template
+    [
+      '[APP]',
+      '[ENV]',
+      tenant_prompt
+    ].compact.join('/')
+  end
+
+  def self.parse(string)
+    string.gsub('[APP]', app_name)
+          .gsub('[ENV]', colored(Rails.env, environment_color))
+          .gsub('[TENANT]', defined?(Apartment) ? Apartment::Tenant.current : '')
+  end
+
+  def self.to_s
+    parse(template)
   end
 
   def self.tenant_prompt
     return unless defined?(Apartment)
 
-    Apartment::Tenant.current
+    '[TENANT]'
   end
 
   def self.colored(text, color)
@@ -45,3 +49,8 @@ module RailsEnvPrompt
     end
   end
 end
+
+# Load patches
+require 'rails_env_prompt/irb-pre-190'
+require 'rails_env_prompt/irb-190'
+require 'rails_env_prompt/pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_env_prompt
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Rene van Lieshout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,7 +51,8 @@ files:
 - README.md
 - Rakefile
 - lib/rails_env_prompt.rb
-- lib/rails_env_prompt/irb.rb
+- lib/rails_env_prompt/irb-190.rb
+- lib/rails_env_prompt/irb-pre-190.rb
 - lib/rails_env_prompt/pry.rb
 - lib/rails_env_prompt/version.rb
 - rails_env_prompt.gemspec
@@ -74,8 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Adds current Rails env and Apartment tenant to prompt

data/lib/rails_env_prompt/irb.rb

@@ -1,34 +0,0 @@
-require 'irb'
-
-module IRB
-  class << self
-    def _patch
-      template = RailsEnvPrompt.template
-
-      current_prompt = IRB.conf[:PROMPT_MODE]
-
-      IRB.conf[:PROMPT][:RAILS_ENV_PROMPT] = IRB.conf[:PROMPT][:DEFAULT].map do |key, value|
-        [
-          key,
-          (template + value)
-        ]
-      end.to_h
-
-      IRB.conf[:PROMPT_MODE] = :RAILS_ENV_PROMPT
-    end
-
-    _setup = instance_method(:setup)
-
-    if _setup.arity == -2
-      define_method(:setup) do |ap_path, argv: ::ARGV|
-        _setup.bind(self).call(ap_path, argv: argv)
-        _patch
-      end
-    else
-      define_method(:setup) do |ap_path|
-        _setup.bind(self).call(ap_path)
-        _patch
-      end
-    end
-  end
-end