neovim 0.2.2 → 0.2.3

data/spec/neovim/ruby_provider/buffer_ext_spec.rb

@@ -9,6 +9,8 @@ module Neovim
       end
     end
 
+    after { nvim.shutdown }
+
     describe ".current" do
       it "returns the current buffer from the global VIM client" do
         expect(Buffer.current).to eq(nvim.get_current_buffer)

data/spec/neovim/ruby_provider/window_ext_spec.rb

@@ -9,6 +9,8 @@ module Neovim
       end
     end
 
+    after { nvim.shutdown }
+
     describe ".current" do
       it "returns the current window from the global VIM client" do
         expect(Window.current).to eq(nvim.get_current_window)

data/spec/neovim/session_spec.rb

@@ -99,7 +99,7 @@ module Neovim
       let!(:nvim_pid) do
         pid = Process.spawn(
           {"NVIM_LISTEN_ADDRESS" => "0.0.0.0:#{nvim_port}"},
-          "nvim --embed -n -u NONE",
+          "nvim --headless -n -u NONE",
           [:out, :err] => "/dev/null"
         )
 
@@ -126,7 +126,7 @@ module Neovim
       let!(:nvim_pid) do
         pid = Process.spawn(
           {"NVIM_LISTEN_ADDRESS" => socket_path},
-          "nvim --embed -n -u NONE",
+          "nvim --headless -n -u NONE",
           [:out, :err] => "/dev/null"
         )
 
@@ -151,6 +151,7 @@ module Neovim
     context "child" do
       let!(:session) { Session.child(["nvim", "-n", "-u", "NONE"]) }
       include_context "session behavior"
+      after { session.shutdown }
     end
   end
 end

data/spec/neovim/window_spec.rb

@@ -4,6 +4,7 @@ module Neovim
   RSpec.describe Window do
     let(:client) { Neovim.attach_child(["nvim", "-n", "-u", "NONE"]) }
     let(:window) { client.current.window }
+    after { client.shutdown }
 
     describe "if_ruby compatibility" do
       describe "#buffer" do
@@ -51,12 +52,22 @@ module Neovim
       end
 
       describe "#cursor=" do
-        it "sets the cursor coodinates" do
+        it "uses 1-index for line numbers" do
           window.buffer.lines = ["one", "two"]
+          client.command("normal G")
 
           expect {
-            window.cursor = [2, 2]
-          }.to change { window.cursor }.to([2, 2])
+            window.cursor = [1, 2]
+          }.to change { client.current.line }.from("two").to("one")
+        end
+
+        it "uses 0-index for column numbers" do
+          window.buffer.lines = ["one", "two"]
+          window.cursor = [1, 1]
+
+          expect {
+            client.command("normal ix")
+          }.to change { client.current.line }.to("oxne")
         end
       end
     end

data/spec/neovim_spec.rb

@@ -1,7 +1,7 @@
 require "helper"
 
 RSpec.describe Neovim do
-  let(:nvim_argv) { %w(nvim --embed -u NONE -i NONE -n) }
+  let(:nvim_argv) { %w(nvim --headless -u NONE -i NONE -n) }
 
   describe ".attach_tcp" do
     it "attaches to a TCP socket" do
@@ -47,23 +47,26 @@ RSpec.describe Neovim do
 
   describe ".attach_child" do
     it "spawns and attaches to a child process" do
-      expect(Neovim.attach_child(nvim_argv).strwidth("hi")).to eq(2)
+      begin
+        client = Neovim.attach_child(nvim_argv)
+        expect(client.strwidth("hi")).to eq(2)
+      ensure
+        client.shutdown
+      end
     end
   end
 
-  describe ".plugin" do
-    it "registers the plugin to Neovim.__configured_plugin_manifest" do
-      mock_manifest = double(:manifest)
-      mock_plugin = double(:plugin)
-      mock_path = "/source/path"
-
-      allow(Neovim).to receive(:__configured_plugin_path).and_return(mock_path)
-      allow(Neovim).to receive(:__configured_plugin_manifest).and_return(mock_manifest)
+  describe ".start_host" do
+    it "loads and runs a Host" do
+      paths = ["/foo", "/bar"]
+      host = double(:host)
 
-      expect(Neovim::Plugin).to receive(:from_config_block).with(mock_path).and_return(mock_plugin)
-      expect(mock_manifest).to receive(:register).with(mock_plugin)
+      expect(Neovim::Host).to receive(:load_from_files).
+        with(paths).
+        and_return(host)
 
-      Neovim.plugin
+      expect(host).to receive(:run)
+      Neovim.start_host(paths)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -107,9 +107,9 @@ files:
 - lib/neovim/current.rb
 - lib/neovim/event_loop.rb
 - lib/neovim/host.rb
+- lib/neovim/host/loader.rb
 - lib/neovim/line_range.rb
 - lib/neovim/logging.rb
-- lib/neovim/manifest.rb
 - lib/neovim/msgpack_stream.rb
 - lib/neovim/notification.rb
 - lib/neovim/plugin.rb
@@ -135,9 +135,9 @@ files:
 - spec/neovim/client_spec.rb
 - spec/neovim/current_spec.rb
 - spec/neovim/event_loop_spec.rb
+- spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
 - spec/neovim/line_range_spec.rb
-- spec/neovim/manifest_spec.rb
 - spec/neovim/msgpack_stream_spec.rb
 - spec/neovim/plugin_spec.rb
 - spec/neovim/remote_object_spec.rb
@@ -181,9 +181,9 @@ test_files:
 - spec/neovim/client_spec.rb
 - spec/neovim/current_spec.rb
 - spec/neovim/event_loop_spec.rb
+- spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
 - spec/neovim/line_range_spec.rb
-- spec/neovim/manifest_spec.rb
 - spec/neovim/msgpack_stream_spec.rb
 - spec/neovim/plugin_spec.rb
 - spec/neovim/remote_object_spec.rb
@@ -193,3 +193,4 @@ test_files:
 - spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
 - spec/support.rb
+has_rdoc: 

data/lib/neovim/manifest.rb

@@ -1,89 +0,0 @@
-require "neovim/logging"
-
-module Neovim
-  class Manifest
-    include Logging
-
-    attr_reader :handlers, :specs
-
-    def initialize
-      @handlers = {"poll" => poll_handler, "specs" => specs_handler}
-      @specs = {}
-    end
-
-    # Register a +Plugin+ to receive +Host+ messages.
-    #
-    # @param plugin [Plugin]
-    def register(plugin)
-      plugin.handlers.each do |handler|
-        wrapped_handler = handler.sync? ? wrap_sync(handler) : wrap_async(handler)
-        @handlers[handler.qualified_name] = wrapped_handler
-      end
-
-      @specs[plugin.source] = plugin.specs
-    end
-
-    # Handle messages received from the host. Sends a +Neovim::Client+ along
-    # with the message to be used in plugin callbacks.
-    #
-    # @param message [Neovim::Request, Neovim::Notification]
-    # @param client [Neovim::Client]
-    def handle(message, client)
-      default_handler = message.sync? ? default_sync_handler : default_async_handler
-      @handlers.fetch(message.method_name, default_handler).call(client, message)
-    rescue => e
-      fatal("got unexpected error #{e}")
-      debug(e.backtrace.join("\n"))
-    end
-
-    private
-
-    def poll_handler
-      @poll_handler ||= Proc.new do |_, req|
-        debug("received 'poll' request #{req.inspect}")
-        req.respond("ok")
-      end
-    end
-
-    def specs_handler
-      @specs_handler ||= Proc.new do |_, req|
-        debug("received 'specs' request #{req.inspect}")
-        source = req.arguments.fetch(0)
-
-        if @specs.key?(source)
-          req.respond(@specs.fetch(source))
-        else
-          req.error("Unknown plugin #{source}")
-        end
-      end
-    end
-
-    def default_sync_handler
-      @default_sync_handler ||= Proc.new { |_, req| req.error("Unknown request #{req.method_name}") }
-    end
-
-    def default_async_handler
-      @default_async_handler ||= Proc.new {}
-    end
-
-    def wrap_sync(handler)
-      Proc.new do |client, request|
-        begin
-          debug("received #{request.inspect}")
-          args = request.arguments.flatten(1)
-          request.respond(handler.call(client, *args))
-        rescue => e
-          request.error(e.message)
-        end
-      end
-    end
-
-    def wrap_async(handler)
-      Proc.new do |client, notification|
-        debug("received #{notification.inspect}")
-        args = notification.arguments.flatten(1)
-        handler.call(client, *args)
-      end
-    end
-  end
-end

data/spec/neovim/manifest_spec.rb

@@ -1,137 +0,0 @@
-require "helper"
-
-module Neovim
-  RSpec.describe Manifest do
-    it "has a default poll handler" do
-      manifest = Manifest.new
-      expect(manifest.handlers["poll"]).to respond_to(:call)
-    end
-
-    it "has default specs" do
-      manifest = Manifest.new
-      expect(manifest.specs).to eq({})
-    end
-
-    describe "#register" do
-      it "adds specs" do
-        manifest = Manifest.new
-
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.command(:Foo)
-        end
-
-        expect {
-          manifest.register(plugin)
-        }.to change { manifest.specs }.from({}).to("source" => plugin.specs)
-      end
-
-      it "adds plugin handlers" do
-        manifest = Manifest.new
-
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.command(:Foo)
-        end
-
-        expect {
-          manifest.register(plugin)
-        }.to change {
-          manifest.handlers["source:command:Foo"]
-        }.from(nil).to(kind_of(Proc))
-      end
-
-      it "doesn't add top-level RPCs to specs" do
-        manifest = Manifest.new
-
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.rpc(:Foo)
-        end
-
-        expect {
-          manifest.register(plugin)
-        }.to change { manifest.specs }.from({}).to("source" => [])
-      end
-    end
-
-    describe "#handle" do
-      it "calls the poll handler" do
-        manifest = Manifest.new
-        message = double(:message, :method_name => "poll", :sync? => true)
-        client = double(:client)
-
-        expect(message).to receive(:respond).with("ok")
-        manifest.handle(message, client)
-      end
-
-      it "calls the specs handler" do
-        manifest = Manifest.new
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.command(:Foo)
-        end
-        manifest.register(plugin)
-
-        message = double(:message, :method_name => "specs", :sync? => true, :arguments => ["source"])
-
-        expect(message).to receive(:respond).with(plugin.specs)
-        manifest.handle(message, double(:client))
-      end
-
-      it "calls a plugin sync handler" do
-        manifest = Manifest.new
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.command(:Foo, :sync => true) { |client, arg| [client, arg] }
-        end
-        manifest.register(plugin)
-
-        message = double(:message, :method_name => "source:command:Foo", :sync? => true, :arguments => [:arg])
-        client = double(:client)
-
-        expect(message).to receive(:respond).with([client, :arg])
-        manifest.handle(message, client)
-      end
-
-      it "rescues plugin sync handler exceptions" do
-        manifest = Manifest.new
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.command(:Foo, :sync => true) { raise "BOOM" }
-        end
-        manifest.register(plugin)
-
-        message = double(:message, :method_name => "source:command:Foo", :sync? => true, :arguments => [])
-        client = double(:client)
-
-        expect(message).to receive(:error).with("BOOM")
-        manifest.handle(message, client)
-      end
-
-      it "calls a plugin async handler" do
-        manifest = Manifest.new
-        async_proc = Proc.new {}
-        plugin = Plugin.from_config_block("source") do |plug|
-          plug.command(:Foo, &async_proc)
-        end
-        manifest.register(plugin)
-
-        message = double(:message, :method_name => "source:command:Foo", :sync? => false, :arguments => [:arg])
-        client = double(:client)
-
-        expect(async_proc).to receive(:call).with(client, :arg)
-        manifest.handle(message, client)
-      end
-
-      it "calls a default sync handler" do
-        manifest = Manifest.new
-        message = double(:message, :method_name => "foobar", :sync? => true)
-
-        expect(message).to receive(:error).with("Unknown request foobar")
-        manifest.handle(message, double(:client))
-      end
-
-      it "calls a default async handler" do
-        manifest = Manifest.new
-        message = double(:message, :method_name => "foobar", :sync? => false)
-
-        manifest.handle(message, double(:client))
-      end
-    end
-  end
-end