r2corba 1.5.4 → 1.6.1

data/lib/corba/cbase/Values.rb

@@ -21,6 +21,7 @@ module R2CORBA
         end
       end
     end
+
     module ValueBase
       def self.included(mod)
         mod.module_eval do
@@ -30,10 +31,10 @@ module R2CORBA
           def kind_of?(mod)
             if mod < CORBA::AbstractValueBase && mod.const_defined?(:Intf)
               org_kind_of?(mod::Intf)
-              #super(mod::Intf)   ## problematic with Ruby 1.9.2 (known bug)
+              # super(mod::Intf)   ## problematic with Ruby 1.9.2 (known bug)
             else
               org_kind_of?(mod)
-              #super              ## problematic with Ruby 1.9.2 (known bug)
+              # super              ## problematic with Ruby 1.9.2 (known bug)
             end
           end
           alias :is_a? :kind_of?
@@ -97,6 +98,7 @@ module R2CORBA
         class FactoryBase < CORBA::Portable::ValueFactoryBase
           ## generic factory base
         end
+
         def self.included(mod)
           mod.module_eval do
             include CORBA::ValueBase unless self.include?(CORBA::ValueBase)

data/lib/corba/cbase/exception.rb

@@ -39,13 +39,14 @@ module R2CORBA
         exklass = CORBA.const_defined?(exklass) ? CORBA.const_get(exklass) : nil
         if exklass.nil? || !(CORBA::SystemException > exklass)
           Kernel.raise InternalError,
-                "Unknown SystemException raised: " +
-                id.to_s+' ['+reason.to_s+']'
+                'Unknown SystemException raised: ' +
+                id.to_s + ' [' + reason.to_s + ']'
         else
-          Kernel.raise exklass.new(reason,minor,completed)
+          Kernel.raise exklass.new(reason, minor, completed)
         end
       end
-      def initialize(reason="", minor=0, completed=nil)
+
+      def initialize(reason = '', minor = 0, completed = nil)
         super(reason)
         @minor = minor
         @completed = completed
@@ -53,6 +54,7 @@ module R2CORBA
       end
       attr_accessor :ids
       def _ids; @ids; end
+
       def _interface_repository_id
         self.class::Id
       end

data/lib/corba/cbase/poa.rb

@@ -15,7 +15,7 @@ require 'corba/idl/POAC.rb'
 require 'corba/idl/IORTableC'
 
 begin
-  require RUBY_PLATFORM =~ /mingw32/ ? "librpoaw" : "librpoa"
+  require 'librpoa'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise

data/lib/corba/cbase/policies.rb

@@ -12,7 +12,7 @@
 require 'corba/idl/TAO_ExtC'
 
 begin
-  require RUBY_PLATFORM =~ /mingw32/ ? "librpolw" : "librpol"
+  require 'librpol'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise
@@ -24,7 +24,7 @@ module R2CORBA
 
     module ORB
       def create_policy(type, val)
-        raise CORBA::BAD_PARAM.new('Any expected',0,CORBA::COMPLETED_NO) unless CORBA::Any === val
+        raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
         begin
           self.orb_.create_policy(type.to_i, val)
         rescue ::NativeException

data/lib/corba/cbase/require.rb

@@ -13,7 +13,14 @@
 begin
   _ext_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../../ext'))
   $: << _ext_dir unless $:.include?(_ext_dir) || !File.directory?(_ext_dir)
-  require RUBY_PLATFORM =~ /mingw32/ ? "libr2taow" : "libr2tao"
+  if RUBY_PLATFORM =~ /mingw/
+    require 'ruby_installer/runtime'
+    RubyInstaller::Runtime.add_dll_directory(_ext_dir)
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'libACE.dll'))
+    end
+  end
+  require 'libr2tao'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise

data/lib/corba/cmds/base.rb

@@ -48,7 +48,7 @@ module R2CORBA
     def self.parse_args(args)
       opts = OptionParser.new
       opts.banner = "Usage: r2corba [global options] command [command options]\n\n" +
-          "    command\t\tSpecifies R2CORBA command to execute.\n"+
+          "    command\t\tSpecifies R2CORBA command to execute.\n" +
           "           \t\tDefault = list :== list commands\n"
       opts.separator ''
       opts.on('-v', '--verbose',

data/lib/corba/common/Any.rb

@@ -58,13 +58,13 @@ module R2CORBA
         end
       end
 
-      def Any.to_any(o, tc=nil)
+      def Any.to_any(o, tc = nil)
         if tc.nil?
           tc = self.typecode_for_value(o)
           if tc.is_a?(CORBA::TypeCode)
             return new(o, tc)
           end
-          raise CORBA::MARSHAL.new('missing TypeCode',0,CORBA::COMPLETED_NO)
+          raise CORBA::MARSHAL.new('missing TypeCode', 0, CORBA::COMPLETED_NO)
         end
         return new(o, tc)
       end
@@ -72,6 +72,7 @@ module R2CORBA
       def _tc
         @__tc
       end
+
       def _value
         @__value
       end

data/lib/corba/common/IDL.rb

@@ -60,7 +60,7 @@ module R2CORBA
           fname
         else
           fp = paths.find do |p|
-            f = p + "/" + fname
+            f = p + '/' + fname
             File.file?(f) && File.readable?(f)
           end
           fp += '/' + fname if !fp.nil?

data/lib/corba/common/ORB.rb

@@ -60,8 +60,8 @@ module R2CORBA
         self
       end
 
-      #obj ::CORBA::Object
-      #ret ::String
+      # obj ::CORBA::Object
+      # ret ::String
       def object_to_string(obj)
         raise CORBA::BAD_PARAM.new('CORBA::Object required', 0, CORBA::COMPLETED_NO) unless obj.is_a?(CORBA::Object)
         begin
@@ -71,8 +71,8 @@ module R2CORBA
         end
       end
 
-      #str ::String
-      #ret ::CORBA::Object
+      # str ::String
+      # ret ::CORBA::Object
       def string_to_object(str)
         begin
           Object._wrap_native(self.orb_.string_to_object(str))
@@ -81,41 +81,41 @@ module R2CORBA
         end
       end
 
-      #str ::Integer
-      #ret ::CORBA::NVList
+      # str ::Integer
+      # ret ::CORBA::NVList
       def create_list(count)
         raise CORBA::NO_IMPLEMENT
       end
 
-      #str OperationDef
-      #ret ::CORBA::NVList
+      # str OperationDef
+      # ret ::CORBA::NVList
       def create_operation_list(oper)
         raise CORBA::NO_IMPLEMENT
       end
 
-      #ret Context
+      # ret Context
       def get_default_context()
         raise CORBA::NO_IMPLEMENT
       end
 
-      #req RequestSeq
-      #ret void
+      # req RequestSeq
+      # ret void
       def send_multiple_request_oneway(req)
         raise CORBA::NO_IMPLEMENT
       end
 
-      #req RequestSeq
-      #ret void
+      # req RequestSeq
+      # ret void
       def send_multiple_request_deferred(req)
         raise CORBA::NO_IMPLEMENT
       end
 
-      #ret boolean
+      # ret boolean
       def poll_next_response()
         raise CORBA::NO_IMPLEMENT
       end
 
-      #ret Request
+      # ret Request
       def get_next_response()
         raise CORBA::NO_IMPLEMENT
       end
@@ -208,13 +208,13 @@ module R2CORBA
 
       # Integer bound
       # ret TypeCode
-      def create_string_tc(bound=nil)
+      def create_string_tc(bound = nil)
         return CORBA::TypeCode::String.new(bound)
       end
 
       # Integer bound
       # ret TypeCode
-      def create_wstring_tc(bound=nil)
+      def create_wstring_tc(bound = nil)
         return CORBA::TypeCode::WString.new(bound)
       end
 
@@ -259,7 +259,7 @@ module R2CORBA
       # Identifier name
       # TypeCode boxed_type
       # ret TypeCode
-      def create_value_box_tc (id, name, boxed_type)
+      def create_value_box_tc(id, name, boxed_type)
         return CORBA::TypeCode::Valuebox.new(id, name, boxed_type)
       end
 
@@ -334,8 +334,8 @@ module R2CORBA
 
       # PolicyType type
       # any val
-      #ret Policy
-      #raises PolicyError
+      # ret Policy
+      # raises PolicyError
       def create_policy(type, val)
         raise ::CORBA::NO_IMPLEMENT
       end
@@ -345,7 +345,7 @@ module R2CORBA
 =end
       # RepositoryId id
       # ValueFactory factory
-      #ret ValueFactory
+      # ret ValueFactory
       def register_value_factory(id, factory)
         self.orb_().register_value_factory(id, factory)
       end
@@ -357,7 +357,7 @@ module R2CORBA
       end
 
       # RepositoryId id
-      #ret ValueFactory
+      # ret ValueFactory
       def lookup_value_factory(id)
         self.orb_().lookup_value_factory(id)
       end

data/lib/corba/common/Object.rb

@@ -27,6 +27,7 @@ module R2CORBA
         def initialize(nobj)
           @objref_ = nobj
         end
+
         def _free_ref
           self._release
         end
@@ -69,17 +70,17 @@ module R2CORBA
         self
       end
 
-      #ret InterfaceDef
+      # ret InterfaceDef
       def _get_interface()
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #ret boolean
+      # ret boolean
       def _is_nil?()
         self.objref_.nil? || (self.objref_.respond_to?(:_is_nil) && self.objref_._is_nil)
       end
 
-      #ret ::CORBA::Object
+      # ret ::CORBA::Object
       def _duplicate()
         return nil if self._is_nil?()
         begin
@@ -151,32 +152,32 @@ module R2CORBA
         end
       end
 
-      #def PolicyType policy_type
+      # def PolicyType policy_type
       # ret Policy
       def _get_policy(policy_type)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #PolicyList policies
-      #SetOverrideType set_add
-      #ret ::CORBA::Object
-      def _set_policy_overrides(policies, set_add )
+      # PolicyList policies
+      # SetOverrideType set_add
+      # ret ::CORBA::Object
+      def _set_policy_overrides(policies, set_add)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #int[] types
-      #ret PolicyList
+      # int[] types
+      # ret PolicyList
       def _get_policy_overrides(types)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #PolicyList inconsistent_policies
-      #ret bool
+      # PolicyList inconsistent_policies
+      # ret bool
       def _validate_connection(inconsistent_policies)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #ret ::CORBA::Object
+      # ret ::CORBA::Object
       def _get_component()
         raise CORBA::INV_OBJREF.new if self._is_nil?()
         begin
@@ -208,4 +209,3 @@ module R2CORBA
     end # Object
   end # CORBA
 end # R2CORBA
-

data/lib/corba/common/Servant.rb

@@ -17,7 +17,7 @@ module R2CORBA
     class Servant
 
       module Intf
-        Id  = "IDL:omg.org/CORBA/Object:1.0".freeze
+        Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
         Ids = [ Id ].freeze
         Operations = {}.freeze
       end
@@ -82,9 +82,9 @@ module R2CORBA
         end
         self.const_set(:TRUNCATABLE_IDS, vt::TRUNCATABLE_IDS)
         self.const_set(:VT_TC, vt._tc)
-        #@@tc_vt_ = vt._tc
+        # @@tc_vt_ = vt._tc
         def self._tc
-          #@@tc_vt_
+          # @@tc_vt_
           self.const_get(:VT_TC)
         end
         include vt::Intf
@@ -93,7 +93,7 @@ module R2CORBA
 
     class DynamicImplementation < Servant
       def invoke(request)
-        if self.class.const_defined?("OPTABLE") && self.class::OPTABLE.has_key?(request.operation)
+        if self.class.const_defined?('OPTABLE') && self.class::OPTABLE.has_key?(request.operation)
           request.describe(self.class::OPTABLE[request.operation])
           return self.__send__(request.operation, *request.arguments) { request }
         else

data/lib/corba/common/Stub.rb

@@ -31,12 +31,12 @@ module R2CORBA
           end
         end
 
-        Id  = "IDL:omg.org/CORBA/Object:1.0".freeze
+        Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
         Ids = [ Id ].freeze
 
         protected
         def init_corba_portable_stub()
-          @ids ||= ["IDL:omg.org/CORBA/Object:1.0"]
+          @ids ||= ['IDL:omg.org/CORBA/Object:1.0']
         end
 
         def _ids; @ids; end
@@ -47,7 +47,7 @@ module R2CORBA
 
         public
         def _narrow!(klass)
-          raise CORBA::OBJECT_NOT_EXIST.new("Nil object narrowed!") if self._is_nil?
+          raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
           raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub) && self._is_a?(klass::Id)
           self.extend klass
           _append_ids(*klass::Ids)
@@ -55,7 +55,7 @@ module R2CORBA
         end
 
         def _unchecked_narrow!(klass)
-          raise CORBA::OBJECT_NOT_EXIST.new("Nil object narrowed!") if self._is_nil?
+          raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
           raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub)
           self.extend klass
           _append_ids(*klass::Ids)
@@ -67,10 +67,10 @@ module R2CORBA
         end
 
         def inspect()
-          s = ""
+          s = ''
           s << self.class.name.to_s << "\n" <<
                "type_id: \n" <<
-               "  " <<  @ids.join("\n  ") << "\n"
+               '  ' << @ids.join("\n  ") << "\n"
         end
       end # Stub
     end # Portable