neovim 0.6.2 → 0.9.0.pre.1

data/spec/neovim/ruby_provider/window_ext_spec.rb

@@ -4,13 +4,11 @@ require "neovim/ruby_provider/window_ext"
 module Neovim
   RSpec.describe Window do
     let!(:nvim) do
-      Neovim.attach_child(Support.child_argv).tap do |nvim|
-        stub_const("::Vim", nvim)
+      Support.persistent_client.tap do |client|
+        stub_const("::Vim", client)
       end
     end
 
-    after { nvim.shutdown }
-
     describe ".current" do
       it "returns the current window from the global Vim client" do
         expect(Window.current).to eq(nvim.get_current_win)
@@ -19,31 +17,30 @@ module Neovim
 
     describe ".count" do
       it "returns the current window count from the global Vim client" do
-        expect {
+        expect do
           nvim.command("new")
-        }.to change { Window.count }.by(1)
+        end.to change { Window.count }.by(1)
       end
 
       it "only includes windows within a tabpage" do
-        expect {
+        expect do
           nvim.command("tabnew")
-        }.not_to change { Window.count }.from(1)
+        end.not_to change { Window.count }.from(1)
       end
     end
 
     describe ".[]" do
       it "returns the window at the given index" do
-        expect {
-          nvim.command("new")
-        }.to change { Window[1] }.from(nil).to(kind_of(Window))
+        window = Window[0]
+
+        expect(window).to be_a(Window)
+        expect(window).to eq(nvim.list_wins[0])
       end
 
       it "only includes windows within a tabpage" do
-        nvim.command("new")
-
-        expect {
+        expect do
           nvim.command("tabnew")
-        }.to change { Window[1] }.from(kind_of(Window)).to(nil)
+        end.to change { Window[0] }
       end
     end
   end

data/spec/neovim/session_spec.rb

@@ -2,10 +2,8 @@ require "helper"
 
 module Neovim
   RSpec.describe Session do
-    let(:event_loop) { EventLoop.child(Support.child_argv) }
-    let!(:session) { Session.new(event_loop) }
-
-    after { session.shutdown }
+    let(:client) { Support.persistent_client }
+    let(:session) { client.session }
 
     describe "#request" do
       it "synchronously returns a result" do
@@ -13,71 +11,46 @@ module Neovim
       end
 
       it "raises an exception when there are errors" do
-        expect {
+        expect do
           session.request(:nvim_strwidth, "too", "many")
-        }.to raise_error(/wrong number of arguments/i)
-      end
-
-      it "handles large data" do
-        large_str = Array.new(1024 * 17) { SecureRandom.hex(1) }.join
-        session.request(:nvim_set_current_line, large_str)
-        expect(session.request(:nvim_get_current_line)).to eq(large_str)
+        end.to raise_error(/wrong number of arguments/i)
       end
 
-      it "fails outside of the main thread" do
-        expect {
+      it "fails outside of the main thread", :silence_thread_exceptions do
+        expect do
           Thread.new { session.request(:nvim_strwidth, "foo") }.join
-        }.to raise_error(/outside of the main thread/)
+        end.to raise_error(/outside of the main thread/)
       end
     end
 
     describe "#notify" do
-      it "doesn't raise exceptions" do
-        expect {
-          session.notify(:nvim_strwidth, "too", "many")
-        }.not_to raise_error
-      end
-
-      it "handles large data" do
-        large_str = Array.new(1024 * 17) { SecureRandom.hex(1) }.join
-        session.notify(:nvim_set_current_line, large_str)
-        expect(session.request(:nvim_get_current_line)).to eq(large_str)
-      end
-
       it "succeeds outside of the main thread" do
-        expect {
+        expect do
           Thread.new { session.notify(:nvim_set_current_line, "foo") }.join
-        }.not_to raise_error
+        end.not_to raise_error
       end
     end
 
-    describe "#run" do
-      it "enqueues messages received during blocking requests" do
-        session.request(:nvim_subscribe, "my_event")
-        session.request(:nvim_command, "call rpcnotify(0, 'my_event', 'foo')")
+    describe "#next" do
+      it "returns the next message from the event loop" do
+        cid, = session.request(:nvim_get_api_info)
+        session.request(:nvim_command, "call rpcnotify(#{cid}, 'my_event', 'foo')")
 
-        message = nil
-        session.run do |msg|
-          message = msg
-          session.shutdown
-        end
+        message = session.next
 
         expect(message.sync?).to eq(false)
         expect(message.method_name).to eq("my_event")
         expect(message.arguments).to eq(["foo"])
       end
 
