neovim 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e20e3f4df52ff80bb9e0aa9826d5c6c723d2cc6
-  data.tar.gz: 04019ea3e3e7bb33d231d8a2160a2320f62ca365
+  metadata.gz: 6807525e36364dd7a60d2e24a3e5ad3b5c370d88
+  data.tar.gz: 59a4fcb659bf1f7f9d2d210aace08b099abb55df
 SHA512:
-  metadata.gz: d3a46053cf6e54b97ef541cf314062ee3ed597a61b642e1d3be7355c60d1b568fe35e0dd76b8b22dd9f5e82cbcdd981ca83d09a596dbbaacbb7221530169d510
-  data.tar.gz: ae0fc91672a39bda8c0a2c756c0a27db7360a8428cb5ab7cdfe9423a25a97d3f3d968d51c0fd42ac986582f32a44eb511a75d6d58213c9384b76483a47b655da
+  metadata.gz: 8c19a0766059f4202ce10e4251ee6b88d4db7534c6623c9aec4273386e3af67e92fe2564410f29a5cc8575e71cc488da631b7b6b93a1fcc85aca5492ac9be28e
+  data.tar.gz: a941792a2f0b00aac4e7b3af6c738835fc1f682e989829fe4af665802276684aad5ad64cf392e5d5234f211acbb64454dbc4cf3d694f9f051f3cbaef4c43787e

data/.travis.yml

@@ -9,25 +9,10 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.3.0
 
-os:
-  - linux
-  - osx
-
-addons:
-  apt:
-    packages:
-      - libtool
-      - autoconf
-      - automake
-      - cmake
-      - libncurses5-dev
-      - g++
-      - pkg-config
-
-cache:
-  - apt
-  - bundler
+before_install:
+  - eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64"
 
 env: REPORT_COVERAGE=1
-script: bundle exec rake spec:ci
+script: bundle exec rake --trace spec

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.1.0
+- Add --version, -V to neovim-ruby-host executable
+- Update object interfaces to be compatible with Vim :ruby API
+- `NVIM_RUBY_LOG_LEVEL` now takes strings, e.g. `DEBUG`
+- Add `rpc` plugin DSL method for exposing top-level functions
+- Add `ruby_provider.rb` for Vim :ruby API compatibility
+- Remove Cursor class
+- Remove vendored `neovim`
+
 # 0.0.6
 - Update Session with improved Fiber coordination
 - Documentation

data/README.md

