neovim 0.3.0 → 0.3.1

data/spec/acceptance/neovim-ruby-host_spec.rb

@@ -15,17 +15,12 @@ RSpec.describe "neovim-ruby-host" do
   end
 
   it "fails when attached to a TTY" do
-    yielded = false
-
     PTY.spawn(host_exe) do |rd, wr, pid|
-      yielded = true
       expect(rd.gets).to match(/can't run.+interactively/i)
 
       _, status = Process.waitpid2(pid)
       expect(status.exitstatus).to be(1)
     end
-
-    expect(yielded).to be(true)
   end
 
   it "loads and runs plugins from Ruby source files" do
@@ -46,7 +41,7 @@ RSpec.describe "neovim-ruby-host" do
       end
     RUBY
 
-    nvim = Neovim.attach_child(["nvim", "-u", "NONE", "-n"])
+    nvim = Neovim.attach_child(Support.child_argv)
 
     nvim.command("let host = rpcstart('#{host_exe}', ['#{plugin_path}'])")
 

data/spec/acceptance/ruby_provider_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 RSpec.describe "ruby_provider" do
   let!(:nvim) do
-    Neovim.attach_child(["nvim", "-u", "NONE", "-n"])
+    Neovim.attach_child(Support.child_argv)
   end
 
   around do |spec|
@@ -15,15 +15,14 @@ RSpec.describe "ruby_provider" do
     begin
       spec.run
     ensure
-      nvim.session.shutdown
+      nvim.shutdown
     end
   end
 
   describe "ruby_execute" do
-    it "runs ruby directly" do
-      ruby = "VIM.command('let myvar = [1, 2]')".inspect
+    it "exposes the VIM constant" do
+      ruby = "VIM.equal?(Vim) || raise".inspect
       nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      expect(nvim.eval("g:myvar")).to eq([1, 2])
     end
 
     it "exposes the $curwin variable" do
@@ -43,31 +42,31 @@ RSpec.describe "ruby_provider" do
     end
 
     it "persists state between requests" do
-      nvim.eval("rpcrequest(host, 'ruby_execute', 'def foo; VIM.command(\"let g:called = 1\"); end')")
+      nvim.eval("rpcrequest(host, 'ruby_execute', 'def foo; Vim.command(\"let g:called = 1\"); end')")
       expect { nvim.get_var("called") }.to raise_error(/key not found/i)
 
       nvim.eval("rpcrequest(host, 'ruby_execute', 'foo')")
       expect(nvim.get_var("called")).to be(1)
     end
 
-    it "persists instance state in globals" do
+    it "persists instance state in $curbuf" do
       nvim.eval("rpcrequest(host, 'ruby_execute', '$curbuf.instance_variable_set(:@foo, 123)')")
-      nvim.eval("rpcrequest(host, 'ruby_execute', 'VIM.command(\"let g:foo = \#{$curbuf.instance_variable_get(:@foo)}\")')")
+      nvim.eval("rpcrequest(host, 'ruby_execute', 'Vim.command(\"let g:foo = \#{$curbuf.instance_variable_get(:@foo)}\")')")
 
       expect(nvim.get_var("foo")).to be(123)
-
-      nvim.eval("rpcrequest(host, 'ruby_execute', '$curwin.instance_variable_set(:@bar, 456)')")
-      nvim.eval("rpcrequest(host, 'ruby_execute', 'VIM.command(\"let g:bar = \#{$curwin.instance_variable_get(:@bar)}\")')")
-
-      expect(nvim.get_var("bar")).to be(456)
     end
   end
 
   describe "ruby_execute_file" do
     let(:script_path) { Support.file_path("script.rb") }
 
+    it "exposes the VIM constant" do
+      File.write(script_path, "VIM.equal?(Vim) || raise")
+      nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
+    end
+
     it "runs ruby from a file" do
-      File.write(script_path, "VIM.command('let myvar = [1, 2]')")
+      File.write(script_path, "Vim.command('let myvar = [1, 2]')")
       nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
       expect(nvim.eval("g:myvar")).to eq([1, 2])
     end
@@ -90,7 +89,7 @@ RSpec.describe "ruby_provider" do
     end
 
     it "persists state between requests" do
-      File.write(script_path, "def foo; VIM.command(\"let g:called = 1\"); end")
+      File.write(script_path, "def foo; Vim.command(\"let g:called = 1\"); end")
       nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
       expect { nvim.get_var("called") }.to raise_error(/key not found/i)
 
@@ -100,7 +99,7 @@ RSpec.describe "ruby_provider" do
 
     it "can run the same file multiple times" do
       nvim.set_var("called", 0)
-      File.write(script_path, "VIM.command(\"let g:called += 1\")")
+      File.write(script_path, "Vim.command(\"let g:called += 1\")")
 
       nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
       expect(nvim.get_var("called")).to be(1)
@@ -109,14 +108,14 @@ RSpec.describe "ruby_provider" do
       expect(nvim.get_var("called")).to be(2)
     end
 
-    it "persists instance state in globals" do
+    it "persists instance state in $curbuf" do
       File.write(script_path, <<-RUBY)
         def $curbuf.foo
           @foo ||= 0
           @foo += 1
         end
 
-        VIM.command("let g:foo = \#{$curbuf.foo}")
+        Vim.command("let g:foo = \#{$curbuf.foo}")
       RUBY
 
       nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
@@ -124,21 +123,6 @@ RSpec.describe "ruby_provider" do
 
       nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
       expect(nvim.get_var("foo")).to be(2)
-
-      File.write(script_path, <<-RUBY)
-        def $curwin.bar
-          @bar ||= 0
-          @bar += 1
-        end
-
-        VIM.command("let g:bar = \#{$curwin.bar}")
-      RUBY
-
-      nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      expect(nvim.get_var("bar")).to be(1)
-
-      nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      expect(nvim.get_var("bar")).to be(2)
     end
   end
 

data/spec/helper.rb

@@ -1,16 +1,53 @@
 require "bundler/setup"
+
+if ENV["REPORT_COVERAGE"]
+  require "coveralls"
+  Coveralls.wear!
+end
+
+require "fileutils"
 require "neovim"
 require "pry"
 require "stringio"
 require "timeout"
-require "fileutils"
 
-if ENV["REPORT_COVERAGE"]
-  require "coveralls"
-  Coveralls.wear!
+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("0.0.0.0", 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", "--headless", "-i", "NONE", "-u", "NONE", "-n"]
+  end
 end
 
-unless system("nvim -nu NONE +q")
+unless system("#{Support.child_argv.join(" ")} +q")
   warn("Can't find `nvim` executable. See installation instructions:")
   warn("https://github.com/neovim/neovim/wiki/Installing-Neovim")
   exit(1)
@@ -49,36 +86,4 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 end
 
-module Support
-  def self.workspace
-    File.expand_path("../workspace", __FILE__)
-  end
-
-  def self.socket_path
-    file_path("nvim.sock")
-  end
-
-  def self.port
-    server = TCPServer.new("0.0.0.0", 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
-end
-
 Thread.abort_on_exception = true

data/spec/neovim/buffer_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe Buffer do
-    let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
+    let(:client) { Neovim.attach_child(Support.child_argv) }
     let(:buffer) { client.current.buffer }
     after { client.shutdown }
 

data/spec/neovim/client_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe Client do
-    let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
+    let(:client) { Neovim.attach_child(Support.child_argv) }
     after { client.shutdown }
 
     specify do

data/spec/neovim/current_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe Current do
-    let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
+    let(:client) { Neovim.attach_child(Support.child_argv) }
     let(:current) { client.current }
     after { client.shutdown }
 

data/spec/neovim/host/loader_spec.rb

@@ -1,4 +1,6 @@
 require "helper"
+require "neovim/host"
+require "neovim/host/loader"
 
 module Neovim
   class Host

data/spec/neovim/host_spec.rb

@@ -1,4 +1,5 @@
 require "helper"
+require "neovim/host"
 
 module Neovim
   RSpec.describe Host do
@@ -6,17 +7,36 @@ module Neovim
     let(:client) { instance_double(Client) }
     let(:host) { Host.new(session, client) }
 
-    describe ".load_from_files" do
-      it "instantiates with a session and loads plugins" do
+    describe ".run" do
+      it "loads plugins and runs the host event loop" do
         paths = ["/foo", "/bar"]
+
+        expect(Host).to receive(:new).and_return(host)
+        expect(host).to receive(:run)
+
         loader = instance_double(Host::Loader)
 
+        expect(loader).to receive(:load).with(paths)
         expect(Host::Loader).to receive(:new).
-          with(kind_of(Host)).
+          with(host).
           and_return(loader)
-        expect(loader).to receive(:load).with(paths)
 
-        Host.load_from_files(paths, :session => session, :client => client)
+        Host.run(paths, :session => session, :client => client)
+      end
+    end
+
+    describe "#run" do
+      it "runs the session event loop and handles messages" do
+        message = double(:message)
+        expect(session).to receive(:run).and_yield(message)
+        expect(host).to receive(:handle).with(message)
+
+        host.run
+      end
+
+      it "rescues session exceptions", :silence_logging do
+        expect(session).to receive(:run).and_raise("BOOM")
+        expect { host.run }.not_to raise_error
       end
     end
 

data/spec/neovim/line_range_spec.rb

@@ -2,7 +2,7 @@ require "helper"
 
 module Neovim
   RSpec.describe LineRange do
-    let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
+    let(:client) { Neovim.attach_child(Support.child_argv) }
     let(:buffer) { client.current.buffer }
     let(:line_range) { LineRange.new(buffer, 0, -1) }
     let(:sub_range) { LineRange.new(buffer, 1, 2) }
@@ -18,7 +18,7 @@ module Neovim
 
     it "is enumerable" do
       expect(line_range).to be_an(Enumerable)
-      expect(line_range).to respond_to(:each)
+      expect(line_range.each.to_a).to eq(["1", "2", "3", "4"])
     end
 
     describe "#to_a" do

data/spec/neovim/logging_spec.rb

@@ -0,0 +1,56 @@
+require "helper"
+
+module Neovim
+  RSpec.describe Logging do
+    around do |spec|
+      old_logger = Logging.logger
+
+      begin
+        Logging.send(:remove_instance_variable, :@logger)
+        spec.run
+      ensure
+        Logging.logger = old_logger
+      end
+    end
+
+    describe ".logger" do
+      it "fetches the output from $NVIM_RUBY_LOG_FILE" do
+        logger = instance_double(Logger, :level= => nil)
+        expect(Logger).to receive(:new).with("/tmp/nvim.log").and_return(logger)
+        Logging.logger("NVIM_RUBY_LOG_FILE" => "/tmp/nvim.log")
+        expect(Logging.logger).to be(logger)
+      end
+
+      it "defaults the output to STDERR" do
+        logger = instance_double(Logger, :level= => nil)
+        expect(Logger).to receive(:new).with(STDERR).and_return(logger)
+        Logging.logger({})
+        expect(Logging.logger).to be(logger)
+      end
+
+      it "fetches the level from $NVIM_RUBY_LOG_LEVEL as a string" do
+        logger = instance_double(Logger)
+        expect(Logger).to receive(:new).and_return(logger)
+        expect(logger).to receive(:level=).with(Logger::DEBUG)
+        Logging.logger("NVIM_RUBY_LOG_LEVEL" => "DEBUG")
+        expect(Logging.logger).to be(logger)
+      end
+
+      it "fetches the level from $NVIM_RUBY_LOG_LEVEL as an integer" do
+        logger = instance_double(Logger)
+        expect(Logger).to receive(:new).and_return(logger)
+        expect(logger).to receive(:level=).with(0)
+        Logging.logger("NVIM_RUBY_LOG_LEVEL" => "0")
+        expect(Logging.logger).to be(logger)
+      end
+
+      it "defaults the level to WARN" do
+        logger = instance_double(Logger)
+        expect(Logger).to receive(:new).and_return(logger)
+        expect(logger).to receive(:level=).with(Logger::WARN)
+        Logging.logger({})
+        expect(Logging.logger).to be(logger)
+      end
+    end
+  end
+end

data/spec/neovim/plugin_spec.rb

@@ -1,4 +1,5 @@
 require "helper"
+require "neovim/plugin"
 
 module Neovim
   RSpec.describe Plugin do
@@ -13,6 +14,8 @@ module Neovim
         expect(plugin.handlers.size).to be(1)
         handler = plugin.handlers.first
 
+        expect(handler.sync?).to be(false)
+        expect(handler.qualified?).to be(true)
         expect(handler.block).to eq(cmd_block)
         expect(handler.qualified_name).to eq("source:command:Foo")
         expect(handler.to_spec).to eq(
@@ -33,6 +36,8 @@ module Neovim
         expect(plugin.handlers.size).to be(1)
         handler = plugin.handlers.first
 
+        expect(handler.sync?).to be(false)
+        expect(handler.qualified?).to be(true)
         expect(handler.block).to eq(au_block)
         expect(handler.qualified_name).to eq("source:autocmd:BufEnter:*.rb")
         expect(handler.to_spec).to eq(
@@ -53,6 +58,8 @@ module Neovim
         expect(plugin.handlers.size).to be(1)
         handler = plugin.handlers.first
 
+        expect(handler.sync?).to be(false)
+        expect(handler.qualified?).to be(true)
         expect(handler.block).to eq(fun_block)
         expect(handler.qualified_name).to eq("source:function:Foo")
         expect(handler.to_spec).to eq(
@@ -73,6 +80,8 @@ module Neovim
         expect(plugin.handlers.size).to be(1)
         handler = plugin.handlers.first
 
+        expect(handler.sync?).to be(true)
+        expect(handler.qualified?).to be(false)
         expect(handler.block).to eq(cmd_block)
         expect(handler.qualified_name).to eq("Foo")
       end