neovim 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a9a7f0da47d7d562b10232fe88d5c4ad4fe0d0
-  data.tar.gz: f12e9d6d73601ca7f5b1650b4c9d35e391f2755d
+  metadata.gz: 9fe8a4ab833d55be2946a9a6b9db21771c47fffe
+  data.tar.gz: d8c4a84c020b04124978cc4311f43e113bbac1c9
 SHA512:
-  metadata.gz: e3f98a53f364aebc4829e8c11dea30f5930b96686ed3bba9691559ec0947825f42d0ad4a33da4658f2cca2c3e298f07434a25c8b218df6e6c4ab22280933dd04
-  data.tar.gz: d37fd74b9f588da7c09844c7c3c7c6cdd18edba7f15e9115cc5bcb54a06744e70337349841ae81ae8b4f116492529a5fbc86ee5a2b60869cdedc6720fd69ece0
+  metadata.gz: bc3418eaa160281fc251f2f57a7e7f5754db4a3f9d7c21d8b29482098556185f4a828d0eb3960f0eb117c352349a0b1077d6471a585ffafec64663bc791978ec
+  data.tar.gz: ff1fd3a88fc4b8bcc44024eab6e4eb22999c68810784ea215448432653f7327a06b1a5d6befe3d2e16cf46618e2fc90bebd71951faf1910fa67fc3767b80be10

data/.gitignore

@@ -17,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 spec/workspace
+vendor/bundle

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.1
+- Fix race condition in Fiber handling
+- General improvements to ruby\_provider.rb
+
 # 0.2.0
 - Backwards incompatible, but we're pre-1.0.0 so going with minor bump instead
 - Make legacy ruby functions 1-indexed

data/README.md

@@ -70,6 +70,8 @@ end
 
 After a call to `:UpdateRemotePlugins`, plugins will be auto-loaded from the `$VIMRUNTIME/rplugin/ruby` directory.
 
+Neovim also supports the legacy Vim commands `:ruby`, `:rubyfile`, and `:rubydo`. A detailed description of their usage can be found with `:help ruby`.
+
 ## Links
 
 * Source: <http://github.com/alexgenco/neovim-ruby>

data/Rakefile

@@ -13,7 +13,7 @@ namespace :neovim do
     buffer_docs = []
     window_docs = []
     tabpage_docs = []
-    session = Neovim::Session.child(%w(nvim -u NONE -n -N))
+    session = Neovim::Session.child(%w(nvim -u NONE -n))
 
     session.request(:vim_get_api_info)[1]["functions"].each do |func|
       prefix, method_name = func["name"].split("_", 2)

data/lib/neovim/buffer.rb

@@ -192,6 +192,10 @@ module Neovim
   @param [Object] value
   @return [Object]
 
+@method del_var(name)
+  @param [String] name
+  @return [Object]
+
 @method get_option(name)
   @param [String] name
   @return [Object]

data/lib/neovim/client.rb

@@ -144,6 +144,10 @@ module Neovim
   @param [Object] value
   @return [Object]
 
+@method del_var(name)
+  @param [String] name
+  @return [Object]
+
 @method get_vvar(name)
   @param [String] name
   @return [Object]

data/lib/neovim/event_loop.rb

@@ -85,7 +85,7 @@ module Neovim
         yield message if block_given?
       end
     rescue EOFError
-      warn("got EOFError")
+      info("got EOFError")
     rescue => e
       fatal("got unexpected error #{e}")
       debug(e.backtrace.join("\n"))

data/lib/neovim/ruby_provider.rb

@@ -1,129 +1,103 @@
-$__ruby_provider_scope = binding
-
-class VIM < BasicObject
-  class << self
-    attr_accessor :__client
-  end
-
-  Buffer = ::Neovim::Buffer
-  Window = ::Neovim::Window
-
-  def self.method_missing(method, *args, &block)
-    @__client.public_send(method, *args, &block)
-  end
-end
+require "neovim/ruby_provider/vim"
+require "neovim/ruby_provider/buffer_ext"
+require "neovim/ruby_provider/window_ext"
 
 module Neovim
