nrepl-lazuli 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afa60bfeead6c887e8af4a6d6beb2e24e50b58984855794601d1c25cd0ba703
-  data.tar.gz: 9a7001c799e5a0aa1d68899ed6c2e06698b2097f7d7518da515938aa9cb2ba95
+  metadata.gz: f4f4fa0597b301ec633b7a332a60a86ec773239fc9c199096249459c7567c0b1
+  data.tar.gz: ec2ce7297bd7351c1be0095af5e157b88c70a8f8ce434ea3e046cd3b97e8d1aa
 SHA512:
-  metadata.gz: 9c60a0b98f239ee46b90400dd6a621d5ada13ef4da208c11749605fe528c1e4b1075b3e774aa6f487d8cee7b31e600a6ed410a46522764b04f638166a21ef548
-  data.tar.gz: f34c1bc6932245fece695740be5f2211563161f7c3c4667748a0e152cb43dfaa78dd08a3dbbf57dfb2e363b6a1ad3ee44f9864eabbaba68f0e3a9b3939820900
+  metadata.gz: b813283650b6ef0a56d0e8a6372f5a5ffea33235322d62ddc1204cc0f696de4912be861752dac02f859ce4592f9c4c84e89c03b9050597c357f222bbe82dbf14
+  data.tar.gz: 5354de88865cded64e7aa9f22b1bebf43fae21d396bfe9cd212a7859d35eccb6a246b3ad273f4d08679fb485d56b75b383986ddb7c494c9a92869c5606d755bb

data/lib/{nrepl → nrepl-lazuli}/connection.rb

@@ -2,13 +2,19 @@ module NREPL
   class Connection
     @@debug_counter = 0
 
-    def initialize(input, debug: false, out: input, watches: NREPL.class_variable_get(:@@watches))
+    def initialize(
+      input, debug: false, out: input,
+      watches: NREPL.class_variable_get(:@@watches), binding: nil,
+      auto_bindings: {}
+    )
       @debug = debug
       @in = input
       @out = out
       @pending_evals = {}
       @watches = watches
       @counter = 0
+      @binding = binding
+      @auto_bindings = auto_bindings
     end
 
     def treat_messages!
@@ -75,7 +81,15 @@ module NREPL
             'op' => msg['op']
           }))
         end
-
+      when 'watches_for_file'
+        msg['id'] ||= "eval_#{@counter += 1}"
+        file = msg['file']
+        rows_bindings = @auto_bindings[file] || {}
+        send_msg(response_for(msg, {
+          'status' => ['done'],
+          'rows' => rows_bindings.keys.sort,
+          'op' => msg['op']
+        }))
       else
         send_msg(response_for(msg, {
           'op' => msg['op'],
@@ -135,6 +149,8 @@ module NREPL
           @pending_evals.fetch(msg['stop_id'], {})[:binding]
         elsif msg['watch_id']
           @watches.fetch(msg['watch_id'], {})[:binding]
+        else
+          find_row_based_binding(msg) || @binding
         end
         evaluate_code(code, msg['file'], msg['line'], original_bind)
       end
@@ -144,6 +160,17 @@ module NREPL
       end
     end
 
+    private def find_row_based_binding(msg)
+      file = msg['file']
+      row = msg['line']
+      return if !file || !row
+
+      rows_bindings = @auto_bindings[file]
+      return unless rows_bindings
+      found_row = row.downto(-1).find { |k| rows_bindings[k] }
+      rows_bindings[found_row]
+    end
+
     private def define_stop_function!(msg, method_name)
       out, inp = IO.pipe
       send_stopped = proc do |ctx_binding, original_msg, caller|

data/lib/{nrepl → nrepl-lazuli}/fake_stdout.rb

@@ -1,9 +1,12 @@
+require "delegate"
+
 module NREPL
-  class FakeStdout
+  class FakeStdout < SimpleDelegator
     def initialize(connections, io, kind)
       @connections = connections
       @io = io
       @kind = kind
+      super(io)
     end
 
     def <<(text)
@@ -21,33 +24,13 @@ module NREPL
       nil
     end
 
-    def method_missing(method, *args)
-      @io.send(method, *args)
-    end
-
     def write(text)
-      @io.write(text)
       @connections.each do |conn|
         conn.send_msg(
           @kind => text
         )
       end
-    end
-
-    def flush
-      @io.flush
-    end
-
-    def close
-      @io.close
-    end
-
-    def sync
-      @io.sync
-    end
-
-    def sync=(val)
-      @io.sync = val
+      @io.write(text)
     end
   end
 end

data/lib/nrepl-lazuli/server.rb

@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+#
+# A Ruby port of ogion https://gitlab.com/technomancy/ogion &
+# https://github.com/borkdude/nrepl-server/blob/master/src/borkdude/nrepl_server.clj
+
+require 'bencode'
+require 'socket'
+require_relative 'connection'
+require_relative 'fake_stdout'
+
+module NREPL
+  class Server
+    attr_reader :debug, :port, :host
+    alias debug? debug
+
+    def self.start(**kwargs)
+      new(**kwargs).start
+    end
+
+    def self.bind!(binding, **kwargs)
+      new(**kwargs.merge(binding: binding)).start
+    end
+
+    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, debug: false, binding: nil, pwd: Dir.pwd)
+      @port  = port
+      @pwd = pwd
+      @host  = host
+      @debug = debug
+      @connections = Set.new
+      @binding = binding
+      @auto_bindings = {}
+      NREPL.class_variable_set(:@@connections, @connections)
+    end
+
+    private def record_port
+      File.open(PORT_FILENAME, 'w+') do |f|
+        f.write(port)
+      end
+    end
+
+    def start
+      puts "nREPL server started on port #{port} on host #{host} - nrepl://#{host}:#{port}"
+      puts "Running in debug mode" if debug?
+      record_port
+
+      $stdout = FakeStdout.new(@connections, STDOUT, "out")
+      $stderr = FakeStdout.new(@connections, STDERR, "err")
+      auto_create_bindings!
+
+      Signal.trap("INT") { stop }
+      Signal.trap("TERM") { stop }
+
+      s = TCPServer.new(host, port)
+      loop do
+        Thread.start(s.accept) do |client|
+          connection = Connection.new(client, debug: debug?, binding: @binding, auto_bindings: @auto_bindings)
+          @connections << connection
+          connection.treat_messages!
+          @connections.delete(connection)
+        end
+      end
+    ensure
+      File.unlink(PORT_FILENAME)
+    end
+
+    def auto_create_bindings!
+      dir_regex = Regexp.new("^#{Regexp.escape(@pwd)}")
+      @call_trace = TracePoint.new(:call) do |tp|
+        @auto_bindings[tp.path] ||= {}
+        @auto_bindings[tp.path][tp.lineno-1] = tp.binding
+        if tp.path =~ dir_regex
+          # puts "Tracing #{tp.path}:#{tp.lineno}"
+          @connections.each do |connection|
+            connection.send_msg(
+              'op' => 'hit_auto_watch',
+              'file' => tp.path,
+              'line' => tp.lineno-1,
+              'status' => ['done']
+            )
+          end
+        end
+      end
+      @call_trace.enable
+    end
+
+    def stop
+      Thread.exit
+      exit(0)
+    end
+  end
+
+  # Sorry, no other way...
+  module ThreadPatch
+    def initialize(*args, &b)
+      @parent = Thread.current
+      super
+    end
+
+    def parent
+      @parent
+    end
+  end
+
+  Thread.prepend(ThreadPatch)
+
+  # Also...
+  module MethodLocationFixer
+    def __lazuli_source_location
+      @__lazuli_source_location || source_location
+    end
+  end
+
+  module DefinitionFixer
+    @@definitions = {}
+
+    def __lazuli_source_location(method)
+      final_loc = nil
+      loc = ancestors.each do |klass|
+        loc = (klass.instance_variable_get(:@__lazuli_methods) || {})[method]
+        if loc
+          final_loc = loc
+          break
+        end
+      end
+
+      if(final_loc && File.exist?(final_loc[0]))
+        final_loc
+      else
+        instance_method(method).source_location
+      end
+    end
+
+    def method_added(method_name)
+      return if method_name == :__lazuli_source_location
+      path = caller.reject { |x| x =~ /gems.*gems/ }[0]
+      if path
+        (file, row) = path.split(/:/)
+
+        known = instance_variable_get(:@__lazuli_methods)
+        if !known
+          known = {}
+          instance_variable_set(:@__lazuli_methods, known)
+        end
+        known[method_name] = [file, row.to_i]
+      end
+    end
+
+    Module.prepend(DefinitionFixer)
+  end
+end

data/lib/{nrepl.rb → nrepl-lazuli.rb}

@@ -6,7 +6,7 @@ module NREPL
   DEFAULT_HOST  = '127.0.0.1'
   PORT_FILENAME = '.nrepl-port'
 
-  require_relative 'nrepl/server'
+  require_relative 'nrepl-lazuli/server'
   @@watches = {}
   @@connections = Set.new
 
@@ -25,5 +25,6 @@ module NREPL
         'status' => ['done']
       )
     end
+    nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Maurício Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bencode
@@ -31,11 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/nrepl.rb
-- lib/nrepl/connection.rb
-- lib/nrepl/fake_stdout.rb
-- lib/nrepl/server.rb
-homepage: https://rubygems.org/gems/nrepl-lazuli
+- lib/nrepl-lazuli.rb
+- lib/nrepl-lazuli/connection.rb
+- lib/nrepl-lazuli/fake_stdout.rb
+- lib/nrepl-lazuli/server.rb
+homepage: https://gitlab.com/clj-editors/nrepl-lazuli
 licenses:
 - MIT
 metadata: {}

data/lib/nrepl/server.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-#
-# A Ruby port of ogion https://gitlab.com/technomancy/ogion &
-# https://github.com/borkdude/nrepl-server/blob/master/src/borkdude/nrepl_server.clj
-
-require 'bencode'
-require 'socket'
-require_relative 'connection'
-require_relative 'fake_stdout'
-
-module NREPL
-  class Server
-    attr_reader :debug, :port, :host
-    alias debug? debug
-
-    def self.start(**kwargs)
-      new(**kwargs).start
-    end
-
-    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, debug: false)
-      @port  = port
-      @host  = host
-      @debug = debug
-      @connections = Set.new
-      NREPL.class_variable_set(:@@connections, @connections)
-    end
-
-    private def record_port
-      File.open(PORT_FILENAME, 'w+') do |f|
-        f.write(port)
-      end
-    end
-
-    def start
-      puts "nREPL server started on port #{port} on host #{host} - nrepl://#{host}:#{port}"
-      puts "Running in debug mode" if debug?
-      record_port
-
-      $stdout = FakeStdout.new(@connections, STDOUT, "out")
-      $stderr = FakeStdout.new(@connections, STDERR, "err")
-
-      Signal.trap("INT") { stop }
-      Signal.trap("TERM") { stop }
-
-      s = TCPServer.new(host, port)
-      loop do
-        Thread.start(s.accept) do |client|
-          connection = Connection.new(client, debug: debug?)
-          @connections << connection
-          connection.treat_messages!
-          @connections.delete(connection)
-        end
-      end
-    ensure
-      File.unlink(PORT_FILENAME)
-    end
-
-    def stop
-      Thread.exit
-      exit(0)
-    end
-  end
-end
-
-# Sorry, no other way...
-module ThreadPatch
-  def initialize(*args, &b)
-    @parent = Thread.current
-    super
-  end
-
-  def parent
-    @parent
-  end
-end
-
-Thread.prepend(ThreadPatch)