rtext 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a5cc8d9398e6453bbc549caf640e38dabf76b56
-  data.tar.gz: bf45a3cb45e7dda6964b516ff71ad6f09ac02ca3
+  metadata.gz: a0e14d27070197af864d0b24a38f9d41cb4115c3
+  data.tar.gz: '0984afc951a23e67def08c00be574c3b9b92647d'
 SHA512:
-  metadata.gz: b6330b11b5cd1f8fa761db136ef272aa07d0994c1fef3739a8a689d0b28dfd5d363196fdf6ea04b8d7319d863f21c4ee3c875b59409a04b93e825d3abf782fe7
-  data.tar.gz: c61c3e48987ec0dc6ea4cebdfeb381764e5447ccda48cd6634158611ebb6a18f80a747c92fb748c582cd3344edb6eb87e8c30acf1dffaedb0c07650fa4b59485
+  metadata.gz: a8ad0fbe93721f12c413f839d4448cc606e50c0ad001272d35f47f67c57fe54b404472a7164f2abee3dec526d9dbd33c60bc16ea80a2b68fc0b7c486ce1ac43f
+  data.tar.gz: bc569b6b09999d14abf10f05c606b738880ffe6f480c520982b052ef3a39124548932e9dfd7901bc92b6f99e6495d6ddf3f87e88a04a97e4f52ec405caeb5b67

data/CHANGELOG

@@ -109,5 +109,8 @@
 
 =0.9.3
 
-* Fixed frontend log file path issue
+* Added lock file for backend service
 
+=0.9.4
+
+* Fixed issue with unquoted multiline strings

data/Project.yaml

@@ -1,5 +1,5 @@
 name: rtext
-version: 0.9.3
+version: 0.9.4
 git: https://github.com/mthiede/rtext.git
 summary: Ruby Textual Modelling
 email: martin dot thiede at gmx de
@@ -8,7 +8,8 @@ description: RText can be used to derive textual languages from an RGen metamode
 authors: [Martin Thiede]
 dependencies:
   http://rubygems.org:
-    - {name: rgen, version: '~> 0.8.0'}
+    - {name: rgen,     version: '~> 0.8.0'}
+    - {name: filelock, version: '~> 1.1.0'}
 rdoc_options: [--main, README.rdoc, -x, test]
 extra_rdoc_files: [README.rdoc, CHANGELOG, MIT-LICENSE, RText_Users_Guide, RText_Protocol]
 encrypt_sources: false

data/lib/rtext/frontend/connector.rb

@@ -39,6 +39,7 @@ def execute_command(obj, options={})
     obj["invocation_id"] = @invocation_id
     obj["type"] = "request"
     @socket.send(serialize_message(obj), 0)
+    @logger.debug('Sent request') if @logger
     result = nil
     @busy = true
     @busy_start_time = Time.now
@@ -72,6 +73,7 @@ def execute_command(obj, options={})
       result
     end
   else
+    @logger.debug('connecting')
     :connecting
   end
 end
@@ -87,7 +89,7 @@ def stop
   end
   if connected?
     execute_command({"type" => "request", "command" => "stop"})
-    while do_work 
+    while do_work
       sleep(0.1)
     end
   end
@@ -184,6 +186,7 @@ def connect
   if @process_id.nil?
     File.unlink(@out_file) if File.exist?(@out_file)
     Dir.chdir(File.dirname(@config.file)) do
+      @logger.debug(@config.command.strip + " > #{@out_file} 2>&1") if @logger
       @process_id = spawn(@config.command.strip + " > #{@out_file} 2>&1")
       @state = :wait_for_file
     end
@@ -191,8 +194,9 @@ def connect
 end
 
 def do_work
-  if @process_id.nil?
+  unless @process_id
     @state = :off
+    @logger.debug('No process id') if @logger
     return false
   end
   if @state == :wait_for_port && !File.exist?(@out_file)
@@ -263,6 +267,7 @@ def do_work
         @logger.info "server socket closed (end of file)" if @logger
       end
       if data
+        @logger.debug('Got data') if @logger
         repeat = true
         response_data.concat(data)
         while obj = extract_message(response_data)
@@ -277,6 +282,7 @@ def do_work
       elsif !backend_running? || socket_closed
         cleanup
         @state = :off
+        @logger.debug("backend_running?: #{backend_running?}, socket_closed: #{socket_closed}") if @logger
         return false
       end
     end
@@ -291,7 +297,8 @@ def cleanup
     break unless backend_running?
     sleep(0.1)
   end
-  ensure_process_cleanup(@process_id, @keep_outfile ? @out_file : nil, 10)
+  ensure_process_cleanup(@process_id, @keep_outfile ? nil : @out_file, 10)
+  @process_id = nil
 end
 
 end

data/lib/rtext/serializer.rb

@@ -152,7 +152,7 @@ class Serializer
           result << v.to_s
         end
       elsif feature.eType.instanceClass == String
-        if @lang.unquoted?(feature) && v.to_s =~ /^[a-zA-Z_]\w*$/ && v.to_s != "true" && v.to_s != "false"
+        if @lang.unquoted?(feature) && v.to_s =~ /^[a-zA-Z_]\w*$/m && v.to_s != "true" && v.to_s != "false"
           result << v.to_s
         else
           result << "\"#{v.gsub("\\","\\\\\\\\").gsub("\"","\\\"").gsub("\n","\\n").