-  # Make +VIM::Buffer.current+ return the current buffer.
-  class Buffer
-    def self.current
-      ::VIM.current.buffer
-    end
-
-    def self.count
-      ::VIM.get_buffers.size
-    end
-
-    def self.[](index)
-      ::VIM.get_buffers[index]
-    end
-  end
-
-  # Make +VIM::Window.current+ return the current buffer.
-  class Window
-    def self.current
-      ::VIM.current.window
-    end
-
-    def self.count
-      ::VIM.get_windows.size
-    end
-
-    def self.[](index)
-      ::VIM.get_windows[index]
-    end
-  end
-
+  # This class is used to define a +Neovim::Plugin+ to act as a backend for the
+  # legacy +:ruby+, +:rubyfile+, and +:rubydo+ Vim commands. It is autoloaded
+  # from +nvim+ and not intended to be loaded directly.
   module RubyProvider
-    def self.define_plugin!
+    def self.__define_plugin!
+      Thread.abort_on_exception = true
+
       Neovim.plugin do |plug|
-        define_ruby_execute(plug)
-        define_ruby_execute_file(plug)
-        define_ruby_do_range(plug)
+        __define_ruby_execute(plug)
+        __define_ruby_execute_file(plug)
+        __define_ruby_do_range(plug)
       end
     end
 
-    def self.define_ruby_execute(plug)
+    # Evaluate the provided Ruby code, exposing the +VIM+ constant for
+    # interactions with the editor.
+    #
+    # This is used by the +:ruby+ command.
+    def self.__define_ruby_execute(plug)
       plug.rpc(:ruby_execute, sync: true) do |nvim, ruby|
-        wrap_client(nvim) do
-          $__ruby_provider_scope.eval(ruby, __FILE__, __LINE__)
+        __wrap_client(nvim) do
+          eval(ruby, TOPLEVEL_BINDING, __FILE__, __LINE__)
         end
       end
     end
-    private_class_method :define_ruby_execute
+    private_class_method :__define_ruby_execute
 
-    def self.define_ruby_execute_file(plug)
+    # Evaluate the provided Ruby file, exposing the +VIM+ constant for
+    # interactions with the editor.
+    #
+    # This is used by the +:rubyfile+ command.
+    def self.__define_ruby_execute_file(plug)
       plug.rpc(:ruby_execute_file, sync: true) do |nvim, path|
-        wrap_client(nvim) do
-          $__ruby_provider_scope.eval(File.read(path), __FILE__, __LINE__)
-        end
+        __wrap_client(nvim) { load(path) }
       end
     end
-    private_class_method :define_ruby_execute_file
-
-    def self.define_ruby_do_range(plug)
-      plug.rpc(:ruby_do_range, sync: true) do |nvim, *args|
-        wrap_client(nvim) do
-          start, stop, ruby = args
-          buffer = nvim.current.buffer
-
-          (start..stop).each_slice(5000) do |linenos|
-            _start, _stop = linenos[0]-1, linenos[-1]
-            lines = buffer.get_lines(_start, _stop, true)
-
-            lines.map! do |line|
-              $__ruby_provider_scope.eval("$_ = #{line.inspect}")
-              $__ruby_provider_scope.eval(ruby, __FILE__, __LINE__)
-              $__ruby_provider_scope.eval("$_")
+    private_class_method :__define_ruby_execute_file
+
+    # Evaluate the provided Ruby code over each line of a range. The contents
+    # of the current line can be accessed and modified via the +$_+ variable.
+    #
+    # Since this method evaluates each line in the local binding, all local
+    # variables and methods are available to the user. Thus the +__+ prefix
+    # obfuscation.
+    #
+    # This is used by the +:rubydo+ command.
+    def self.__define_ruby_do_range(__plug)
+      __plug.rpc(:ruby_do_range, sync: true) do |__nvim, *__args|
+        __wrap_client(__nvim) do
+          __start, __stop, __ruby = __args
+          __buffer = __nvim.get_current_buffer
+
+          __update_lines_in_chunks(__buffer, __start, __stop, 5000) do |__lines|
+            __lines.map do |__line|
+              $_ = __line
+              eval(__ruby, binding, __FILE__, __LINE__)
+              $_
             end
