r2corba 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4b41ce29f4c04e4afcbb88bf9021b39af168cec3b266180d4ade18dfd1a8f3
-  data.tar.gz: de5474ca6e07b8eb5b168dfde39cea42b49ceae7673c3133b04e58db8fb53b98
+  metadata.gz: d9ded7979933239c9ec3d05ea022e0c434ad2700a1e3e4dcb5d73352d9ecf3ae
+  data.tar.gz: 1d515a9aae79f3ef07e3a88001d2ea9822d8396dccd24fcb9682797b8bb1f26f
 SHA512:
-  metadata.gz: 54a2a77db21524e9ae328fc453796eb7760a279cb0e4be0cc9b6e87f98ce5e3cc31272a89f9d1fabfc3807f421c0f8e15c4465baacc13ca574548a4397f702da
-  data.tar.gz: 751cde536093f73c0eebc7b1d0f5e86bcfeb91cafc35e7717a63862317bd5c5e4ed0c0c29c0c4e60300086c4ccd9ddb9838844cb56f6789ebaae716150bca5db
+  metadata.gz: f3630d3894a347182085fd461a165a93c38f4beb14e390e9042f5ca3bf7a035d37d231e5dfda5442e19100e79ff52423af6664e23eb2ea0faf7ba235fc3258ed
+  data.tar.gz: 509e3206ad39fb5e04df6f497a61de860ef5c3963dcbd8e93bbde6dd2cbe85ce068244c8a5dc4046d32cd5932904b2b8271de12681162f0ebb62176527fd7012

data/README.rdoc

@@ -1,7 +1,7 @@
-{<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://rubygems.org/gems/r2corba]
-{<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
-{<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="Linux CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
-{<img src="https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg" alt="Windows CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
+{rdoc-image:https://badge.fury.io/rb/r2corba.svg}[https://rubygems.org/gems/r2corba]
+{rdoc-image:https://www.codefactor.io/repository/github/remedyit/r2corba/badge}[https://www.codefactor.io/repository/github/remedyit/r2corba]
+{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
+{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
 
 = R2CORBA
 
@@ -40,7 +40,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
 
 == License
 
-R2CORBA is Copyright (c) 2007-2022 Remedy IT Expertise BV, The Netherlands.
+R2CORBA is Copyright (c) 2007-2023 Remedy IT Expertise BV, The Netherlands.
 
 It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
 

data/ext/libr2tao/orb.cpp

@@ -237,7 +237,7 @@ VALUE rCORBA_ORB_init(int _argc, VALUE *_argv, VALUE /*klass*/) {
   char **argv;
   int i;
   CORBA::ORB_var orb;
-  std::unique_ptr<char*> argv_safe;
+  std::unique_ptr<char*[]> argv_safe;
 
   rb_scan_args(_argc, _argv, "02", &v0, &v1);
 

data/ext/libr2tao/values.cpp

@@ -1806,7 +1806,7 @@ VALUE r2tao_OStream_write_any_array (VALUE self, VALUE rval, VALUE offset, VALUE
       ACE_NEW_THROW_EX (any_array,
                         CORBA::Any[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Any> any_array_safe (any_array);
+      std::unique_ptr<CORBA::Any[]> any_array_safe (any_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -1845,7 +1845,7 @@ VALUE r2tao_OStream_write_boolean_array (VALUE self, VALUE rval, VALUE offset, V
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Boolean[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Boolean> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Boolean[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -1884,7 +1884,7 @@ VALUE r2tao_OStream_write_char_array (VALUE self, VALUE rval, VALUE offset, VALU
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Char[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Char> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Char[]> native_array_safe (native_array);
       char* s = RSTRING_PTR (rval);
       for (CORBA::ULong l=0; l<len ;++l)
       {
@@ -1923,7 +1923,7 @@ VALUE r2tao_OStream_write_wchar_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::WChar[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::WChar> native_array_safe (native_array);
+      std::unique_ptr<CORBA::WChar[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -1962,7 +1962,7 @@ VALUE r2tao_OStream_write_octet_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Octet[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Octet> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Octet[]> native_array_safe (native_array);
       unsigned char* s = (unsigned char*)RSTRING_PTR (rval);
       for (CORBA::ULong l=0; l<len ;++l)
       {
@@ -2001,7 +2001,7 @@ VALUE r2tao_OStream_write_short_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Short[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Short> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Short[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2040,7 +2040,7 @@ VALUE r2tao_OStream_write_ushort_array (VALUE self, VALUE rval, VALUE offset, VA
       ACE_NEW_THROW_EX (native_array,
                         CORBA::UShort[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::UShort> native_array_safe (native_array);
+      std::unique_ptr<CORBA::UShort[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2079,7 +2079,7 @@ VALUE r2tao_OStream_write_long_array (VALUE self, VALUE rval, VALUE offset, VALU
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Long[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Long> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Long[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2118,7 +2118,7 @@ VALUE r2tao_OStream_write_ulong_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::ULong[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::ULong> native_array_safe (native_array);
+      std::unique_ptr<CORBA::ULong[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2157,7 +2157,7 @@ VALUE r2tao_OStream_write_longlong_array (VALUE self, VALUE rval, VALUE offset,
       ACE_NEW_THROW_EX (native_array,
                         CORBA::LongLong[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::LongLong> native_array_safe (native_array);
+      std::unique_ptr<CORBA::LongLong[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2196,7 +2196,7 @@ VALUE r2tao_OStream_write_ulonglong_array (VALUE self, VALUE rval, VALUE offset,
       ACE_NEW_THROW_EX (native_array,
                         CORBA::ULongLong[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::ULongLong> native_array_safe (native_array);
+      std::unique_ptr<CORBA::ULongLong[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2235,7 +2235,7 @@ VALUE r2tao_OStream_write_float_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Float[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Float> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Float[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2274,7 +2274,7 @@ VALUE r2tao_OStream_write_double_array (VALUE self, VALUE rval, VALUE offset, VA
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Double[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Double> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Double[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2313,7 +2313,7 @@ VALUE r2tao_OStream_write_longdouble_array (VALUE self, VALUE rval, VALUE offset
       ACE_NEW_THROW_EX (native_array,
                         CORBA::LongDouble[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::LongDouble> native_array_safe (native_array);
+      std::unique_ptr<CORBA::LongDouble[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);

data/ext/libr2tao/values.h

@@ -20,6 +20,7 @@
 #include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
+#include <memory>
 
 extern VALUE r2tao_cBoxedValueBase;
 
@@ -37,16 +38,16 @@ public:
   R2TAO_ArrayAny_Impl_T (CORBA::TypeCode_ptr,
                          T * const,
                          CORBA::ULong);
-  virtual ~R2TAO_ArrayAny_Impl_T ();
+  ~R2TAO_ArrayAny_Impl_T () override;
 
   static void insert (CORBA::Any &,
                       CORBA::TypeCode_ptr,
                       T * const,
                       CORBA::ULong);
 
-  virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+  CORBA::Boolean marshal_value (TAO_OutputCDR &) override;
   virtual const void *value () const;
-  virtual void free_value ();
+  void free_value () override;
 
 private:
   void* value_;
@@ -62,18 +63,9 @@ private:
 //===================================================================
 
 class R2TAO_Value;
-typedef R2TAO_Value * R2TAO_Value_ptr;
-typedef
-  TAO_Value_Var_T<
-    R2TAO_Value
-    >
-  R2TAO_Value_var;
-
-typedef
-  TAO_Value_Out_T<
-    R2TAO_Value
-    >
-  R2TAO_Value_out;
+using R2TAO_Value_ptr = R2TAO_Value *;
+using R2TAO_Value_var = TAO_Value_Var_T<R2TAO_Value>;
+using R2TAO_Value_out = TAO_Value_Out_T<R2TAO_Value>;
 
 class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
 {
@@ -81,7 +73,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
     R2TAO_Value (VALUE rbValue, bool for_unmarshal=false);
     ~R2TAO_Value () override;
 
-    virtual CORBA::ValueBase* _copy_value ();
+    CORBA::ValueBase* _copy_value () override;
 
     static void _tao_any_destructor (void *);
 
@@ -150,7 +142,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
 
     CORBA::TypeCode_var val_tc_; // the typecode for the valuetype
 
-    ACE_Auto_Ptr<Chunk> chunk_list_;
+    std::unique_ptr<Chunk> chunk_list_;
     Chunk* last_chunk_;
 };
 
@@ -206,19 +198,9 @@ VALUE r2tao_VFB_lookup_value_factory(VALUE self, VALUE id);
 //===================================================================
 
 class R2TAO_AbstractValue;
-typedef R2TAO_AbstractValue* R2TAO_AbstractValue_ptr;
-
-typedef
-  TAO_Objref_Var_T<
-    R2TAO_AbstractValue
-    >
-  R2TAO_AbstractValue_var;
-
-typedef
-  TAO_Objref_Out_T<
-    R2TAO_AbstractValue
-    >
-  R2TAO_AbstractValue_out;
+using R2TAO_AbstractValue_ptr = R2TAO_AbstractValue*;
+using R2TAO_AbstractValue_var = TAO_Objref_Var_T<R2TAO_AbstractValue>;
+using R2TAO_AbstractValue_out = TAO_Objref_Out_T<R2TAO_AbstractValue>;
 
 class R2TAO_AbstractValue :
   public ::CORBA::AbstractBase,
@@ -281,19 +263,9 @@ void operator<<= (::CORBA::Any &, R2TAO_AbstractValue_ptr *); // non-copying
 //===================================================================
 
 class R2TAO_AbstractObject;
-typedef R2TAO_AbstractObject* R2TAO_AbstractObject_ptr;
-
-typedef
-  TAO_Objref_Var_T<
-    R2TAO_AbstractObject
-    >
-  R2TAO_AbstractObject_var;
-
-typedef
-  TAO_Objref_Out_T<
-    R2TAO_AbstractObject
-    >
-  R2TAO_AbstractObject_out;
+using R2TAO_AbstractObject_ptr = R2TAO_AbstractObject*;
+using R2TAO_AbstractObject_var = TAO_Objref_Var_T<R2TAO_AbstractObject>;
+using R2TAO_AbstractObject_out = TAO_Objref_Out_T<R2TAO_AbstractObject>;
 
 class R2TAO_AbstractObject :
   public ::CORBA::AbstractBase,
@@ -366,26 +338,18 @@ namespace TAO
   template<>
   struct  Objref_Traits< R2TAO_AbstractValue>
   {
-    static R2TAO_AbstractValue_ptr duplicate (
-        R2TAO_AbstractValue_ptr p);
-    static void release (
-        R2TAO_AbstractValue_ptr p);
+    static R2TAO_AbstractValue_ptr duplicate (R2TAO_AbstractValue_ptr p);
+    static void release (R2TAO_AbstractValue_ptr p);
     static R2TAO_AbstractValue_ptr nil ();
-    static ::CORBA::Boolean marshal (
-        const R2TAO_AbstractValue_ptr p,
-        TAO_OutputCDR & cdr);
+    static ::CORBA::Boolean marshal (const R2TAO_AbstractValue_ptr p, TAO_OutputCDR & cdr);
   };
 
   template<>
   struct  Objref_Traits< R2TAO_AbstractObject>
   {
-    static R2TAO_AbstractObject_ptr duplicate (
-        R2TAO_AbstractObject_ptr p);
-    static void release (
-        R2TAO_AbstractObject_ptr p);
+    static R2TAO_AbstractObject_ptr duplicate (R2TAO_AbstractObject_ptr p);
+    static void release (R2TAO_AbstractObject_ptr p);
     static R2TAO_AbstractObject_ptr nil ();
-    static ::CORBA::Boolean marshal (
-        const R2TAO_AbstractObject_ptr p,
-        TAO_OutputCDR & cdr);
+    static ::CORBA::Boolean marshal (const R2TAO_AbstractObject_ptr p, TAO_OutputCDR & cdr);
   };
 }

data/lib/corba/cbase/Request.rb

@@ -79,9 +79,9 @@ module R2CORBA
 
       def invoke
         self._invoke({
-          :arg_list => self._arguments,
-          :result_type => @_rettc,
-          :exc_list => self._exceptions
+          arg_list: self._arguments,
+          result_type: @_rettc,
+          exc_list: self._exceptions
           })
       end
 
@@ -91,9 +91,9 @@ module R2CORBA
 
       def send_deferred
         self._send_deferred({
-          :arg_list => self._arguments,
-          :result_type => @_rettc,
-          :exc_list => self._exceptions
+          arg_list: self._arguments,
+          result_type: @_rettc,
+          exc_list: self._exceptions
           })
       end
 

data/lib/corba/cmds/base.rb

@@ -21,7 +21,7 @@ module R2CORBA
     end
 
     @@options = {
-      :verbose => false
+      verbose: false
     }
 
     def self.register(cmdid, cmdhandler)

data/lib/corba/common/Any.rb

@@ -19,7 +19,7 @@ module R2CORBA
             return val._tc
           when ::NilClass
             return CORBA._tc_null
-          when ::Bignum
+          when BIGNUM_KLASS
             return CORBA._tc_longlong
           when ::Integer
             return CORBA._tc_long

data/lib/corba/common/Values.rb

@@ -79,10 +79,10 @@ module R2CORBA
     VM_TRUNCATABLE = 3
 
     VT_MODIFIERS = {
-      :none => VM_NONE,
-      :abstract => VM_ABSTRACT,
-      :truncatable => VM_TRUNCATABLE,
-      :custom => VM_CUSTOM
+      none: VM_NONE,
+      abstract: VM_ABSTRACT,
+      truncatable: VM_TRUNCATABLE,
+      custom: VM_CUSTOM
     }.freeze
 
     PRIVATE_MEMBER = 0

data/lib/corba/common/version.rb

@@ -13,8 +13,8 @@
 module R2CORBA
 
   R2CORBA_MAJOR = 1
-  R2CORBA_MINOR = 6
-  R2CORBA_RELEASE = 2
+  R2CORBA_MINOR = 7
+  R2CORBA_RELEASE = 0
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/jbase/Servant.rb

@@ -44,25 +44,25 @@ module R2CORBA
             begin
               case rsrvreq.srvreq_.operation()
               when '_is_a'
-                rsrvreq.describe({:arg_list => [['', CORBA::ARG_IN, CORBA._tc_string]], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [['', CORBA::ARG_IN, CORBA._tc_string]], result_type: CORBA._tc_boolean})
                 rc = self._is_a(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_non_existent'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_boolean})
                 rc = self._non_existent(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_repository_id'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_string})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_string})
                 rc = self._repository_id(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_string(rc)
                 jsrvreq.set_result(jany)
               when '_component'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_Object})
                 rc = self._get_component(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_Object(rc)

data/lib/corba/svcs/ins/cos_naming.rb

@@ -363,9 +363,9 @@ module R2CORBA
         @map.synchronize do
           raise CosNaming::NamingContext::AlreadyBound.new if @map.has_key?(key_)
           @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
+            name: full_name,
+            type: type,
+            object: obj
           }
         end
       end
@@ -380,9 +380,9 @@ module R2CORBA
             raise CosNaming::NamingContext::NotFound.new(why, [])
           end
           @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
+            name: full_name,
+            type: type,
+            object: obj
           }
         end
       end

data/lib/corba/svcs/ins/ins.rb

@@ -181,14 +181,14 @@ module R2CORBA
             report 'INS - starting daemon mode'
 
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['start'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
-              :log_dir => @options[:logdir] || @options[:piddir],
-              :log_output => true,
-              :stop_proc => Proc.new do
+              app_name: 'rins',
+              ARGV: ['start'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
+              log_dir: @options[:logdir] || @options[:piddir],
+              log_output: true,
+              stop_proc: Proc.new do
                 report 'INS - shutting down'
                 ins_svc.shutdown
               end
@@ -252,11 +252,11 @@ module R2CORBA
           report 'INS - stopping service'
           if @options[:daemon]
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['stop'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
+              app_name: 'rins',
+              ARGV: ['stop'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
             }
 
             Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -279,14 +279,14 @@ module R2CORBA
             report 'INS - restarting daemon mode'
 
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['restart'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
-              :log_dir => @options[:logdir] || @options[:piddir],
-              :log_output => true,
-              :stop_proc => Proc.new do
+              app_name: 'rins',
+              ARGV: ['restart'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
+              log_dir: @options[:logdir] || @options[:piddir],
+              log_output: true,
+              stop_proc: Proc.new do
                 report 'INS - shutting down'
                 ins_svc.shutdown
               end
@@ -310,11 +310,11 @@ module R2CORBA
         def status
           report 'INS - retrieving service status'
           daemon_opt = {
-            :app_name => 'rins',
-            :ARGV => ['status'],
-            :dir_mode => :normal,
-            :dir => @options[:piddir],
-            :multiple => true,
+            app_name: 'rins',
+            ARGV: ['status'],
+            dir_mode: :normal,
+            dir: @options[:piddir],
+            multiple: true,
           }
 
           Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -351,13 +351,13 @@ module R2CORBA
     end
 
     OPTIONS = {
-      :piddir => Dir.getwd,
-      :iorfile => 'ins.ior',
-      :debug => 0,
-      :logdir => nil,
-      :threads => 5,
-      :orbprop => {},
-      :port => 0,
+      piddir: Dir.getwd,
+      iorfile: 'ins.ior',
+      debug: 0,
+      logdir: nil,
+      threads: 5,
+      orbprop: {},
+      port: 0,
     }
 
     COMMANDS = [

data/lib/corba/svcs/ins/naming_service.rb

@@ -18,11 +18,11 @@ module R2CORBA
     class Service
       # default options
       OPTIONS = {
-        :iorfile => 'ins.ior',
-        :debug => 0,
-        :threads => 5,
-        :orbprop => {},
-        :port => 0
+        iorfile: 'ins.ior',
+        debug: 0,
+        threads: 5,
+        orbprop: {},
+        port: 0
       }
 
       def initialize(options = {})

data/rakelib/config.rb

@@ -346,10 +346,12 @@ module R2CORBA
 
       @@ridlc = File.join('bin', 'ridlc')
 
-      # check availability of RIDL; either as gem or in subdir
-      if (@@ridl_local = File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')))
+      # check availability of RIDL; either as gem or in ridl subdir, or to a location as set
+      # in the RIDL_ROOT environment variable
+      ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
+      if (@@ridl_local = File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')))
         incdirs = [
-            File.expand_path(File.join('ridl', 'lib')),
+            File.expand_path(File.join(ENV['RIDL_ROOT'], 'lib')),
             File.expand_path('lib'),
             ENV['RUBYLIB']
         ].compact
@@ -513,9 +515,10 @@ module R2CORBA
         end
       end
 
-      # 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.'
+      # check availability of RIDL; either as gem or in subdir or as set in RIDL_ROOT
+      ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
+      unless File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
+        raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in the subdirectory ridl, or at the location as set by RIDL_ROOT.'
       end
     end
 

data/test/BiDirectional/client.rb

@@ -12,9 +12,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -96,7 +96,7 @@ begin
 
   puts 'child_poa created'
 
-  policies.each { |pol| pol.destroy() }
+  policies.each { |pol| pol.destroy }
 
   puts 'policies destroyed'
 
@@ -110,7 +110,7 @@ begin
 
   callback_i = MyCallback.new(orb)
 
-  callback_ref = callback_i._this()
+  callback_ref = callback_i._this
 
   # Send the calback object to the server
   simple_srv.callback_object(callback_ref)
@@ -120,12 +120,12 @@ begin
 
   assert "unexpected result = #{r}", r == 0
 
-  orb.run()
+  orb.run
 
   root_poa.destroy(1, 1)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/BiDirectional/run_test.rb

@@ -9,8 +9,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'