neovim 0.7.1 → 0.8.0

data/lib/neovim/connection.rb

@@ -40,7 +40,8 @@ module Neovim
 
     def write(object)
       log(:debug) { {object: object} }
-      @packer.write(object).flush
+      @packer.write(object)
+      self
     end
 
     def read
@@ -49,6 +50,11 @@ module Neovim
       end
     end
 
+    def flush
+      @packer.flush
+      self
+    end
+
     def register_type(id)
       @unpacker.register_type(id) do |data|
         index = MessagePack.unpack(data)

data/lib/neovim/event_loop.rb

@@ -34,8 +34,9 @@ module Neovim
     end
 
     def shutdown
-      stop
+      @running = false
       @shutdown = true
+      run
     end
 
     def request(request_id, method, *args)
@@ -102,7 +103,7 @@ module Neovim
     private
 
     def read
-      array = @connection.read
+      array = @connection.flush.read
       Message.from_array(array)
     end
 

data/lib/neovim/message.rb

@@ -49,7 +49,7 @@ module Neovim
       end
 
       def received(handlers)
-        handlers[request_id].call(self)
+        handlers.delete(request_id).call(self)
       end
     end
 

data/lib/neovim/remote_object.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module Neovim
   # @abstract Superclass for all +nvim+ remote objects.
   #
@@ -37,7 +39,7 @@ module Neovim
 
     # Extend +methods+ to include RPC methods
     def methods(*args)
-      super | rpc_methods
+      super | rpc_methods.to_a
     end
 
     # Extend +==+ to only look at class and index.
@@ -48,7 +50,8 @@ module Neovim
     private
 
     def rpc_methods
-      @api.functions_for_object(self).map(&:method_name)
+      @rpc_methods ||=
+        @api.functions_for_object(self).map(&:method_name).to_set
     end
   end
 end

data/lib/neovim/ruby_provider.rb

@@ -134,9 +134,9 @@ module Neovim
     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)
+        lines = buffer.get_lines(start, stop, false)
 
-        buffer.set_lines(start, stop, true, yield(lines))
+        buffer.set_lines(start, stop, false, yield(lines))
       end
     end
     private_class_method :__update_lines_in_chunks

data/lib/neovim/ruby_provider/vim.rb

@@ -15,7 +15,7 @@ module Vim
 
   # Delegate all method calls to the underlying +Neovim::Client+ object.
   def self.method_missing(method, *args, &block)
-    if @__client.respond_to?(method)
+    if @__client
       @__client.public_send(method, *args, &block).tap do
         __refresh_globals(@__client)
       end
@@ -33,13 +33,14 @@ module Vim
   end
 
   def self.__refresh_globals(client)
-    bufnr = client.evaluate("bufnr('%')")
+    bufid, winid = client.evaluate("[nvim_get_current_buf(), nvim_get_current_win()]")
+    session, api = client.session, client.api
 
-    $curbuf = @__buffer_cache.fetch(bufnr) do
-      @__buffer_cache[bufnr] = client.get_current_buf
+    $curbuf = @__buffer_cache.fetch(bufid) do
+      @__buffer_cache[bufid] = Buffer.new(bufid, session, api)
     end
 
-    $curwin = client.get_current_win
+    $curwin = Window.new(winid, session, api)
   end
 end
 

data/lib/neovim/session.rb

@@ -11,6 +11,13 @@ module Neovim
 
     attr_writer :request_id
 
+    # @api private
+    class Exited < RuntimeError
+      def initialize
+        super("nvim process exited")
+      end
+    end
+
     def initialize(event_loop)
       @event_loop = event_loop
       @main_thread = Thread.current
@@ -60,7 +67,10 @@ module Neovim
 
         @event_loop.request(@request_id, method, *args)
         response = blocking ? blocking_response : yielding_response
-        response.error ? raise(response.error) : response.value
+
+        raise(Exited) if response.nil?
+        raise(response.error) if response.error
+        response.value
       end
     end
 

data/lib/neovim/tabpage.rb

@@ -3,47 +3,40 @@ require "neovim/remote_object"
 module Neovim
   # Class representing an +nvim+ tabpage.
   #
-  # The methods documented here were generated using NVIM v0.2.2
+  # The methods documented here were generated using NVIM v0.3.1
   class Tabpage < RemoteObject
 # The following methods are dynamically generated.
 =begin
-@method list_wins(tabpage)
+@method list_wins
   See +:h nvim_tabpage_list_wins()+
-  @param [Tabpage] tabpage
   @return [Array<Window>]
 
-@method get_var(tabpage, name)
+@method get_var(name)
   See +:h nvim_tabpage_get_var()+
-  @param [Tabpage] tabpage
   @param [String] name
   @return [Object]
 
-@method set_var(tabpage, name, value)
+@method set_var(name, value)
   See +:h nvim_tabpage_set_var()+
-  @param [Tabpage] tabpage
   @param [String] name
   @param [Object] value
   @return [void]
 
-@method del_var(tabpage, name)
+@method del_var(name)
   See +:h nvim_tabpage_del_var()+
-  @param [Tabpage] tabpage
   @param [String] name
   @return [void]
 
-@method get_win(tabpage)
+@method get_win
   See +:h nvim_tabpage_get_win()+
-  @param [Tabpage] tabpage
   @return [Window]
 
-@method get_number(tabpage)
+@method get_number
   See +:h nvim_tabpage_get_number()+
-  @param [Tabpage] tabpage
   @return [Integer]
 
-@method is_valid(tabpage)
+@method is_valid
   See +:h nvim_tabpage_is_valid()+
-  @param [Tabpage] tabpage
   @return [Boolean]
 
 =end

data/lib/neovim/version.rb

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

data/lib/neovim/window.rb

@@ -3,7 +3,7 @@ require "neovim/remote_object"
 module Neovim
   # Class representing an +nvim+ window.
   #
-  # The methods documented here were generated using NVIM v0.2.2
+  # The methods documented here were generated using NVIM v0.3.1
   class Window < RemoteObject
     # Get the buffer displayed in the window
     #
@@ -64,94 +64,78 @@ module Neovim
 
 # The following methods are dynamically generated.
 =begin
-@method get_buf(window)
+@method get_buf
   See +:h nvim_win_get_buf()+
-  @param [Window] window
   @return [Buffer]
 
-@method get_cursor(window)
+@method get_cursor
   See +:h nvim_win_get_cursor()+
-  @param [Window] window
   @return [Array<Integer>]
 
-@method set_cursor(window, pos)
+@method set_cursor(pos)
   See +:h nvim_win_set_cursor()+
-  @param [Window] window
   @param [Array<Integer>] pos
   @return [void]
 
-@method get_height(window)
+@method get_height
   See +:h nvim_win_get_height()+
-  @param [Window] window
   @return [Integer]
 
-@method set_height(window, height)
+@method set_height(height)
   See +:h nvim_win_set_height()+
-  @param [Window] window
   @param [Integer] height
   @return [void]
 
-@method get_width(window)
+@method get_width
   See +:h nvim_win_get_width()+
-  @param [Window] window
   @return [Integer]
 
-@method set_width(window, width)
+@method set_width(width)
   See +:h nvim_win_set_width()+
-  @param [Window] window
   @param [Integer] width
   @return [void]
 
-@method get_var(window, name)
+@method get_var(name)
   See +:h nvim_win_get_var()+
-  @param [Window] window
   @param [String] name
   @return [Object]
 
-@method set_var(window, name, value)
+@method set_var(name, value)
   See +:h nvim_win_set_var()+
-  @param [Window] window
   @param [String] name
   @param [Object] value
   @return [void]
 
-@method del_var(window, name)
+@method del_var(name)
   See +:h nvim_win_del_var()+
-  @param [Window] window
   @param [String] name
   @return [void]
 
-@method get_option(window, name)
+@method get_option(name)
   See +:h nvim_win_get_option()+
-  @param [Window] window
   @param [String] name
   @return [Object]
 
-@method set_option(window, name, value)
+@method set_option(name, value)
   See +:h nvim_win_set_option()+
-  @param [Window] window
   @param [String] name
   @param [Object] value
   @return [void]
 
-@method get_position(window)
+@method get_position
   See +:h nvim_win_get_position()+
-  @param [Window] window
   @return [Array<Integer>]
 
-@method get_tabpage(window)
+@method get_tabpage
   See +:h nvim_win_get_tabpage()+
-  @param [Window] window
   @return [Tabpage]
 
-@method get_number(window)
+@method get_number
   See +:h nvim_win_get_number()+
-  @param [Window] window
   @return [Integer]
 
-@method is_valid(window)
+@method is_valid
   See +:h nvim_win_is_valid()+
-  @param [Window] window
   @return [Boolean]
 
 =end

data/neovim.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $:.unshift(lib) unless $:.include?(lib)
 require "neovim/version"
 
@@ -8,10 +8,11 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Alex Genco"]
   spec.email         = ["alexgenco@gmail.com"]
   spec.summary       = "A Ruby client for Neovim"
-  spec.homepage      = "https://github.com/alexgenco/neovim-ruby"
+  spec.homepage      = "https://github.com/neovim/neovim-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
+  spec.bindir        = "exe"
   spec.executables   = ["neovim-ruby-host"]
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
@@ -22,11 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "multi_json", "~> 1.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "0.52.1"
+  spec.add_development_dependency "rubocop", "0.56.0"
   spec.add_development_dependency "vim-flavor", "2.2.2"
 end

data/script/dump_api.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __dir__)
 
 require "neovim"
 require "json"

data/script/generate_docs.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __dir__)
 
 require "neovim"
 require "pathname"
@@ -19,10 +19,6 @@ buffer_defs = Neovim::Buffer.instance_methods(false)
 tabpage_defs = Neovim::Tabpage.instance_methods(false)
 window_defs = Neovim::Window.instance_methods(false)
 
-def add_method(docs, defs, method_name)
-  return if defs.include?(method_name.to_s)
-end
-
 session.request(:nvim_get_api_info)[1]["functions"].each do |func|
   func_name = func["name"]
   params = func["parameters"]
@@ -30,16 +26,18 @@ session.request(:nvim_get_api_info)[1]["functions"].each do |func|
   case func_name
   when /^nvim_buf_(.+)/
     method_name = $1
+    params.shift
     next if buffer_defs.include?(method_name.to_sym)
   when /^nvim_win_(.+)/
     method_name = $1
+    params.shift
     next if window_defs.include?(method_name.to_sym)
   when /^nvim_tabpage_(.+)/
     method_name = $1
+    params.shift
     next if tabpage_defs.include?(method_name.to_sym)
   when /^nvim_(.+)/
     method_name = $1
-    params.shift
     next if nvim_defs.include?(method_name.to_sym)
   else
     next
@@ -72,7 +70,8 @@ session.request(:nvim_get_api_info)[1]["functions"].each do |func|
   end
 end
 
-lib_dir = Pathname.new(File.expand_path("../../lib/neovim", __FILE__))
+lib_dir = Pathname.new(File.expand_path("../lib/neovim", __dir__))
+
 {
   "client.rb" => nvim_docs,
   "buffer.rb" => buffer_docs,

data/script/run_acceptance.rb

@@ -5,7 +5,7 @@ require "fileutils"
 ENV.delete("VIM")
 ENV.delete("VIMRUNTIME")
 
-acceptance_root = File.expand_path("../../spec/acceptance", __FILE__)
+acceptance_root = File.expand_path("../spec/acceptance", __dir__)
 themis_rtp = File.join(acceptance_root, "runtime")
 themis_home = File.join(themis_rtp, "flavors/thinca_vim-themis")
 manifest = File.join(themis_rtp, "rplugin_manifest.vim")

data/script/validate_docs.rb

@@ -15,7 +15,7 @@ end
 release_version = response["name"][/NVIM v?(.+)$/, 1]
 
 client_file = File.read(
-  File.expand_path("../../lib/neovim/client.rb", __FILE__)
+  File.expand_path("../lib/neovim/client.rb", __dir__)
 )
 docs_version = client_file[
   /The methods documented here were generated using NVIM v?(.+)$/,

data/spec/acceptance/ruby_spec.vim

@@ -4,6 +4,7 @@ let s:expect = themis#helper("expect")
 function! s:suite.before_each() abort
   1,$delete
   call append(0, ["one", "two"])
+  unlet! s:var
 endfunction
 
 function! s:suite.has_nvim() abort
@@ -11,41 +12,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(/^C:/, "")}'")
   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