neovim 0.5.1 → 0.6.0

data/spec/neovim/logging_spec.rb

@@ -15,21 +15,21 @@ module Neovim
 
     describe ".logger" do
       it "fetches the output from $NVIM_RUBY_LOG_FILE" do
-        logger = instance_double(Logger, :level= => nil)
+        logger = instance_double(Logger, :level= => nil, :formatter= => 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)
+        logger = instance_double(Logger, :level= => nil, :formatter= => 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)
+        logger = instance_double(Logger, :formatter= => nil)
         expect(Logger).to receive(:new).and_return(logger)
         expect(logger).to receive(:level=).with(Logger::DEBUG)
         Logging.logger("NVIM_RUBY_LOG_LEVEL" => "DEBUG")
@@ -37,7 +37,7 @@ module Neovim
       end
 
       it "fetches the level from $NVIM_RUBY_LOG_LEVEL as an integer" do
-        logger = instance_double(Logger)
+        logger = instance_double(Logger, :formatter= => nil)
         expect(Logger).to receive(:new).and_return(logger)
         expect(logger).to receive(:level=).with(0)
         Logging.logger("NVIM_RUBY_LOG_LEVEL" => "0")
@@ -45,12 +45,84 @@ module Neovim
       end
 
       it "defaults the level to WARN" do
-        logger = instance_double(Logger)
+        logger = instance_double(Logger, :formatter= => nil)
         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
+
+    describe Logging::Helpers do
+      let!(:log) do
+        StringIO.new.tap do |io|
+          logger = Logger.new(io)
+          logger.level = Logger::DEBUG
+          Neovim.logger = logger
+        end
+      end
+
+      let(:klass) do
+        Class.new do
+          include Logging
+
+          def public_log(level, fields)
+            log(level) { fields }
+          end
+
+          def public_log_exception(*args)
+            log_exception(*args)
+          end
+        end
+      end
+
+      let(:obj) { klass.new }
+
+      describe "#log" do
+        it "logs JSON at the specified level" do
+          obj.public_log(:info, :foo => "bar")
+          logged = JSON.parse(log.string)
+
+          expect(logged).to match(
+            "_level" => "INFO",
+            "_class" => klass.to_s,
+            "_method" => "public_log",
+            "_time" => /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+/,
+            "foo" => "bar"
+          )
+        end
+      end
+
+      describe "#log_exception" do
+        it "logs JSON at the specified level and debugs the backtrace" do
+          ex = RuntimeError.new("BOOM")
+          ex.set_backtrace(["one", "two"])
+          obj.public_log_exception(:fatal, ex, :some_method)
+          lines = log.string.lines.to_a
+
+          fatal = JSON.parse(lines[0])
+          debug = JSON.parse(lines[1])
+
+          expect(fatal).to match(
+            "_level" => "FATAL",
+            "_class" => klass.to_s,
+            "_method" => "some_method",
+            "_time" => /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+/,
+            "exception" => "RuntimeError",
+            "message" => "BOOM",
+          )
+
+          expect(debug).to match(
+            "_level" => "DEBUG",
+            "_class" => klass.to_s,
+            "_method" => "some_method",
+            "_time" => /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+/,
+            "exception" => "RuntimeError",
+            "message" => "BOOM",
+            "backtrace" => ["one", "two"],
+          )
+        end
+      end
+    end
   end
 end

data/spec/neovim/session_spec.rb

@@ -1,157 +1,84 @@
 require "helper"
-require "securerandom"
 
 module Neovim
   RSpec.describe Session do
-    shared_context "session behavior" do
-      describe "#channel_id" do
-        it "returns nil when the API hasn't been discovered" do
-          expect(session.channel_id).to be(nil)
-        end
-
-        it "returns the channel_id when the API has been discovered" do
-          session.discover_api
-          expect(session.channel_id).to respond_to(:to_int)
-        end
-      end
-
-      describe "#request" do
-        it "synchronously returns a result" do
-          expect(session.request(:nvim_strwidth, "foobar")).to be(6)
-        end
-
-        it "raises an exception when there are errors" do
-          expect {
-            session.request(:nvim_strwidth, "too", "many")
-          }.to raise_error(/wrong number of arguments/i)
-        end
+    let(:event_loop) { EventLoop.child(Support.child_argv) }
+    let!(:session) { Session.new(event_loop) }
 
-        it "handles large data" do
-          large_str = Array.new(1024 * 17) { SecureRandom.hex(1) }.join
-          session.request(:nvim_set_current_line, large_str)
-          expect(session.request(:nvim_get_current_line)).to eq(large_str)
-        end
+    after { session.shutdown }
 
-        it "fails outside of the main thread" do
-          expect {
-            Thread.new { session.request(:nvim_strwidth, "foo") }.join
-          }.to raise_error(/outside of the main thread/)
-        end
+    describe "#request" do
+      it "synchronously returns a result" do
+        expect(session.request(:nvim_strwidth, "foobar")).to be(6)
       end
 
-      describe "#notify" do
-        it "returns nil" do
-          expect(session.notify(:nvim_input, "jk")).to be(nil)
-        end
-
-        it "doesn't raise exceptions" do
-          expect {
-            session.notify(:nvim_strwidth, "too", "many")
-          }.not_to raise_error
-        end
-
-        it "handles large data" do
-          large_str = Array.new(1024 * 17) { SecureRandom.hex(1) }.join
-          session.notify(:nvim_set_current_line, large_str)
-          expect(session.request(:nvim_get_current_line)).to eq(large_str)
-        end
-
-        it "fails outside of the main thread" do
-          expect {
-            Thread.new { session.notify(:nvim_set_current_line, "foo") }.join
-          }.to raise_error(/outside of the main thread/)
-        end
+      it "raises an exception when there are errors" do
+        expect {
+          session.request(:nvim_strwidth, "too", "many")
+        }.to raise_error(/wrong number of arguments/i)
       end
 
-      describe "#run" do
-        it "enqueues messages received during blocking requests" do
-          session.request(:nvim_subscribe, "my_event")
-          session.request(:nvim_command, "call rpcnotify(0, 'my_event', 'foo')")
-
-          message = nil
-          session.run do |msg|
-            message = msg
-            session.shutdown
-          end
-
-          expect(message).to be_a(Session::Notification)
-          expect(message.method_name).to eq("my_event")
-          expect(message.arguments).to eq(["foo"])
-        end
-
-        it "supports requests within callbacks" do
-          session.request(:nvim_subscribe, "my_event")
-          session.request(:nvim_command, "call rpcnotify(0, 'my_event', 'foo')")
-
-          result = nil
-          session.run do |msg|
-            result = session.request(:nvim_strwidth, msg.arguments.first)
-            session.shutdown
-          end
+      it "handles large data" do
+        large_str = Array.new(1024 * 17) { SecureRandom.hex(1) }.join
+        session.request(:nvim_set_current_line, large_str)
+        expect(session.request(:nvim_get_current_line)).to eq(large_str)
+      end
 
-          expect(result).to be(3)
-        end
+      it "fails outside of the main thread" do
+        expect {
+          Thread.new { session.request(:nvim_strwidth, "foo") }.join
+        }.to raise_error(/outside of the main thread/)
       end
     end
 
-    context "tcp" do
-      let!(:nvim_port) { Support.tcp_port }
-      let!(:nvim_pid) do
-        pid = Process.spawn(
-          {"NVIM_LISTEN_ADDRESS" => "0.0.0.0:#{nvim_port}"},
-          Support.child_argv.join(" "),
-          [:out, :err] => "/dev/null"
-        )
-
-        begin
-          TCPSocket.open("0.0.0.0", nvim_port).close
-        rescue Errno::ECONNREFUSED
-          retry
-        end
-
-        pid
+    describe "#notify" do
+      it "doesn't raise exceptions" do
+        expect {
+          session.notify(:nvim_strwidth, "too", "many")
+        }.not_to raise_error
       end
 
-      after do
-        Process.kill(:TERM, nvim_pid)
-        Process.waitpid(nvim_pid)
+      it "handles large data" do
+        large_str = Array.new(1024 * 17) { SecureRandom.hex(1) }.join
+        session.notify(:nvim_set_current_line, large_str)
+        expect(session.request(:nvim_get_current_line)).to eq(large_str)
       end
 
-      let!(:session) { Session.tcp("0.0.0.0", nvim_port) }
-      include_context "session behavior"
+      it "succeeds outside of the main thread" do
+        expect {
+          Thread.new { session.notify(:nvim_set_current_line, "foo") }.join
+        }.not_to raise_error
+      end
     end
 
-    context "unix" do
-      let!(:socket_path) { Support.socket_path }
-      let!(:nvim_pid) do
-        pid = Process.spawn(
-          {"NVIM_LISTEN_ADDRESS" => socket_path},
-          Support.child_argv.join(" "),
-          [:out, :err] => "/dev/null"
-        )
+    describe "#run" do
+      it "enqueues messages received during blocking requests" do
+        session.request(:nvim_subscribe, "my_event")
+        session.request(:nvim_command, "call rpcnotify(0, 'my_event', 'foo')")
 