@@ -166,7 +166,7 @@ class Serializer
           # formatting not available for BigDecimals
         else
           if arg_format 
-            result << sprintf(arg_format, v)
+          result << sprintf(arg_format, v)
           else
             result << v.to_s
           end

data/lib/rtext/service.rb

@@ -1,4 +1,6 @@
 require 'socket'
+require 'yaml'
+require 'filelock'
 require 'rtext/context_builder'
 require 'rtext/message_helper'
 require 'rtext/link_detector'
@@ -6,7 +8,7 @@ require 'rtext/link_detector'
 # optimization: garbage collect while service is idle
 
 module RText
-
+  
 class Service
   include RText::MessageHelper
 
@@ -33,62 +35,77 @@ class Service
     @timeout = options[:timeout] || 60
     @logger = options[:logger]
     @on_startup = options[:on_startup]
+    @lock_file_path = options[:lock_file_path] || File.expand_path('.rtext.lock')
+    @config_file_path = options[:config_file_path] || File.expand_path('.rtext.config')
+    @lock_file = nil
   end
 
   def run
-    server = create_server 
-    puts "RText service, listening on port #{server.addr[1]}"
-    @on_startup.call if @on_startup
-    $stdout.flush
-
-    last_access_time = Time.now
-    last_flush_time = Time.now
-    @stop_requested = false
-    sockets = []
-    request_data = {}
-    while !@stop_requested
+    Filelock @lock_file_path, :timeout => 0, :wait => 1 do
+      server = create_server 
+      puts "RText service, listening on port #{server.addr[1]}"
+      @logger.debug('Server started') if @logger
+      File.write(@config_file_path, YAML.dump({'port' => server.addr[1], 'pid' => Process.pid}))
       begin
-        sock = server.accept_nonblock
-        sock.sync = true
-        sockets << sock
-        @logger.info "accepted connection" if @logger
-      rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR, Errno::EWOULDBLOCK
-      rescue Exception => e
-        @logger.warn "unexpected exception during socket accept: #{e.class}"
-      end
-      sockets.dup.each do |sock|
-        data = nil
-        begin
-          data = sock.read_nonblock(100000)
-        rescue Errno::EWOULDBLOCK
-        rescue IOError, EOFError, Errno::ECONNRESET, Errno::ECONNABORTED
-          sock.close
-          request_data[sock] = nil
-          sockets.delete(sock)
-        rescue Exception => e
-          # catch Exception to make sure we don't crash due to unexpected exceptions
-          @logger.warn "unexpected exception during socket read: #{e.class}"
-          sock.close
-          request_data[sock] = nil
-          sockets.delete(sock)
-        end
-        if data
-          last_access_time = Time.now
-          request_data[sock] ||= ""
-          request_data[sock].concat(data)
-          while obj = extract_message(request_data[sock])
-            message_received(sock, obj)
-          end
-        end
-      end
-      IO.select([server] + sockets, [], [], 1)
-      if Time.now > last_access_time + @timeout
-        @logger.info("RText service, stopping now (timeout)") if @logger
-        break 
-      end
-      if Time.now > last_flush_time + FlushInterval
+        @on_startup.call if @on_startup
         $stdout.flush
+      
+        last_access_time = Time.now
         last_flush_time = Time.now
+        @stop_requested = false
+        sockets = []
+        request_data = {}
+        while !@stop_requested
+          begin
+            sock = server.accept_nonblock
+            sock.sync = true
+            sockets << sock
+            @logger.info "accepted connection" if @logger
+          rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR, Errno::EWOULDBLOCK
+          rescue Exception => e
+            @logger.warn "unexpected exception during socket accept: #{e.class}"
+          end
+          sockets.dup.each do |sock|
+            data = nil
+            begin
+              data = sock.read_nonblock(100000)
+              @logger.debug('Got data') if @logger
+            rescue Errno::EWOULDBLOCK
+            rescue IOError, EOFError, Errno::ECONNRESET, Errno::ECONNABORTED
+              sock.close
+              request_data[sock] = nil
+              sockets.delete(sock)
+            rescue Exception => e
+              # catch Exception to make sure we don't crash due to unexpected exceptions
+              @logger.warn "unexpected exception during socket read: #{e.class}"
+              sock.close
+              request_data[sock] = nil
+              sockets.delete(sock)
+            end
+            if data
+              last_access_time = Time.now
+              request_data[sock] ||= ""
+              request_data[sock].concat(data)
+              @logger.debug("Data available: #{request_data[sock]}") if @logger
+              while obj = extract_message(request_data[sock])
+                @logger.debug("Got message #{obj.inspect}") if @logger
+                message_received(sock, obj)
+              end
+            end
+          end
+          IO.select([server] + sockets, [], [], 1)
+          if Time.now > last_access_time + @timeout
+            @logger.info("RText service, stopping now (timeout)") if @logger
+            break 
+          end
+          if Time.now > last_flush_time + FlushInterval
+            $stdout.flush
+            last_flush_time = Time.now
+          end
+        end
+      ensure
+        @logger.warn("Config file doesn't exist, but lock is acquired, it could be a bug") unless File.exist?(@config_file_path)
+        File.unlink(@config_file_path) if File.exist?(@config_file_path)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: filelock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: RText can be used to derive textual languages from an RGen metamodel
   with very little effort.
 email: 
@@ -84,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby Textual Modelling