console1984 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472b88a03c5befd81877d190baa41cd0cd4d4a985fff797ddc447e729e6fa56a
-  data.tar.gz: 9c791955b0caf6d49fd655905a9d37a231bb7ee668f5b2a1dd85e4ebd14efdaa
+  metadata.gz: 26a59332236edcf9b00811ef8fe7a7d6e3667763d0a58771bb09a5ef3935a64c
+  data.tar.gz: 03a89cc1fedb6e0837941730afb811a1e0f3f6b13393778e81993a5c577162c4
 SHA512:
-  metadata.gz: 8300ef44660e9b9933ae68ebfc4b26f0e57849c716b1339817e00332407a0696df4e46599f056be186171cc884bf8c8fb4c1eba688aecf7702c04d1ad0ad69a9
-  data.tar.gz: b7a073d5bfc4f648fc10f5bb331320ae0b84a7afa3e1108df9005faedc2f51a338fd9b3d659ecf5fe0744bee6067e444e75dd67a12c53647d6c079fdb554e5fa
+  metadata.gz: f21b2f38b9d1d1f136f7d3f83dac67cedd49fa47343e98b365c083aa58485d2a61aa0959ab8e9c6ff3086120b72bc6122e8a2c55f319419e812923e92badaf74
+  data.tar.gz: 50e7fdea76f8128744486dd5fddf59fd216118b7db7e51ff8c42aec0ff427fe720e94ffd308b95a6fee5c80b356dbf062e3802e1eaaac9829ac0a60e2d9c3742

data/config/protections.yml

@@ -5,6 +5,7 @@ validations:
     - PG
     - Mysql2
     - IRB
+    - Parser
   forbidden_constant_reference:
     always:
       - Console1984

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

@@ -0,0 +1,69 @@
+# Naming class with dot so that it doesn't get loaded eagerly by Zeitwork. We want to load
+# only when a console session is started, when +parser+ is loaded.
+#
+# See +Console1984::Supervisor#require_dependencies+
+class Console1984::CommandValidator::CommandParser < ::Parser::AST::Processor
+  include AST::Processor::Mixin
+  include Console1984::Freezeable
+
+  def initialize
+    @constants = []
+    @declared_classes_or_modules = []
+    @constant_assignments = []
+  end
+
+  # We define accessors to define lists without duplicates. We are not using a +SortedSet+ because we want
+  # to mutate strings in the list while the processing is happening. And we don't use metapgroamming to define the
+  # accessors to prevent having problems with freezable and its instance_variable* protection.
+
+  def constants
+    @constants.uniq
+  end
+
+  def declared_classes_or_modules
+    @declared_classes_or_modules.uniq
+  end
+
+  def constant_assignments
+    @constant_assignments.uniq
+  end
+
+  def on_class(node)
+    super
+    const_declaration, _, _ = *node
+    constant = extract_constants(const_declaration).first
+    @declared_classes_or_modules << constant if constant.present?
+  end
+
+  alias_method :on_module, :on_class
+
+  def on_const(node)
+    super
+    name, const_name = *node
+    const_name = const_name.to_s
+    last_constant = @constants.last
+
+    if name.nil? || (name && name.type == :cbase) # cbase = leading ::
+      if last_constant&.end_with?("::")
+        last_constant << const_name
+      else
+        @constants << const_name
+      end
+    elsif last_constant
+      last_constant << "::#{const_name}"
+    end
+  end
+
+  def on_casgn(node)
+    super
+    scope_node, name, value_node = *node
+    @constant_assignments.push(*extract_constants(value_node))
+  end
+
+  private
+    def extract_constants(node)
+      self.class.new.tap do |processor|
+        processor.process(node)
+      end.constants
+    end
+end

data/lib/console1984/ext/core/module.rb

@@ -6,7 +6,7 @@ module Console1984::Ext::Core::Module
   extend ActiveSupport::Concern
 
   def instance_eval(*)
-    if Console1984.command_executor.executing_user_command?
+    if Console1984.command_executor.from_irb?(caller)
       raise Console1984::Errors::ForbiddenCommandAttempted
     else
       super

data/lib/console1984/refrigerator.rb

@@ -11,6 +11,11 @@ class Console1984::Refrigerator
   end
 
   private
+    def eager_load_all_classes
+      Rails.application.eager_load! unless Rails.application.config.eager_load
+      Console1984.class_loader.eager_load
+    end
+
     def freeze_internal_instances
       Console1984.config.freeze unless Console1984.config.test_mode
     end
@@ -23,9 +28,4 @@ class Console1984::Refrigerator
       # Not using a constant because we want this to run lazily (console-dependant dependencies might not be loaded).
       [Parser::CurrentRuby]
     end
-
-    def eager_load_all_classes
-      Rails.application.eager_load! unless Rails.application.config.eager_load
-      Console1984.class_loader.eager_load
-    end
 end

data/lib/console1984/supervisor.rb

@@ -45,6 +45,12 @@ class Console1984::Supervisor
       # Explicit lazy loading because it depends on +parser+, which we want to only load
       # in console sessions.
       require_relative "./command_validator/.command_parser"
+
+      # This solves a weird class loading error where ActiveRecord dosn't resolve +Relation+ properly.
+      # See https://github.com/basecamp/console1984/issues/29
+      #
+      # TODO: This is a temporary fix. Need to figure out why/when this happens.
+      require "active_record/relation"
     end
 
     def start_session

data/lib/console1984/version.rb

@@ -1,3 +1,3 @@
 module Console1984
-  VERSION = '0.1.11'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console1984
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.15
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  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'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +214,7 @@ files:
 - lib/console1984.rb
 - lib/console1984/command_executor.rb
 - lib/console1984/command_validator.rb
+- lib/console1984/command_validator/.command_parser.rb
 - lib/console1984/command_validator/forbidden_constant_reference_validation.rb
 - lib/console1984/command_validator/forbidden_reopening_validation.rb
 - lib/console1984/command_validator/parsed_command.rb