-        begin
-          UNIXSocket.new(socket_path).close
-        rescue Errno::ENOENT, Errno::ECONNREFUSED
-          retry
+        message = nil
+        session.run do |msg|
+          message = msg
+          session.shutdown
         end
 
-        pid
+        expect(message.sync?).to eq(false)
+        expect(message.method_name).to eq("my_event")
+        expect(message.arguments).to eq(["foo"])
       end
 
-      after do
-        Process.kill(:TERM, nvim_pid)
-        Process.waitpid(nvim_pid)
-      end
+      it "supports requests within callbacks" do
+        session.request(:nvim_subscribe, "my_event")
+        session.request(:nvim_command, "call rpcnotify(0, 'my_event', 'foo')")
 
-      let!(:session) { Session.unix(socket_path) }
-      include_context "session behavior"
-    end
+        result = nil
+        session.run do |msg|
+          result = session.request(:nvim_strwidth, msg.arguments.first)
+          session.shutdown
+        end
 
-    context "child" do
-      let!(:session) { Session.child(Support.child_argv) }
-      include_context "session behavior"
-      after { session.shutdown }
+        expect(result).to be(3)
+      end
     end
   end
 end

data/spec/neovim/window_spec.rb

@@ -0,0 +1,46 @@
+require "helper"
+
+module Neovim
+  RSpec.describe Window do
+    let(:client) { Neovim.attach_child(Support.child_argv) }
+    let(:window) { client.current.window }
+
+    before do
+      client.command("normal ione")
+      client.command("normal otwo")
+      client.command("normal gg")
+      client.command("vsplit")
+    end
+
+    describe "#buffer" do
+      it "returns the window's buffer" do
+        expect(window.buffer).to eq(client.get_current_buf)
+      end
+    end
+
+    describe "#height", "#height=" do
+      it "adjusts the window height" do
+        expect do
+          window.height -= 1
+        end.to change { window.height }.by(-1)
+      end
+    end
+
+    describe "#width", "#width=" do
+      it "adjusts the window width" do
+        expect do
+          window.width -= 1
+        end.to change { window.width }.by(-1)
+      end
+    end
+
+    describe "#cursor", "#cursor=" do
+      it "adjusts the window cursor" do
+        expect do
+          window.cursor = [2, 0]
+        end.to change { window.cursor }.to([2, 0])
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neovim
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -94,15 +94,21 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/neovim-ruby-host
 - lib/neovim.rb
+- lib/neovim/api.rb
 - lib/neovim/buffer.rb
 - lib/neovim/client.rb
 - lib/neovim/current.rb
+- lib/neovim/event_loop.rb
+- lib/neovim/event_loop/connection.rb
+- lib/neovim/event_loop/message_builder.rb
+- lib/neovim/event_loop/serializer.rb
 - lib/neovim/executable.rb
 - lib/neovim/host.rb
 - lib/neovim/host/loader.rb
@@ -117,12 +123,6 @@ files:
 - lib/neovim/ruby_provider/vim.rb
 - lib/neovim/ruby_provider/window_ext.rb
 - lib/neovim/session.rb
-- lib/neovim/session/api.rb
-- lib/neovim/session/event_loop.rb
-- lib/neovim/session/notification.rb
-- lib/neovim/session/request.rb
-- lib/neovim/session/rpc.rb
-- lib/neovim/session/serializer.rb
 - lib/neovim/tabpage.rb
 - lib/neovim/version.rb
 - lib/neovim/window.rb
@@ -131,40 +131,45 @@ files:
 - script/generate_docs
 - script/j2mp
 - script/mp2j
