rtext 0.8.1 → 0.10.0

data/lib/rtext/frontend/connector.rb

@@ -21,18 +21,25 @@ def initialize(config, options={})
   @outfile_provider = options[:outfile_provider]
   @keep_outfile = options[:keep_outfile]
   @connection_timeout = options[:connection_timeout] || 10
+  @process_id = nil
 end
 
 def execute_command(obj, options={})
-  timeout = options[:timeout] || 5
+  timeout = options[:timeout] || 10
   @busy = false if @busy_start_time && (Time.now > @busy_start_time + timeout)
   if @busy
     do_work
-    :backend_busy 
-  elsif connected?
+    return :backend_busy 
+  end
+  unless connected?
+    connect unless connecting?
+    do_work
+  end
+  if connected?
     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
@@ -66,9 +73,8 @@ def execute_command(obj, options={})
       result
     end
   else
-    connect unless connecting?
-    do_work
-    :connecting 
+    @logger.debug('connecting')
+    :connecting
   end
 end
 
@@ -83,27 +89,72 @@ def stop
   end
   if connected?
     execute_command({"type" => "request", "command" => "stop"})
-    while do_work 
+    while do_work
       sleep(0.1)
     end
   end
+  ensure_process_cleanup(@process_id, @keep_outfile ? nil : @out_file, 10)
+  @process_id = nil
 end
 
 private
 
+def wait_for_process_to_exit(process_id, timeout)
+  with_timeout timeout do
+    begin
+      waitpid(process_id, Process::WNOHANG)
+      process_id = nil
+      true
+    rescue Errno::ECHILD => _
+      false
+    end
+  end
+end
+
+def ensure_process_cleanup(process_id, out_file, timeout)
+  Thread.new do
+    begin
+      unless process_id.nil?
+        process_id = nil if wait_for_process_to_exit(process_id, timeout)
+      end
+    ensure
+      unless process_id.nil?
+        begin
+          Process.kill('QUIT', process_id)
+        rescue Errno::ESRCH => _
+        end
+      end
+      File.unlink(out_file) if !out_file.nil? && File.exist?(out_file)
+    end
+  end
+end
+
+def with_timeout(timeout, sleep_time = 0.1, &block)
+  started = Time.now
+  while true do
+    return true if block.call
+    if Time.now > started + timeout
+      return false
+    end
+    sleep(sleep_time)
+  end
+end
+
+
 def connected?
-  @state == :connected && backend_running?
+  !@process_id.nil? && @state == :read_from_socket && backend_running?
 end
 
 def connecting?
-  @state == :connecting
+  !@process_id.nil? && (@state == :wait_for_file || @state == :wait_for_port)
 end
 
 def backend_running?
   if @process_id
     begin
-      return true unless waitpid(@process_id, Process::WNOHANG)
-    rescue Errno::ECHILD
+      waitpid(@process_id, Process::WNOHANG)
+      return true
+    rescue Errno::ECHILD => _
     end
   end
   false
@@ -121,66 +172,87 @@ def tempfile_name
 end
 
 def connect
-  @state = :connecting
+  return if connected?
   @connect_start_time = Time.now
 
   @logger.info @config.command if @logger
 
   if @outfile_provider
-    @out_file = @outfile_provider.call
+    @out_file = File.expand_path(@outfile_provider.call)
   else
-    @out_file = tempfile_name 
+    @out_file = File.expand_path(tempfile_name) 
   end
-  File.unlink(@out_file) if File.exist?(@out_file)
 
-  Dir.chdir(File.dirname(@config.file)) do
-    @process_id = spawn(@config.command.strip + " > #{@out_file} 2>&1")
+  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
   end
-  @work_state = :wait_for_file
 end
 
 def do_work
-  case @work_state
-  when :wait_for_file
-    if File.exist?(@out_file)
-      @work_state = :wait_for_port
-    end
-    if Time.now > @connect_start_time + @connection_timeout
-      cleanup
-      @connection_listener.call(:timeout) if @connection_listener
-      @work_state = :done
-      @state = :off
-      @logger.warn "process didn't startup (connection timeout)" if @logger
+  unless @process_id
+    @state = :off
+    @logger.debug('No process id') if @logger
+    return false
+  end
+  if @state == :wait_for_port && !File.exist?(@out_file)
+    @state = :wait_for_file
+  end
+  if @state == :wait_for_file && File.exist?(@out_file)
+    @state = :wait_for_port
+  end
+  if @state == :wait_for_file
+    while true
+      if Time.now > @connect_start_time + @connection_timeout
+        cleanup
+        @connection_listener.call(:timeout) if @connection_listener
+        @state = :off
+        @logger.warn "process didn't startup (connection timeout)" if @logger
+        return false
+      end
+      sleep(0.1)
+      if File.exist?(@out_file)
+        @state = :wait_for_port
+        break
+      end
     end
-    true
-  when :wait_for_port
-    output = File.read(@out_file)
-    if output =~ /^RText service, listening on port (\d+)/
-      port = $1.to_i
-      @logger.info "connecting to #{port}" if @logger
-      begin
-        @socket = TCPSocket.new("127.0.0.1", port)
-        @socket.setsockopt(:SOCKET, :RCVBUF, 1000000)
-      rescue Errno::ECONNREFUSED
+  end
+  if @state == :wait_for_port
+    while true
+      break unless File.exist?(@out_file)
+      output = File.read(@out_file)
+      if output =~ /^RText service, listening on port (\d+)/
+        port = $1.to_i
+        @logger.info "connecting to #{port}" if @logger
+        begin
+          @socket = TCPSocket.new("127.0.0.1", port)
+          @socket.setsockopt(:SOCKET, :RCVBUF, 1000000)
+        rescue Errno::ECONNREFUSED
+          cleanup
+          @connection_listener.call(:timeout) if @connection_listener
+          @state = :off
+          @logger.warn "could not connect socket (connection timeout)" if @logger
+          return false
+        end
+        @state = :read_from_socket
+        @connection_listener.call(:connected) if @connection_listener
+        break
+      end
+      if Time.now > @connect_start_time + @connection_timeout
         cleanup
         @connection_listener.call(:timeout) if @connection_listener
-        @work_state = :done
         @state = :off
         @logger.warn "could not connect socket (connection timeout)" if @logger
+        return false
       end
-      @state = :connected
-      @work_state = :read_from_socket
-      @connection_listener.call(:connected) if @connection_listener
-    end
-    if Time.now > @connect_start_time + @connection_timeout
-      cleanup
-      @connection_listener.call(:timeout) if @connection_listener
-      @work_state = :done
-      @state = :off
-      @logger.warn "could not connect socket (connection timeout)" if @logger
+      sleep(0.1)
     end
-    true
-  when :read_from_socket
+  end
+  if @state == :read_from_socket
     repeat = true
     socket_closed = false
     response_data = ""
@@ -195,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)
@@ -208,13 +281,13 @@ def do_work
         end
       elsif !backend_running? || socket_closed
         cleanup
-        @work_state = :done
+        @state = :off
+        @logger.debug("backend_running?: #{backend_running?}, socket_closed: #{socket_closed}") if @logger
         return false
       end
     end
-    true
   end
-
+  true
 end
 
 def cleanup
@@ -224,7 +297,8 @@ def cleanup
     break unless backend_running?
     sleep(0.1)
   end
-  File.unlink(@out_file) unless @keep_outfile
+  ensure_process_cleanup(@process_id, @keep_outfile ? nil : @out_file, 10)
+  @process_id = nil
 end
 
 end

data/lib/rtext/instantiator.rb

@@ -247,7 +247,15 @@ class Instantiator
         element.setOrAddGeneric(feature.name, proxy)
       else
         begin
-          element.setOrAddGeneric(feature.name, v.value)
+          v_value = v.value
+          feature_instance_class = feature.eType.instanceClass
+          if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Fixnum))
+            element.setOrAddGeneric(feature.name, v_value.to_s)
+          elsif feature_instance_class == Float && v_value.is_a?(Fixnum)
+            element.setOrAddGeneric(feature.name, v_value.to_f)
+          else
+            element.setOrAddGeneric(feature.name, v_value)
+          end
         rescue StandardError
           # backward compatibility for RGen versions not supporting BigDecimal
           if v.value.is_a?(BigDecimal)
@@ -302,9 +310,9 @@ class Instantiator
     elsif feature.eType.is_a?(RGen::ECore::EEnum)
       [:identifier, :string]
     else
-      expected = { String => [:string, :identifier],
+      expected = { String => [:string, :identifier, :integer, :float],
         Integer => [:integer],
-        Float => [:float],
+        Float => [:float, :integer],
         RGen::MetamodelBuilder::DataTypes::Boolean => [:boolean],
         Object => [:string, :identifier, :integer, :float, :boolean]
       }[feature.eType.instanceClass] 

data/lib/rtext/language.rb

@@ -260,7 +260,7 @@ class Language
   end
 
   def concrete_types(clazz)
-    ([clazz] + clazz.eAllSubTypes).select{|c| !c.abstract}
+    ([clazz] + clazz.eAllSubTypes).select{|c| c.concrete}
   end
 
   def containments_by_target_type(clazz, type)
@@ -299,7 +299,7 @@ class Language
     @command_by_class = {}
     @has_command = {}
     root_epackage.eAllClasses.each do |c|
-      next if c.abstract
+      next unless c.concrete
       cmd = command_name_provider.call(c)
       @command_by_class[c.instanceClass] = cmd 
       @has_command[cmd] = true
@@ -307,7 +307,7 @@ class Language
       @class_by_command[clazz] ||= {} 
       containments(c).collect{|r|
           [r.eType] + r.eType.eAllSubTypes}.flatten.uniq.each do |t|
-        next if t.abstract
+        next unless t.concrete
         cmw = command_name_provider.call(t)
         raise "ambiguous command name #{cmw}" if @class_by_command[clazz][cmw]
         @class_by_command[clazz][cmw] = t.instanceClass
@@ -315,7 +315,7 @@ class Language
     end
     @class_by_command[nil] = {} 
     @root_classes.each do |c|
-      next if c.abstract
+      next unless c.concrete
       cmw = command_name_provider.call(c)
       raise "ambiguous command name #{cmw}" if @class_by_command[nil][cmw]
       @class_by_command[nil][cmw] = c.instanceClass
@@ -323,7 +323,7 @@ class Language
   end
 
   def default_root_classes(root_package)
-    root_epackage.eAllClasses.select{|c| !c.abstract &&
+    root_epackage.eAllClasses.select{|c| c.concrete &&
       !c.eAllReferences.any?{|r| r.eOpposite && r.eOpposite.containment}}
   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
@@ -179,7 +179,7 @@ class Serializer
           result << v.to_s  
         end
       elsif feature.eType.instanceClass == Object
-        if v.to_s =~ /^\d+(\.\d+)?$|^\w+$|^true$|^false$/ 
+        if v.to_s =~ /^-?\d+(\.\d+)?$|^\w+$|^true$|^false$/
           result << v.to_s  
         else
           result << "\"#{v.to_s.gsub("\\","\\\\\\\\").gsub("\"","\\\"").gsub("\n","\\n").