neovim 0.6.2 → 0.7.0

data/spec/neovim/session_spec.rb

@@ -24,7 +24,7 @@ module Neovim
         expect(session.request(:nvim_get_current_line)).to eq(large_str)
       end
 
-      it "fails outside of the main thread" do
+      it "fails outside of the main thread", :silence_thread_exceptions do
         expect {
           Thread.new { session.request(:nvim_strwidth, "foo") }.join
         }.to raise_error(/outside of the main thread/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: coveralls
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,16 +147,15 @@ files:
 - lib/neovim/api.rb
 - lib/neovim/buffer.rb
 - lib/neovim/client.rb
+- lib/neovim/connection.rb
 - lib/neovim/current.rb
 - lib/neovim/event_loop.rb
-- lib/neovim/event_loop/connection.rb
-- lib/neovim/event_loop/message_builder.rb
-- lib/neovim/event_loop/serializer.rb
 - lib/neovim/executable.rb
 - lib/neovim/host.rb
 - lib/neovim/host/loader.rb
 - lib/neovim/line_range.rb
 - lib/neovim/logging.rb
+- lib/neovim/message.rb
 - lib/neovim/plugin.rb
 - lib/neovim/plugin/dsl.rb
 - lib/neovim/plugin/handler.rb
@@ -164,7 +191,6 @@ files:
 - spec/acceptance/rubyfile/set_pwd_before.rb
 - spec/acceptance/rubyfile_spec.vim
 - spec/acceptance/runtime/init.vim
-- spec/acceptance/runtime/rplugin.vim
 - spec/acceptance/runtime/rplugin/ruby/autocmds.rb
 - spec/acceptance/runtime/rplugin/ruby/commands.rb
 - spec/acceptance/runtime/rplugin/ruby/functions.rb
@@ -180,16 +206,15 @@ files:
 - spec/neovim/api_spec.rb
 - spec/neovim/buffer_spec.rb
 - spec/neovim/client_spec.rb
+- spec/neovim/connection_spec.rb
 - spec/neovim/current_spec.rb
-- spec/neovim/event_loop/connection_spec.rb
-- spec/neovim/event_loop/message_builder_spec.rb
-- spec/neovim/event_loop/serializer_spec.rb
 - spec/neovim/event_loop_spec.rb
 - spec/neovim/executable_spec.rb
 - spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
 - spec/neovim/line_range_spec.rb
 - spec/neovim/logging_spec.rb
+- spec/neovim/message_spec.rb
 - spec/neovim/plugin_spec.rb
 - spec/neovim/remote_object_spec.rb
 - spec/neovim/ruby_provider/buffer_ext_spec.rb
@@ -211,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -219,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Neovim
@@ -242,7 +267,6 @@ test_files:
 - spec/acceptance/rubyfile/set_pwd_before.rb
 - spec/acceptance/rubyfile_spec.vim
 - spec/acceptance/runtime/init.vim
-- spec/acceptance/runtime/rplugin.vim
 - spec/acceptance/runtime/rplugin/ruby/autocmds.rb
 - spec/acceptance/runtime/rplugin/ruby/commands.rb
 - spec/acceptance/runtime/rplugin/ruby/functions.rb
@@ -258,16 +282,15 @@ test_files:
 - spec/neovim/api_spec.rb
 - spec/neovim/buffer_spec.rb
 - spec/neovim/client_spec.rb
+- spec/neovim/connection_spec.rb
 - spec/neovim/current_spec.rb
-- spec/neovim/event_loop/connection_spec.rb
-- spec/neovim/event_loop/message_builder_spec.rb
-- spec/neovim/event_loop/serializer_spec.rb
 - spec/neovim/event_loop_spec.rb
 - spec/neovim/executable_spec.rb
 - spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
 - spec/neovim/line_range_spec.rb
 - spec/neovim/logging_spec.rb
+- spec/neovim/message_spec.rb
 - spec/neovim/plugin_spec.rb
 - spec/neovim/remote_object_spec.rb
 - spec/neovim/ruby_provider/buffer_ext_spec.rb

data/lib/neovim/event_loop/connection.rb

@@ -1,78 +0,0 @@
-require "neovim/logging"
-require "socket"
-
-module Neovim
-  class EventLoop
-    # The lowest level interface to reading from and writing to +nvim+.
-    #
-    # @api private
-    class Connection
-      include Logging
-
-      def self.tcp(host, port)
-        socket = Socket.tcp(host, port)
-        new(socket, socket)
-      end
-
-      def self.unix(path)
-        socket = Socket.unix(path)
-        new(socket, socket)
-      end
-
-      def self.child(_argv)
-        argv = _argv.include?("--embed") ? _argv : _argv + ["--embed"]
-
-        io = ::IO.popen(argv, "rb+").tap do |_io|
-          Process.detach(_io.pid)
-        end
-
-        new(io, io)
-      end
-
-      def self.stdio
-        new(STDIN, STDOUT)
-      end
-
-      def initialize(rd, wr)
-        @rd, @wr = [rd, wr].map(&:binmode)
-        @running = false
-      end
-
-      # Write data to the underlying +IO+. This will block until all the
-      # data has been written.
-      def write(data)
-        written = 0
-        total = data.bytesize
-        log(:debug) { {:bytes => total} }
-
-        begin
-          while written < total
-            written += @wr.write_nonblock(data[written..-1])
-          end
-        rescue ::IO::WaitWritable
-          ::IO.select(nil, [@wr], nil, 1)
-          retry
-        ensure
-          @wr.flush
-        end
-      end
-
-      def read
-        @rd.readpartial(1024 * 16).tap do |bytes|
-          log(:debug) { {:bytes => bytes.bytesize} }
-          yield bytes
-        end
-      end
-
-      # Close underlying +IO+s.
-      def close
-        [@rd, @wr].each do |io|
-          begin
-            io.close
-          rescue ::IOError
-          end
-        end
-      end
-    end
-  end
-end

data/lib/neovim/event_loop/message_builder.rb

@@ -1,127 +0,0 @@
-require "neovim/logging"
-
-module Neovim
-  class EventLoop
-    # Handles formatting RPC messages and registering response callbacks for
-    # requests.
-    #
-    # @api private
-    class MessageBuilder
-      module StructToH
-        def to_h
-          each_pair.inject({}) { |acc, (k, v)| acc.merge(k => v) }
-        end
-      end
-
-      class Request < Struct.new(:id, :method_name, :arguments)
-        include StructToH
-
-        def sync?
-          true
-        end
-
-        def to_h
-          super.merge(:type => :request)
-        end
-      end
-
-      class Notification < Struct.new(:method_name, :arguments)
-        include StructToH
-
-        def sync?
-          false
-        end
-
-        def to_h
-          super.merge(:type => :notification)
-        end
-      end
-
-      class Response < Struct.new(:request_id, :value, :error)
-        include StructToH
-
-        def value!
-          error ? raise(error) : value
-        end
-
-        def to_h
-          super.merge(:type => :response)
-        end
-      end
-
-      include Logging
-
-      def initialize
-        @request_id = 0
-        @pending_requests = {}
-      end
-
-      def write(type, *write_args)
-        case type
-        when :request
-          method, args, response_handler = write_args
-
-          @request_id += 1
-          @pending_requests[@request_id] = response_handler
-
-          log(:debug) do
-            {
-              :type => type,
-              :request_id => @request_id,
-              :method_name => method,
-              :arguments => args,
-            }
-          end
-
-          yield [0, @request_id, method, args]
-        when :response
-          reqid, value, error = write_args
-
-          log(:debug) do
-            {
-              :type => type,
-              :request_id => reqid,
-              :value => value,
-              :error => error,
-            }
-          end
-
-          yield [1, reqid, error, value]
-        when :notification
-          method, args = write_args
-
-          log(:debug) do
-            {
-              :type => type,
-              :method_name => method,
-              :arguments => args,
-            }
-          end
-
-          yield [2, method, args]
-        else
-          raise "Unknown RPC message type #{type}"
-        end
-      end
-
-      def read((kind, *payload))
-        case kind
-        when 0
-          message = Request.new(*payload)
-          log(:debug) { message.to_h }
-          yield message
-        when 2
-          message = Notification.new(*payload)
-          log(:debug) { message.to_h }
-          yield message
-        when 1
-          reqid, (_, error), result = payload
-          handler = @pending_requests.delete(reqid) || Proc.new {}
-          message = Response.new(reqid, result, error)
-          log(:debug) { message.to_h }
-          handler.call(message)
-        end
-      end
-    end
-  end
-end

data/lib/neovim/event_loop/serializer.rb

@@ -1,37 +0,0 @@
-require "neovim/logging"
-require "msgpack"
-
-module Neovim
-  class EventLoop
-    # Handles serializing RPC messages to and from MessagePack
-    #
-    # @api private
-    class Serializer
-      include Logging
-
-      def initialize(unpacker = MessagePack::Unpacker.new)
-        @unpacker = unpacker
-      end
-
-      # Serialize an RPC message
-      def write(obj)
-        log(:debug) { {:object => obj} }
-        yield MessagePack.pack(obj)
-      end
-
-      def read(bytes)
-        @unpacker.feed_each(bytes) do |obj|
-          log(:debug) { {:object => obj} }
-          yield obj
-        end
-      end
-
-      def register_type(id, &block)
-        @unpacker.register_type(id) do |data|
-          index = MessagePack.unpack(data)
-          block.call(index)
-        end
-      end
-    end
-  end
-end

data/spec/acceptance/runtime/rplugin.vim

@@ -1,37 +0,0 @@
-" python3 plugins
-
-
-" ruby plugins
-call remote#host#RegisterPlugin('ruby', './runtime/rplugin/ruby/autocmds.rb', [
-      \ {'sync': v:false, 'name': 'BufEnter', 'type': 'autocmd', 'opts': {'pattern': '*.rb'}},
-      \ {'sync': v:false, 'name': 'BufEnter', 'type': 'autocmd', 'opts': {'pattern': '*.c', 'eval': 'g:to_eval'}},
-     \ ])
-call remote#host#RegisterPlugin('ruby', './runtime/rplugin/ruby/commands.rb', [
-      \ {'sync': v:false, 'name': 'RPluginCommandNargs0', 'type': 'command', 'opts': {}},
-      \ {'sync': v:false, 'name': 'RPluginCommandNargs1', 'type': 'command', 'opts': {'nargs': 1}},
-      \ {'sync': v:false, 'name': 'RPluginCommandNargsN', 'type': 'command', 'opts': {'nargs': '*'}},
-      \ {'sync': v:false, 'name': 'RPluginCommandNargsQ', 'type': 'command', 'opts': {'nargs': '?'}},
-      \ {'sync': v:false, 'name': 'RPluginCommandNargsP', 'type': 'command', 'opts': {'nargs': '+'}},
-      \ {'sync': v:false, 'name': 'RPluginCommandRange', 'type': 'command', 'opts': {'range': ''}},
-      \ {'sync': v:false, 'name': 'RPluginCommandRangeP', 'type': 'command', 'opts': {'range': '%'}},
-      \ {'sync': v:false, 'name': 'RPluginCommandRangeN', 'type': 'command', 'opts': {'range': '1'}},
-      \ {'sync': v:false, 'name': 'RPluginCommandCountN', 'type': 'command', 'opts': {'count': 1}},
-      \ {'sync': v:false, 'name': 'RPluginCommandBang', 'type': 'command', 'opts': {'bang': ''}},
-      \ {'sync': v:false, 'name': 'RPluginCommandRegister', 'type': 'command', 'opts': {'register': ''}},
-      \ {'sync': v:false, 'name': 'RPluginCommandCompletion', 'type': 'command', 'opts': {'complete': 'buffer'}},
-      \ {'sync': v:false, 'name': 'RPluginCommandEval', 'type': 'command', 'opts': {'eval': 'g:to_eval'}},
-      \ {'sync': v:true, 'name': 'RPluginCommandSync', 'type': 'command', 'opts': {}},
-      \ {'sync': v:true, 'name': 'RPluginCommandRecursive', 'type': 'command', 'opts': {'nargs': 1}},
-     \ ])
-call remote#host#RegisterPlugin('ruby', './runtime/rplugin/ruby/functions.rb', [
-      \ {'sync': v:false, 'name': 'RPluginFunctionArgs', 'type': 'function', 'opts': {}},
-      \ {'sync': v:false, 'name': 'RPluginFunctionRange', 'type': 'function', 'opts': {'range': ''}},
-      \ {'sync': v:false, 'name': 'RPluginFunctionEval', 'type': 'function', 'opts': {'eval': 'g:to_eval'}},
-      \ {'sync': v:true, 'name': 'RPluginFunctionSync', 'type': 'function', 'opts': {}},
-      \ {'sync': v:true, 'name': 'RPluginFunctionRecursive', 'type': 'function', 'opts': {'nargs': 1}},
-     \ ])
-
-
-" python plugins
-
-