-
-            buffer.set_lines(_start, _stop, true, lines)
           end
         end
       end
     end
-    private_class_method :define_ruby_do_range
+    private_class_method :__define_ruby_do_range
 
-    def self.wrap_client(__client)
-      with_globals(__client) do
-        with_vim_constant(__client) do
-          with_redirect_streams(__client) do
+    # @api private
+    def self.__wrap_client(client)
+      __with_globals(client) do
+        __with_vim_constant(client) do
+          __with_redirect_streams(client) do
             yield
           end
         end
       end
       nil
     end
-    private_class_method :wrap_client
+    private_class_method :__wrap_client
 
-    def self.with_globals(client)
-      $curbuf = client.current.buffer
-      $curwin = client.current.window
+    # @api private
+    def self.__with_globals(client)
+      $curbuf = client.get_current_buffer
+      $curwin = client.get_current_window
       yield
     end
-    private_class_method :with_globals
+    private_class_method :__with_globals
 
-    def self.with_vim_constant(client)
+    # @api private
+    def self.__with_vim_constant(client)
       ::VIM.__client = client
       yield
     end
-    private_class_method :with_vim_constant
-
-    def self.with_redirect_streams(client)
-      @with_redirect_streams ||= begin
-        old_out_write = $stdout.method(:write)
-        old_err_write = $stderr.method(:write)
+    private_class_method :__with_vim_constant
 
+    # @api private
+    def self.__with_redirect_streams(client)
+      @__with_redirect_streams ||= begin
         $stdout.define_singleton_method(:write) do |string|
           client.out_write(string)
         end
@@ -137,8 +111,19 @@ module Neovim
 
       yield
     end
-    private_class_method :with_redirect_streams
+    private_class_method :__with_redirect_streams
+
+    # @api private
+    def self.__update_lines_in_chunks(buffer, start, stop, size)
+      (start..stop).each_slice(size) do |linenos|
+        _start, _stop = linenos[0]-1, linenos[-1]
+        lines = buffer.get_lines(_start, _stop, true)
+
+        buffer.set_lines(_start, _stop, true, yield(lines))
+      end
+    end
+    private_class_method :__update_lines_in_chunks
   end
 end
 
-Neovim::RubyProvider.define_plugin!
+Neovim::RubyProvider.__define_plugin!

data/lib/neovim/ruby_provider/buffer_ext.rb

@@ -0,0 +1,17 @@
+require "neovim/ruby_provider/vim"
+
+module Neovim
+  class Buffer
+    def self.current
+      ::VIM.get_current_buffer
+    end
+
+    def self.count
+      ::VIM.get_buffers.size
+    end
+
+    def self.[](index)
+      ::VIM.get_buffers[index]
+    end
+  end
+end

data/lib/neovim/ruby_provider/vim.rb

@@ -0,0 +1,15 @@
+require "neovim/buffer"
+require "neovim/window"
+
+class VIM < BasicObject
+  Buffer = ::Neovim::Buffer
+  Window = ::Neovim::Window
+
+  def self.__client=(client)
+    @__client = client
+  end
+
+  def self.method_missing(method, *args, &block)
+    @__client.public_send(method, *args, &block)
+  end
+end

data/lib/neovim/ruby_provider/window_ext.rb

@@ -0,0 +1,17 @@
+require "neovim/ruby_provider/vim"
+
+module Neovim
+  class Window
+    def self.current
+      ::VIM.get_current_window
+    end
+
+    def self.count
+      ::VIM.get_windows.size
+    end
+
+    def self.[](index)
+      ::VIM.get_windows[index]
+    end
+  end
+end

