vimrunner 0.0.3 → 0.0.4

data/lib/vimrunner/server.rb

@@ -27,20 +27,11 @@ module Vimrunner
         Client.new(self)
       end
 
-      # Retrieve a list of names of currently running Vim servers.
-      def list
-        %x[#{vim_path} --serverlist].strip.split "\n"
-      end
-
       # The default path to use when starting a server with a terminal Vim. If
       # the "vim" executable is not compiled with clientserver capabilities,
       # the GUI version is started instead.
       def vim_path
-        if clientserver_enabled? 'vim'
-          'vim'
-        else
-          gui_vim_path
-        end
+        'vim'
       end
 
       # The default path to use when starting a server with the GUI version of
@@ -103,10 +94,18 @@ module Vimrunner
     #   server = Server.new(:vim_path => '/opt/bin/vim') # Will start a server with the given vim instance
     #
     def initialize(options = {})
-      @gui      = options.fetch(:gui) { false }
-      @vim_path = options.fetch(:vim_path) { gui? ? Server.gui_vim_path : Server.vim_path }
+      @gui      = options[:gui]
+      @vim_path = options[:vim_path]
+      @name     = "VIMRUNNER#{rand.to_s}"
 
-      @name = "VIMRUNNER#{rand.to_s}"
+      if not @vim_path or not Server.clientserver_enabled? @vim_path
+        @vim_path = Server.vim_path
+      end
+
+      if @gui or not Server.clientserver_enabled? @vim_path
+        @gui      = true
+        @vim_path = Server.gui_vim_path
+      end
     end
 
     # Starts a Vim server.
@@ -123,10 +122,8 @@ module Vimrunner
       self
     end
 
-    # Returns true if the server was initialized with :gui => true. Note that
-    # this may not be consistent with the binary that was actually started. If
-    # a terminal Vim instance was attempted, but an appropriate one was not
-    # available, it may still have a GUI.
+    # Returns true if the server is a GUI version of Vim. This can be forced by
+    # instantiating the server with :gui => true
     def gui?
       @gui
     end
@@ -136,14 +133,19 @@ module Vimrunner
       Shell.kill(@pid)
     end
 
+    # Retrieve a list of names of currently running Vim servers.
+    def serverlist
+      %x[#{vim_path} --serverlist].strip.split "\n"
+    end
+
     private
 
     def wait_until_started
       Timeout.timeout(5, TimeoutError) do
-        serverlist = Server.list
-        while serverlist.empty? or not serverlist.include? name
+        servers = serverlist
+        while servers.empty? or not servers.include? name
           sleep 0.1
-          serverlist = Server.list
+          servers = serverlist
         end
       end
     end

data/lib/vimrunner/version.rb

@@ -1,3 +1,3 @@
 module Vimrunner
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimrunner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23987740 !ruby/object:Gem::Requirement
+  requirement: &20415700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23987740
+  version_requirements: *20415700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &23987320 !ruby/object:Gem::Requirement
+  requirement: &20415020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23987320
+  version_requirements: *20415020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23986780 !ruby/object:Gem::Requirement
+  requirement: &20414500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *23986780
+  version_requirements: *20414500
 description: ! "    Using vim's client/server functionality, this library exposes
   a way to\n    spawn a vim instance and control it programatically. Apart from being
   a fun\n    party trick, this could be used to do integration testing on vimscript.\n"
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3146226263794770349
+      hash: 507320625350919209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: