neovim 0.3.3 → 0.4.0

data/spec/acceptance/rubydo_spec.vim

@@ -0,0 +1,66 @@
+Given:
+  a
+  b
+  c
+  d
+
+Execute (Update one line using `$_`):
+  2rubydo $_.upcase!
+
+Expect:
+  a
+  B
+  c
+  d
+
+Execute (Update a range of lines using `$_`):
+  2,3rubydo $_.upcase!
+
+Expect:
+  a
+  B
+  C
+  d
+
+Execute (Update all lines using `$_`):
+  %rubydo $_.upcase!
+
+Execute (Raise a Ruby standard error):
+  try
+    1rubydo raise "BOOM"
+  catch /BOOM/
+  endtry
+
+  1rubydo $_.replace("still works")
+
+Expect:
+  still works
+  b
+  c
+  d
+
+Execute (Raise a Ruby syntax error):
+  try
+    1rubydo puts[
+  catch /SyntaxError/
+  endtry
+
+  1rubydo $_.replace("still works")
+
+Expect:
+  still works
+  b
+  c
+  d
+
+Given:
+  x
+
+Execute (Add a large number of lines):
+  1yank
+  silent normal 6000p
+  %rubydo $_.succ!
+
+  AssertEqual "y", getline(1)
+  AssertEqual "y", getline(6001)
+  AssertEqual "", getline(6002)

data/spec/acceptance/rubyfile/call_foo.rb

@@ -0,0 +1 @@
+foo

data/spec/acceptance/rubyfile/curbuf.rb

@@ -0,0 +1 @@
+$curbuf[1] = "first"

data/spec/acceptance/rubyfile/curbuf_ivar_get.rb

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

data/spec/acceptance/rubyfile/curbuf_ivar_set.rb

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

data/spec/acceptance/rubyfile/curwin.rb

@@ -0,0 +1 @@
+$curwin.buffer[1] = "first"

data/spec/acceptance/rubyfile/define_foo.rb

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

data/spec/acceptance/rubyfile/raise_standard_error.rb

@@ -0,0 +1 @@
+raise "BOOM"

data/spec/acceptance/rubyfile/raise_syntax_error.rb

@@ -0,0 +1 @@
+puts [

data/spec/acceptance/rubyfile/set_pwd_after.rb

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

data/spec/acceptance/rubyfile/set_pwd_before.rb

@@ -0,0 +1 @@
+Vim.command("let g:pwd_before = '#{Dir.pwd}'")

data/spec/acceptance/rubyfile/vim_constants.rb

@@ -0,0 +1,2 @@
+Vim.command('1normal! Sfirst')
+VIM.command('2normal! Ssecond')

data/spec/acceptance/rubyfile_spec.vim

@@ -0,0 +1,111 @@
+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
+
+Given:
+  one
+  two
+
+Execute (Access `Vim` and `VIM` constants):
+  rubyfile ./spec/acceptance/rubyfile/vim_constants.rb
+
+Expect:
+  first
+  second
+
+Execute (Access `$curbuf` global variable):
+  rubyfile ./spec/acceptance/rubyfile/curbuf.rb
+
+Expect:
+  first
+  two
+
+Execute (Access `$curwin` global variable):
+  rubyfile ./spec/acceptance/rubyfile/curwin.rb
+
+Expect:
+  first
+  two
+
+Execute (Define a Ruby method):
+  rubyfile ./spec/acceptance/rubyfile/define_foo.rb
+
+Execute (Call a Ruby method):
+  rubyfile ./spec/acceptance/rubyfile/call_foo.rb
+
+Then:
+  AssertEqual 1, g:called
+
+Execute (Update instance state on $curbuf):
+  rubyfile ./spec/acceptance/rubyfile/curbuf_ivar_set.rb
+
+Execute (Access instance state on $curbuf):
+  rubyfile ./spec/acceptance/rubyfile/curbuf_ivar_get.rb
+
+Then:
+  AssertEqual 123, g:foo
+
+Execute (Change the working directory explicitly):
+  let g:rubyfile = getcwd() . "/spec/acceptance/rubyfile/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
+
+Execute (Change the working directory implicitly):
+  let g:before_file = getcwd() . "/spec/acceptance/rubyfile/set_pwd_before.rb"
+  let g:after_file = getcwd() . "/spec/acceptance/rubyfile/set_pwd_after.rb"
+
+  split | lcd /
+  exec "rubyfile " . g:before_file
+  wincmd p
+  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
+
+Execute (Raise a Ruby load error):
+  try
+    rubyfile /foo/bar/baz
+  catch /LoadError/
+  endtry
+
+  ruby $curbuf[1] = "still works"
+
+Expect:
+  still works
+  two
+
+Execute (Raise a Ruby standard error):
+  try
+    rubyfile ./spec/acceptance/rubyfile/raise_standard_error.rb
+  catch /BOOM/
+  endtry
+
+  ruby $curbuf[1] = "still works"
+
+Expect:
+  still works
+  two
+
+Execute (Raise a Ruby syntax error):
+  try
+    rubyfile ./spec/acceptance/rubyfile/raise_syntax_error.rb
+  catch /SyntaxError/
+  endtry
+
+  ruby $curbuf[1] = "still works"
+
+Expect:
+  still works
+  two

data/spec/acceptance/runtime/init.vim

@@ -0,0 +1 @@
+set rtp=vendor/vader.vim,spec/acceptance/runtime,$VIMRUNTIME

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

@@ -0,0 +1,13 @@
+Neovim.plugin do |plug|
+  plug.command(:PlugSetFoo, :nargs => 1) do |nvim, str|
+    nvim.command("let g:PlugFoo = '#{str}'")
+  end
+
+  plug.function(:PlugAdd, :args => 2, :sync => true) do |nvim, x, y|
+    x + y
+  end
+
+  plug.autocmd(:BufEnter, :pattern => "*.rb") do |nvim|
+    nvim.command("let g:PlugInRuby = 1")
+  end
+end

data/spec/documentation_spec.rb

@@ -0,0 +1,24 @@
+require "json"
+require "net/http"
+require "open-uri"
+
+RSpec.describe "neovim-ruby documentation" do
+  it "has up-to-date generated method docs" do
+    begin
+      url = "https://api.github.com/repos/neovim/neovim/releases/latest"
+      response = open(url) { |json| JSON.load(json) }
+
+      client_file = File.read(
+        File.expand_path("../../lib/neovim/client.rb", __FILE__)
+      )
+      docs_version = client_file[
+        /The methods documented here were generated using (.+)$/,
+        1
+      ]
+
+      expect(docs_version).to eq(response["name"])
+    rescue SocketError => e
+      skip "Skipping: #{e}"
+    end
+  end
+end

data/spec/helper.rb

@@ -8,52 +8,11 @@ end
 require "fileutils"
 require "neovim"
 require "pry"
-require "shellwords"
+require "rubygems"
 require "stringio"
 require "timeout"
 
-module Support
-  def self.workspace
-    File.expand_path("../workspace", __FILE__)
-  end
-
-  def self.socket_path
-    file_path("nvim.sock")
-  end
-
-  def self.tcp_port
-    server = TCPServer.new("127.0.0.1", 0)
-
-    begin
-      server.addr[1]
-    ensure
-      server.close
-    end
-  end
-
-  def self.file_path(name)
-    File.join(workspace, name)
-  end
-
-  def self.setup_workspace
-    FileUtils.mkdir_p(workspace)
-  end
-
-  def self.teardown_workspace
-    FileUtils.rm_rf(workspace)
-  end
-
-  def self.child_argv
-    nvim_exe = ENV.fetch("NVIM_EXECUTABLE", "nvim")
-    [nvim_exe, "--headless", "-i", "NONE", "-u", "NONE", "-n"]
-  end
-end
-
-unless system("#{Support.child_argv.shelljoin} --version | grep -q NVIM")
-  warn("Failed to load nvim. See installation instructions:")
-  warn("https://github.com/neovim/neovim/wiki/Installing-Neovim")
-  exit(1)
-end
+require File.expand_path("../support.rb", __FILE__)
 
 RSpec.configure do |config|
   config.expect_with :rspec do |exp|
@@ -74,21 +33,37 @@ RSpec.configure do |config|
     end
   end
 
-  config.around(:example, :silence_logging) do |spec|
+  config.around(:example, :silence_warnings) do |spec|
     old_logger = Neovim.logger
     log_target = StringIO.new
     Neovim.logger = Logger.new(log_target)
+    Neovim.logger.level = Logger::WARN
 
     begin
       spec.run
 
       expect(log_target.string).not_to be_empty,
-        ":silence_logging used but nothing logged"
+        ":silence_warnings used but nothing logged at WARN level"
     ensure
       Neovim.logger = old_logger
     end
   end
 
+  config.before(:example, :nvim_version) do |spec|
+    req = Gem::Requirement.new(spec.metadata[:nvim_version])
+
+    begin
+      nvim_vrs = Support.nvim_version
+      vrs = Gem::Version.new(nvim_vrs)
+    rescue ArgumentError
+      vrs = Gem::Version.new(nvim_vrs.gsub("-", "."))
+    end
+
+    unless req.satisfied_by?(vrs.release)
+      pending "Pending: Installed nvim (#{vrs}) doesn't satisfy '#{req}'."
+    end
+  end
+
   Kernel.srand config.seed
 end
 

data/spec/neovim/executable_spec.rb

@@ -0,0 +1,32 @@
+require "helper"
+
+module Neovim
+  RSpec.describe Executable do
+    describe ".from_env" do
+      it "respects NVIM_EXECUTABLE" do
+        executable = Executable.from_env("NVIM_EXECUTABLE" => "/foo/nvim")
+        expect(executable.path).to eq("/foo/nvim")
+      end
+
+      it "returns a default path" do
+        executable = Executable.from_env({})
+        expect(executable.path).to eq("nvim")
+      end
+    end
+
+    describe "#version" do
+      it "returns the current nvim version" do
+        executable = Executable.from_env
+        expect(executable.version).to match(/^\d+\.\d+\.\d+/)
+      end
+
+      it "raises with an invalid executable path" do
+        executable = Executable.new("/dev/null")
+
+        expect {
+          executable.version
+        }.to raise_error(Executable::Error, /\/dev\/null/)
+      end
+    end
+  end
+end

data/spec/neovim/host_spec.rb

@@ -34,7 +34,7 @@ module Neovim
         host.run
       end
 
-      it "rescues session exceptions", :silence_logging do
+      it "rescues session exceptions", :silence_warnings do
         expect(session).to receive(:run).and_raise("BOOM")
         expect { host.run }.not_to raise_error
       end
@@ -136,7 +136,7 @@ module Neovim
         host.handle(message)
       end
 
-      it "rescues plugin sync handler exceptions", :silence_logging do
+      it "rescues plugin sync handler exceptions", :silence_warnings do
         plugin = Plugin.from_config_block("source") do |plug|
           plug.command(:Foo, :sync => true) { raise "BOOM" }
         end

data/spec/neovim/ruby_provider/vim_spec.rb

@@ -2,6 +2,27 @@ require "helper"
 require "neovim/ruby_provider/vim"
 
 RSpec.describe Vim do
+  around do |spec|
+    client = Vim.instance_variable_get(:@__client)
+    buffer_cache = Vim.instance_variable_get(:@__buffer_cache)
+    curbuf = $curbuf
+    curwin = $curwin
+
+    begin
+      Vim.__client = nil
+      Vim.instance_variable_set(:@__buffer_cache, {})
+      $curbuf = nil
+      $curwin = nil
+
+      spec.run
+    ensure
+      Vim.__client = client
+      Vim.instance_variable_set(:@__buffer_cache, buffer_cache)
+      $curbuf = curbuf
+      $curwin = curwin
+    end
+  end
+
   describe Vim::Buffer do
     it "refers to Neovim::Buffer" do
       expect(Vim::Buffer).to be(Neovim::Buffer)
@@ -23,10 +44,27 @@ RSpec.describe Vim do
   describe "#method_missing" do
     it "delegates method calls to @__client" do
       client = double(:client)
+      expect(Vim).to receive(:__refresh_globals).with(client)
       expect(client).to receive(:foo).with(1, 2)
 
       Vim.__client = client
       Vim.foo(1, 2)
     end
+
+    it "refreshes global variables" do
+      client = Neovim.attach_child(Support.child_argv)
+      client.command("vs foo")
+
+      Vim.__client = client
+      Vim.__refresh_globals(client)
+
+      expect {
+        Vim.command("wincmd n")
+      }.to change { $curwin.index }.by(1)
+
+      expect {
+        Vim.command("vs bar")
+      }.to change { $curbuf.index }.by(1)
+    end
   end
 end