data/lib/neovim/session.rb

@@ -57,6 +57,7 @@ module Neovim
     def initialize(async_session)
       @async_session = async_session
       @pending_messages = []
+      @main_thread = Thread.current
       @main_fiber = Fiber.current
       @running = false
     end
@@ -117,15 +118,17 @@ module Neovim
     # @return [Object] The response from the RPC call
     # @raise [ArgumentError] An error returned from +nvim+
     def request(method, *args)
-      if Fiber.current == @main_fiber
-        debug("handling blocking request")
-        err, res = stopped_request(method, *args)
-      else
-        debug("yielding request to fiber")
-        err, res = running_request(method, *args)
+      main_thread_only do
+        if Fiber.current == @main_fiber
+          debug("handling blocking request")
+          err, res = stopped_request(method, *args)
+        else
+          debug("yielding request to fiber")
+          err, res = running_request(method, *args)
+        end
+
+        err ? raise(ArgumentError, err) : res
       end
-
-      err ? raise(ArgumentError, err) : res
     end
 
     # Make an RPC notification.
@@ -134,8 +137,10 @@ module Neovim
     # @param *args [Array] The RPC method arguments
     # @return [nil]
     def notify(method, *args)
-      @async_session.notify(method, *args)
-      nil
+      main_thread_only do
+        @async_session.notify(method, *args)
+        nil
+      end
     end
 
     # Stop the event loop.
@@ -185,5 +190,16 @@ module Neovim
 
       [error, result]
     end
+
+    def main_thread_only
+      if Thread.current == @main_thread
+        yield if block_given?
+      else
+        raise(
+          "A Ruby plugin attempted to call neovim outside of the main thread, " +
+          "which is not yet supported by the neovim gem."
+        )
+      end
+    end
   end
 end

data/lib/neovim/tabpage.rb

@@ -17,6 +17,10 @@ module Neovim
   @param [Object] value
   @return [Object]
 
+@method del_var(name)
+  @param [String] name
+  @return [Object]
+
 @method get_window
   @return [Window]
 

data/lib/neovim/version.rb

@@ -1,3 +1,3 @@
 module Neovim
-  VERSION = Gem::Version.new("0.2.0")
+  VERSION = Gem::Version.new("0.2.1")
 end

data/lib/neovim/window.rb

@@ -99,6 +99,10 @@ module Neovim
   @param [Object] value
   @return [Object]
 
+@method del_var(name)
+  @param [String] name
+  @return [Object]
+
 @method get_option(name)
   @param [String] name
   @return [Object]

data/neovim.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "msgpack", "~> 0.7"
+  spec.add_dependency "msgpack", "~> 1.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

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

@@ -28,7 +28,7 @@ RSpec.describe "neovim-ruby-host" do
       end
     RUBY
 
-    nvim = Neovim.attach_child(["nvim", "--headless", "-u", "NONE", "-N", "-n"])
+    nvim = Neovim.attach_child(["nvim", "-u", "NONE", "-n"])
 
     host_exe = File.expand_path("../../../bin/neovim-ruby-host", __FILE__)
     nvim.command("let host = rpcstart('#{host_exe}', ['#{plugin1_path}', '#{plugin2_path}'])")

data/spec/acceptance/ruby_provider_spec.rb

@@ -1,16 +1,22 @@
 require "helper"
 
 RSpec.describe "ruby_provider" do
-  let(:nvim) do
-    Neovim.attach_child(["nvim", "--headless", "-u", "NONE", "-N", "-n"])
+  let!(:nvim) do
+    Neovim.attach_child(["nvim", "-u", "NONE", "-n"])
   end
 
-  before do
+  around do |spec|
     provider_path = Support.file_path("provider.rb")
     File.write(provider_path, "require 'neovim/ruby_provider'")
     host_exe = File.expand_path("../../../bin/neovim-ruby-host", __FILE__)
     nvim.current.buffer.lines = ["line1", "line2"]
     nvim.command("let host = rpcstart('#{host_exe}', ['#{provider_path}'])")
