r2corba 1.5.4 → 1.6.1

data/rakelib/ext_r2tao.rb

@@ -16,10 +16,10 @@ module R2CORBA
 
   module Ext
 
-    if RUBY_PLATFORM =~ /mingw32/
+    if RUBY_PLATFORM =~ /mingw/
 
       mpc_os_block = <<OS_DEP__
-  libs += #{File.basename(RB_CONFIG['LIBRUBY'],'.a').sub(/^lib/,'')}
+  libs += #{File.basename(RB_CONFIG['LIBRUBY'], '.a').sub(/^lib/, '')}
   libout = .
   dllout = .
   verbatim(gnuace, macros, 1) {
@@ -73,7 +73,7 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
   }
   dynamicflags = R2TAO_BUILD_DLL
   includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-              #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
+              #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
               .
   macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
   sharedname = r2tao
@@ -91,16 +91,16 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
     iortable.cpp
   }
   dynamicflags = R2TAO_POA_BUILD_DLL
-  libpaths += #{File.join('..','libr2tao')}
+  libpaths += #{File.join('..', 'libr2tao')}
   includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-               #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
+               #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
                #{File.join('..', 'libr2tao')} \\
                .
   macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
   sharedname = rpoa
   libpaths += "#{RB_CONFIG['libdir']}"
   #{mpc_os_block}
-  libs += r2tao#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
+  libs += r2tao#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
 }
 THE_END
 
@@ -113,7 +113,7 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
   dynamicflags = R2TAO_POL_BUILD_DLL
   libpaths += #{File.join('..', 'libr2tao')} #{File.join('..', 'librpoa')}
   includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-               #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
+               #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
                #{File.join('..', 'libr2tao')} \\
                #{File.join('..', 'librpoa')} \\
                .
@@ -121,8 +121,8 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
   sharedname = rpol
   libpaths += "#{RB_CONFIG['libdir']}"
   #{mpc_os_block}
-  libs += r2tao#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
-  libs += rpoa#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
+  libs += r2tao#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
+  libs += rpoa#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
 }
 THE_END
 
@@ -139,45 +139,6 @@ THE_END
       File.join('ext', 'librpol', 'rpol.mpc')
     end
 
-    if Config.is_win32
-
-      EXTLOAD_MPC = <<THE_END__
-project {
-  Source_Files {
-    extload.c
-  }
-  dynamicflags = EXTLOAD_BUILD_DLL
-  includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-              #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
-              .
-  macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
-  sharedname = extload
-  libpaths += "#{RB_CONFIG['libdir']}"
-  libs += #{File.basename(RB_CONFIG['LIBRUBY'],'.a').sub(/^lib/,'')}
-  libout = .
-  dllout = .
-  verbatim(gnuace, macros, 1) {
-    override SOEXT := #{RB_CONFIG['DLEXT']}
-  }
-  postbuild  = <%cp%> lib<%sharedname%>.so ..<%slash%>libr2taow.so
-  postbuild += <%cp%> lib<%sharedname%>.so ..<%slash%>librpoaw.so
-  postbuild += <%cp%> lib<%sharedname%>.so ..<%slash%>librpolw.so
-  postclean  = <%rm%> ..<%slash%>libr2taow.so
-  postclean += <%rm%> ..<%slash%>librpoaw.so
-  postclean += <%rm%> ..<%slash%>librpolw.so
-}
-THE_END__
-
-      def self.extload_mpc_file
-        File.join('ext', 'extload', 'extload.mpc')
-      end
-
-      def self.extload_makefile
-        File.join('ext', 'extload', 'GNUmakefile')
-      end
-
-    end
-
     def self.get_latest_ace_version
       print 'Latest ACE release is '
       _version = nil
@@ -207,14 +168,14 @@ THE_END__
     end
 
     def self.download_tao_source(version, targetdir)
