Update sampple plugin to use 0.1.0 neovim-client

Author: jebberjeb

README.md

@@ -40,23 +40,18 @@ neovim-client.nvim=> (api/command ":echo 'Hello Neovim!'")
 
 [![Repling Neovim](http://img.youtube.com/vi/g-9DdVwbSTo/0.jpg)](https://www.youtube.com/watch?v=g-9DdVwbSTo)
 
-### Sample Plugins
+### Examples
 
-Several sample plugins -- consumers of neovim-client -- are included.
+#### Included Sample Plugin
 
-#### Installation
+##### Installation
 
-While these plugins can be installed locally, the easiest thing to do is to
-run them from the repl, as described above. Simply use `lein repl` from the
-plugin project's root directory.
+One way to install the sample plugin is by running `./deploy-local.sh` script,
+included, which copies the sample plugin to `~/.vim/bundle`, and then ensure
+Neovim's runtimepath is set correctly by adding `set
+runtimepath^=~/.vim/bundle/sample-plugin` to `.vimrc`.
 
-#### Simple Plugin
-
-```
-:call RunSamplePluginSimple()
-```
-
-#### Count Plugin
+##### Running
 
 This plugin stays running, and maintains state. Additionally, it shows how
 plugins are actually servers, which Neovim can make requests to via

sample-plugin/deploy-local.sh

@@ -0,0 +1,5 @@
+lein uberjar
+cp target/uberjar/sample-plugin-0.1.0-standalone.jar .
+rm -rf ~/.vim/bundle/sample-plugin
+cd ..
+cp -rf sample-plugin ~/.vim/bundle

sample-plugin/plugin/sample.vim

@@ -1,21 +1,19 @@
 let s:p_dir = expand('<sfile>:p:h')
-let g:is_running = 0
-let g:channel = -1
+let g:sample_is_running = 0
+let g:nvim_tcp_plugin_channel = 0
 
-function! StartIfNotRunning()
-    if g:is_running == 0
+function! SampleStartIfNotRunning()
+    if g:sample_is_running == 0
         echo 'starting plugin...'
-        "TODO - This is a dirty hack. We should launch things without changing
-        "the working directory.
-        exec ':cd ' . s:p_dir
-        let g:channel = rpcstart('lein', ['run'])
-        let g:is_running = 1
+        let jar_file_path = s:p_dir . '/../' . 'sample-plugin-0.1.0-standalone.jar'
+        call jobstart(['java', '-jar', jar_file_path], {'rpc': v:true})
+        let g:sample_is_running = 1
     endif
 endfunction
 
 function! SamplePluginCount()
-    call StartIfNotRunning()
-    let res = rpcrequest(g:channel, 'count', [])
+    call SampleStartIfNotRunning()
+    let res = rpcnotify(g:nvim_tcp_plugin_channel, 'count', [])
     return res
 endfunction
 

sample-plugin/project.clj

@@ -1,10 +1,10 @@
-(defproject sample-plugin "0.1.0-SNAPSHOT"
-  :description "FIXME: write description"
-  :url "http://example.com/FIXME"
+(defproject sample-plugin "0.1.0"
+  :description "Sample Neovim plugin"
+  :url "https://github.com/clojure-vim/neovim-client"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [neovim-client "0.1.0-SNAPSHOT"]]
+  :dependencies [[org.clojure/clojure "1.8.0"]
+                 [neovim-client "0.1.0"]]
   :main ^:skip-aot sample-plugin.core
   :target-path "target/%s"
   :profiles {:uberjar {:aot :all}})

sample-plugin/src/sample_plugin/core.clj

@@ -1,29 +1,30 @@
 (ns sample-plugin.core
-  (:require [neovim-client.nvim :as nvim])
+  (:require
+    [neovim-client.1.api :as api]
+    [neovim-client.nvim :as nvim])
   (:gen-class))
 
 (defn -main
   [& args]
-  (let [nvim (nvim/new)
+  (let [nvim (nvim/new 1)
         x (atom 0)]
     (nvim/register-method!
       nvim
       "count"
       (fn [msg]
         ;; Plugin can call back to nvim if it wants to, while
         ;; its doing its own thing.
-        (nvim/vim-command-async nvim
-                                ":echo 'incrementing'"
-                                (fn [_] nil))
         (swap! x inc)
-        @x))
+        (api/command-async nvim
+                           (format ":echo 'incrementing ... %s'" @x)
+                           (fn [_] nil))))
 
     ;; Stay alive for a minute!
     (dotimes [n 60]
       (if (= 0 (mod n 10))
-        (nvim/vim-command nvim (str ":echo 'plugin alive for " n " seconds.'")))
+        (api/command nvim (str ":echo 'plugin alive for " n " seconds.'")))
       (Thread/sleep 1000))
 
     ;; Let nvim know we're shutting down.
-    (nvim/vim-command nvim ":let g:is_running=0")
-    (nvim/vim-command nvim ":echo 'plugin stopping.'")))
+    (api/command nvim ":let g:is_running=0")
+    (api/command nvim ":echo 'plugin stopping.'")))