+
+    begin
+      spec.run
+    ensure
+      nvim.command("call rpcstop(host) | qa!")
+    end
   end
 
   describe "ruby_execute" do
@@ -36,60 +42,6 @@ RSpec.describe "ruby_provider" do
       }.to change { nvim.current.buffer.lines.to_a }.to(["line"])
     end
 
-    it "exposes VIM::Buffer.current" do
-      expect {
-        ruby = "VIM::Buffer.current.lines = ['line']".inspect
-        nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      }.to change { nvim.current.buffer.lines.to_a }.to(["line"])
-    end
-
-    it "exposes VIM::Buffer.count" do
-      ruby = "VIM.set_var('count', VIM::Buffer.count)".inspect
-      nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      expect(nvim.get_var("count")).to eq(1)
-
-      nvim.command("tabe")
-
-      ruby = "VIM.set_var('count', VIM::Buffer.count)".inspect
-      nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      expect(nvim.get_var("count")).to eq(2)
-    end
-
-    it "exposes VIM::Buffer[]" do
-      expect {
-        ruby = "VIM::Buffer[0].lines = ['line']".inspect
-        nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      }.to change { nvim.current.buffer.lines.to_a }.to(["line"])
-    end
-
-    it "exposes VIM::Window.current" do
-      nvim.command("vsplit")
-      expect {
-        ruby = "VIM::Window.current.width = 12".inspect
-        nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      }.to change { nvim.current.window.width }.to(12)
-    end
-
-    it "exposes VIM::Window.count" do
-      ruby = "VIM.set_var('count', VIM::Window.count)".inspect
-      nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      expect(nvim.get_var("count")).to eq(1)
-
-      nvim.command("vsplit")
-
-      ruby = "VIM.set_var('count', VIM::Window.count)".inspect
-      nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      expect(nvim.get_var("count")).to eq(2)
-    end
-
-    it "exposes VIM::Window[]" do
-      nvim.command("vsplit")
-      expect {
-        ruby = "VIM::Window[0].width = 12".inspect
-        nvim.eval("rpcrequest(host, 'ruby_execute', #{ruby})")
-      }.to change { nvim.current.window.width }.to(12)
-    end
-
     it "persists state between requests" do
       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)
@@ -125,71 +77,24 @@ RSpec.describe "ruby_provider" do
       }.to change { nvim.current.buffer.lines.to_a }.to(["line"])
     end
 
-    it "exposes VIM::Buffer.current" do
-      File.write(script_path, "VIM::Buffer.current.lines = ['line']")
-
-      expect {
-        nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      }.to change { nvim.current.buffer.lines.to_a }.to(["line"])
-    end
-
-    it "exposes VIM::Buffer.count" do
-      File.write(script_path, "VIM.set_var('count', VIM::Buffer.count)")
-      nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      expect(nvim.get_var("count")).to eq(1)
-
-      nvim.command("tabe")
-
-      File.write(script_path, "VIM.set_var('count', VIM::Buffer.count)")
+    it "persists state between requests" do
+      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("count")).to eq(2)
-    end
-
-    it "exposes VIM::Buffer[]" do
-      File.write(script_path, "VIM::Buffer[0].lines = ['line']")
-
-      expect {
-        nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      }.to change { nvim.current.buffer.lines.to_a }.to(["line"])
-    end
-
-    it "exposes VIM::Window.current" do
-      nvim.command("vsplit")
-      File.write(script_path, "VIM::Window.current.width = 12")
+      expect { nvim.get_var("called") }.to raise_error(/key not found/i)
 
-      expect {
-        nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      }.to change { nvim.current.window.width }.to(12)
+      nvim.eval("rpcrequest(host, 'ruby_execute', 'foo')")
+      expect(nvim.get_var("called")).to be(1)
     end
 