-      version_dir = version.gsub('.','_')
+      version_dir = version.gsub('.', '_')
       _url = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-#{version_dir}/ACE+TAO-src-#{version}.tar.gz"
       print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz from #{_url}")
       _fnm = File.join(targetdir, "ACE+TAO-src-#{version}.tar.gz")
       # First follow all http redirects
       url = URI(follow_url(_url))
       Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
-       _fout = File.open(_fnm, "wb")
+       _fout = File.open(_fnm, 'wb')
         begin
           http.request_get(url) do |resp|
             _sndlen =  resp.content_length
@@ -239,11 +200,7 @@ THE_END__
     end
 
     def self.ext_shlibs
-      (if Config.is_win32
-        %w{libr2taow libepoaw librpolw}
-      else
-        %w{libr2tao libepoa librpol}
-      end).collect {|lib| File.join('ext', lib+'.so') }
+      %w{libr2tao librpoa librpol}.collect {|lib| File.join('ext', lib + '.so') }
     end
 
   end

data/rakelib/gem.rake

@@ -25,7 +25,7 @@ namespace :r2corba do
       unless defined?(JRUBY_VERSION) || get_config('without-tao')
         # install ACE+TAO dlls
         R2CORBA::Ext.ace_shlibs.each do |acelib|
-          libmask = R2CORBA::Config.is_linux ? acelib+'.*' : acelib
+          libmask = R2CORBA::Config.is_linux ? acelib + '.*' : acelib
           path = Dir.glob(libmask).first
           raise "Cannot find ACE+TAO library #{File.basename(acelib)}." unless path
           FileUtils.install(path, ext_dir, :mode => 0555, :verbose => Rake.verbose)
@@ -43,7 +43,7 @@ namespace :r2corba do
         if R2CORBA::Config.is_linux
           # create unversioned ACE/TAO lib symlinks
           R2CORBA::Ext.ace_shlibs('.so', 'ext').each do |acelib|
-            acelib_ver = File.expand_path(Dir[acelib+'.*'].first)
+            acelib_ver = File.expand_path(Dir[acelib + '.*'].first)
             ln_s(acelib_ver, acelib)
           end
         end
@@ -67,7 +67,7 @@ namespace :r2corba do
           gem.summary = %Q{TAO sourcecode for building R2CORBA}
           gem.description = %Q{TAO sourcecode for building R2CORBA.}
           gem.email = 'mcorino@remedy.nl'
-          gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+          gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
           gem.authors = ['Martin Corino', 'Johnny Willemsen']
           gem.files = Dir['lib/taosource/**/*']
           gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"])
@@ -75,11 +75,11 @@ namespace :r2corba do
           gem.extensions = ['mkrf_conf_taogem.rb']
           gem.require_paths = %w{lib}
           gem.executables = []
-          gem.required_ruby_version = '>= 2.0'
+          gem.required_ruby_version = '>= 2.4'
           gem.licenses = ['DOC']
           gem.metadata = {
-            "bug_tracker_uri"   => "https://github.com/DOCGroup/ACE_TAO/issues",
-            "source_code_uri"   => "https://github.com/DOCGroup/ACE_TAO"
+            'bug_tracker_uri'   => 'https://github.com/DOCGroup/ACE_TAO/issues',
+            'source_code_uri'   => 'https://github.com/DOCGroup/ACE_TAO'
           }
         end
         R2CORBA::Gem.build_gem(gemspec)
@@ -94,21 +94,21 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     gem.summary = %Q{CORBA language mapping implementation for Ruby}
     gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
     gem.email = 'mcorino@remedy.nl'
-    gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+    gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
     gem.authors = ['Martin Corino', 'Johnny Willemsen']
     gem.files = R2CORBA::Gem.manifest
     gem.extensions = ['mkrf_conf_srcgem.rb']
     gem.require_paths = %w{lib}
     gem.executables = %w{ridlc rins r2corba}
-    gem.required_ruby_version = '>= 2.0'
+    gem.required_ruby_version = '>= 2.4'
     gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
     gem.require_paths << 'ext'
     gem.add_dependency 'ridl', '~> 2.8'
