r2corba 1.5.5-universal-java → 1.6.0-universal-java

data/mkrf_conf_bingem.rb

@@ -36,7 +36,7 @@ end
 if defined?(JRUBY_VERSION)
 
   unless system("ruby -S rake -- configure --jacorb-home=#{File.expand_path('ext')}")
-    $stderr.puts "Failed to configure R2CORBA"
+    $stderr.puts 'Failed to configure R2CORBA'
     exit(1)
   end
 
@@ -141,9 +141,9 @@ else
 
   end
 
-  puts "Running rake -- configure --without-tao"
-  unless system("rake -- configure --without-tao")
-    puts "Failed to configure R2CORBA."
+  puts 'Running rake -- configure --without-tao'
+  unless system('rake -- configure --without-tao')
+    puts 'Failed to configure R2CORBA.'
     exit(1)
   end
 end

data/rakelib/build.rake

@@ -44,7 +44,7 @@ CLOBBER.include orb_pidlc
 file File.join(r2c_idlc_root, 'r2c_orb.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
   cmd = R2CORBA::Config.ridlc
   cmd << " --ignore-pidl --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root}" <<
-         " --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl"
+         ' --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl'
   sh(cmd)
 end
 Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, 'r2c_orb.rb')]

data/rakelib/config.rake

@@ -29,7 +29,7 @@ namespace :r2corba do
   namespace :config do
     task :show do
       R2CORBA::CFGKEYS.each do |ck|
-        puts "%20s => %s" % [ck, get_config(ck)]
+        puts '%20s => %s' % [ck, get_config(ck)]
       end
     end
   end

data/rakelib/config.rb

@@ -86,8 +86,8 @@ if (Rake::Version::MAJOR.to_i == 10 &&
 
       begin
         return OptionParser.new do |opts|
-          opts.banner = ""
-          opts.separator ""
+          opts.banner = ''
+          opts.separator ''
 
           standard_rake_options.each { |args| opts.on(*args) }
           opts.environment('RAKEOPT')
@@ -367,9 +367,9 @@ module R2CORBA
     def self.define
       _argv = Rake.application.cleanup_args(ARGV)
       OptionParser.new do |opts|
-        opts.banner = "Usage: rake [rake options] -- configure [options]"
+        opts.banner = 'Usage: rake [rake options] -- configure [options]'
 
-        opts.separator ""
+        opts.separator ''
 
         opts.on('--prefix=path',
                 "path prefix of target environment [#{get_config(:prefix)}]") {|v| set_config(:prefix, File.expand_path(v))}
@@ -429,7 +429,7 @@ module R2CORBA
                   "build with debugger support [#{get_config('with-debug')}]")  {|v| CONFIG[:'with-debug'] = true}
         end
 
-        opts.separator ""
+        opts.separator ''
 
         opts.on('--help', 'Show this help message') { puts opts; puts; exit }
       end.parse!(_argv)
@@ -441,7 +441,7 @@ module R2CORBA
         if get_config('jacorb_home') == '' && File.directory?('jacorb')
           set_config('jacorb_home', File.expand_path('jacorb'))
         end
-        raise "Cannot find JacORB. Missing JACORB_HOME configuration!" if get_config('jacorb_home').empty?
+        raise 'Cannot find JacORB. Missing JACORB_HOME configuration!' if get_config('jacorb_home').empty?
       else
         if Dir[File.join('ext', 'libACE.*')].empty? # Don't check for ACE/TAO installation when executed for binary gem install
 
@@ -466,8 +466,8 @@ module R2CORBA
             if get_config('taoroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'TAO')) || File.directory?(File.join('ACE', 'TAO')))
               set_config('taoroot', File.directory?(File.join(get_config('aceroot'), 'TAO')) ? File.expand_path(File.join(get_config('aceroot'), 'TAO')) : File.expand_path(File.join('ACE', 'TAO')))
             end
-            if get_config('mpcroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'MPC')) || File.directory?(File.join('ACE', 'MPC')))
-              set_config('mpcroot', File.directory?(File.join(get_config('aceroot'), 'MPC')) ? File.expand_path(File.join(get_config('aceroot'), 'MPC')) : File.expand_path(File.join('ACE', 'MPC')))
+            if get_config('mpcroot').empty? && (File.directory?(File.join('ACE', 'MPC')) || File.directory?(File.join(get_config('aceroot'), 'MPC')))
+              set_config('mpcroot', File.directory?(File.join('ACE', 'MPC')) ? File.expand_path(File.join('ACE', 'MPC')) : File.expand_path(File.join(get_config('aceroot'), 'MPC')))
             end
 
             set_config('aceinstdir', get_config('sodir')) if get_config('aceinstdir').empty?
@@ -515,7 +515,7 @@ module R2CORBA
 
       # check availability of RIDL; either as gem or in subdir
       unless File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
-        raise "Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl."
+        raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl.'
       end
     end
 

data/rakelib/gem.rake

@@ -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.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,11 +184,11 @@ 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
@@ -196,8 +196,8 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       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)
@@ -219,7 +219,7 @@ unless defined?(JRUBY_VERSION)
       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)
       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

@@ -98,7 +98,7 @@ module R2CORBA
       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

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.",
+    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('--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

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.separator ''
 
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
+    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.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.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
@@ -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
 

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.",
+    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('--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,7 +60,7 @@ 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)