neovim 0.7.1 → 0.9.0

data/spec/acceptance/rplugin_command_spec.vim

@@ -77,8 +77,8 @@ function! s:suite.supports_register() abort
 endfunction
 
 function! s:suite.supports_completion() abort
-  RPluginCommandCompletion
-  call s:expect(g:rplugin_command_completion).to_equal("buffer")
+  RPluginCommandCompletion foo
+  call s:expect(g:rplugin_command_completion).to_equal(["buffer", "foo"])
 endfunction
 
 function! s:suite.supports_eval() abort

data/spec/acceptance/ruby_spec.vim

@@ -2,8 +2,14 @@ let s:suite = themis#suite(":ruby")
 let s:expect = themis#helper("expect")
 
 function! s:suite.before_each() abort
+  let s:pwd = getcwd()
   1,$delete
   call append(0, ["one", "two"])
+  unlet! s:var
+endfunction
+
+function! s:suite.after_each() abort
+  execute("cd " . s:pwd)
 endfunction
 
 function! s:suite.has_nvim() abort
@@ -11,41 +17,42 @@ function! s:suite.has_nvim() abort
 endfunction
 
 function! s:suite.defines_a_ruby_method() abort
-  ruby def foo; Vim.command("let g:called = 1"); end
+  ruby def foo; Vim.command("let s:var = 1"); end
   ruby foo
 
-  call s:expect(g:called).to_equal(1)
+  call s:expect(s:var).to_equal(1)
 endfunction
 
 function! s:suite.persists_curbuf_state() abort
   ruby $curbuf.instance_variable_set(:@foo, 123)
-  ruby Vim.command("let g:foo = #{$curbuf.instance_variable_get(:@foo)}")
+  ruby Vim.command("let s:var = #{$curbuf.instance_variable_get(:@foo)}")
 
-  call s:expect(g:foo).to_equal(123)
+  call s:expect(s:var).to_equal(123)
 endfunction
 
 function! s:suite.updates_working_directory() abort
   cd /
-  ruby Vim.command("let g:ruby_pwd = '#{Dir.pwd.sub(/^C:/, "")}'")
+  ruby Vim.command("let s:var = '#{Dir.pwd.sub(/^[A-Z]:/, "")}'")
   cd -
 
-  call s:expect(g:ruby_pwd).to_equal("/")
+  call s:expect(s:var).to_equal("/")
 endfunction
 
 function! s:suite.updates_working_directory_implicitly() abort
   split | lcd /
-  ruby Vim.command("let g:before_pwd = '#{Dir.pwd}'")
+  ruby Vim.command("let s:var = ['#{Dir.pwd}']")
   wincmd p
-  ruby Vim.command("let g:after_pwd = '#{Dir.pwd}'")
+  ruby Vim.command("call add(s:var, '#{Dir.pwd}')")
   wincmd p | lcd -
 
-  call s:expect(g:before_pwd).not.to_equal(g:after_pwd)
+  call s:expect(len(s:var)).to_equal(2)
+  call s:expect(s:var[0]).not.to_equal(s:var[1])
 endfunction
 
 function! s:suite.supports_nesting() abort
-  ruby Vim.command("ruby Vim.command('let g:ruby_nested = 123')")
+  ruby Vim.command("ruby Vim.command('let s:var = 123')")
 
-  call s:expect(g:ruby_nested).to_equal(123)
+  call s:expect(s:var).to_equal(123)
 endfunction
 
 function! s:suite.handles_standard_error() abort

data/spec/acceptance/rubydo_spec.vim

@@ -42,6 +42,15 @@ function! s:suite.updates_all_lines() abort
   call s:expect(getline(1, 4)).to_equal(["ONE", "TWO", "THREE", "FOUR"])
 endfunction
 
+function! s:suite.ignores_line_deletion() abort
+  " Just ensure `Index out of bounds` exception isn't raised.
+  "
+  " Deleting or adding lines inside `:rubydo` is documented as not supported.
+  " Therefore this will remain inconsistent with Vim, which deletes all but
+  " the first line (?)
+  %rubydo Vim.command("%d")
+endfunction
+
 function! s:suite.handles_standard_error() abort
   try
     1rubydo raise "BOOM"

data/spec/acceptance/rubyeval_spec.vim

