ensime_bridge 0.0.0 → 0.0.1

data/lib/ensime_bridge.rb

@@ -6,13 +6,14 @@ require_relative 'ensime'
 class EnsimeBridge
     attr_accessor :socket
     attr_reader :cache
-    def get_socket
-        TCPSocket.open("localhost", File.read(@bridge_file).chomp)
+    def get_socket file
+        TCPSocket.open("localhost", File.read(file).chomp)
     end
-    def is_running?
-        return false if not File.exists? @bridge_file
+    def is_running? file = nil
+        file = file.nil? ? @bridge_file : file
+        return false if not File.exists? file
         begin
-            get_socket.close
+            get_socket(file).close
         rescue => e
             return false
         end
@@ -23,9 +24,10 @@ class EnsimeBridge
         @cache = "#{path}_cache/"
         @queue = Queue.new
         @bridge_file = "#{@cache}bridge"
+        @http_file = "#{@cache}http"
     end
     def remote_stop
-        s = get_socket
+        s = get_socket(@bridge_file)
         s.puts "self.stop"
         s.close
     end
@@ -67,11 +69,18 @@ class EnsimeBridge
             @queue.pop(true)
         end
     end
+    def wait_for_ensime
+        while not is_running? @http_file
+            sleep 0.2
+        end
+    end
     def run
         if is_running?
             puts "bridge is already running"
             return
         end
+        wait_for_ensime
+        puts "ensime is ready"
         Thread.new do
             EventMachine.run do
                 connect_to_ensime
@@ -81,10 +90,10 @@ class EnsimeBridge
         File.write(@bridge_file, server.addr[1])
         while @client = server.accept
             begin
-                command = @client.readline
+                command = @client.readline.chomp
                 while true
                     result = instance_eval command
-                    if command.chomp == "unqueue"
+                    if command == "unqueue"
                         if not result.nil? and not result.empty?
                             @client.puts result.gsub("\n", "")
                         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ensime_bridge
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors: