neovim 0.8.1 → 0.9.0.pre.1

data/lib/neovim/connection.rb

@@ -35,7 +35,6 @@ module Neovim
 
       @unpacker = MessagePack::Unpacker.new(@rd)
       @packer = MessagePack::Packer.new(@wr)
-      @running = false
     end
 
     def write(object)

data/lib/neovim/event_loop.rb

@@ -36,7 +36,7 @@ module Neovim
     def shutdown
       @running = false
       @shutdown = true
-      run
+      @connection.close
     end
 
     def request(request_id, method, *args)
@@ -70,20 +70,23 @@ module Neovim
 
     def run
       @running = true
+      last_value = nil
 
       loop do
         break unless @running
         break if @shutdown
 
         begin
-          yield read
-        rescue EOFError => e
+          last_value = yield(read)
+        rescue EOFError, Errno::EPIPE => e
           log_exception(:debug, e, __method__)
           shutdown
         rescue => e
           log_exception(:error, e, __method__)
         end
       end
+
+      last_value
     ensure
       @connection.close if @shutdown
     end

data/lib/neovim/host/cli.rb

@@ -0,0 +1,41 @@
+require "neovim/connection"
+require "neovim/event_loop"
+require "neovim/host"
+require "neovim/version"
+require "optparse"
+
+module Neovim
+  class Host
+    # @api private
+    class CLI
+      def self.run(path, argv, inn, out, err)
+        cmd = File.basename(path)
+
+        OptionParser.new do |opts|
+          opts.on("-V", "--version") do
+            out.puts Neovim::VERSION
+            exit(0)
+          end
+
+          opts.on("-h", "--help") do
+            out.puts "Usage: #{cmd} [-hV] rplugin_path ..."
+            exit(0)
+          end
+        end.order!(argv)
+
+        if inn.tty?
+          err.puts("Can't run #{cmd} interactively.")
+          exit(1)
+        else
+          conn = Connection.new(inn, out)
+          event_loop = EventLoop.new(conn)
+
+          Host.run(argv, event_loop)
+        end
+      rescue OptionParser::InvalidOption => e
+        err.puts(e.message)
+        exit(1)
+      end
+    end
+  end
+end

data/lib/neovim/logging.rb

@@ -18,7 +18,7 @@ module Neovim
 
       @logger = Logger.new(env_file || STDERR)
 
-      if env_level
+      if /\S+/.match?(env_level)
         begin
           @logger.level = Integer(env_level)
         rescue ArgumentError

data/lib/neovim/ruby_provider.rb

@@ -1,4 +1,5 @@
 require "neovim/ruby_provider/vim"
+require "neovim/ruby_provider/object_ext"
 require "neovim/ruby_provider/buffer_ext"
 require "neovim/ruby_provider/window_ext"
 require "stringio"
@@ -18,6 +19,7 @@ module Neovim
 
         __define_setup(plug)
         __define_ruby_execute(plug)
+        __define_ruby_eval(plug)
         __define_ruby_execute_file(plug)
         __define_ruby_do_range(plug)
         __define_ruby_chdir(plug)
@@ -44,12 +46,26 @@ module Neovim
     def self.__define_ruby_execute(plug)
       plug.__send__(:rpc, :ruby_execute) do |nvim, ruby|
         __wrap_client(nvim) do
-          eval(ruby, TOPLEVEL_BINDING, "eval")
+          eval(ruby, TOPLEVEL_BINDING, "ruby_execute")
         end
+        nil
       end
     end
     private_class_method :__define_ruby_execute
 
+    # Evaluate the provided Ruby code, exposing the +Vim+ constant for
+    # interactions with the editor and returning the value.
+    #
+    # This is used by the +:rubyeval+ command.
+    def self.__define_ruby_eval(plug)
+      plug.__send__(:rpc, :ruby_eval) do |nvim, ruby|
+        __wrap_client(nvim) do
+          eval(ruby, TOPLEVEL_BINDING, "ruby_eval")
+        end
+      end
+    end
+    private_class_method :__define_ruby_eval
+
     # Evaluate the provided Ruby file, exposing the +Vim+ constant for
     # interactions with the editor.
     #
@@ -57,6 +73,7 @@ module Neovim
     def self.__define_ruby_execute_file(plug)
       plug.__send__(:rpc, :ruby_execute_file) do |nvim, path|
         __wrap_client(nvim) { load(path) }
+        nil
       end
     end
     private_class_method :__define_ruby_execute_file
@@ -75,14 +92,15 @@ module Neovim
           __start, __stop, __ruby = __args
           __buffer = __nvim.get_current_buf
 