-    gem.add_dependency 'rake', '~> 12.3.3'
+    gem.add_dependency 'rake', '>= 12.3.3'
     gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
     gem.metadata = {
-      "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
-      "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+      'bug_tracker_uri'   => 'https://github.com/RemedyIT/r2corba/issues',
+      'source_code_uri'   => 'https://github.com/RemedyIT/r2corba'
     }
   end
   R2CORBA::Gem.build_gem(gemspec)
@@ -133,18 +133,18 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.summary = %Q{CORBA language mapping implementation for Ruby (extension binaries)}
       gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. (extension binaries)}
       gem.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+      gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
       gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = R2CORBA::Gem.manifest(:extbin)
       gem.extensions = []
       gem.require_paths = %w{ext}
       gem.executables = []
-      gem.required_ruby_version = '>= 2.0'
+      gem.required_ruby_version = '>= 2.4'
       gem.licenses = ['Nonstandard', 'DOC']
       gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
       gem.metadata = {
-        "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
-        "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+        'bug_tracker_uri'   => 'https://github.com/RemedyIT/r2corba/issues',
+        'source_code_uri'   => 'https://github.com/RemedyIT/r2corba'
       }
     end
     R2CORBA::Gem.build_gem(gemspec)
@@ -176,7 +176,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.summary = %Q{CORBA language mapping implementation for Ruby}
       gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
       gem.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+      gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
       gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = R2CORBA::Gem.manifest(:bin)
       gem.require_paths = %w{lib}
@@ -184,20 +184,20 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.extensions = ['mkrf_conf_bingem.rb']
       if defined?(JRUBY_VERSION)
         gem.require_paths << 'jacorb/lib'
-        gem.required_ruby_version = '>= 2.0'
+        gem.required_ruby_version = '>= 2.4'
         gem.licenses = ['Nonstandard', 'GPL-2.0']
       else
         gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
-        gem.required_ruby_version = '>= 2.0'
+        gem.required_ruby_version = '>= 2.4'
         gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
         gem.require_paths << 'ext'
       end
       gem.add_dependency 'ridl', '~> 2.8'
-      gem.add_dependency 'rake', '~> 12.3.3'
+      gem.add_dependency 'rake', '>= 12.3.3'
       gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
       gem.metadata = {
-        "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
-        "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+        'bug_tracker_uri'   => 'https://github.com/RemedyIT/r2corba/issues',
+        'source_code_uri'   => 'https://github.com/RemedyIT/r2corba'
       }
     end
     R2CORBA::Gem.build_gem(gemspec)
@@ -211,7 +211,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
 end
 t_.enhance ['mkrf_conf_bingem.rb']
 
-unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
+unless defined?(JRUBY_VERSION)
   # Devkit faker Gem for binary Windows gems
   t_devkit = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba_devkit', '1.0.0', :devkit)}.gem") => 'lib/rubygems_plugin.rb' do
     # create gemspec
@@ -219,7 +219,7 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
       gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
       gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
       gem.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+      gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
       gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = 'lib/rubygems_plugin.rb'
       gem.require_paths = %w{lib}
@@ -228,8 +228,8 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
       gem.required_ruby_version = '>= 2.0'
       gem.licenses = ['Nonstandard']
       gem.metadata = {
-        "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
-        "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+        'bug_tracker_uri'   => 'https://github.com/RemedyIT/r2corba/issues',
+        'source_code_uri'   => 'https://github.com/RemedyIT/r2corba'
       }
     end
     R2CORBA::Gem.build_gem(gemspec)

data/rakelib/gem.rb

@@ -92,21 +92,21 @@ module R2CORBA
     end
 
     def self.define_spec(name, version, gemtype = :src, &block)