+- spec/acceptance/rplugin_autocmd_spec.vim
+- spec/acceptance/rplugin_command_spec.vim
+- spec/acceptance/rplugin_function_spec.vim
+- spec/acceptance/ruby_spec.vim
+- spec/acceptance/rubydo_spec.vim
+- spec/acceptance/rubyfile/call_foo.rb
+- spec/acceptance/rubyfile/curbuf_ivar_get.rb
+- spec/acceptance/rubyfile/curbuf_ivar_set.rb
+- spec/acceptance/rubyfile/define_foo.rb
+- spec/acceptance/rubyfile/nested.rb
+- spec/acceptance/rubyfile/nested_inner.rb
+- spec/acceptance/rubyfile/raise_standard_error.rb
+- spec/acceptance/rubyfile/raise_syntax_error.rb
+- spec/acceptance/rubyfile/ruby_interface.rb
+- spec/acceptance/rubyfile/set_pwd_after.rb
+- spec/acceptance/rubyfile/set_pwd_before.rb
+- spec/acceptance/rubyfile_spec.vim
+- spec/acceptance/runtime/init.vim
+- spec/acceptance/runtime/rplugin.vim
+- spec/acceptance/runtime/rplugin/ruby/autocmds.rb
+- spec/acceptance/runtime/rplugin/ruby/commands.rb
+- spec/acceptance/runtime/rplugin/ruby/functions.rb
+- spec/acceptance/runtime/vader.vim/autoload/vader.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/assert.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/helper.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/parser.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/syntax.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/window.vim
+- spec/acceptance/runtime/vader.vim/plugin/vader.vim
+- spec/acceptance_spec.rb
 - spec/helper.rb
-- spec/integration/rplugin_autocmd_spec.vim
-- spec/integration/rplugin_command_spec.vim
-- spec/integration/rplugin_function_spec.vim
-- spec/integration/ruby_buffer_spec.rb
-- spec/integration/ruby_spec.vim
-- spec/integration/ruby_vim_spec.rb
-- spec/integration/ruby_window_spec.rb
-- spec/integration/rubydo_spec.vim
-- spec/integration/rubyfile/call_foo.rb
-- spec/integration/rubyfile/curbuf_ivar_get.rb
-- spec/integration/rubyfile/curbuf_ivar_set.rb
-- spec/integration/rubyfile/define_foo.rb
-- spec/integration/rubyfile/raise_standard_error.rb
-- spec/integration/rubyfile/raise_syntax_error.rb
-- spec/integration/rubyfile/set_pwd_after.rb
-- spec/integration/rubyfile/set_pwd_before.rb
-- spec/integration/rubyfile_spec.vim
-- spec/integration/runtime/init.vim
-- spec/integration/runtime/rplugin.vim
-- spec/integration/runtime/rplugin/ruby/autocmds.rb
-- spec/integration/runtime/rplugin/ruby/commands.rb
-- spec/integration/runtime/rplugin/ruby/functions.rb
-- spec/integration/runtime/vader.vim/autoload/vader.vim
-- spec/integration/runtime/vader.vim/autoload/vader/assert.vim
-- spec/integration/runtime/vader.vim/autoload/vader/helper.vim
-- spec/integration/runtime/vader.vim/autoload/vader/parser.vim
-- spec/integration/runtime/vader.vim/autoload/vader/syntax.vim
-- spec/integration/runtime/vader.vim/autoload/vader/window.vim
-- spec/integration/runtime/vader.vim/plugin/vader.vim
-- spec/integration_spec.rb
+- spec/neovim/api_spec.rb
 - spec/neovim/buffer_spec.rb
 - spec/neovim/client_spec.rb
 - spec/neovim/current_spec.rb
+- spec/neovim/event_loop/connection_spec.rb
+- spec/neovim/event_loop/message_builder_spec.rb
+- spec/neovim/event_loop/serializer_spec.rb
+- spec/neovim/event_loop_spec.rb
 - spec/neovim/executable_spec.rb
 - spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
@@ -175,13 +180,8 @@ files:
 - spec/neovim/ruby_provider/buffer_ext_spec.rb
 - spec/neovim/ruby_provider/vim_spec.rb
 - spec/neovim/ruby_provider/window_ext_spec.rb
-- spec/neovim/session/api_spec.rb
-- spec/neovim/session/event_loop_spec.rb
-- spec/neovim/session/notification_spec.rb
-- spec/neovim/session/request_spec.rb
-- spec/neovim/session/rpc_spec.rb
-- spec/neovim/session/serializer_spec.rb
 - spec/neovim/session_spec.rb
+- spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
 - spec/support.rb
 homepage: https://github.com/alexgenco/neovim-ruby
@@ -204,45 +204,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Neovim
 test_files:
+- spec/acceptance/rplugin_autocmd_spec.vim
+- spec/acceptance/rplugin_command_spec.vim
+- spec/acceptance/rplugin_function_spec.vim
+- spec/acceptance/ruby_spec.vim
+- spec/acceptance/rubydo_spec.vim
+- spec/acceptance/rubyfile/call_foo.rb
+- spec/acceptance/rubyfile/curbuf_ivar_get.rb
+- spec/acceptance/rubyfile/curbuf_ivar_set.rb
+- spec/acceptance/rubyfile/define_foo.rb
+- spec/acceptance/rubyfile/nested.rb
+- spec/acceptance/rubyfile/nested_inner.rb
+- spec/acceptance/rubyfile/raise_standard_error.rb
+- spec/acceptance/rubyfile/raise_syntax_error.rb
+- spec/acceptance/rubyfile/ruby_interface.rb
+- spec/acceptance/rubyfile/set_pwd_after.rb
+- spec/acceptance/rubyfile/set_pwd_before.rb
+- spec/acceptance/rubyfile_spec.vim
+- spec/acceptance/runtime/init.vim
+- spec/acceptance/runtime/rplugin.vim
+- spec/acceptance/runtime/rplugin/ruby/autocmds.rb
+- spec/acceptance/runtime/rplugin/ruby/commands.rb
+- spec/acceptance/runtime/rplugin/ruby/functions.rb
+- spec/acceptance/runtime/vader.vim/autoload/vader.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/assert.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/helper.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/parser.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/syntax.vim
+- spec/acceptance/runtime/vader.vim/autoload/vader/window.vim
+- spec/acceptance/runtime/vader.vim/plugin/vader.vim
+- spec/acceptance_spec.rb
 - spec/helper.rb
-- spec/integration/rplugin_autocmd_spec.vim
-- spec/integration/rplugin_command_spec.vim
-- spec/integration/rplugin_function_spec.vim
-- spec/integration/ruby_buffer_spec.rb
-- spec/integration/ruby_spec.vim
-- spec/integration/ruby_vim_spec.rb
-- spec/integration/ruby_window_spec.rb
-- spec/integration/rubydo_spec.vim
-- spec/integration/rubyfile/call_foo.rb
-- spec/integration/rubyfile/curbuf_ivar_get.rb
-- spec/integration/rubyfile/curbuf_ivar_set.rb
-- spec/integration/rubyfile/define_foo.rb
-- spec/integration/rubyfile/raise_standard_error.rb
-- spec/integration/rubyfile/raise_syntax_error.rb
-- spec/integration/rubyfile/set_pwd_after.rb
-- spec/integration/rubyfile/set_pwd_before.rb
-- spec/integration/rubyfile_spec.vim
-- spec/integration/runtime/init.vim
-- spec/integration/runtime/rplugin.vim
-- spec/integration/runtime/rplugin/ruby/autocmds.rb
-- spec/integration/runtime/rplugin/ruby/commands.rb
-- spec/integration/runtime/rplugin/ruby/functions.rb
-- spec/integration/runtime/vader.vim/autoload/vader.vim
-- spec/integration/runtime/vader.vim/autoload/vader/assert.vim
-- spec/integration/runtime/vader.vim/autoload/vader/helper.vim
-- spec/integration/runtime/vader.vim/autoload/vader/parser.vim
-- spec/integration/runtime/vader.vim/autoload/vader/syntax.vim
-- spec/integration/runtime/vader.vim/autoload/vader/window.vim
-- spec/integration/runtime/vader.vim/plugin/vader.vim
-- spec/integration_spec.rb
+- spec/neovim/api_spec.rb
 - spec/neovim/buffer_spec.rb
 - spec/neovim/client_spec.rb
 - spec/neovim/current_spec.rb
+- spec/neovim/event_loop/connection_spec.rb
+- spec/neovim/event_loop/message_builder_spec.rb
+- spec/neovim/event_loop/serializer_spec.rb
+- spec/neovim/event_loop_spec.rb
 - spec/neovim/executable_spec.rb
 - spec/neovim/host/loader_spec.rb
 - spec/neovim/host_spec.rb
@@ -253,12 +258,7 @@ test_files:
 - spec/neovim/ruby_provider/buffer_ext_spec.rb
 - spec/neovim/ruby_provider/vim_spec.rb
 - spec/neovim/ruby_provider/window_ext_spec.rb
-- spec/neovim/session/api_spec.rb
-- spec/neovim/session/event_loop_spec.rb
-- spec/neovim/session/notification_spec.rb
-- spec/neovim/session/request_spec.rb
-- spec/neovim/session/rpc_spec.rb
-- spec/neovim/session/serializer_spec.rb
 - spec/neovim/session_spec.rb
+- spec/neovim/window_spec.rb
 - spec/neovim_spec.rb
 - spec/support.rb