-    it "exposes VIM::Window.count" do
-      File.write(script_path, "VIM.set_var('count', VIM::Window.count)")
-      nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      expect(nvim.get_var("count")).to eq(1)
-
-      nvim.command("vsplit")
+    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.set_var('count', VIM::Window.count)")
       nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      expect(nvim.get_var("count")).to eq(2)
-    end
-
-    it "exposes VIM::Window[]" do
-      nvim.command("vsplit")
-      File.write(script_path, "VIM::Window[0].width = 12")
-
-      expect {
-        nvim.eval("rpcrequest(host, 'ruby_execute_file', '#{script_path}')")
-      }.to change { nvim.current.window.width }.to(12)
-    end
+      expect(nvim.get_var("called")).to be(1)
 
-    it "persists state between requests" do
-      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)
-
-      nvim.eval("rpcrequest(host, 'ruby_execute', 'foo')")
-      expect(nvim.get_var("called")).to be(1)
+      expect(nvim.get_var("called")).to be(2)
     end
   end
 
@@ -201,5 +106,15 @@ RSpec.describe "ruby_provider" do
         nvim.eval("rpcrequest(host, 'ruby_do_range', 2, 3, '$_.upcase!; 42')")
       }.to change { nvim.current.buffer.lines.to_a }.to(["a", "B", "C", "d"])
     end
+
+    it "handles large amounts of lines" do
+      xs = Array.new(6000, "x")
+      ys = Array.new(6000, "y")
+      nvim.current.buffer.lines = xs
+
+      expect {
+        nvim.eval("rpcrequest(host, 'ruby_do_range', 1, 6000, '$_.succ!')")
+      }.to change { nvim.current.buffer.lines.to_a }.to(ys)
+    end
   end
 end

data/spec/neovim/buffer_spec.rb

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

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", "--headless", "-n", "-u", "NONE"]) }
+    let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
     let(:buffer) { client.current.buffer }
     let(:line_range) { LineRange.new(buffer, 0, 3) }
     let(:sub_range) { LineRange.new(buffer, 1, 2) }

data/spec/neovim/ruby_provider/buffer_ext_spec.rb

@@ -0,0 +1,34 @@
+require "helper"
+require "neovim/ruby_provider/buffer_ext"
+
+module Neovim
+  RSpec.describe Buffer do
+    let!(:nvim) do
+      Neovim.attach_child(["nvim", "-u", "NONE", "-n"]).tap do |nvim|
+        stub_const("::VIM", nvim)
+      end
+    end
+
+    describe ".current" do
+      it "returns the current buffer from the global VIM client" do
+        expect(Buffer.current).to eq(nvim.get_current_buffer)
+      end
+    end
+
+    describe ".count" do
+      it "returns the current buffer count from the global VIM client" do
+        expect {
+          nvim.command("new")
+        }.to change { Buffer.count }.by(1)
+      end
+    end
+
+    describe ".[]" do
+      it "returns the buffer from the global VIM client at the given index" do
+        expect(Buffer[0]).to eq(nvim.get_current_buffer)
+        nvim.command("new")
+        expect(Buffer[1]).to eq(nvim.get_current_buffer)
+      end
+    end
+  end
+end

data/spec/neovim/ruby_provider/window_ext_spec.rb

@@ -0,0 +1,34 @@
+require "helper"
+require "neovim/ruby_provider/window_ext"
+
+module Neovim
+  RSpec.describe Window do
+    let!(:nvim) do
+      Neovim.attach_child(["nvim", "-u", "NONE", "-n"]).tap do |nvim|
+        stub_const("::VIM", nvim)
+      end
+    end
+
+    describe ".current" do
+      it "returns the current window from the global VIM client" do
+        expect(Window.current).to eq(nvim.get_current_window)
+      end
+    end
+
+    describe ".count" do
+      it "returns the current window count from the global VIM client" do
+        expect {
+          nvim.command("new")
+        }.to change { Window.count }.by(1)
+      end
+    end
+
+    describe ".[]" do
+      it "returns the window from the global VIM client at the given index" do
+        expect(Window[0]).to eq(nvim.get_current_window)
+        nvim.command("tabnew")
+        expect(Window[1]).to eq(nvim.get_current_window)
+      end
+    end
+  end
+end

