neovim 0.7.0 → 0.7.1

data/spec/acceptance/rubydo_spec.vim

@@ -1,75 +1,63 @@
-Given:
-  one
-  two
-  three
-  four
+let s:suite = themis#suite(":rubydo")
+let s:expect = themis#helper("expect")
 
-Execute (Update one line using `$_`):
+function! s:suite.before_each() abort
+  1,$delete
+  call append(0, ["one", "two", "three", "four"])
+endfunction
+
+function! s:suite.has_nvim() abort
+  call s:expect(has("nvim")).to_equal(1)
+endfunction
+
+function! s:suite.updates_one_line() abort
   2rubydo $_.upcase!
 
-Expect:
-  one
-  TWO
-  three
-  four
+  call s:expect(getline(1, 4)).to_equal(["one", "TWO", "three", "four"])
+endfunction
 
-Execute (Update a range of lines using `$_`):
+function! s:suite.updates_line_range() abort
   2,3rubydo $_.upcase!
 
-Expect:
-  one
-  TWO
-  THREE
-  four
+  call s:expect(getline(1, 4)).to_equal(["one", "TWO", "THREE", "four"])
+endfunction
+
+function! s:suite.updates_large_line_range() abort
+  1,$delete
+
+  for _ in range(0, 6000)
+    call append(0, "x")
+  endfor
+
+  %rubydo $_.succ!
+
+  call s:expect(getline(1)).to_equal("y")
+  call s:expect(getline(6001)).to_equal("y")
+  call s:expect(getline(6002)).to_equal("")
+endfunction
 
-Execute (Update all lines using `$_`):
+function! s:suite.updates_all_lines() abort
   %rubydo $_.upcase!
 
-Expect:
-  ONE
-  TWO
-  THREE
-  FOUR
+  call s:expect(getline(1, 4)).to_equal(["ONE", "TWO", "THREE", "FOUR"])
+endfunction
 
-Execute (Raise a Ruby standard error):
+function! s:suite.handles_standard_error() abort
   try
     1rubydo raise "BOOM"
     throw "Nothing raised"
   catch /BOOM/
   endtry
 
-  1rubydo $_.replace("still works")
+  call s:suite.updates_one_line()
+endfunction
 