@@ -0,0 +1,22 @@
+let s:suite = themis#suite(":rubyeval")
+let s:expect = themis#helper("expect")
+
+function! s:suite.evaluates_ruby_objects() abort
+  call s:expect(rubyeval("123")).to_equal(123)
+  call s:expect(rubyeval("1.2")).to_equal(1.2)
+  call s:expect(rubyeval("'test'")).to_equal("test")
+  call s:expect(rubyeval("nil")).to_equal(v:null)
+  call s:expect(rubyeval("true")).to_equal(v:true)
+  call s:expect(rubyeval("false")).to_equal(v:false)
+  call s:expect(rubyeval("{x: 1}")).to_equal({"x": 1})
+  call s:expect(rubyeval(":test")).to_equal("test")
+  call s:expect(rubyeval(":test.class")).to_equal("Symbol")
+endfunction
+
+function! s:suite.propagates_exceptions() abort
+  try
+    rubyeval("raise 'BOOM'")
+    throw "Nothing raised"
+  catch /BOOM/
+  endtry
+endfunction

data/spec/acceptance/rubyfile/curbuf_ivar_get.rb

@@ -1 +1 @@
-Vim.command("let g:foo = #{$curbuf.instance_variable_get(:@foo)}")
+Vim.command("let s:var = #{$curbuf.instance_variable_get(:@var)}")

data/spec/acceptance/rubyfile/curbuf_ivar_set.rb

@@ -1 +1 @@
-$curbuf.instance_variable_set(:@foo, 123)
+$curbuf.instance_variable_set(:@var, 123)

data/spec/acceptance/rubyfile/define_foo.rb

@@ -1,3 +1,3 @@
 def foo
-  Vim.command("let g:called = 1")
+  Vim.command("let s:var = 1")
 end

data/spec/acceptance/rubyfile/nested_inner.rb

@@ -1 +1 @@
-Vim.command("let g:ruby_nested = 123")
+Vim.command("let s:var = 123")

data/spec/acceptance/rubyfile/set_pwd_after.rb

@@ -1 +1 @@
-Vim.command("let g:pwd_after = '#{Dir.pwd}'")
+Vim.command("call add(s:var, '#{Dir.pwd}')")

data/spec/acceptance/rubyfile/set_pwd_before.rb

@@ -1 +1 @@
-Vim.command("let g:pwd_before = '#{Dir.pwd.sub(/^C:/, '')}'")
+Vim.command("let s:var = ['#{Dir.pwd.sub(/^[A-Z]:/, '')}']")

data/spec/acceptance/rubyfile_spec.vim

@@ -2,19 +2,18 @@ let s:suite = themis#suite(":rubyfile")
 let s:expect = themis#helper("expect")
 
 function! s:suite.before() abort
-  let g:return_pwd = getcwd()
-  cd spec/acceptance/rubyfile
-endfunction
-
-function! s:suite.after() abort
-  execute("cd " . g:return_pwd)
-endfunction
+  let s:pwd = getcwd()
+  cd ./spec/acceptance/rubyfile
+  unlet! s:var
 
-function! s:suite.before_each() abort
   1,$delete
   call append(0, ["one", "two"])
 endfunction
 
+function! s:suite.after() abort
+  execute("cd " . s:pwd)
+endfunction
+
 function! s:suite.has_nvim() abort
   call s:expect(has("nvim")).to_equal(1)
 endfunction
@@ -23,42 +22,43 @@ function! s:suite.defines_a_ruby_method() abort
   rubyfile ./define_foo.rb
   rubyfile ./call_foo.rb
 
-  call s:expect(g:called).to_equal(1)
+  call s:expect(s:var).to_equal(1)
 endfunction
 
 function! s:suite.persists_curbuf_state() abort
   rubyfile ./curbuf_ivar_set.rb
   rubyfile ./curbuf_ivar_get.rb
 
-  call s:expect(g:foo).to_equal(123)
+  call s:expect(s:var).to_equal(123)
 endfunction
 
 function! s:suite.updates_working_directory() abort
-  let g:rubyfile = getcwd() . "/set_pwd_before.rb"
+  let s:rubyfile = getcwd() . "/set_pwd_before.rb"
   cd /
-  exec "rubyfile " . g:rubyfile
+  exec "rubyfile " . s:rubyfile
   cd -
 