data/spec/neovim/session_spec.rb

@@ -31,6 +31,12 @@ module Neovim
           session.request(:vim_set_current_line, large_str)
           expect(session.request(:vim_get_current_line)).to eq(large_str)
         end
+
+        it "fails outside of the main thread" do
+          expect {
+            Thread.new { session.request(:vim_strwidth, "foo") }.join
+          }.to raise_error(/outside of the main thread/)
+        end
       end
 
       describe "#notify" do
@@ -49,6 +55,12 @@ module Neovim
           session.notify(:vim_set_current_line, large_str)
           expect(session.request(:vim_get_current_line)).to eq(large_str)
         end
+
+        it "fails outside of the main thread" do
+          expect {
+            Thread.new { session.notify(:vim_set_current_line, "foo") }.join
+          }.to raise_error(/outside of the main thread/)
+        end
       end
 
       describe "#run" do
@@ -87,7 +99,7 @@ module Neovim
       let!(:nvim_pid) do
         pid = Process.spawn(
           {"NVIM_LISTEN_ADDRESS" => "0.0.0.0:#{nvim_port}"},
-          "nvim --headless -n -u NONE",
+          "nvim --embed -n -u NONE",
           [:out, :err] => "/dev/null"
         )
 
@@ -105,7 +117,7 @@ module Neovim
         Process.waitpid(nvim_pid)
       end
 
-      let(:session) { Session.tcp("0.0.0.0", nvim_port) }
+      let!(:session) { Session.tcp("0.0.0.0", nvim_port) }
       include_context "session behavior"
     end
 
@@ -114,7 +126,7 @@ module Neovim
       let!(:nvim_pid) do
         pid = Process.spawn(
           {"NVIM_LISTEN_ADDRESS" => socket_path},
-          "nvim --headless -n -u NONE",
+          "nvim --embed -n -u NONE",
           [:out, :err] => "/dev/null"
         )
 
@@ -132,12 +144,12 @@ module Neovim
         Process.waitpid(nvim_pid)
       end
 
-      let(:session) { Session.unix(socket_path) }
+      let!(:session) { Session.unix(socket_path) }
       include_context "session behavior"
     end
 
     context "child" do
-      let(:session) { Session.child(["nvim", "-n", "-u", "NONE"]) }
+      let!(:session) { Session.child(["nvim", "-n", "-u", "NONE"]) }
       include_context "session behavior"
     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(["nvim", "--headless", "-n", "-u", "NONE"]) }
+    let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
     let(:window) { client.current.window }
 
     describe "if_ruby compatibility" do

data/spec/neovim_spec.rb

@@ -1,7 +1,7 @@
 require "helper"
 
 RSpec.describe Neovim do
-  let(:nvim_argv) { %w(nvim --headless -u NONE -i NONE -N -n) }
+  let(:nvim_argv) { %w(nvim --embed -u NONE -i NONE -n) }
 
   describe ".attach_tcp" do
     it "attaches to a TCP socket" do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -88,9 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -118,6 +118,9 @@ files:
 - lib/neovim/remote_object.rb
 - lib/neovim/request.rb
 - lib/neovim/ruby_provider.rb
+- lib/neovim/ruby_provider/buffer_ext.rb
+- lib/neovim/ruby_provider/vim.rb
+- lib/neovim/ruby_provider/window_ext.rb
 - lib/neovim/session.rb
 - lib/neovim/tabpage.rb
 - lib/neovim/version.rb
@@ -138,6 +141,8 @@ files:
 - spec/neovim/msgpack_stream_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/window_ext_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
@@ -152,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Neovim
@@ -182,6 +187,8 @@ test_files:
 - spec/neovim/msgpack_stream_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/window_ext_spec.rb
 - spec/neovim/session_spec.rb
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb