neovim 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f815ff4bec0348ba8b77aa4f9b04197e8a521655
-  data.tar.gz: 149067ce655eb2b13102f9d68b0ef635668a3578
+  metadata.gz: 65ebef25a57b7d4e244b65fbceb840bd8b1102f3
+  data.tar.gz: 152c9fbe48f7a50594be2abe6551e41a576808a1
 SHA512:
-  metadata.gz: a0b76436db1b7523be49ecfb8be84785f3420a0eeeea294b38f6173b94136a5d60cd02f8c9dd3ff6d209bf728dc1e042c1faf1c5b0a24239a199a3099a5b141b
-  data.tar.gz: e7048d7300227a7effc924d3248798b0669471dfa56820eac798a0300f3cc3545bad333d14d37c682b61b67d3cbf185f9d40c356c17491ff8288706551a2da46
+  metadata.gz: 8da3e2b81089bf418c16900e0db39144b7f0bb39a9cbebd2bed4d6a5f4272940ccc02d65b8b55a629a38c121522caa46dda963145311fc052cf2d6be01dc2514
+  data.tar.gz: af51998f0fbe47a2f7e97e576d7e22fb9721ad81cf84c73d8bb6052487c1e1cbb795d62a0d88058924f28b60270c2a1429ed2551b8c0c1c591570e2b28a0d663

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.4
+- Maintain cursor position on Buffer#append for compatibility with vim
+- Fix excessive fetching of API metadata
+
 # 0.2.3
 - Detach child processes in `Neovim::EventLoop.child`
 - Improve performance/compatibility of `Buffer#append`

data/lib/neovim/async_session.rb

@@ -11,6 +11,8 @@ module Neovim
   class AsyncSession
     include Logging
 
+    attr_reader :msgpack_stream
+
     def initialize(msgpack_stream)
       @msgpack_stream = msgpack_stream
       @request_id = 0
@@ -59,8 +61,8 @@ module Neovim
     # @return [void]
     # @see MsgpackStream#run
     # @see EventLoop#run
-    def run(session=nil, &callback)
-      @msgpack_stream.run(session) do |msg|
+    def run(&callback)
+      @msgpack_stream.run do |msg|
         debug("received #{msg.inspect}")
         kind, *payload = msg
 

data/lib/neovim/buffer.rb

@@ -93,14 +93,21 @@ module Neovim
 
     # Append a line after the given line (1-indexed).
     #
+    # To maintain backwards compatibility with +vim+, the cursor is forced back
+    # to its previous position after inserting the line.
+    #
     # @param index [Fixnum]
     # @param str [String]
     # @return [String]
     def append(index, str)
+      window = @session.request(:vim_get_current_window)
+      cursor = window.cursor
+
       if index < 0
         raise ArgumentError, "Index out of bounds"
       else
-        lines.insert(index, str)
+        set_lines(index, index, true, [str])
+        window.set_cursor(cursor)
       end
       str
     end

data/lib/neovim/line_range.rb

@@ -114,7 +114,7 @@ module Neovim
     end
 
     # @param index [Fixnum]
-    # @param line [String]
+    # @param lines [String]
     def insert(index, lines)
       @buffer.insert(index, Array(lines))
     end

data/lib/neovim/msgpack_stream.rb

@@ -32,9 +32,7 @@ module Neovim
     #   described by the +vim_get_api_info+ call
     # @return [void]
     # @see EventLoop#run
-    def run(session=nil)
-      register_types(session)
-
+    def run
       @event_loop.run do |data|
         @unpacker.feed_each(data) do |msg|
           debug("received #{msg.inspect}")
@@ -62,12 +60,14 @@ module Neovim
       @event_loop.shutdown
     end
 
-    private
-
-    def register_types(session)
-      return unless session && session.api
-
-      session.api.types.each do |type, info|
+    # Register msgpack ext types using the provided API and session
+    #
+    # @param api [API]
+    # @param session [Session]
+    # @see Session#discover_api
+    def register_types(api, session)
+      info("registering msgpack ext types")
+      api.types.each do |type, info|
         klass = Neovim.const_get(type)
         id = info.fetch("id")
 

data/lib/neovim/session.rb

@@ -73,12 +73,15 @@ module Neovim
       @api ||= API.null
     end
 
-    # Discover the +nvim+ API as described in the +vim_get_api_info+ call.
+    # Discover the +nvim+ API as described in the +vim_get_api_info+ call,
+    # propagating it down to lower layers of the stack.
     #
     # @return [API]
     # @see API
     def discover_api
-      @api = API.new(request(:vim_get_api_info))
+      @api = API.new(request(:vim_get_api_info)).tap do |api|
+        @async_session.msgpack_stream.register_types(api, self)
+      end
     end
 
     # Run the event loop, handling messages in a +Fiber+.
@@ -97,7 +100,7 @@ module Neovim
 
       return unless @running
 
-      @async_session.run(self) do |message|
+      @async_session.run do |message|
         Fiber.new { yield message if block_given? }.resume
       end
     ensure
@@ -186,7 +189,7 @@ module Neovim
       @async_session.request(method, *args) do |err, res|
         error, result = err, res
         stop
-      end.run(self) do |message|
+      end.run do |message|
         @pending_messages << message
       end
 

data/lib/neovim/version.rb

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

data/lib/neovim/window.rb

@@ -2,14 +2,6 @@ require "neovim/remote_object"
 
 module Neovim
   class Window < RemoteObject