data/spec/neovim/event_loop/connection_spec.rb

@@ -1,89 +0,0 @@
-require "helper"
-
-module Neovim
-  class EventLoop
-    RSpec.describe Connection do
-      let(:nil_io) { StringIO.new }
-
-      describe "#write" do
-        it "writes to the underlying file descriptor" do
-          rd, wr = IO.pipe
-          connection = Connection.new(nil_io, wr)
-          connection.write("some data")
-          wr.close
-
-          expect(rd.read).to eq("some data")
-        end
-
-        it "writes large amounts of data" do
-          port = Support.tcp_port
-
-          server_thr = Thread.new do
-            read_result = ""
-
-            TCPServer.open("127.0.0.1", port) do |server|
-              client = server.accept
-
-              loop do
-                begin
-                  read_result << client.readpartial(1024 * 16)
-                rescue EOFError
-                  break
-                end
-              end
-              client.close
-            end
-
-            read_result
-          end
-
-          begin
-            socket = Socket.tcp("127.0.0.1", port)
-          rescue Errno::ECONNREFUSED
-            retry
-          end
-
-          big_data = Array.new(1024 * 16) { SecureRandom.hex(4) }.join
-          connection = Connection.new(nil_io, socket)
-
-          connection.write(big_data)
-          socket.close
-          expect(server_thr.value).to eq(big_data)
-        end
-      end
-
-      describe "#read" do
-        it "yields data from the underlying file descriptor" do
-          rd, wr = IO.pipe
-          wr.write("some data")
-          wr.close
-
-          connection = Connection.new(rd, nil_io)
-
-          expect do |y|
-            connection.read(&y)
-          end.to yield_with_args("some data")
-        end
-      end
-
-      describe "#close" do
-        it "closes IO handles" do
-          rd, wr = ::IO.pipe
-          Connection.new(rd, wr).close
-
-          expect(rd).to be_closed
-          expect(wr).to be_closed
-        end
-
-        it "kills spawned processes" do
-          io = ::IO.popen("cat", "rb+")
-          pid = io.pid
-          expect(pid).to respond_to(:to_int)
-
-          Connection.new(io, nil_io).close
-          expect { Process.kill(0, pid) }.to raise_error(Errno::ESRCH)
-        end
-      end
-    end
-  end
-end