console1984 0.1.30 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edc219593c4db79d9abb483cb91fb2da5f229fbbb6729fecede09bd12a9a5c1f
-  data.tar.gz: 874b307704da2c60e082cd2eb0e9ad02b32fc85eb986b7f607975781328b8fe7
+  metadata.gz: dab24e3e5ca1a9640cc312b6466e8ec4b3f917435bd54df8cd44fe361eb19cf8
+  data.tar.gz: 9550f056b2252a148a1d5fff0eac6936ad75d4283827222503d754098d1c4b77
 SHA512:
-  metadata.gz: c6b1423d81bced6b0e6e430537d8da90574d4d13cf7a1f191a7c63fd943435e74c5842c94cc468d8e6389a9b4b84fef3472c095be25264ad8a50f8a66009e9ba
-  data.tar.gz: ed1b618301bd46e5479b046b34d8f1bc4f94b2bc919e4b5553240b4c77252fa827abc395eb4efd3b262047e19da6e66cf3007fca8a714e6b519df59c231eb726
+  metadata.gz: 70d3abebccbb42053c4071353a8db786bd50ef4f5faa3dde4357ff4f02b6e8a8fd0b1178ba3559fe832a1afa8d89c2f3a0531040d707ef6777e88c1ccfb583ec
+  data.tar.gz: 211e8a17167c63454007bd89a308a9e1d96aea58693fa33afba79105c266a9d39e4cf1a4665dc29188b9d09085d0c2f0fd6b680a59e269279cf75de7d8395883

data/lib/console1984/command_executor.rb

@@ -101,12 +101,16 @@ class Console1984::CommandExecutor
     end
 
     def encrypting_error(error)
-      def error.inspect
-        Console1984.command_executor.execute_in_protected_mode { super }
+      if error.respond_to?(:inspect)
+        def error.inspect
+          Console1984.command_executor.execute_in_protected_mode { method(:inspect).super_method.call }
+        end
       end
 
-      def error.to_s
-        Console1984.command_executor.execute_in_protected_mode { super }
+      if error.respond_to?(:to_s)
+        def error.to_s
+          Console1984.command_executor.execute_in_protected_mode { method(:to_s).super_method.call }
+        end
       end
 
       error

data/lib/console1984/command_validator/.command_parser.rb

@@ -1,4 +1,4 @@
-# Naming class with dot so that it doesn't get loaded eagerly by Zeitwork. We want to load
+# Naming class with dot so that it doesn't get loaded eagerly by Zeitwerk. We want to load
 # only when a console session is started, when +parser+ is loaded.
 #
 # See +Console1984::Supervisor#require_dependencies+

data/lib/console1984/commands/decrypt.rb

@@ -0,0 +1,14 @@
+require "irb/command"
+
+module Console1984::Commands
+  class Decrypt < IRB::Command::Base
+    include Console1984::Ext::Irb::Commands
+
+    category "Console1984"
+    description "go back to protected mode, without access to encrypted information"
+
+    def execute(*)
+      decrypt!
+    end
+  end
+end

data/lib/console1984/commands/encrypt.rb

@@ -0,0 +1,14 @@
+require "irb/command"
+
+module Console1984::Commands
+  class Encrypt < IRB::Command::Base
+    include Console1984::Ext::Irb::Commands
+
+    category "Console1984"
+    description "go back to protected mode, without access to encrypted information"
+
+    def execute(*)
+      encrypt!
+    end
+  end
+end

data/lib/console1984/ext/irb/commands.rb

@@ -1,4 +1,3 @@
-# Add Console 1984 commands to IRB sessions.
 module Console1984::Ext::Irb::Commands
   include Console1984::Freezeable
 
@@ -13,13 +12,4 @@ module Console1984::Ext::Irb::Commands
   def encrypt!
     shield.enable_protected_mode
   end
-
-  # This returns the last error that prevented a command execution in the console
-  # or nil if there isn't any.
-  #
-  # This is meant for internal usage when debugging legit commands that are wrongly
-  # prevented.
-  def _console_last_suspicious_command_error
-    Console1984.command_executor.last_suspicious_command_error
-  end
 end

data/lib/console1984/ext/irb/context.rb

@@ -12,8 +12,16 @@ module Console1984::Ext::Irb::Context
   end
 
   #
-  def evaluate(line, ...)
-    Console1984.command_executor.execute(Array(line)) do
+  def evaluate(line_or_statement, ...)
+    # irb  < 1.13 passes String as parameter
+    # irb >= 1.13 passes IRB::Statement instead and method #code contains the actual code
+    code = if defined?(IRB::Statement) && line_or_statement.kind_of?(IRB::Statement)
+      line_or_statement.code
+    else
+      line_or_statement
+    end
+
+    Console1984.command_executor.execute(Array(code)) do
       super
     end
   end

data/lib/console1984/shield.rb

@@ -34,7 +34,8 @@ class Console1984::Shield
 
     def extend_irb
       IRB::Context.prepend(Console1984::Ext::Irb::Context)
-      Rails::ConsoleMethods.include(Console1984::Ext::Irb::Commands)
+      IRB::Command.register :decrypt!, Console1984::Commands::Decrypt
+      IRB::Command.register :encrypt!, Console1984::Commands::Encrypt
     end
 
     def extend_core_ruby
@@ -47,8 +48,12 @@ class Console1984::Shield
       socket_classes = [TCPSocket, OpenSSL::SSL::SSLSocket]
       OpenSSL::SSL::SSLSocket.include(SSLSocketRemoteAddress)
 
-      if defined?(Redis::Connection)
-        socket_classes.push(*[Redis::Connection::TCPSocket, Redis::Connection::SSLSocket])
+      if defined?(Redis::Connection::TCPSocket)
+        socket_classes.push(Redis::Connection::TCPSocket)
+      end
+
+      if defined?(Redis::Connection::SSLSocket)
+        socket_classes.push(Redis::Connection::SSLSocket)
       end
 
       socket_classes.compact.each do |socket_klass|

data/lib/console1984/supervisor.rb

@@ -1,4 +1,4 @@
-require 'rails/console/app'
+require "active_support/all"
 
 # Entry point to the system. In charge of installing everything
 # and starting and stopping sessions.

data/lib/console1984/version.rb

@@ -1,3 +1,3 @@
 module Console1984
-  VERSION = "0.1.30"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console1984
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.2.0
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -45,13 +45,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - jorge@basecamp.com
@@ -219,6 +247,8 @@ files:
 - lib/console1984/command_validator/forbidden_reopening_validation.rb
 - lib/console1984/command_validator/parsed_command.rb
 - lib/console1984/command_validator/suspicious_terms_validation.rb
+- lib/console1984/commands/decrypt.rb
+- lib/console1984/commands/encrypt.rb
 - lib/console1984/config.rb
 - lib/console1984/engine.rb
 - lib/console1984/errors.rb
@@ -268,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Your Rails console, 1984 style