-  call s:expect(g:pwd_before).to_equal("/")
+  call s:expect(s:var).to_equal(["/"])
 endfunction
 
 function! s:suite.updates_working_directory_implicitly() abort
-  let g:before_file = getcwd() . "/set_pwd_before.rb"
-  let g:after_file = getcwd() . "/set_pwd_after.rb"
+  let s:before_file = getcwd() . "/set_pwd_before.rb"
+  let s:after_file = getcwd() . "/set_pwd_after.rb"
 
   split | lcd /
-  exec "rubyfile " . g:before_file
+  exec "rubyfile " . s:before_file
   wincmd p
-  exec "rubyfile " . g:after_file
+  exec "rubyfile " . s:after_file
   wincmd p | lcd -
 
-  call s:expect(g:pwd_before).not.to_equal(g:pwd_after)
+  call s:expect(len(s:var)).to_equal(2)
+  call s:expect(s:var[0]).not.to_equal(s:var[1])
 endfunction
 
 function! s:suite.supports_nesting() abort
   rubyfile ./nested.rb
 
-  call s:expect(g:ruby_nested).to_equal(123)
+  call s:expect(s:var).to_equal(123)
 endfunction
 
 function! s:suite.handles_standard_error() abort

data/spec/acceptance/runtime/init.vim

@@ -1,7 +1,7 @@
 let s:lib_path = getcwd() . "/lib"
-let s:bin_path = getcwd() . "/bin/neovim-ruby-host"
+let s:exe_path = getcwd() . "/exe/neovim-ruby-host"
 let g:acceptance_rtp = getcwd() . "/spec/acceptance/runtime"
-let g:ruby_host_prog = printf("ruby -I %s %s", s:lib_path, s:bin_path)
+let g:ruby_host_prog = printf("ruby -I %s %s", s:lib_path, s:exe_path)
 
 ruby require "rspec/expectations"
 ruby include ::RSpec::Matchers.dup

data/spec/acceptance/runtime/rplugin/ruby/commands.rb

@@ -43,10 +43,10 @@ Neovim.plugin do |plug|
     nvim.set_var("rplugin_command_register", reg)
   end
 
-  plug.command(:RPluginCommandCompletion, complete: "buffer", sync: true) do |nvim|
+  plug.command(:RPluginCommandCompletion, complete: "buffer", nargs: 1, sync: true) do |nvim, arg|
     attrs = nvim.command_output("silent command RPluginCommandCompletion")
     compl = attrs.split($/).last.split[2]
-    nvim.set_var("rplugin_command_completion", compl)
+    nvim.set_var("rplugin_command_completion", [compl, arg])
   end
 
   plug.command(:RPluginCommandEval, eval: "g:to_eval", sync: true) do |nvim, to_eval|

data/spec/helper.rb

@@ -1,10 +1,5 @@
 require "bundler/setup"
 
-if ENV["REPORT_COVERAGE"]
-  require "coveralls"
-  Coveralls.wear!
-end
-
 require "fileutils"
 require "msgpack"
 require "neovim"
@@ -14,7 +9,9 @@ require "securerandom"
 require "stringio"
 require "timeout"
 
-require File.expand_path("../support.rb", __FILE__)
+require File.expand_path("support.rb", __dir__)
+
+ENV["NVIM_RUBY_LOG_LEVEL"] ||= "FATAL"
 
 RSpec.configure do |config|
   config.expect_with :rspec do |exp|
@@ -45,12 +42,33 @@ RSpec.configure do |config|
     timeout = spec.metadata.fetch(:timeout, 3)
 
     begin
-      Timeout.timeout(timeout) { spec.run }
+      Timeout.timeout(timeout) do
+        Support.clean_persistent_client
+        spec.run
+      end
     ensure
       Support.teardown_workspace
     end
   end
 
+  config.before(:example, :nvim_version) do |spec|
+    comparator = spec.metadata.fetch(:nvim_version)
+    requirement = Gem::Requirement.create(comparator)
+
+    nvim_version = Support
+      .nvim_version
+      .split("+")
+      .first
+
+    if !requirement.satisfied_by?(Gem::Version.new(nvim_version))
+      skip "Skipping on nvim #{nvim_version} (requires #{comparator})"
+    end
+  end
+
+  config.after(:suite) do
+    Support.persistent_client.shutdown
+  end
+
   Kernel.srand config.seed
 end
 

