javonet-ruby-sdk 2.0.4 → 2.1.1

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/invoke_instance_method_handler.rb

@@ -1,28 +1,25 @@
-require_relative '../../../sdk/core/runtime_lib'
-require_relative '../../../sdk/core/ruby_command_type'
-require_relative '../../../sdk/core/ruby_command'
 require_relative 'abstract_command_handler'
 
-
 class InvokeInstanceMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
-  def process(ruby_command)
-    return invoke_instance_method(ruby_command)
+
+  def process(command)
+    return invoke_instance_method(command)
   end
 
-  def invoke_instance_method(ruby_command)
+  def invoke_instance_method(command)
     begin
-    if ruby_command.payload.length < @required_parameters_count
-      raise "InvokeInstanceMethod parameters mismatch"
-    end
-    if ruby_command.payload.length > 2
-      arguments = ruby_command.payload[2..]
-      return ruby_command.payload[0].send(ruby_command.payload[1], *arguments)
-    else
-      return ruby_command.payload[0].send(ruby_command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "InvokeInstanceMethod parameters mismatch"
+      end
+      if command.payload.length > 2
+        arguments = command.payload[2..]
+        return command.payload[0].send(command.payload[1], *arguments)
+      else
+        return command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/invoke_static_method_handler.rb

@@ -1,27 +1,25 @@
-require_relative '../../../sdk/core/runtime_lib'
-require_relative '../../../sdk/core/ruby_command_type'
-require_relative '../../../sdk/core/ruby_command'
 require_relative 'abstract_command_handler'
 
 class InvokeStaticMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
-  def process(ruby_command)
-    return invoke_static_method(ruby_command)
+
+  def process(command)
+    invoke_static_method(command)
   end
 
-  def invoke_static_method(ruby_command)
+  def invoke_static_method(command)
     begin
-    if ruby_command.payload.length < @required_parameters_count
-      raise "Static method parameters mismatch"
-    end
-    if ruby_command.payload.length > @required_parameters_count
-      args = ruby_command.payload[2..]
-      ruby_command.payload[0].send(ruby_command.payload[1],*args)
-    else
-      ruby_command.payload[0].send(ruby_command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "Static method parameters mismatch"
+      end
+      if command.payload.length > @required_parameters_count
+        args = command.payload[2..]
+        command.payload[0].send(command.payload[1], *args)
+      else
+        command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/load_library_handler.rb

@@ -1,6 +1,3 @@
-require_relative '../../../sdk/core/ruby_command'
-require_relative '../../../sdk/core/runtime_lib'
-require_relative '../../../sdk/core/ruby_command_type'
 require_relative 'abstract_command_handler'
 
 class LoadLibraryHandler < AbstractCommandHandler
@@ -8,22 +5,21 @@ class LoadLibraryHandler < AbstractCommandHandler
     @required_parameters_count = 1
   end
 
-  def process(ruby_command)
+  def process(command)
     begin
-      if ruby_command.payload.length < @required_parameters_count
+      if command.payload.length < @required_parameters_count
         raise Exception.new "Load library method parameters mismatch"
       end
-      if ruby_command.payload.length > @required_parameters_count
-        assembly_name = ruby_command.payload[1]
+      if command.payload.length > @required_parameters_count
+        assembly_name = command.payload[1]
       else
-        assembly_name = ruby_command.payload[0]
+        assembly_name = command.payload[0]
       end
       #noinspection RubyResolve
       require(assembly_name)
-      return "Load library success"
-
+      return 0
     rescue Exception => e
-      return "Exception during loading library..." + e.to_s
+      return e
     end
   end
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/resolve_instance_handler.rb

@@ -1,6 +1,3 @@
-require_relative '../../../sdk/core/runtime_lib'
-require_relative '../../../sdk/core/ruby_command_type'
-require_relative '../../../sdk/core/ruby_command'
 require_relative '../references_cache'
 require_relative 'abstract_command_handler'
 
@@ -8,17 +5,18 @@ class ResolveInstanceHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
-  def process(ruby_command)
-    return resolve_reference(ruby_command)
+
+  def process(command)
+    return resolve_reference(command)
   end
 
-  def resolve_reference(ruby_command)
-    if ruby_command.payload.length != @required_parameters_count
+  def resolve_reference(command)
+    if command.payload.length != @required_parameters_count
       raise "Resolve Instance parameters mismatch"
     end
     begin
       references_cache = ReferencesCache.instance
-      return references_cache.resolve_reference(ruby_command.payload[0])
+      return references_cache.resolve_reference(command.payload[0])
     rescue Exception => ex
       return ex
     end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/set_static_field_handler.rb

@@ -1,25 +1,22 @@
-require_relative '../../../sdk/core/runtime_lib'
-require_relative '../../../sdk/core/ruby_command_type'
-require_relative '../../../sdk/core/ruby_command'
 require_relative 'abstract_command_handler'
 
-class  SetStaticFieldHandler < AbstractCommandHandler
+class SetStaticFieldHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 3
   end
 
-  def process(ruby_command)
-    RubyCommand.new(RuntimeLib::RUBY, RubyCommandType::RESPONSE, [set_static_field(ruby_command)])
+  def process(command)
+    Command.new(RuntimeName::RUBY, CommandType::VALUE, [set_static_field(command)])
   end
 
-  def set_static_field(ruby_command)
+  def set_static_field(command)
     begin
-    if ruby_command.payload.length != @required_parameters_count
-      raise "Set static field parameters mismatch"
-    end
+      if command.payload.length != @required_parameters_count
+        raise "Set static field parameters mismatch"
+      end
 
-    merged_value = '@@' + ruby_command.payload[1]
-    ruby_command.payload[0].class_variable_set(merged_value, ruby_command.payload[2])
+      merged_value = '@@' + command.payload[1]
+      command.payload[0].class_variable_set(merged_value, command.payload[2])
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/value_handler.rb

@@ -0,0 +1,7 @@
+require_relative 'abstract_command_handler'
+
+class ValueHandler < AbstractCommandHandler
+  def process(command)
+    command.payload[0]
+  end
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/handler.rb

@@ -0,0 +1,89 @@
+require_relative '../../utils/runtime_name'
+require_relative '../../utils/command_type'
+require_relative '../../core/handler/abstract_handler'
+require_relative '../../core/handler/command_handler/value_handler'
+require_relative '../../core/handler/command_handler/load_library_handler'
+require_relative '../../core/handler/command_handler/invoke_static_method_handler'
+require_relative '../../core/handler/command_handler/get_static_field_handler'
+require_relative '../../core/handler/command_handler/get_instance_field_handler'
+require_relative '../../core/handler/command_handler/create_class_instance_handler'
+require_relative '../../core/handler/command_handler/set_static_field_handler'
+require_relative '../../core/handler/command_handler/get_type_handler'
+require_relative '../../core/handler/command_handler/invoke_instance_method_handler'
+require_relative '../../core/handler/command_handler/resolve_instance_handler'
+require_relative '../../core/handler/command_handler/casting_handler'
+require_relative '../../core/handler/command_handler/destruct_reference_handler'
+require_relative '../../core/handler/command_handler/array_get_item_handler'
+require_relative '../../core/handler/command_handler/array_get_size_handler'
+require_relative '../../core/handler/command_handler/array_get_rank_handler'
+require_relative '../../core/handler/command_handler/array_set_item_handler'
+require_relative '../../core/handler/references_cache'
+require_relative '../../core/handler/handler_dictionary'
+require_relative '../../core/exceptions/exception_serializer'
+
+
+class Handler < AbstractHandler
+
+  def initialize
+    super
+    value_handler = ValueHandler.new
+    load_library_handler = LoadLibraryHandler.new
+    invoke_static_method_handler = InvokeStaticMethodHandler.new
+    get_static_field_handler = GetStaticFieldHandler.new
+    get_class_instance_handler = CreateClassInstanceHandler.new
+    set_static_field_handler = SetStaticFieldHandler.new
+    get_type_handler = GetTypeHandler.new
+    invoke_instance_method_handler = InvokeInstanceMethodHandler.new
+    resolve_instance_handler = ResolveInstanceHandler.new
+    casting_handler = CastingHandler.new
+    get_instance_field_handler = GetInstanceFieldHandler.new
+    destruct_reference_handler = DestructReferenceHandler.new
+    array_get_item_handler = ArrayGetItemHandler.new
+    array_get_size_handler = ArrayGetSizeHandler.new
+    array_get_rank_handler = ArrayGetRankHandler.new
+    array_set_item_handler = ArraySetItemHandler.new
+
+
+    $handler_dict[CommandType::VALUE] = value_handler
+    $handler_dict[CommandType::LOAD_LIBRARY] = load_library_handler
+    $handler_dict[CommandType::INVOKE_STATIC_METHOD] = invoke_static_method_handler
+    $handler_dict[CommandType::GET_STATIC_FIELD] = get_static_field_handler
+    $handler_dict[CommandType::CREATE_CLASS_INSTANCE] = get_class_instance_handler
+    $handler_dict[CommandType::SET_STATIC_FIELD] = set_static_field_handler
+    $handler_dict[CommandType::GET_TYPE] = get_type_handler
+    $handler_dict[CommandType::INVOKE_INSTANCE_METHOD] = invoke_instance_method_handler
+    $handler_dict[CommandType::REFERENCE] = resolve_instance_handler
+    $handler_dict[CommandType::CAST] = casting_handler
+    $handler_dict[CommandType::GET_INSTANCE_FIELD] = get_instance_field_handler
+    $handler_dict[CommandType::DESTRUCT_REFERENCE] = destruct_reference_handler
+    $handler_dict[CommandType::ARRAY_GET_ITEM] = array_get_item_handler
+    $handler_dict[CommandType::ARRAY_GET_SIZE] = array_get_size_handler
+    $handler_dict[CommandType::ARRAY_GET_RANK] = array_get_rank_handler
+    $handler_dict[CommandType::ARRAY_SET_ITEM] = array_set_item_handler
+
+  end
+
+
+  def handle_command(command)
+    response = $handler_dict[command.command_type].handle_command(command)
+      if is_response_simple_type(response)
+        return command.create_response(response)
+      elsif response.is_a? Exception
+        return ExceptionSerializer.serialize_exception(response, command)
+      else
+        reference_cache = ReferencesCache.instance
+        guid = reference_cache.cache_reference(response)
+        return command.create_reference(guid)
+      end
+  end
+
+  def is_response_simple_type(response)
+    return (response.is_a? String or response.is_a? Float or response.is_a? Integer or response.is_a? TrueClass or response.is_a? FalseClass)
+  end
+
+  def is_response_array(response)
+    return response.is_a? Array
+  end
+
+
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/interpreter/interpreter.rb

@@ -0,0 +1,30 @@
+require_relative '../protocol/command_serializer'
+require_relative '../protocol/command_deserializer'
+require_relative '../handler/handler'
+
+class Interpreter
+  def execute(command, connection_type, tcp_address)
+
+    command_serializer = CommandSerializer.new
+    message_byte_array = command_serializer.encode(command, connection_type, tcp_address)
+    if command.runtime_name == RuntimeName::RUBY
+      require_relative '../receiver/receiver'
+      response_byte_array = Receiver.new.send_command(message_byte_array, message_byte_array.length)
+    else
+      require_relative '../transmitter/transmitter'
+      response_byte_array = Transmitter.send_command(message_byte_array, message_byte_array.length)
+    end
+
+    command_deserializer = CommandDeserializer.new(response_byte_array,response_byte_array.length)
+    encoded_response = command_deserializer.decode
+    return encoded_response
+  end
+
+  def process(byte_array, byte_array_len)
+    command_deserializer = CommandDeserializer.new(byte_array,byte_array_len)
+    received_command = command_deserializer.decode
+    handler = Handler.new
+    command_serializer = CommandSerializer.new
+    return command_serializer.encode(handler.handle_command(received_command), 0, "0.0.0.0:0")
+  end
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/protocol/command_deserializer.rb

@@ -1,7 +1,7 @@
 require_relative 'type_deserializer'
-require_relative '../../sdk/core/type'
-require_relative '../../sdk/core/ruby_command'
-require_relative '../../sdk/core/string_encoding_mode'
+require_relative '../../utils/type'
+require_relative '../../utils/command'
+require_relative '../../utils/string_encoding_mode'
 
 class CommandDeserializer
 
@@ -9,7 +9,7 @@ class CommandDeserializer
     def initialize(buffer,byte_array_len)
         @buffer = buffer
         @byte_array_len = byte_array_len
-        @command = RubyCommand.new(buffer[0], buffer[10], [])
+        @command = Command.new(buffer[0], buffer[10], [])
         @position = 11
     end
 
@@ -58,7 +58,7 @@ class CommandDeserializer
         command_type = @buffer[p + 6]
 
         @position += 7
-        return_command = RubyCommand.new(runtime, command_type, [])
+        return_command = Command.new(runtime, command_type, [])
         return read_command_recursively(number_of_elements_in_payload, return_command)
     end
 
@@ -67,7 +67,6 @@ class CommandDeserializer
             return cmd
         else
             p = @position
-            arg_size = TypeDeserializer.deserialize_int(@buffer[p+1..p+4])
             new_command = cmd.add_arg_to_payload(self.read_object(@buffer[p]))
             return read_command_recursively(number_of_elements_in_payload_left - 1, new_command)
         end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/protocol/command_serializer.rb

@@ -1,6 +1,6 @@
 require_relative 'type_serializer'
-require_relative '../../sdk/internal/connection_type'
-require_relative '../../sdk/core/runtime_lib'
+require_relative '../../utils/connection_type'
+require_relative '../../utils/runtime_name'
 
 class CommandSerializer
 
@@ -9,10 +9,10 @@ class CommandSerializer
   end
 
 
-  def encode(root_command, connection_type, tcp_address = nil, runtimeVersion = 0)
+  def encode(root_command, connection_type = ConnectionType::IN_MEMORY, tcp_address = nil, runtimeVersion = 0)
     queue = []
     queue.unshift(root_command)
-    self.insert_into_buffer([root_command.runtime_lib, runtimeVersion])
+    self.insert_into_buffer([root_command.runtime_name, runtimeVersion])
     if connection_type == ConnectionType::TCP
       self.insert_into_buffer([ConnectionType::TCP])
       self.insert_into_buffer(self.serialize_tcp(tcp_address))
@@ -21,7 +21,7 @@ class CommandSerializer
       self.insert_into_buffer([ConnectionType::IN_MEMORY])
       self.insert_into_buffer([0, 0, 0, 0, 0, 0])
     end
-    self.insert_into_buffer([RuntimeLib::RUBY, root_command.command_type])
+    self.insert_into_buffer([RuntimeName::RUBY, root_command.command_type])
     return self.serialize_recursively(queue)
   end
 
@@ -58,7 +58,7 @@ class CommandSerializer
       serialized_bool = TypeSerializer.serialize_bool(payload_item)
       return serialized_bool
     else
-      return None
+      return nil
     end
   end
 
@@ -75,7 +75,7 @@ class CommandSerializer
     command = queue.shift
     queue.unshift(command.drop_first_payload_argument)
     if command.payload.length > 0
-      if command.payload[0].is_a? RubyCommand
+      if command.payload[0].is_a? Command
         inner_command = command.payload[0]
         self.insert_into_buffer(TypeSerializer.serialize_command(inner_command))
         queue.unshift(inner_command)

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/protocol/type_deserializer.rb

@@ -1,4 +1,4 @@
-require_relative '../../sdk/core/string_encoding_mode'
+require_relative '../../utils/string_encoding_mode'
 
 class TypeDeserializer
 
@@ -67,7 +67,7 @@ class TypeDeserializer
   # end
 
   def self.deserialize_command(command_byte_array)
-    python_command = RubyCommand.new(RuntimeLib(command_byte_array[0]), RubyCommandType(command_byte_array[1]), [])
+    python_command = Command.new(RuntimeName(command_byte_array[0]), CommandType(command_byte_array[1]), [])
     return python_command
   end
 

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/protocol/type_serializer.rb

@@ -1,5 +1,5 @@
-require_relative '../../sdk/core/type'
-require_relative '../../sdk/core/string_encoding_mode'
+require_relative '../../utils/type'
+require_relative '../../utils/string_encoding_mode'
 
 class TypeSerializer
 
@@ -62,7 +62,7 @@ class TypeSerializer
 
   def self.serialize_command(command)
       length = [command.payload.length()].pack("i").bytes
-      return [Type::COMMAND] + length + [command.runtime_lib, command.command_type]
+      return [Type::COMMAND] + length + [command.runtime_name, command.command_type]
   end
 
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/receiver/receiver.rb

@@ -1,16 +1,16 @@
-require_relative '../interpreter/ruby_interpreter'
+require_relative '../interpreter/interpreter'
 
 class Receiver
   
   def initialize
-    @@ruby_interpreter = RubyInterpreter.new
+    @@interpreter = Interpreter.new
   end
 
   def send_command(message_array, message_array_len)
-    return @@ruby_interpreter.process(message_array, message_array_len)
+    @@interpreter.process(message_array, message_array_len)
   end
   
   def heart_beat(message_array, message_array_len)
-    response_array = [49,48]
+    [49,48]
   end
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/transmitter/transmitter.rb

@@ -0,0 +1,51 @@
+require 'ffi'
+require 'os'
+require_relative 'transmitter_wrapper'
+
+class Transmitter
+
+  def self.get_native_error
+    TransmitterWrapper.GetNativeError
+  end
+
+  def self.send_command(message_byte_array, message_byte_array_len)
+    message = FFI::MemoryPointer.new(:uchar, message_byte_array_len, true)
+    message.put_array_of_uchar(0, message_byte_array)
+    response_byte_array_len = TransmitterWrapper.SendCommand(message, message_byte_array_len)
+    if response_byte_array_len > 0
+      response = FFI::MemoryPointer.new(:uchar, response_byte_array_len, true)
+      TransmitterWrapper.ReadResponse(response, response_byte_array_len)
+      response_byte_array = response.get_array_of_uchar(0, response_byte_array_len)
+      return response_byte_array
+    elsif response_byte_array_len == 0
+      error_message = "Response is empty"
+      raise Exception.new error_message
+    else
+      error_message = get_native_error
+      raise Exception.new "Javonet native error code: " + response_byte_array_len.to_s + ". " + error_message
+    end
+  end
+
+  def self.activate_with_licence_file()
+    return activate()
+  end
+
+  def self.activate_with_credentials(email, licenceKey)
+    return activate(email, licenceKey)
+  end
+
+  def self.activate_with_credentials_and_proxy(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
+    return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
+  end
+
+  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    if activation_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message
+    else
+      return activation_result
+    end
+  end
+
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/transmitter/transmitter_wrapper.rb

@@ -0,0 +1,16 @@
+module TransmitterWrapper
+  extend FFI::Library
+  if OS.linux?
+    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+  elsif OS.mac?
+    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+  else
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
+    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+  end
+  attach_function :SendCommand, [:pointer, :int], :int
+  attach_function :ReadResponse, [:pointer, :int], :int
+  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  attach_function :GetNativeError, [], :string
+
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/{sdk/core/ruby_command.rb → utils/command.rb}

@@ -1,15 +1,15 @@
-require_relative 'runtime_lib'
-require_relative 'ruby_command_type'
+require_relative 'runtime_name'
+require_relative 'command_type'
 
-class RubyCommand
-  def initialize(runtime_lib, command_type, payload)
-    @runtime_lib = runtime_lib
+class Command
+  def initialize(runtime_name, command_type, payload)
+    @runtime_name = runtime_name
     @command_type = command_type
     @payload = payload
   end
 
-  def runtime_lib
-    @runtime_lib
+  def runtime_name
+    @runtime_name
   end
 
   def command_type
@@ -21,7 +21,7 @@ class RubyCommand
   end
 
   def to_string
-    'Runtime Library: ' + RuntimeLib.get_name(@runtime_lib).to_s + ' ' + 'Ruby command type: ' + RubyCommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
+    'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
   end
 
   def eql?(other)
@@ -32,7 +32,7 @@ class RubyCommand
     if other == nil or self.class != other.class
       @is_equal = false
     end
-    if self.command_type == other.command_type and self.runtime_lib == other.runtime_lib
+    if self.command_type == other.command_type and self.runtime_name == other.runtime_name
       @is_equal = true
     end
     if payload.length == other.payload.length
@@ -54,15 +54,15 @@ class RubyCommand
   end
 
   def create_response(response)
-    return RubyCommand.new(@runtime_lib, RubyCommandType::RESPONSE, [response])
+    return Command.new(@runtime_name, CommandType::VALUE, [response])
   end
 
   def create_reference(guid)
-    return RubyCommand.new(@runtime_lib, RubyCommandType::REFERENCE, [guid])
+    return Command.new(@runtime_name, CommandType::REFERENCE, [guid])
   end
 
   def create_array_response(array)
-    return RubyCommand.new(@runtime_lib, RubyCommandType::ARRAY, [array])
+    return Command.new(@runtime_name, CommandType::ARRAY, [array])
   end
 
   def drop_first_payload_argument
@@ -71,17 +71,21 @@ class RubyCommand
     if payload_args.length != 0
       payload_args.delete_at(0)
     end
-    return RubyCommand.new(@runtime_lib, @command_type, payload_args)
+    return Command.new(@runtime_name, @command_type, payload_args)
   end
 
   def add_arg_to_payload(argument)
     merged_payload = payload + [argument]
-    return RubyCommand.new(@runtime_lib, @command_type, merged_payload)
+    return Command.new(@runtime_name, @command_type, merged_payload)
   end
 
-  def add_arg_to_payload_on_beginning(argument)
-    merged_payload = [argument] + payload
-    return RubyCommand.new(@runtime_lib, @command_type, merged_payload)
+  def add_arg_to_payload_on_beginning(current_command)
+    if current_command.nil?
+      return Command.new(@runtime_name, @command_type, @payload)
+    else
+      merged_payload = [current_command] + payload
+      return Command.new(@runtime_name, @command_type, merged_payload)
+    end
   end
 
 end