-      it "supports requests within callbacks" do
-        session.request(:nvim_subscribe, "my_event")
-        session.request(:nvim_command, "call rpcnotify(0, 'my_event', 'foo')")
+      it "returns asynchronous notification errors", nvim_version: ">= 0.4.pre.dev" do
+        session.notify(:nvim_set_current_line, "too", "many", "args")
 
-        result = nil
-        session.run do |msg|
-          result = session.request(:nvim_strwidth, msg.arguments.first)
-          session.shutdown
-        end
+        message = session.next
 
-        expect(result).to be(3)
+        expect(message.sync?).to eq(false)
+        expect(message.method_name).to eq("nvim_error_event")
+        expect(message.arguments).to eq([0, "Wrong number of arguments: expecting 1 but got 3"])
       end
     end
   end

data/spec/neovim/window_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe Window do
-    let(:client) { Neovim.attach_child(Support.child_argv) }
+    let(:client) { Support.persistent_client }
     let(:window) { client.current.window }
 
     before do
@@ -43,4 +43,3 @@ module Neovim
     end
   end
 end
-

data/spec/neovim_spec.rb

@@ -1,60 +1,37 @@
 require "helper"
 
 RSpec.describe Neovim do
-  describe ".attach_tcp" do
-    it "attaches to a TCP socket" do
-      port = Support.tcp_port
-      env = {"NVIM_LISTEN_ADDRESS" => "127.0.0.1:#{port}"}
-      pid = Process.spawn(env, *Support.child_argv, [:out, :err] => File::NULL)
-
-      begin
-        client = Neovim.attach_tcp("127.0.0.1", port)
-      rescue Errno::ECONNREFUSED
-        retry
-      end
-
-      begin
-        expect(client.strwidth("hi")).to eq(2)
-      ensure
-        Support.kill(pid)
-        Process.waitpid(pid)
-      end
-    end
-  end
-
-  describe ".attach_unix" do
-    before do
-      skip("Not supported on this platform") if Support.windows?
-    end
-
-    it "attaches to a UNIX socket" do
-      socket_path = Support.socket_path
-      env = {"NVIM_LISTEN_ADDRESS" => socket_path}
-      pid = Process.spawn(env, *Support.child_argv, [:out, :err] => File::NULL)
-
-      begin
-        client = Neovim.attach_unix(socket_path)
-      rescue Errno::ENOENT, Errno::ECONNREFUSED
-        retry
-      end
-
-      begin
-        expect(client.strwidth("hi")).to eq(2)
-      ensure
-        Support.kill(pid)
-        Process.waitpid(pid)
-      end
+  let(:client) { Support.persistent_client }
+
+  let(:stream) do
+    case Support.backend_strategy
+    when /^tcp/, /^unix/
+      "socket"
+    else
+      "stdio"
     end
   end
 
-  describe ".attach_child" do
-    it "spawns and attaches to a child process" do
-      begin
-        client = Neovim.attach_child(Support.child_argv)
-        expect(client.strwidth("hi")).to eq(2)
-      ensure
-        client.shutdown
-      end
+  describe ".attach" do
+    it "sets appropriate client info" do
+      chan_info = client.evaluate("nvim_get_chan_info(#{client.channel_id})")
+
+      expect(chan_info).to match(
+        "client" => {
+          "name" => "ruby-client",
+          "version" => {
+            "major" => duck_type(:to_int),
+            "minor" => duck_type(:to_int),
+            "patch" => duck_type(:to_int)
+          },
+          "type" => "remote",
+          "methods" => {},
+          "attributes" => duck_type(:to_hash)
+        },
+        "id" => duck_type(:to_int),
+        "mode" => "rpc",
+        "stream" => stream
+      )
     end
   end
 

data/spec/support.rb

@@ -1,10 +1,35 @@
+require "shellwords"
+
 module Support
   class << self
     attr_accessor :nvim_version
   end
 
+  def self.clean_persistent_client
+    persistent_client.command("%bdelete! | tabonly | only | set all&")
+  end
+
+  def self.backend_strategy
+    @backend_strategy ||= ENV.fetch("NVIM_RUBY_SPEC_BACKEND", "child")
+  end
+
+  def self.persistent_client
+    return @persistent_client if defined?(@persistent_client)
+
+    case backend_strategy
+    when /^child:?(.*)$/
+      @persistent_client = Neovim.attach_child(child_argv + Shellwords.split($1))
+    when /^tcp:(.+)$/
+      @persistent_client = Neovim.attach_tcp(*$1.split(":", 2))
+    when /^unix:(.+)$/
+      @persistent_client = Neovim.attach_unix($1)
+    else
+      raise "Unrecognized $NVIM_RUBY_SPEC_BACKEND #{backend_strategy.inspect}"
+    end
+  end
+
   def self.workspace