-          __update_lines_in_chunks(__buffer, __start, __stop, 5000) do |__lines|
+          __update_lines_in_chunks(__buffer, __start, __stop, 1_000) do |__lines|
             __lines.map do |__line|
               $_ = __line
-              eval(__ruby, binding, "eval")
+              eval(__ruby, binding, "ruby_do_range")
               $_
             end
           end
         end
+        nil
       end
     end
     private_class_method :__define_ruby_do_range
@@ -103,7 +121,6 @@ module Neovim
           yield
         end
       end
-      nil
     end
     private_class_method :__wrap_client
 
@@ -122,10 +139,10 @@ module Neovim
       $stdout, $stderr = StringIO.new, StringIO.new
 
       begin
-        yield
-
-        client.out_write($stdout.string + $/) if $stdout.size > 0
-        client.err_writeln($stderr.string) if $stderr.size > 0
+        yield.tap do
+          client.out_write($stdout.string + $/) if $stdout.size > 0
+          client.err_writeln($stderr.string) if $stderr.size > 0
+        end
       ensure
         $stdout = old_stdout
         $stderr = old_stderr

data/lib/neovim/ruby_provider/object_ext.rb

@@ -0,0 +1,5 @@
+class Object
+  def to_msgpack(packer)
+    packer.pack(to_s)
+  end
+end

data/lib/neovim/session.rb

@@ -12,9 +12,9 @@ module Neovim
     attr_writer :request_id
 
     # @api private
-    class Exited < RuntimeError
+    class Disconnected < RuntimeError
       def initialize
-        super("nvim process exited")
+        super("Disconnected from nvim process")
       end
     end
 
@@ -28,19 +28,21 @@ module Neovim
     end
 
     def run(&block)
-      @running = true
-
-      while (pending = @pending_messages.shift)
-        Fiber.new { pending.received(@response_handlers, &block) }.resume
-      end
+      block ||= ->(msg) { @pending_messages << msg }
 
-      return unless @running
+      @running = true
 
       @event_loop.run do |message|
         Fiber.new { message.received(@response_handlers, &block) }.resume
       end
     end
 
+    def next
+      return @pending_messages.shift if @pending_messages.any?
+
+      run { |msg| stop; msg }
+    end
+
     # Make an RPC request and return its response.
     #
     # If this method is called inside a callback, we are already inside a
@@ -68,7 +70,7 @@ module Neovim
         @event_loop.request(@request_id, method, *args)
         response = blocking ? blocking_response : yielding_response
 
-        raise(Exited) if response.nil?
+        raise(Disconnected) if response.nil?
         raise(response.error) if response.error
         response.value
       end
@@ -95,15 +97,8 @@ module Neovim
     private
 
     def blocking_response
-      response = nil
-
-      @response_handlers[@request_id] = lambda do |res|
-        response = res
-        stop
-      end
-
-      run { |message| @pending_messages << message }
-      response
+      @response_handlers[@request_id] = ->(res) { stop; res }
+      run
     end
 
     def yielding_response

data/lib/neovim/tabpage.rb

@@ -3,7 +3,7 @@ require "neovim/remote_object"
 module Neovim
   # Class representing an +nvim+ tabpage.
   #
-  # The methods documented here were generated using NVIM v0.3.7
+  # The methods documented here were generated using NVIM v0.4.4
   class Tabpage < RemoteObject
 # The following methods are dynamically generated.
 =begin

data/lib/neovim/version.rb

@@ -1,3 +1,3 @@
 module Neovim
-  VERSION = Gem::Version.new("0.8.1")
+  VERSION = Gem::Version.new("0.9.0.pre.1")
 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.3.7
+  # The methods documented here were generated using NVIM v0.4.4
   class Window < RemoteObject
     # Get the buffer displayed in the window
     #
@@ -143,6 +143,20 @@ module Neovim
   See +:h nvim_win_is_valid()+
   @return [Boolean]
 
+@method set_config(config)
+  See +:h nvim_win_set_config()+
+  @param [Hash] config
+  @return [void]
+
+@method get_config
+  See +:h nvim_win_get_config()+
+  @return [Hash]
+
+@method close(force)
+  See +:h nvim_win_close()+
+  @param [Boolean] force
+  @return [void]
+
 =end
   end
 end

data/neovim.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "msgpack", "~> 1.1"
   spec.add_dependency "multi_json", "~> 1.0"
 
-  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"

