r2corba 1.5.4 → 1.6.1

data/test/Performance/Simple/server.rb

@@ -21,22 +21,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
+    opts.on('--o IORFILE',
+            'Set IOR filename.',
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -60,9 +60,9 @@ class MyHello < POA::Test::Hello
   def shutdown()
     @orb.shutdown()
   end
-end #of servant MyHello
+end # of servant MyHello
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -83,7 +83,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 

data/test/Policies/run_test.rb

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end

data/test/Policies/test.rb

@@ -22,19 +22,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -53,24 +53,24 @@ class MyHello < POA::Test::Hello
   end
 
   def get_string()
-    "Hello there!"
+    'Hello there!'
   end
 
   def shutdown()
     @orb.shutdown()
   end
-end #of servant MyHello
+end # of servant MyHello
 
 if defined?(JRUBY_VERSION)
   ## JacORB needs explicit activation of this option
   props = {
-    "org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" =>
-               "org.jacorb.orb.giop.BiDirConnectionInitializer"
+    'org.omg.PortableInterceptor.ORBInitializerClass.bidir_init' =>
+               'org.jacorb.orb.giop.BiDirConnectionInitializer'
   }
 else
   props = {}
 end
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB', props)
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB', props)
 
 begin
 
@@ -81,31 +81,31 @@ begin
   assert_not 'Failed to resolve RootPOA', CORBA.is_nil(rootpoa) || !rootpoa.is_a?(PortableServer::POA)
 
   pol = rootpoa.create_thread_policy(PortableServer::SINGLE_THREAD_MODEL)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::ThreadPolicy) and pol.value == PortableServer::SINGLE_THREAD_MODEL
 
   pol = rootpoa.create_lifespan_policy(PortableServer::PERSISTENT)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::LifespanPolicy) and pol.value == PortableServer::PERSISTENT
 
   pol = rootpoa.create_id_uniqueness_policy(PortableServer::UNIQUE_ID)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::IdUniquenessPolicy) and pol.value == PortableServer::UNIQUE_ID
 
   pol = rootpoa.create_id_assignment_policy(PortableServer::USER_ID)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::IdAssignmentPolicy) and pol.value == PortableServer::USER_ID
 
   pol = rootpoa.create_implicit_activation_policy(PortableServer::NO_IMPLICIT_ACTIVATION)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::ImplicitActivationPolicy) and pol.value == PortableServer::NO_IMPLICIT_ACTIVATION
 
   pol = rootpoa.create_servant_retention_policy(PortableServer::RETAIN)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::ServantRetentionPolicy) and pol.value == PortableServer::RETAIN
 
   pol = rootpoa.create_request_processing_policy(PortableServer::USE_DEFAULT_SERVANT)
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(PortableServer::RequestProcessingPolicy) and pol.value == PortableServer::USE_DEFAULT_SERVANT
 
   assert_except('orb.create_policy should have thrown a PolicyError',
@@ -113,7 +113,7 @@ begin
 
   pol = orb.create_policy(BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
                           CORBA::Any.to_any(BiDirPolicy::BOTH, BiDirPolicy::BidirectionalPolicyValue._tc))
-  assert 'Failed to create correct policy'  ,
+  assert 'Failed to create correct policy',
          !pol.nil? and pol.is_a?(BiDirPolicy) and pol.value == BiDirPolicy::BOTH
 
   poa_man = rootpoa.the_POAManager
@@ -140,4 +140,3 @@ begin
 ensure
   orb.destroy()
 end
-

data/test/Timeout/client.rb

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel]=v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
+    opts.on('--k IORFILE',
+            'Set IOR.',
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0', Integer) { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -55,7 +55,7 @@ Min_timeout = 0
 Max_timeout = 20
 
 None, Orb1, Thread1, Object1 = (0..3).to_a
-To_type_names = [ "none", "orb", "thread", "object" ]
+To_type_names = ['none', 'orb', 'thread', 'object']
 
 Timeout_count = [0, 0, 0, 0]
 In_time_count = [0, 0, 0, 0]
@@ -69,7 +69,7 @@ def send_echo (ctype, orb, server, t)
       Timeout_count[ctype] += 1
 
       # Trap this exception and continue...
-      puts "==> Trapped a TIMEOUT exception (expected)"
+      puts '==> Trapped a TIMEOUT exception (expected)'
 
       # Sleep so the server can send the reply...
       tv = Max_timeout / 1000.0  # max_timeout is in msec, so get seconds
@@ -82,12 +82,12 @@ def send_echo (ctype, orb, server, t)
       # This is a non-standard TAO call that's used to give the
       # client ORB a chance to cleanup the reply that's come back
       # from the server.
-#orb.run(tv)
+# orb.run(tv)
   end
 end
 
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -113,8 +113,8 @@ begin
   mid_value = 10000 * (Min_timeout + Max_timeout) / 2   # convert from msec to "TimeT" (0.1 usec units)
 
   any_orb = CORBA::Any.to_any(mid_value, TimeBase::TimeT._tc)
-  any_thread = CORBA::Any.to_any(mid_value+10000, TimeBase::TimeT._tc) # midvalue + 1 msec
-  any_object = CORBA::Any.to_any(mid_value+20000, TimeBase::TimeT._tc) # midvalue + 2 msec
+  any_thread = CORBA::Any.to_any(mid_value + 10000, TimeBase::TimeT._tc) # midvalue + 1 msec
+  any_object = CORBA::Any.to_any(mid_value + 20000, TimeBase::TimeT._tc) # midvalue + 2 msec
 
   policies = []
   policies << orb.create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_object)
