archer-rails 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a51652ad167e88ab4359b2a007746f46c1e15ed689ab252cda60631adaef45
-  data.tar.gz: 71f8034c47eeb7f6f0ed618544332f32a318e04a6419963bfa4a8dc9a9413c94
+  metadata.gz: 5c3fdea9c7dd926570591aa18df85e82ffec3759feb6ae3768446c263db5f0e2
+  data.tar.gz: b778542bba600b0c2146750769cc19779d7366176b19690be1ef8d91b2e7af43
 SHA512:
-  metadata.gz: fa0caa5c6ef56a53b2e76b2b753eed6e02695584ecc23f57ae4e46b939e4bdd53288b8d997ffd24b1e3eb85a8210d3c61c3755b52c98f8f83ae65ccca9453507
-  data.tar.gz: 7150fd672798cb21d465fb9247093c2e1b220e56106f5e38a5fdc3cbbb26f9c2bce2e3f5fb856035d53e33a3641e767ea5603d20aab851db6862a06510400fe8
+  metadata.gz: ef40368afbd616f17f31e93892c100f855634f7c7d74fd41f3b66538e81bf8663b68c9e83d135d64a159ce8879433d43b59092280df8dbdb33d5f560e6440b33
+  data.tar.gz: 59cbbd96bfe605d295057571aa70ec04ec4d9a851c10c0bf9a7d564283b589b31ebdf4de1241da5e2d945c42ddd34edc6ff89813ceacd8566a93d6c58518b4d7

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.4.1 (2023-10-31)
+
+- Fixed error with Rails 7.1
+
+## 0.4.0 (2023-02-06)
+
+- Fixed error with irb 1.4.2+
+- Dropped support for Ruby < 2.7 and Rails < 6
+
 ## 0.3.0 (2022-01-10)
 
 - Dropped support for Ruby < 2.6 and Rails < 5.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2022 Andrew Kane
+Copyright (c) 2018-2023 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -6,6 +6,8 @@ Rails console history for Heroku, Docker, and more
 
 Designed for platforms with ephemeral filesystems
 
+[![Build Status](https://github.com/ankane/archer/workflows/build/badge.svg?branch=master)](https://github.com/ankane/archer/actions)
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/lib/archer/engine.rb

@@ -2,11 +2,8 @@ module Archer
   class Engine < Rails::Engine
     console do
       # need IRB context to be ready before Archer.start
+      require "irb"
       ::IRB::Irb.prepend(Archer::Irb)
-
-      at_exit do
-        Archer.save if Archer.save_session
-      end
     end
   end
 end

data/lib/archer/irb.rb

@@ -1,7 +1,7 @@
 module Archer
   module Irb
     # needs to run after conf[:MAIN_CONTEXT] is set
-    def eval_input(*)
+    def eval_input(...)
       Archer.start
       super
     end

data/lib/archer/version.rb

@@ -1,3 +1,3 @@
 module Archer
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

data/lib/archer-rails.rb

@@ -1 +1 @@
-require "archer"
+require_relative "archer"

data/lib/archer.rb

@@ -2,9 +2,9 @@
 require "active_support/core_ext/module/attribute_accessors"
 
 # modules
-require "archer/engine" if defined?(Rails)
-require "archer/irb"
-require "archer/version"
+require_relative "archer/engine" if defined?(Rails)
+require_relative "archer/irb"
+require_relative "archer/version"
 
 module Archer
   autoload :History, "archer/history"
@@ -18,58 +18,63 @@ module Archer
   mattr_accessor :save_session
   self.save_session = true
 
-  def self.clear
-    quietly do
-      Archer::History.where(user: user).delete_all
+  class << self
+    def start
+      if !history_object
+        warn "[archer] Skipping history"
+        return
+      end
+
+      history = nil
+      begin
+        quietly do
+          history = Archer::History.find_by(user: user)
+        end
+      rescue ActiveRecord::StatementInvalid
+        warn "[archer] Create table to enable history"
+      end
+
+      if history
+        commands = history.commands.split("\n")
+        history_object.clear
+        history_object.push(*commands)
+      end
+
+      IRB.conf[:AT_EXIT].push(proc { Archer.save if Archer.save_session })
     end
-    Readline::HISTORY.clear if defined?(Readline)
-    Reline::HISTORY.clear if defined?(Reline)
-    true
-  end
 
-  def self.start
-    history = nil
-    begin
+    def save
+      return false unless history_object
+
       quietly do
-        history = Archer::History.find_by(user: user)
+        history = Archer::History.where(user: user).first_or_initialize
+        history.commands = history_object.to_a.last(limit).join("\n")
+        history.save!
       end
     rescue ActiveRecord::StatementInvalid
-      warn "[archer] Create table to enable history"
-    end
-
-    if history
-      commands = history.commands.split("\n")
-      history_object.push(*commands)
+      warn "[archer] Unable to save history"
+      false
     end
-  end
 
-  def self.save
-    quietly do
-      history = Archer::History.where(user: user).first_or_initialize
-      history.commands = history_object.to_a.last(limit).join("\n")
-      history.save!
+    def clear
+      quietly do
+        Archer::History.where(user: user).delete_all
+      end
+      history_object.clear if history_object
+      true
     end
-  rescue ActiveRecord::StatementInvalid
-    warn "[archer] Unable to save history"
-  end
 
-  # private
-  # TODO use IRB.CurrentContext.io.class::HISTORY
-  def self.history_object
-    reline? ? Reline::HISTORY : Readline::HISTORY
-  end
+    private
 
-  # private
-  def self.reline?
-    IRB.CurrentContext.io.is_a?(IRB::ReidlineInputMethod)
-  rescue
-    false
-  end
+    def history_object
+      cls = IRB.CurrentContext&.io&.class
+      cls && cls.const_defined?(:HISTORY) ? cls::HISTORY : nil
+    end
 
-  # private
-  def self.quietly
-    ActiveRecord::Base.logger.silence do
-      yield
+    def quietly
+      ActiveRecord::Base.logger.silence do
+        yield
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archer-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 description:
 email: andrew@ankane.org
 executables: []
@@ -67,14 +67,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Rails console history for Heroku, Docker, and more