-    File.expand_path("../workspace", __FILE__)
+    File.expand_path("workspace", __dir__)
   end
 
   def self.socket_path
@@ -43,6 +68,7 @@ module Support
 
   def self.kill(pid)
     windows? ? Process.kill(:KILL, pid) : Process.kill(:TERM, pid)
+    Process.waitpid(pid)
   end
 
   begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.9.0.pre.1
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -40,6 +40,20 @@ dependencies:
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.56.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.56.0
+- !ruby/object:Gem::Dependency
+  name: vim-flavor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 description: 
 email:
 - alexgenco@gmail.com
@@ -102,39 +144,41 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".github/workflows/docs.yml"
+- ".github/workflows/linter.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
-- bin/neovim-ruby-host
+- VimFlavor
+- exe/neovim-ruby-host
 - lib/neovim.rb
 - lib/neovim/api.rb
 - lib/neovim/buffer.rb
 - lib/neovim/client.rb
+- lib/neovim/client_info.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/cli.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
 - lib/neovim/remote_object.rb
 - lib/neovim/ruby_provider.rb
 - lib/neovim/ruby_provider/buffer_ext.rb
+- lib/neovim/ruby_provider/object_ext.rb
 - lib/neovim/ruby_provider/vim.rb
 - lib/neovim/ruby_provider/window_ext.rb
 - lib/neovim/session.rb
@@ -142,15 +186,19 @@ files:
 - lib/neovim/version.rb
 - lib/neovim/window.rb
 - neovim.gemspec
-- script/dump_api
-- script/generate_docs
-- script/j2mp
-- script/mp2j
+- script/ci/download_nvim.sh
+- script/dump_api.rb
+- script/generate_docs.rb
+- script/j2mp.rb
+- script/mp2j.rb
+- script/run_acceptance.rb
+- spec/acceptance/client_info_spec.vim
 - spec/acceptance/rplugin_autocmd_spec.vim
 - spec/acceptance/rplugin_command_spec.vim
 - spec/acceptance/rplugin_function_spec.vim
 - spec/acceptance/ruby_spec.vim
 - spec/acceptance/rubydo_spec.vim
+- spec/acceptance/rubyeval_spec.vim
 - spec/acceptance/rubyfile/call_foo.rb
 - spec/acceptance/rubyfile/curbuf_ivar_get.rb
 - spec/acceptance/rubyfile/curbuf_ivar_set.rb
@@ -164,42 +212,35 @@ 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
-- spec/acceptance/runtime/vader.vim/autoload/vader.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/assert.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/helper.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/parser.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/syntax.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/window.vim
-- spec/acceptance/runtime/vader.vim/plugin/vader.vim
-- spec/acceptance_spec.rb
 - spec/helper.rb
 - spec/neovim/api_spec.rb
 - spec/neovim/buffer_spec.rb
+- spec/neovim/client_info_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/cli_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
+- spec/neovim/ruby_provider/object_ext_spec.rb
 - spec/neovim/ruby_provider/vim_spec.rb
 - spec/neovim/ruby_provider/window_ext_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
 - spec/support.rb
-homepage: https://github.com/alexgenco/neovim-ruby
+homepage: https://github.com/neovim/neovim-ruby
 licenses:
 - MIT
 metadata: {}
@@ -211,24 +252,25 @@ 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:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Neovim
 test_files:
+- spec/acceptance/client_info_spec.vim
 - spec/acceptance/rplugin_autocmd_spec.vim
 - spec/acceptance/rplugin_command_spec.vim
 - spec/acceptance/rplugin_function_spec.vim
 - spec/acceptance/ruby_spec.vim
 - spec/acceptance/rubydo_spec.vim
+- spec/acceptance/rubyeval_spec.vim
 - spec/acceptance/rubyfile/call_foo.rb
 - spec/acceptance/rubyfile/curbuf_ivar_get.rb
 - spec/acceptance/rubyfile/curbuf_ivar_set.rb
@@ -242,35 +284,28 @@ 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
-- spec/acceptance/runtime/vader.vim/autoload/vader.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/assert.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/helper.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/parser.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/syntax.vim
-- spec/acceptance/runtime/vader.vim/autoload/vader/window.vim
-- spec/acceptance/runtime/vader.vim/plugin/vader.vim
-- spec/acceptance_spec.rb
 - spec/helper.rb
 - spec/neovim/api_spec.rb
 - spec/neovim/buffer_spec.rb
+- spec/neovim/client_info_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/cli_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
+- spec/neovim/ruby_provider/object_ext_spec.rb
 - spec/neovim/ruby_provider/vim_spec.rb
 - spec/neovim/ruby_provider/window_ext_spec.rb
 - spec/neovim/session_spec.rb