@@ -48,8 +48,8 @@ The `neovim-ruby-host` executable can be used to spawn Ruby plugins via the `rpc
 # $VIMRUNTIME/rplugin/ruby/my_plugin.rb
 
 Neovim.plugin do |plug|
-  # Define a command called "SetLine" which sets the current line to the sum of
-  # two values. This command is executed asynchronously, so the return value is
+  # Define a command called "SetLine" which sets the contents of the current
+  # line. This command is executed asynchronously, so the return value is
   # ignored.
   plug.command(:SetLine, :nargs => 1) do |nvim, str|
     nvim.current.line = str

data/Rakefile

@@ -3,31 +3,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-namespace :spec do
-  desc "Build Neovim and run specs on CI"
-  task :ci => ["neovim:build", :spec]
-end
-
 namespace :neovim do
-  vendor = File.expand_path("../vendor/neovim", __FILE__)
-
-  desc "Build Neovim"
-  task :build do
-    sh "git submodule update --init && " +
-       "cd #{vendor} && " +
-       "make distclean && " +
-       "make"
-  end
-
-  desc "Update vendored Neovim revision"
-  task :update do
-    sh "git submodule update --init && " +
-       "cd #{vendor} && " +
-       "make distclean && " +
-       "git pull origin master && " +
-       "make"
-  end
-
   desc "Generate Neovim remote API docs"
   task :generate_docs do
     require "neovim"
@@ -37,7 +13,7 @@ namespace :neovim do
     buffer_docs = []
     window_docs = []
     tabpage_docs = []
-    session = Neovim::Session.child(%w(-u NONE -n -N))
+    session = Neovim::Session.child(%w(nvim -u NONE -n -N))
 
     session.request(:vim_get_api_info)[1]["functions"].each do |func|
       prefix, method_name = func["name"].split("_", 2)

data/bin/j2mp

@@ -5,4 +5,4 @@ require "json"
 require "msgpack"
 
 ARGF.binmode
-puts MessagePack.pack(JSON.parse(ARGF.read.strip))
+print MessagePack.pack(JSON.parse(ARGF.read.strip))

data/bin/mp2j

@@ -5,4 +5,4 @@ require "json"
 require "msgpack"
 
 ARGF.binmode
-puts JSON.dump(MessagePack.unpack(ARGF.read.strip))
+MessagePack::Unpacker.new(ARGF).each { |data| print JSON.dump(data) }

data/bin/neovim-ruby-host

@@ -1,6 +1,15 @@
 #!/usr/bin/env ruby
 require "neovim"
 
+ARGV.each do |arg|
+  break if arg == "--"
+
+  if ["--version", "-V"].include?(arg)
+    puts Neovim::VERSION
+    exit(0)
+  end
+end
+
 if STDIN.tty?
   abort("Can't run neovim-ruby-host interactively.")
 else

data/lib/neovim.rb

@@ -1,10 +1,8 @@
-require "neovim/async_session"
 require "neovim/client"
-require "neovim/event_loop"
 require "neovim/host"
-require "neovim/msgpack_stream"
 require "neovim/session"
 require "neovim/plugin"
+require "neovim/version"
 
 # The main entrypoint to the +Neovim+ gem. It allows you to connect to a
 # running +nvim+ instance programmatically or define a remote plugin to be
@@ -27,7 +25,7 @@ require "neovim/plugin"
 #   Neovim.attach_unix("/tmp/nvim.sock") # => Neovim::Client
 #
 # @example Spawn and connect to a child +nvim+ process
-#   Neovim.attach_child(["-u", "NONE"]) # => Neovim::Client
+#   Neovim.attach_child(["nvim", "--embed"]) # => Neovim::Client
 #
 # @example Define a Ruby plugin
 #   # ~/.config/nvim/rplugin/ruby/plugin.rb
@@ -73,7 +71,7 @@ module Neovim
   # @return [Client]
   # @see Session.tcp
   def self.attach_tcp(host, port)
-    Client.new(Session.tcp(host, port).discover_api)
+    Client.new Session.tcp(host, port)
   end
 
   # Connect to a running +nvim+ instance over a UNIX domain socket.
@@ -82,7 +80,7 @@ module Neovim
   # @return [Client]
   # @see Session.unix
   def self.attach_unix(socket_path)
-    Client.new(Session.unix(socket_path).discover_api)
+    Client.new Session.unix(socket_path)
   end
 
   # Spawn and connect to a child +nvim+ process.
@@ -91,7 +89,7 @@ module Neovim
   # @return [Client]
   # @see Session.child
   def self.attach_child(argv=[])
-    Client.new(Session.child(argv).discover_api)
+    Client.new Session.child(argv)
   end
 
   # Define an +nvim+ remote plugin using the plugin DSL.

data/lib/neovim/async_session.rb

@@ -101,7 +101,8 @@ module Neovim
 
     def handle_response(payload)
       reqid, (_, error), result = payload
-      @pending_requests.delete(reqid).call(error, result)
+      callback = @pending_requests.delete(reqid) || Proc.new {}
+      callback.call(error, result)
     end
 
     def handle_notification(payload, callback)

data/lib/neovim/buffer.rb

@@ -38,6 +38,105 @@ module Neovim
       @range = LineRange.new(self, _range.begin, _end)
     end
 
+    # Get the buffer name.
+    #
+    # @return [String]
+    def name
+      get_name
+    end
+
+    # Get the buffer index.
+    #
+    # @return [Fixnum]
+    def number
+      get_number
+    end
+
+    # Get the number of lines.
+    #
+    # @return [Fixnum]
+    def count
+      lines.to_a.size
+    end
+
+    # Get the number of lines.
+    #
+    # @return [Fixnum]
+    def length
+      count
+    end
+
+    # Get the line at the given index.
+    #
+    # @param index [Fixnum]
+    # @return [String]
+    def [](index)
+      lines[index]
+    end
+
+    # Set the line at the given index.
+    #
+    # @param index [Fixnum]
+    # @param str [String]
+    # @return [String]
+    def []=(index, str)
+      lines[index] = str
+    end
+
+    # Delete the line at the given index.
+    #
+    # @param index [Fixnum]
+    # @return [void]
+    def delete(index)
+      lines.delete(index)
+    end
+
+    # Append a line after the given index.
+    #
+    # @param index [Fixnum]
+    # @param str [String]
+    # @return [String]
+    def append(index, str)
+      lines[index, 1] = [lines[index], str]
+      str
+    end
+
+    # Get the current line of an active buffer.
+    #
+    # @return [String, nil]
+    def line
+      if active?
+        @session.request(:vim_get_current_line)
+      end
+    end
+
+    # Set the current line of an active buffer.
+    #
+    # @param str [String]
+    # @return [String, nil]
+    def line=(str)
+      if active?
+        @session.request(:vim_set_current_line, str)
+      end
+    end
+
+    # Get the current line number of an active buffer.
+    #
+    # @return [Fixnum, nil]
+    def line_number
+      if active?
+        window = @session.request(:vim_get_current_window)
+        @session.request(:window_get_cursor, window)[0]
+      end
+    end
+
+    # Determine if the buffer is active.
+    #
+    # @return [Boolean]
+    def active?
+      @session.request(:vim_get_current_buffer) == self
+    end
+
 # The following methods are dynamically generated.
 =begin
 @method line_count
@@ -63,6 +162,12 @@ module Neovim
   @param [Boolean] include_end
   @return [Array<String>]
 
+@method get_lines(start, end, strict_indexing)
+  @param [Fixnum] start
+  @param [Fixnum] end
+  @param [Boolean] strict_indexing
+  @return [Array<String>]
+
 @method set_line_slice(start, end, include_start, include_end, replacement)
   @param [Fixnum] start
   @param [Fixnum] end
@@ -71,6 +176,13 @@ module Neovim
   @param [Array<String>] replacement
   @return [void]
 
+@method set_lines(start, end, strict_indexing, replacement)
+  @param [Fixnum] start
+  @param [Fixnum] end
+  @param [Boolean] strict_indexing
+  @param [Array<String>] replacement
+  @return [void]
+
 @method get_var(name)
   @param [String] name
   @return [Object]

data/lib/neovim/client.rb

@@ -13,6 +13,8 @@ module Neovim
     attr_reader :session
 
     def initialize(session)
+      session.discover_api
+
       @session = session
       @api = session.api
     end
@@ -20,7 +22,7 @@ module Neovim
     # Intercept method calls and delegate to appropriate RPC methods.
     def method_missing(method_name, *args)
       if func = @api.function("vim_#{method_name}")
-        func.call(session, *args)
+        func.call(@session, *args)
       else
         super
       end
@@ -45,7 +47,7 @@ module Neovim
     #   client.current.line = "New line"
     # @see Current
     def current
-      Current.new(@session)
+      @current ||= Current.new(@session)
     end
 
     private

data/lib/neovim/current.rb

@@ -8,6 +8,7 @@ module Neovim
   class Current
     def initialize(session)
       @session = session
+      @range = (0..-1)
     end
 
     # @return [String]
@@ -23,7 +24,9 @@ module Neovim
 
     # @return [Buffer]
     def buffer
-      @session.request(:vim_get_current_buffer)
+      @session.request(:vim_get_current_buffer).tap do |buf|
+        buf.range = @range
+      end
     end
 
     # @param buffer [Buffer, Fixnum] The target buffer or index.
@@ -53,5 +56,10 @@ module Neovim
     def tabpage=(tabpage)
       @session.request(:vim_set_current_tabpage, tabpage)
     end
+
+    # @param range [Range] The target range
+    def range=(range)
+      @range = range
+    end
   end
 end

data/lib/neovim/event_loop.rb

@@ -32,8 +32,7 @@ module Neovim
     # @param argv [Array] The arguments to pass to the spawned process
     # @return [EventLoop]
     def self.child(argv)
-      argv = [ENV.fetch("NVIM_EXECUTABLE", "nvim"), "--embed"] | argv
-      io = IO.popen(argv, "rb+")
+      io = IO.popen(argv | ["--embed"], "rb+")
       new(io)
     end
 
@@ -104,8 +103,13 @@ module Neovim
     # @return [void]
     def shutdown
       stop
-      [@rd, @wr].each(&:close)
-    rescue IOError
+
+      [@rd, @wr].each do |io|
+        begin
+          io.close
+        rescue IOError
+        end
+      end
     end
   end
 end

data/lib/neovim/host.rb

@@ -49,6 +49,8 @@ module Neovim
     #
     # @return [void]
     def run
+      @session.discover_api
+
       @session.run do |msg|
         debug("received #{msg.inspect}")
         @manifest.handle(msg, client)
@@ -61,7 +63,7 @@ module Neovim
     private
 
     def client
-      @client ||= Client.new(@session.discover_api)
+      @client ||= Client.new(@session)
     end
   end
 end

data/lib/neovim/line_range.rb

@@ -38,14 +38,21 @@ module Neovim
     #   line_range[0, 2] # => ["first", "second"]
     def [](pos, len=nil)
       case pos
-      when ::Range
-        _end = pos.exclude_end? ? pos.end - 1 : pos.end
-        LineRange.new(@buffer, pos.begin, _end)
+      when Range
+        LineRange.new(
+          @buffer,
+          abs_line(pos.begin),
+          abs_line(pos.exclude_end? ? pos.end - 1 : pos.end)
+        )
       else
         if len
-          LineRange.new(@buffer, pos, pos + len - 1)
+          LineRange.new(
+            @buffer,
+            abs_line(pos),
+            abs_line(pos + len -1)
+          )
         else
-          @buffer.get_line(pos)
+          @buffer.get_line(abs_line(pos))
         end
       end
     end
@@ -75,19 +82,25 @@ module Neovim
       pos, len = target
 
       case pos
-      when ::Range
+      when Range
         @buffer.set_line_slice(
-          pos.begin,
-          pos.end,
+          abs_line(pos.begin),
+          abs_line(pos.end),
           true,
           !pos.exclude_end?,
           val
         )
       else
         if len
-          @buffer.set_line_slice(pos, pos + len, true, false, val)
+          @buffer.set_line_slice(
+            abs_line(pos),
+            abs_line(pos + len),
+            true,
+            false,
+            val
+          )
         else
-          @buffer.set_line(pos, val)
+          @buffer.set_line(abs_line(pos), val)
         end
       end
     end
@@ -97,5 +110,16 @@ module Neovim
       self[0..-1] = other
       self
     end
+
+    # @param index [Fixnum]
+    def delete(index)
+      @buffer.del_line(abs_line(index))
+    end
+
+    private
+
+    def abs_line(n)
+      n < 0 ? (@end + n + 1) : @begin + n
+    end
   end
 end