data/script/ci/download_nvim.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+set -eu
+
+: ${RUNNER_OS:?} ${BUILD:?}
+
+case "$BUILD" in
+  latest)
+    URL_PART="latest/download"
+    ;;
+  nightly)
+    URL_PART="download/nightly"
+    ;;
+  *)
+    echo "BUILD must be 'latest' or 'nightly'." >&2
+    exit 1
+    ;;
+esac
+
+case "$(echo "$RUNNER_OS" | tr "[:upper:]" "[:lower:]")" in
+  macos)
+    wget -nv -P /tmp \
+      "https://github.com/neovim/neovim/releases/$URL_PART/nvim-macos.tar.gz"
+    tar -C /tmp -xzf /tmp/nvim-macos.tar.gz
+    mv /tmp/nvim-osx64 ./_nvim
+    ;;
+  linux)
+    mkdir -p _nvim/bin
+    wget -nv -O _nvim/bin/nvim \
+      "https://github.com/neovim/neovim/releases/$URL_PART/nvim.appimage"
+    ;;
+  *)
+    echo "Unrecognized \$RUNNER_OS" >&2
+    exit 1
+    ;;
+esac
+
+chmod u+x _nvim/bin/nvim
+
+_nvim/bin/nvim --version

data/script/run_acceptance.rb

@@ -5,11 +5,13 @@ require "fileutils"
 ENV.delete("VIM")
 ENV.delete("VIMRUNTIME")
 
-acceptance_root = File.expand_path("../spec/acceptance", __dir__)
+root = File.expand_path("..", __dir__)
+acceptance_root = File.join(root, "spec/acceptance")
 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")
 vimrc = File.join(themis_rtp, "init.vim")
+nvim = ENV.fetch("NVIM_EXECUTABLE", "nvim")
 
 themis_exe = Gem.win_platform? ?
   File.join(themis_home, "bin/themis.bat") :
@@ -17,19 +19,21 @@ themis_exe = Gem.win_platform? ?
 
 env = {
   "NVIM_RPLUGIN_MANIFEST" => manifest,
-  "THEMIS_VIM" => "nvim",
+  "THEMIS_VIM" => nvim,
   "THEMIS_HOME" => themis_home,
   "THEMIS_ARGS" => "-e -s --headless -u #{vimrc}"
 }
 
 FileUtils.rm_f(manifest)
 
-system(
-  env,
-  "nvim",
-  "-e", "-s", "--headless",
-  "-u", vimrc,
-  "+UpdateRemotePlugins", "+qa!"
-)
-
-exec(env, themis_exe, *ARGV)
+Dir.chdir(root) do
+  system(
+    env,
+    nvim,
+    "-e", "-s", "--headless",
+    "-u", vimrc,
+    "+UpdateRemotePlugins", "+qa!"
+  )
+
+  exec(env, themis_exe, *ARGV)
+end

data/spec/acceptance/ruby_spec.vim

@@ -2,11 +2,16 @@ let s:suite = themis#suite(":ruby")
 let s:expect = themis#helper("expect")
 
 function! s:suite.before_each() abort
+  let s:pwd = getcwd()
   1,$delete
   call append(0, ["one", "two"])
   unlet! s:var
 endfunction
 
+function! s:suite.after_each() abort
+  execute("cd " . s:pwd)
+endfunction
+
 function! s:suite.has_nvim() abort
   call s:expect(has("nvim")).to_equal(1)
 endfunction
@@ -27,7 +32,7 @@ endfunction
 
 function! s:suite.updates_working_directory() abort
   cd /
-  ruby Vim.command("let s:var = '#{Dir.pwd.sub(/^C:/, "")}'")
+  ruby Vim.command("let s:var = '#{Dir.pwd.sub(/^[A-Z]:/, "")}'")
   cd -
 
   call s:expect(s:var).to_equal("/")

data/spec/acceptance/rubyeval_spec.vim

@@ -0,0 +1,22 @@
+let s:suite = themis#suite(":rubyeval")
+let s:expect = themis#helper("expect")
+
+function! s:suite.evaluates_ruby_objects() abort
+  call s:expect(rubyeval("123")).to_equal(123)
+  call s:expect(rubyeval("1.2")).to_equal(1.2)
+  call s:expect(rubyeval("'test'")).to_equal("test")
+  call s:expect(rubyeval("nil")).to_equal(v:null)
+  call s:expect(rubyeval("true")).to_equal(v:true)
+  call s:expect(rubyeval("false")).to_equal(v:false)
+  call s:expect(rubyeval("{x: 1}")).to_equal({"x": 1})
+  call s:expect(rubyeval(":test")).to_equal("test")
+  call s:expect(rubyeval(":test.class")).to_equal("Symbol")
+endfunction
+
+function! s:suite.propagates_exceptions() abort
+  try
+    rubyeval("raise 'BOOM'")
+    throw "Nothing raised"
+  catch /BOOM/
+  endtry
+endfunction