-      name += '_ext' if gemtype == :extbin &&  !defined?(JRUBY_VERSION)
-      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) &&  !defined?(JRUBY_VERSION)
-      gemspec = ::Gem::Specification.new(name,version.dup)
+      name += '_ext' if gemtype == :extbin && !defined?(JRUBY_VERSION)
+      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
+      gemspec = ::Gem::Specification.new(name, version.dup)
       if gemtype == :bin || gemtype == :extbin
         gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
-      gemspec.required_rubygems_version = ::Gem::Requirement.new(">= 0") if gemspec.respond_to? :required_rubygems_version=
+      gemspec.required_rubygems_version = ::Gem::Requirement.new('>= 0') if gemspec.respond_to? :required_rubygems_version=
       block.call(gemspec) if block_given?
       gemspec
     end
 
     def self.gem_name(name, version, gemtype = :src)
       name += '_ext' if gemtype == :extbin &&  !defined?(JRUBY_VERSION)
-      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) &&  !defined?(JRUBY_VERSION)
-      gemspec = ::Gem::Specification.new(name,version.dup)
+      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
+      gemspec = ::Gem::Specification.new(name, version.dup)
       if gemtype == :bin || gemtype == :extbin
         gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end

data/rakelib/package.rake

@@ -14,7 +14,7 @@ require 'rake/packagetask'
 
 require File.join(File.dirname(__FILE__), 'config.rb')
 
-Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
+Rake::PackageTask.new('r2corba', R2CORBA::R2CORBA_VERSION) do |p|
   p.need_tar_gz = true
   p.need_zip = true
   p.package_files.include(%w{ext/**/*.{mwc,cpp,c,h}})

data/test/BiDirectional/client.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("--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
@@ -64,19 +64,19 @@ class MyCallback < POA::Callback
     end
   end
 
-end #of servant Callback
+end # of servant Callback
 
 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
 

data/test/BiDirectional/run_test.rb

@@ -19,19 +19,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
@@ -58,7 +58,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/BiDirectional/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
@@ -92,19 +92,19 @@ class Simple_Server_i < POA::Simple_Server
     return 0
   end
 
-end #of servant Simple_Server_i
+end # of servant Simple_Server_i
 
 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)
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -143,7 +143,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 
@@ -165,4 +165,3 @@ end
 puts 'event loop finished'
 
 root_poa.destroy(true, true)
-

data/test/CORBA_Services/Naming/BindingIterator/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://ins.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('--k IORFILE',
+            'Set IOR.',
+            "Default: 'file://ins.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
@@ -51,7 +51,7 @@ else
 end
 require 'corba/naming'
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -60,12 +60,12 @@ begin
 
   nc = CosNaming::NamingContextExt._narrow(obj)
 
-  assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
+  assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
 
   # list registered items in context
   binding_list, binding_iterator = nc.list(1)
 
-  assert 'ERROR: INS list() does not function', (!CORBA::is_nil(binding_iterator) && binding_list.size==1) &&
+  assert 'ERROR: INS list() does not function', (!CORBA::is_nil(binding_iterator) && binding_list.size == 1) &&
                                                 binding_list.first.binding_type == CosNaming::Nobject
 
   n = binding_list.first.binding_name.first
@@ -83,7 +83,7 @@ begin
   has_list, binding_list = binding_iterator.next_n(3)
 
   assert 'ERROR: INS BindingIterator#next_n() does not function',
-         (has_list && binding_list.size==3) &&
+         (has_list && binding_list.size == 3) &&
          binding_list.first.binding_type == CosNaming::Nobject &&
          binding_list.last.binding_type == CosNaming::Nobject
 

data/test/CORBA_Services/Naming/BindingIterator/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
@@ -42,7 +42,7 @@ include TestUtil
 
 def do_exit(rc)
   ins_stop = Test.new
-  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- stop --no-daemon")
+  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
   ins_stop.wait(50)
   exit(rc)
 end
@@ -53,7 +53,7 @@ TestUtil.remove_file(ior_file)
 
 ins = Test.new
 
-exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- start")
+exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start')
 
 do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
 
@@ -72,7 +72,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)