console1984 0.1.9 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1312b244e339b0196d4baa80fc989ed3871cd722f166a278f4877ca1dee4da
-  data.tar.gz: a66ab76f426a50cb99c4de2223d420c9d2d246b5dd0a6ec8f1712deca56244f9
+  metadata.gz: 78f591775f469668e6d50741f421c188e048e42942ce4a9c9c707e9a34328c69
+  data.tar.gz: 190d0069e0bc4268400e59f1884539403233fd66fb873892d41ecf5e3d888323
 SHA512:
-  metadata.gz: d46797d8751dde38fccb25fef4e86e3a8ee42b17251d932e5cbc9ffc381bba2bd42c2a946ce8e7e867ff8e6270700dec73d8425534f52970c87bffbc682365f8
-  data.tar.gz: cd1a43abe5170dfb94a83ed375b8517b4263354ba30a53cb2287f3ffd240ab18984134df79801657fcb07fea1826d6fc3f978f6ae752c013ead820330d8e024a
+  metadata.gz: d6930e488260091857f8f2196ef88ec3c364391de1b1a9e9385a246153c80a1b5c7cd3cafd76d988d54f3ded5b4b3f66b2ae1d9735cc5ebeacadabd4a3bbe12e
+  data.tar.gz: 19746bce408667fb06d48e5a98032999e46a44b47f3620d510b5ce4a707a9414c76f57b996d5a707372bf533b5904aa2af19bd0b9c2866fc8d00e4b2e5228f70

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/command_validator/parsed_command.rb

@@ -6,85 +6,19 @@ class Console1984::CommandValidator::ParsedCommand
 
   attr_reader :raw_command
 
-  delegate :declared_classes_or_modules, :constants, :constant_assignments, to: :processed_ast
+  delegate :declared_classes_or_modules, :constants, :constant_assignments, to: :command_parser
 
   def initialize(raw_command)
     @raw_command = Array(raw_command).join("\n")
   end
 
   private
-    def processed_ast
-      @processed_ast ||= CommandProcessor.new.tap do |processor|
+    def command_parser
+      @command_parser ||= Console1984::CommandValidator::CommandParser.new.tap do |processor|
         ast = Parser::CurrentRuby.parse(raw_command)
         processor.process(ast)
       rescue Parser::SyntaxError
         # Fail open with syntax errors
       end
     end
-
-    class CommandProcessor < ::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
 end

data/lib/console1984/refrigerator.rb

@@ -11,14 +11,17 @@ class Console1984::Refrigerator
   end
 
   private
-    EXTERNAL_MODULES_AND_CLASSES_TO_FREEZE = [Parser::CurrentRuby]
-
     def freeze_internal_instances
       Console1984.config.freeze unless Console1984.config.test_mode
     end
 
     def freeze_external_modules_and_classes
-      EXTERNAL_MODULES_AND_CLASSES_TO_FREEZE.each { |klass| klass.include(Console1984::Freezeable) }
+      external_modules_and_classes_to_freeze.each { |klass| klass.include(Console1984::Freezeable) }
+    end
+
+    def external_modules_and_classes_to_freeze
+      # 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

data/lib/console1984/supervisor.rb

@@ -41,6 +41,16 @@ class Console1984::Supervisor
         require 'parser/current'
       end
       require 'colorized_string'
+
+      # 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.9'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console1984
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.13
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -200,6 +200,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