-Expect:
-  still works
-  two
-  three
-  four
-
-Execute (Raise a Ruby syntax error):
+function! s:suite.handles_syntax_error() abort
   try
     1rubydo puts[
     throw "Nothing raised"
   catch /SyntaxError/
   endtry
 
-  1rubydo $_.replace("still works")
-
-Expect:
-  still works
-  two
-  three
-  four
-
-Given:
-  x
-
-Execute (Add a large number of lines):
-  1yank
-  silent normal 6000p
-  %rubydo $_.succ!
-
-Then:
-  AssertEqual "y", getline(1)
-  AssertEqual "y", getline(6001)
-  AssertEqual "", getline(6002)
+  call s:suite.updates_one_line()
+endfunction

data/spec/acceptance/rubyfile/nested.rb

@@ -1 +1 @@
-Vim.command("rubyfile ./rubyfile/nested_inner.rb")
+Vim.command("rubyfile ./nested_inner.rb")

data/spec/acceptance/rubyfile_spec.vim

@@ -1,46 +1,50 @@
-Execute (Set nvim_version):
-  if has('nvim')
-    let g:nvim_version = api_info()['version']
-  else
-    let g:nvim_version = {'major': 99, 'minor': 99, 'patch': 99}
-  endif
+let s:suite = themis#suite(":rubyfile")
+let s:expect = themis#helper("expect")
 
-Given:
-  one
-  two
+function! s:suite.before() abort
+  let g:return_pwd = getcwd()
+  cd spec/acceptance/rubyfile
+endfunction
 
-Execute (Define a Ruby method):
-  rubyfile ./rubyfile/define_foo.rb
+function! s:suite.after() abort
+  execute("cd " . g:return_pwd)
+endfunction
 
-Execute (Call a Ruby method):
-  rubyfile ./rubyfile/call_foo.rb
+function! s:suite.before_each() abort
+  1,$delete
+  call append(0, ["one", "two"])
+endfunction
 
-Then:
-  AssertEqual 1, g:called
+function! s:suite.has_nvim() abort
+  call s:expect(has("nvim")).to_equal(1)
+endfunction
 
-Execute (Update instance state on $curbuf):
-  rubyfile ./rubyfile/curbuf_ivar_set.rb
+function! s:suite.defines_a_ruby_method() abort
+  rubyfile ./define_foo.rb
+  rubyfile ./call_foo.rb
 
-Execute (Access instance state on $curbuf):
-  rubyfile ./rubyfile/curbuf_ivar_get.rb
+  call s:expect(g:called).to_equal(1)
+endfunction
 
-Then:
-  AssertEqual 123, g:foo
+function! s:suite.persists_curbuf_state() abort
+  rubyfile ./curbuf_ivar_set.rb
+  rubyfile ./curbuf_ivar_get.rb
 
-Execute (Change the working directory explicitly):
-  let g:rubyfile = getcwd() . "/rubyfile/set_pwd_before.rb"
+  call s:expect(g:foo).to_equal(123)
+endfunction
+
+function! s:suite.updates_working_directory() abort
+  let g:rubyfile = getcwd() . "/set_pwd_before.rb"
   cd /
   exec "rubyfile " . g:rubyfile
   cd -
 
-Then:
-  if g:nvim_version['major'] > 0 || g:nvim_version['minor'] >= 2
-    AssertEqual "/", g:pwd_before
-  endif
+  call s:expect(g:pwd_before).to_equal("/")
+endfunction
 
-Execute (Change the working directory implicitly):
-  let g:before_file = getcwd() . "/rubyfile/set_pwd_before.rb"
-  let g:after_file = getcwd() . "/rubyfile/set_pwd_after.rb"
+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"
 
   split | lcd /
   exec "rubyfile " . g:before_file
@@ -48,55 +52,45 @@ Execute (Change the working directory implicitly):
   exec "rubyfile " . g:after_file
   wincmd p | lcd -
 
-Then:
-  if g:nvim_version['major'] > 0 || g:nvim_version['minor'] >= 2
-    AssertNotEqual g:pwd_before, g:pwd_after
-  endif
+  call s:expect(g:pwd_before).not.to_equal(g:pwd_after)
+endfunction
 
-Execute (Run nested Ruby files):
-  rubyfile ./rubyfile/nested.rb
+function! s:suite.supports_nesting() abort
+  rubyfile ./nested.rb
 
-Then:
-  AssertEqual 123, g:ruby_nested
+  call s:expect(g:ruby_nested).to_equal(123)
+endfunction
 
-Execute (Raise a Ruby load error):
+function! s:suite.handles_standard_error() abort
   try
-    rubyfile /foo/bar/baz
+    rubyfile ./raise_standard_error.rb
     throw "Nothing raised"
-  catch /LoadError/
+  catch /BOOM/
   endtry
 
-  ruby $curbuf[1] = "still works"
-
-Expect:
-  still works
-  two
+  call s:suite.defines_a_ruby_method()
+endfunction
 
-Execute (Raise a Ruby standard error):
+function! s:suite.handles_load_error() abort
   try
-    rubyfile ./rubyfile/raise_standard_error.rb
+    rubyfile /foo/bar/baz
     throw "Nothing raised"
-  catch /BOOM/
+  catch /LoadError/
   endtry
 
-  ruby $curbuf[1] = "still works"
+  call s:suite.defines_a_ruby_method()
+endfunction
 
-Expect:
-  still works
-  two
-
-Execute (Raise a Ruby syntax error):
+function! s:suite.handles_syntax_error() abort
   try
-    rubyfile ./rubyfile/raise_syntax_error.rb
+    rubyfile ./raise_syntax_error.rb
     throw "Nothing raised"
   catch /SyntaxError/
   endtry
 
-  ruby $curbuf[1] = "still works"
-
-Expect:
-  still works
-  two
+  call s:suite.defines_a_ruby_method()
+endfunction
 
-Execute (Access ruby interface):
-  rubyfile ./rubyfile/ruby_interface.rb
+function! s:suite.exposes_constants() abort
+  rubyfile ./ruby_interface.rb
+endfunction

data/spec/acceptance/runtime/init.vim

@@ -1,8 +1,9 @@
-let s:lib_path = fnamemodify(getcwd() . "/../../lib", ":p")
-let s:bin_path = fnamemodify(getcwd() . "/../../bin/neovim-ruby-host", ":p")
+let s:lib_path = getcwd() . "/lib"
+let s:bin_path = getcwd() . "/bin/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)
 
 ruby require "rspec/expectations"
 ruby include ::RSpec::Matchers.dup
 
-set rtp=./runtime,./runtime/vader.vim,$VIMRUNTIME
+set rtp=./spec/acceptance/runtime,$VIMRUNTIME

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

@@ -1,9 +1,13 @@
 Neovim.plugin do |plug|
-  plug.autocmd(:BufEnter, pattern: "*.rb") do |nvim|
+  plug.autocmd(:BufEnter, pattern: "*.rb", sync: true) do |nvim|
     nvim.get_current_buf.set_var("rplugin_autocmd_BufEnter", true)
   end
 
-  plug.autocmd(:BufEnter, pattern: "*.c", eval: "g:to_eval") do |nvim, to_eval|
+  plug.autocmd(:BufEnter, pattern: "*.c", eval: "g:to_eval", sync: true) do |nvim, to_eval|
     nvim.set_var("rplugin_autocmd_BufEnter_eval", to_eval.merge(b: 43))
   end
+
+  plug.autocmd(:BufEnter, pattern: "*.async") do |nvim, to_eval|
+    nvim.set_var("rplugin_autocmd_BufEnter_async", true)
+  end
 end

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

@@ -1,63 +1,64 @@
 Neovim.plugin do |plug|
-  plug.command(:RPluginCommandNargs0) do |nvim|
+  plug.command(:RPluginCommandNargs0, sync: true) do |nvim|
     nvim.set_var("rplugin_command_nargs_0", true)
   end
 
-  plug.command(:RPluginCommandNargs1, nargs: 1) do |nvim, arg|
+  plug.command(:RPluginCommandNargs1, nargs: 1, sync: true) do |nvim, arg|
     nvim.set_var("rplugin_command_nargs_1", arg)
   end
 
-  plug.command(:RPluginCommandNargsN, nargs: "*") do |nvim, *args|
+  plug.command(:RPluginCommandNargsN, nargs: "*", sync: true) do |nvim, *args|
     nvim.set_var("rplugin_command_nargs_n", args)
   end
 
-  plug.command(:RPluginCommandNargsQ, nargs: "?") do |nvim, arg|
+  plug.command(:RPluginCommandNargsQ, nargs: "?", sync: true) do |nvim, arg|
     nvim.set_var("rplugin_command_nargs_q", arg)
   end
 
-  plug.command(:RPluginCommandNargsP, nargs: "+") do |nvim, *args|
+  plug.command(:RPluginCommandNargsP, nargs: "+", sync: true) do |nvim, *args|
     nvim.set_var("rplugin_command_nargs_p", args)
   end
 
-  plug.command(:RPluginCommandRange, range: true) do |nvim, *range|
+  plug.command(:RPluginCommandRange, range: true, sync: true) do |nvim, *range|
     nvim.set_var("rplugin_command_range", range)
   end
 
-  plug.command(:RPluginCommandRangeP, range: "%") do |nvim, *range|
+  plug.command(:RPluginCommandRangeP, range: "%", sync: true) do |nvim, *range|
     nvim.set_var("rplugin_command_range_p", range)
   end
 
-  plug.command(:RPluginCommandRangeN, range: 1) do |nvim, *range|
+  plug.command(:RPluginCommandRangeN, range: 1, sync: true) do |nvim, *range|
     nvim.set_var("rplugin_command_range_n", range)
   end
 
-  plug.command(:RPluginCommandCountN, count: 1) do |nvim, *count|
+  plug.command(:RPluginCommandCountN, count: 1, sync: true) do |nvim, *count|
     nvim.set_var("rplugin_command_count_n", count)
   end
 
-  plug.command(:RPluginCommandBang, bang: true) do |nvim, bang|
+  plug.command(:RPluginCommandBang, bang: true, sync: true) do |nvim, bang|
     nvim.set_var("rplugin_command_bang", bang)
   end
 
-  plug.command(:RPluginCommandRegister, register: true) do |nvim, reg|
+  plug.command(:RPluginCommandRegister, register: true, sync: true) do |nvim, reg|
     nvim.set_var("rplugin_command_register", reg)
   end
 
-  plug.command(:RPluginCommandCompletion, complete: "buffer") do |nvim|
+  plug.command(:RPluginCommandCompletion, complete: "buffer", sync: true) do |nvim|
     attrs = nvim.command_output("silent command RPluginCommandCompletion")
     compl = attrs.split($/).last.split[2]
     nvim.set_var("rplugin_command_completion", compl)
   end
 
-  plug.command(:RPluginCommandEval, eval: "g:to_eval") do |nvim, to_eval|
+  plug.command(:RPluginCommandEval, eval: "g:to_eval", sync: true) do |nvim, to_eval|
     nvim.set_var("rplugin_command_eval", to_eval.merge(b: 43))
+    to_eval.merge(b: 43)
   end
 
-  plug.command(:RPluginCommandSync, sync: true) do |nvim|
-    nvim.set_var("rplugin_command_sync", true)
+  plug.command(:RPluginCommandAsync) do |nvim|
+    nvim.set_var("rplugin_command_async", true)
   end
 
-  plug.command(:RPluginCommandRecursive, sync: true, nargs: 1) do |nvim, n|
+  plug.command(:RPluginCommandRecursive, nargs: 1, sync: true) do |nvim, n|
     if Integer(n) >= 10
       nvim.set_var("rplugin_command_recursive", n)
     else

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

@@ -1,18 +1,18 @@
 Neovim.plugin do |plug|
-  plug.function(:RPluginFunctionArgs) do |nvim, *args|
-    nvim.set_var("rplugin_function_args", args)
+  plug.function(:RPluginFunctionArgs, sync: true) do |nvim, *args|
+    args
   end
 
-  plug.function(:RPluginFunctionRange, range: true) do |nvim, *range|
-    nvim.set_var("rplugin_function_range", range)
+  plug.function(:RPluginFunctionRange, range: true, sync: true) do |nvim, start, stop|
+    nvim.set_var("rplugin_function_range", [start, stop])
   end
 
-  plug.function(:RPluginFunctionEval, eval: "g:to_eval") do |nvim, to_eval|
-    nvim.set_var("rplugin_function_eval", to_eval.merge(b: 43))
+  plug.function(:RPluginFunctionEval, eval: "g:to_eval", sync: true) do |nvim, to_eval|
+    to_eval.merge(b: 43)
   end
 
-  plug.function(:RPluginFunctionSync, sync: true) do |nvim|
-    true
+  plug.function(:RPluginFunctionAsync) do |nvim|
+    nvim.set_var("rplugin_function_async", true)
   end
 
   plug.function(:RPluginFunctionRecursive, sync: true, nargs: 1) do |nvim, n|

data/spec/helper.rb

@@ -6,13 +6,13 @@ if ENV["REPORT_COVERAGE"]
 end
 
 require "fileutils"
+require "msgpack"
 require "neovim"
 require "pry"
 require "rubygems"
+require "securerandom"
 require "stringio"
 require "timeout"
-require "securerandom"
-require "msgpack"
 
 require File.expand_path("../support.rb", __FILE__)
 

data/spec/neovim/api_spec.rb

@@ -13,7 +13,7 @@ module Neovim
               {"name" => "nvim_func"},
               {"name" => "nvim_buf_func"},
               {"name" => "nvim_win_func"},
-              {"name" => "nvim_tabpage_func"},
+              {"name" => "nvim_tabpage_func"}
             ]
           }
         ]