data/spec/neovim/api_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe API do
-    let(:client) { Neovim.attach_child(Support.child_argv) }
+    let(:client) { Support.persistent_client }
 
     let(:api) do
       API.new(

data/spec/neovim/buffer_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe Buffer do
-    let(:client) { Neovim.attach_child(Support.child_argv) }
+    let(:client) { Support.persistent_client }
     let(:buffer) { client.current.buffer }
 
     before do
@@ -11,8 +11,6 @@ module Neovim
       client.command("normal gg")
     end
 
-    after { client.shutdown }
-
     describe "#lines" do
       it "returns a LineRange" do
         expect(buffer.lines).to be_a(LineRange)
@@ -37,9 +35,9 @@ module Neovim
 
     describe "#number" do
       it "returns the buffer number" do
-        expect(buffer.number).to eq(1)
-        client.command("new")
-        expect(client.get_current_buf.number).to eq(2)
+        expect do
+          client.command("new")
+        end.to change { client.get_current_buf.number }
       end
     end
 
@@ -124,6 +122,12 @@ module Neovim
         end.to change { buffer.lines.to_a }.to(["first", "one", "two"])
       end
 
+      it "allows newlines" do
+        expect do
+          buffer.append(0, "first\nsecond")
+        end.to change { buffer.lines.to_a }.to(["first", "second", "one", "two"])
+      end
+
       it "doesn't move the cursor" do
         expect do
           buffer.append(0, "first")

data/spec/neovim/client_info_spec.rb

@@ -0,0 +1,77 @@
+require "neovim/client_info"
+require "neovim/host"
+require "neovim/plugin"
+
+module Neovim
+  RSpec.describe ClientInfo do
+    describe "#to_args" do
+      context ".for_host" do
+        it "returns script-host info" do
+          plugin = double(Plugin, script_host?: true)
+          host = double(Host, plugins: [plugin])
+          info = ClientInfo.for_host(host)
+
+          expect(info.to_args).to match(
+            [
+              "ruby-script-host",
+              {
+                "major" => duck_type(:to_int),
+                "minor" => duck_type(:to_int),
+                "patch" => duck_type(:to_int)
+              },
+              :host,
+              {
+                poll: {},
+                specs: {nargs: 1}
+              },
+              duck_type(:to_hash)
+            ]
+          )
+        end
+
+        it "returns rplugin info" do
+          plugin = double(Plugin, script_host?: false)
+          host = double(Host, plugins: [plugin])
+          info = ClientInfo.for_host(host)
+
+          expect(info.to_args).to match(
+            [
+              "ruby-rplugin-host",
+              {
+                "major" => duck_type(:to_int),
+                "minor" => duck_type(:to_int),
+                "patch" => duck_type(:to_int)
+              },
+              :host,
+              {
+                poll: {},
+                specs: {nargs: 1}
+              },
+              duck_type(:to_hash)
+            ]
+          )
+        end
+      end
+
+      context ".for_client" do
+        it "returns remote client info" do
+          info = ClientInfo.for_client
+
+          expect(info.to_args).to match(
+            [
+              "ruby-client",
+              {
+                "major" => duck_type(:to_int),
+                "minor" => duck_type(:to_int),
+                "patch" => duck_type(:to_int)
+              },
+              :remote,
+              {},
+              duck_type(:to_hash)
+            ]
+          )
+        end
+      end
+    end
+  end
+end

data/spec/neovim/client_spec.rb

@@ -2,8 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe Client do
-    let(:client) { Neovim.attach_child(Support.child_argv) }
-    after { client.shutdown }
+    let(:client) { Support.persistent_client }
 
     describe "#set_option" do
       it "sets an option from two arguments" do
@@ -25,6 +24,14 @@ module Neovim
       end
     end
 
+    describe "#shutdown" do
+      it "causes nvim to exit" do
+        client = Neovim.attach_child(Support.child_argv)
+        client.shutdown
+        expect { client.strwidth("hi") }.to raise_error(Neovim::Session::Disconnected)
+      end
+    end
+
     describe "#respond_to?" do
       it "returns true for vim functions" do
         expect(client).to respond_to(:strwidth)