@@ -129,7 +129,7 @@ begin
   puts "client (#{Process.pid}) testing from #{Min_timeout} to #{Max_timeout} milliseconds"
 
   for t in Min_timeout...Max_timeout
-    puts ""
+    puts ''
     puts "client (#{Process.pid}) ================================"
     puts "client (#{Process.pid}) Trying with timeout = #{t} msec"
 
@@ -187,7 +187,7 @@ begin
   for i in 0..3
     timeout_count_total += Timeout_count[i]
     in_time_count_total += In_time_count[i]
-    puts "client (#{Process.pid}) in_time_count[#{To_type_names[i]}]= #{In_time_count[i]} "+
+    puts "client (#{Process.pid}) in_time_count[#{To_type_names[i]}]= #{In_time_count[i]} " +
                                 "timeout_count[#{To_type_names[i]}]= #{Timeout_count[i]}"
   end
 

data/test/Timeout/run_test.rb

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -59,7 +59,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/Timeout/server.rb

@@ -22,25 +22,25 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
-
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
-    opts.on("--i ITERATIONS",
-            "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num]=v }
-
-    opts.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.separator ''
+
+    opts.on('--o IORFILE',
+            'Set IOR filename.',
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
+    opts.on('--i ITERATIONS',
+            'Set number of iterations.',
+            'Default: 10', Integer) { |v| OPTIONS[:iter_num] = v }
+
+    opts.separator ''
+
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -74,9 +74,9 @@ class Simple_Server_i < POA::Simple_Server
     puts "server (#{Process.pid}) received shutdown request from client"
     @orb.shutdown()
   end
-end #of servant Simple_Server_i
+end # of servant Simple_Server_i
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -97,7 +97,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 

data/test/lib/assert.rb

@@ -39,4 +39,3 @@ module TestUtil
   end
 
 end
-

data/test/lib/test.rb

@@ -21,7 +21,7 @@ module TestUtil
   end
 
   def self.is_win32?
-    (RB_CONFIG['target_os'] =~ /win32/ || RB_CONFIG['target_os'] =~ /mingw32/) ? true : false
+    (RB_CONFIG['target_os'] =~ /win32/ || RB_CONFIG['target_os'] =~ /mingw/) ? true : false
   end
 
   RBVersion = RUBY_VERSION.split('.').collect {|x| x.to_i}
@@ -65,7 +65,7 @@ if defined?(JRUBY_VERSION)
         #                    const char *const *argv,
         #                    const char *const *envp);
 
-        attach_function :_spawnvpe,:_spawnvpe, [:int, :string, :pointer, :pointer], :pointer
+        attach_function :_spawnvpe, :_spawnvpe, [:int, :string, :pointer, :pointer], :pointer
 
         P_NOWAIT = 1
 
@@ -105,7 +105,7 @@ if defined?(JRUBY_VERSION)
         def self.wait(pid)
           stat_ptr = FFI::MemoryPointer.new(:int, 1)
           tmp_pid = _wait(stat_ptr, pid, 0)
-          if tmp_pid==pid
+          if tmp_pid == pid
             return [pid, stat_ptr.get_int()]
           else
             return [pid, 0]
@@ -120,7 +120,7 @@ if defined?(JRUBY_VERSION)
           args_ary.put_array_of_pointer(0, str_ptrs)
 
           env_ary = FFI::MemoryPointer.new(:pointer, ENV.length + 1)
-          env_ptrs = ENV.map {|key,value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
+          env_ptrs = ENV.map {|key, value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
           env_ary.put_array_of_pointer(0, env_ptrs)
 
           [P_NOWAIT, args[0], args_ary, env_ary]
@@ -159,8 +159,8 @@ if defined?(JRUBY_VERSION)
         def self.wait(pid)
           begin
             tmp, status = ::Process.waitpid2(pid, ::Process::WNOHANG)
-            if tmp==pid and status.success? != nil
-              return [pid, status.success?() ? 0 : status.exitstatus ]
+            if tmp == pid and status.success? != nil
+              return [pid, status.success?() ? 0 : status.exitstatus]
             end
             return [nil, 0]
           rescue Errno::ECHILD
@@ -178,13 +178,14 @@ if defined?(JRUBY_VERSION)
           args_ary.put_array_of_pointer(0, str_ptrs)
 
           env_ary = FFI::MemoryPointer.new(:pointer, ENV.length + 1)
-          env_ptrs = ENV.map {|key,value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
+          env_ptrs = ENV.map {|key, value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
           env_ary.put_array_of_pointer(0, env_ptrs)
 
           [pid_ptr, args[0], nil, nil, args_ary, env_ary]
         end
       end
     end
+
     def initialize(cmd_, arg_)
       @pid = nil
       @exitstatus = nil
@@ -197,7 +198,7 @@ if defined?(JRUBY_VERSION)
             sleep 0.01
 
             tmp_pid, tmp_status = Exec.wait(@pid)
-            if tmp_pid==@pid
+            if tmp_pid == @pid
               exit_status = tmp_status
               is_running = false
             end
@@ -237,7 +238,8 @@ if defined?(JRUBY_VERSION)
     end
 
     def is_running?; @exitstatus.nil?; end
-    def has_error? ; @trd.status.nil? or (!self.is_running? and self.exitstatus!=0) ;end
+
+    def has_error? ; @trd.status.nil? or (!self.is_running? and self.exitstatus != 0) ;end
 
     def stop
       Exec.stop(@pid)
@@ -264,7 +266,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
 
     protected
       # Used by Process.create
-      ProcessInfo = Struct.new("ProcessInfo",
+      ProcessInfo = Struct.new('ProcessInfo',
           :process_handle,
           :thread_handle,
           :process_id,
@@ -287,9 +289,9 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
       extend WinAPI
 
       def Process.create(cmd_)
-        startinfo = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+        startinfo = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         startinfo = startinfo.pack('LLLLLLLLLLLLSSLLLL')
-        procinfo  = [0,0,0,0].pack('LLLL')
+        procinfo  = [0, 0, 0, 0].pack('LLLL')
 
         bool = CreateProcess(
            0,                 # App name
@@ -305,14 +307,14 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
         )
 
         unless bool
-           raise ProcessError, "CreateProcess() failed: ", get_last_error
+           raise ProcessError, 'CreateProcess() failed: ', get_last_error
         end
 
         ProcessInfo.new(
-           procinfo[0,4].unpack('L').first, # hProcess
-           procinfo[4,4].unpack('L').first, # hThread
-           procinfo[8,4].unpack('L').first, # hProcessId
-           procinfo[12,4].unpack('L').first # hThreadId
+           procinfo[0, 4].unpack('L').first, # hProcess
+           procinfo[4, 4].unpack('L').first, # hThread
+           procinfo[8, 4].unpack('L').first, # hProcessId
+           procinfo[12, 4].unpack('L').first # hThreadId
         )
       end
 
@@ -324,7 +326,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
         else
           CloseHandle(pi_.process_handle) unless pi_.process_handle == INVALID_HANDLE_VALUE
           pi_.process_handle = INVALID_HANDLE_VALUE
-          raise ProcessError, "GetExitCodeProcess failed: ", get_last_error
+          raise ProcessError, 'GetExitCodeProcess failed: ', get_last_error
         end
       end
 
@@ -395,6 +397,7 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
       def exitstatus; @exitstatus; end
 
       def is_running?; @exitstatus.nil?; end
+
       def has_error?; !@exitstatus.nil? and (@exitstatus != 0); end
 
       def stop
@@ -441,7 +444,7 @@ else # !win32
     def check_status
       begin
         tmp, @status = ::Process.waitpid2(@pid, ::Process::WNOHANG)
-        if tmp==@pid and @status.success? == false
+        if tmp == @pid and @status.success? == false
           @exitstatus = @status.exitstatus
           return false
         end
@@ -457,6 +460,7 @@ else # !win32
     end
 
     def is_running?; @exitstatus.nil?; end
+
     def has_error?; !@status.nil? and (@status.success? == false); end
 
     def stop
@@ -472,7 +476,7 @@ end
   class Test
     def initialize
       @proc = nil
-      @cmd = ""
+      @cmd = ''
     end
 
     def run(cmd_, arg_)
@@ -487,10 +491,12 @@ end
     end
 
     def pid; @proc.pid; end
+
     def is_running?; @proc.is_running?; end
+
     def exit_status; @proc.exitstatus; end
 
-    def wait(timeout, check_exit=true)
+    def wait(timeout, check_exit = true)
       t = Time.now
       begin
         if @proc.check_status
@@ -523,7 +529,7 @@ end
 
   def TestUtil.wait_for_file(filename, timeout)
     t = Time.now
-    while !File.readable?(filename) do
+    while !File.readable?(filename)
       sleep(0.1)
       if (Time.now() - t) >= timeout.to_f
         STDERR.puts "ERROR: could not find file '#{filename}'"
@@ -538,4 +544,3 @@ end
   end
 
 end
-