data/spec/neovim/client_spec.rb

@@ -7,21 +7,21 @@ module Neovim
 
     describe "#set_option" do
       it "sets an option from two arguments" do
-        expect {
+        expect do
           client.set_option("makeprg", "rake")
-        }.to change { client.evaluate("&makeprg") }.to("rake")
+        end.to change { client.evaluate("&makeprg") }.to("rake")
       end
 
       it "sets an option from a string" do
-        expect {
+        expect do
           client.set_option("timeoutlen=0")
-        }.to change { client.evaluate("&timeoutlen") }.to(0)
+        end.to change { client.evaluate("&timeoutlen") }.to(0)
       end
 
       it "sets a boolean option" do
-        expect {
+        expect do
           client.set_option("expandtab")
-        }.to change { client.evaluate("&expandtab") }.to(1)
+        end.to change { client.evaluate("&expandtab") }.to(1)
       end
     end
 
@@ -45,15 +45,15 @@ module Neovim
       end
 
       it "raises exceptions for unknown methods" do
-        expect {
+        expect do
           client.foobar
-        }.to raise_error(NoMethodError)
+        end.to raise_error(NoMethodError)
       end
 
       it "raises exceptions for incorrect usage" do
-        expect {
+        expect do
           client.strwidth("too", "many")
-        }.to raise_error("Wrong number of arguments: expecting 1 but got 2")
+        end.to raise_error("Wrong number of arguments: expecting 1 but got 2")
       end
     end