-    # Interface for interacting with the cursor position.
-    #
-    # @return [Cursor]
-    # @see Cursor
-    def cursor
-      @cursor ||= Cursor.new(self)
-    end
-
     # Get the buffer displayed in the window
     #
     # @return [Buffer]

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

@@ -1,10 +1,41 @@
 require "helper"
+require "pty"
 
 RSpec.describe "neovim-ruby-host" do
+  let(:host_exe) do
+    File.expand_path("../../../bin/neovim-ruby-host", __FILE__)
+  end
+
+  it "prints the gem version" do
+    ["--version", "-V"].each do |opt|
+      expect {
+        system(host_exe, opt)
+      }.to output("#{Neovim::VERSION}\n").to_stdout_from_any_process
+    end
+  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
-    plugin1_path = Support.file_path("plugin1.rb")
-    File.write(plugin1_path, <<-RUBY)
+    plugin_path = Support.file_path("plugin1.rb")
+    File.write(plugin_path, <<-RUBY)
       Neovim.plugin do |plug|
+        plug.command(:AsyncSetLine, :args => 1) do |nvim, str|
+          nvim.current.line = str
+        end
+
         plug.function(:SyncAdd, :args => 2, :sync => true) do |nvim, x, y|
           x + y
         end
@@ -12,15 +43,6 @@ RSpec.describe "neovim-ruby-host" do
         plug.autocmd(:BufEnter, :pattern => "*.rb") do |nvim|
           nvim.current.line = "Ruby file, eh?"
         end
-      end
-    RUBY
-
-    plugin2_path = Support.file_path("plugin2.rb")
-    File.write(plugin2_path, <<-RUBY)
-      Neovim.plugin do |plug|
-        plug.command(:AsyncSetLine, :args => 1) do |nvim, str|
-          nvim.current.line = str
-        end
 
         plug.rpc(:TopLevelAdd, :nargs => 2, :sync => true) do |nvim, x, y|
           x + y
@@ -30,21 +52,20 @@ RSpec.describe "neovim-ruby-host" do
 
     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}'])")
+    nvim.command("let host = rpcstart('#{host_exe}', ['#{plugin_path}'])")
 
     expect(nvim.eval("rpcrequest(host, 'poll')")).to eq("ok")
-    expect(nvim.eval("rpcrequest(host, '#{plugin1_path}:function:SyncAdd', [1, 2])")).to eq(3)
+    expect(nvim.eval("rpcrequest(host, '#{plugin_path}:function:SyncAdd', [1, 2])")).to eq(3)
     expect(nvim.eval("rpcrequest(host, 'TopLevelAdd', 1, 2)")).to eq(3)
 
     expect {
-      nvim.command("call rpcnotify(host, '#{plugin1_path}:autocmd:BufEnter:*.rb')")
-      sleep 0.1
+      nvim.command("call rpcnotify(host, '#{plugin_path}:autocmd:BufEnter:*.rb')")
+      sleep 0.01
     }.to change { nvim.current.buffer.lines.to_a }.from([""]).to(["Ruby file, eh?"])
 
     expect {
-      nvim.command("call rpcnotify(host, '#{plugin2_path}:command:AsyncSetLine', ['foo'])")
-      sleep 0.1
+      nvim.command("call rpcnotify(host, '#{plugin_path}:command:AsyncSetLine', ['foo'])")
+      sleep 0.01
     }.to change { nvim.current.buffer.lines.to_a }.from(["Ruby file, eh?"]).to(["foo"])
 
     expect {

data/spec/acceptance/ruby_provider_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe "ruby_provider" do
     begin
       spec.run
     ensure
-      nvim.command("call rpcstop(host) | qa!")
+      nvim.session.shutdown
     end
   end
 

data/spec/helper.rb

@@ -1,6 +1,7 @@
 require "bundler/setup"
 require "neovim"
 require "pry"
+require "stringio"
 require "timeout"
 
 require File.expand_path("../support.rb", __FILE__)
@@ -35,8 +36,18 @@ RSpec.configure do |config|
     end
   end
 
+  config.around(:example, :silence_logging) do |spec|
+    old_logger = Neovim.logger
+
+    begin
+      Neovim.logger = Logger.new(StringIO.new)
+      spec.run
+    ensure
+      Neovim.logger = old_logger
+    end
+  end
+
   Kernel.srand config.seed
 end
 
-Neovim.logger.level = Logger::FATAL
 Thread.abort_on_exception = true

data/spec/neovim/buffer_spec.rb

@@ -118,6 +118,12 @@ module Neovim
           }.to change { buffer.lines.to_a }.to(["one", "two", ""])
         end
 
+        it "leaves the cursor unchanged" do
+          expect {
+            buffer.append(0, "one")
+          }.not_to change { client.current.window.cursor }
+        end
+
         it "raises for out of bounds indexes" do
           expect {
             buffer.append(-1, "err")

data/spec/neovim/client_spec.rb

@@ -5,6 +5,12 @@ module Neovim
     let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
     after { client.shutdown }
 
+    specify do
+      client.strwidth("foo")
+      client.strwidth("bar")
+      client.command("echom 'hi'")
+    end
+
     describe "#respond_to?" do
       it "returns true for vim functions" do
         expect(client).to respond_to(:strwidth)

data/spec/neovim/host_spec.rb

@@ -98,7 +98,7 @@ module Neovim
         host.handle(message)
       end
 
-      it "rescues plugin sync handler exceptions" do
+      it "rescues plugin sync handler exceptions", :silence_logging do
         plugin = Plugin.from_config_block("source") do |plug|
           plug.command(:Foo, :sync => true) { raise "BOOM" }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack