r2corba 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfbe450e1d6dab4ddc3260d54132b2f1474d365ab51c28b8a15a4adcbb26d036
-  data.tar.gz: 519b4bb1f14abc93211618901fd1e97cf108e0fc8fc27debb831bf53f77ae7a0
+  metadata.gz: 8e97f90895b0ba227ee8ec57b59aaed32b1598f0eb39d81addeb2929f8c7db9b
+  data.tar.gz: 2e0b712d33258178e9d0f6fd63ee0d1a6518aafe9351c68c41391ef391f10f71
 SHA512:
-  metadata.gz: b9d957de390d1b44852561d7df2a99776ef541e1b74addbe5c6c1ad7111cd99fbf496736383012888766def5d61504ca0c2a523b5217f1a6163ef611fdea0fdc
-  data.tar.gz: 4dea2d557cc7857bed252f2f035c73740043d9aadc38471258b49193fa8e3bc4e0eefa86cff8efb9bb7f484b9c72a9a5cf364657d2ce561ee90e663b49dfa9e7
+  metadata.gz: 748458c46255969a38efccabe6b48c5169daa874c5f5935ae2b45dac9dac247db0b55306f4171775f7d726a3a56e254795115b71d5a8fbca35a86795e128a541
+  data.tar.gz: 0b67467fb0f85b6b09212777c40ed28a7b5eac0ee2a1e4c9a2022311a0b4a41fa4a0605f2baf4ec23c61103e955e231a6abd1700761c8c861605282ec79c5070

data/README.rdoc

@@ -1,6 +1,6 @@
 {<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://badge.fury.io/rb/r2corba]
-{<img src="https://dev.azure.com/remedyit/r2corba/_apis/build/status/r2corba?branchName=master" alt="Azure pipeline" />}[https://dev.azure.com/remedyit/r2corba/_build?definitionId=3&_a=summary]
 {<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]
 
 = R2CORBA
 
@@ -35,17 +35,17 @@ to install R2CORBA as a gem.
 
 == Bugs
 
-If you find a bug, please report it at the R2CORBA project's {issues tracker}[https://github.com/RemedyIT/r2corba/issues].
+If you find a bug, please report it at the R2CORBA project's {issue tracker}[https://github.com/RemedyIT/r2corba/issues].
 
 == License
 
-R2CORBA is Copyright (c) 2007-2019 Remedy IT Expertise BV, The Netherlands.
+R2CORBA is Copyright (c) 2007-2020 Remedy IT Expertise BV, The Netherlands.
 
 It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
 
 == Acknowledgments
 
-See the file link:THANKS
+See the link:THANKS file.
 
 == Warranty
 
@@ -53,6 +53,8 @@ This software is provided "as is" and without any express or implied warranties,
 
 == Releasing new r2corba gems
 
+A new r2corba ruby gem release can be made by incrementing the R2CORBA version in link:lib/corba/common/version.rb and create a new release on {github}[https://github.com/RemedyIT/r2corba/releases] matching the new version (for example v1.6.0). The github {Ruby Gem Release}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3A%22Ruby+Gem+Release%22] action will automatically create a new {r2corba}[https://www.rubygems.org/gems/r2corba] and {taosource}[https://www.rubygems.org/gems/taosource] gem and push these to Rubygems.org.
+
 A new R2CORBA taosource gem can be created by executing
 
   rake r2corba:gem:taogem

data/lib/corba/common/IDL.rb

@@ -10,17 +10,14 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-# hardwire RIDL to embedded state for Ruby language mapping
-module IDL
-  @@embedded = true
-  @@be_name = :ruby
-end
-
 begin
   require 'rubygems'
 rescue LoadError
   # ignore error, RIDL may be installed locally not as gem
 end
+# hardwire R2CORBA :ruby RIDL backend
+ENV['RIDL_BE_SELECT'] = 'ruby'
+# load RIDL
 require 'ridl/ridl'
 
 module R2CORBA

data/lib/corba/common/Typecode.rb

@@ -309,9 +309,9 @@ module R2CORBA
       def get_type
         @type ||= case self.kind
           when TK_SHORT, TK_LONG, TK_USHORT, TK_ULONG
-            ::Fixnum
+            FIXNUM_KLASS
           when TK_LONGLONG, TK_ULONGLONG
-            ::Bignum
+            BIGNUM_KLASS
           when TK_FLOAT, TK_DOUBLE
             ::Float
           when TK_LONGDOUBLE
@@ -321,7 +321,7 @@ module R2CORBA
           when TK_CHAR, TK_STRING
             ::String
           when TK_WCHAR, TK_OCTET
-            ::Fixnum
+            FIXNUM_KLASS
           when TK_VOID, TK_NULL
             ::NilClass
           when TK_ANY

data/lib/corba/common/require.rb

@@ -10,6 +10,14 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
+module R2CORBA
+
+  # from Ruby 2.4 Fixnum and Bignum are deprecated
+  FIXNUM_KLASS = (1.class == ::Integer ? ::Integer : ::Fixnum)
+  BIGNUM_KLASS = (1.class == ::Integer ? ::Integer : ::Bignum)
+
+end
+
 [ 'version',
   'const',
   'IDL',

data/lib/corba/common/version.rb

@@ -14,7 +14,7 @@ module R2CORBA
 
   R2CORBA_MAJOR = 1
   R2CORBA_MINOR = 5
-  R2CORBA_RELEASE = 2
+  R2CORBA_RELEASE = 3
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

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

@@ -417,7 +417,7 @@ module R2CORBA
         puts "          provides help for the specified command\n\n"
         exit
       when :version
-        puts "R2CORBA Interoprable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}"
+        puts "R2CORBA Interoperable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}"
         puts INS_COPYRIGHT
         puts ''
         exit

data/lib/ridlbe/ruby/config.rb

@@ -254,28 +254,45 @@ module IDL
 
     module LeafMixin
 
-      RESERVED_RUBY_CONST = [
-        'Array', 'Bignum', 'Binding', 'Class', 'Continuation', 'Dir', 'Exception',
-        'FalseClass', 'File', 'Fixnum', 'Float', 'Hash', 'Integer', 'IO', 'MatchData',
-        'Method', 'Module', 'NilClass', 'Numeric', 'Object', 'Proc', 'Process', 'Range',
-        'Regexp', 'String', 'Struct', 'Symbol', 'Thread', 'ThreadGroup', 'Time', 'TrueClass',
-        'UnboundMethod', 'Comparable', 'Enumerable', 'Errno', 'FileTest', 'GC', 'Kernel',
-        'Marshal', 'Math', 'ObjectSpace', 'Signal'
-      ]
+      RESERVED_RUBY_CONST = %w(Array Bignum Binding Class Continuation Dir Exception FalseClass File
+          Fixnum Float Hash Integer IO MatchData Method Module NilClass Numeric Object Proc Process
+          Range Regexp String Struct Symbol Thread ThreadGroup Time TrueClass UnboundMethod Comparable
+          Enumerable Errno FileTest GC Kernel Marshal Math ObjectSpace Signal)
 
-      RESERVED_RUBY_MEMBER = [
-        "untaint", "id", "instance_variable_get", "inspect", "taint", "public_methods", "__send__", "to_a", "display", "instance_eval",
-        "extend", "clone", "protected_methods", "hash", "freeze", "type", "instance_variable_set", "methods", "instance_variables", "to_s", "method", "dup",
-        "private_methods", "object_id", "send", "__id__", "singleton_methods",
-        "proc", "readline", "global_variables", "singleton_method_removed", "callcc", "syscall", "fail", "untrace_var", "load", "srand", "puts", "catch", "chomp",
-        "initialize_copy", "format", "scan", "print", "abort", "fork", "gsub", "trap", "test", "select", "initialize", "method_missing", "lambda", "readlines",
-        "local_variables", "singleton_method_undefined", "system", "open", "caller", "eval", "set_trace_func", "require", "rand", "singleton_method_added",
-        "throw", "gets", "binding", "raise", "warn", "getc", "exec", "trace_var", "irb_binding", "at_exit", "split", "putc", "loop", "chop", "sprintf", "p",
-        "remove_instance_variable", "exit", "printf", "sleep", "sub", "autoload"
-      ]
+      RESERVED_RUBY_MEMBER = %w(untaint id instance_variable_get inspect taint public_methods
+          __send__ to_a display instance_eval extend clone protected_methods hash freeze type
+          instance_variable_set methods instance_variables to_s method dup private_methods object_id
+          send __id__ singleton_methods proc readline global_variables singleton_method_removed callcc
+          syscall fail untrace_var load srand puts catch chomp initialize_copy format scan print abort
+          fork gsub trap test select initialize method_missing lambda readlines local_variables
+          singleton_method_undefined system open caller eval set_trace_func require rand
+          singleton_method_added throw gets binding raise warn getc exec trace_var irb_binding at_exit
+          split putc loop chop sprintf p remove_instance_variable exit printf sleep sub autoload)
 
-      def self.included(klass)
-        klass.extend ClassMethods
+      def ruby_lm_name
+        unless @lm_name
+          ret = @name.checked_name.dup
+          case self
+          when IDL::AST::Port,
+              IDL::AST::StateMember,
+              IDL::AST::Initializer,
+              IDL::AST::Parameter,
+              IDL::AST::Operation,
+              IDL::AST::Attribute,
+              IDL::AST::Member,
+              IDL::AST::UnionMember
+            # member names
+            ret = ret[0,1].downcase + ret[1,ret.size].to_s
+            ret = 'r_'+ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
+          else
+            # class/module names
+            ret = ret[0,1].upcase + ret[1,ret.size].to_s
+            is_scoped = @enclosure && !@enclosure.scopes.empty?
+            ret = 'R_'+ret if !is_scoped && IDL::Ruby::LeafMixin::RESERVED_RUBY_CONST.include?(ret)
+          end
+          @lm_name = ret
+        end
+        @lm_name
       end
 
       def rubyname
@@ -285,38 +302,20 @@ module IDL
       def scoped_rubyname
         scoped_lm_name
       end
-
-      module ClassMethods
-        def mk_name(nm, is_scoped)
-          ret = nm.dup
-          case self::NAMETYPE
-          when :class
-            ret = ret[0,1].upcase + ret[1,ret.size].to_s
-            ret = 'R_'+ret if !is_scoped && IDL::Ruby::LeafMixin::RESERVED_RUBY_CONST.include?(ret)
-          when :member
-            ret = ret[0,1].downcase + ret[1,ret.size].to_s
-            ret = 'r_'+ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
-          else
-            raise "invalid nametype for #{self.class}: #{self::NAMETYPE}"
-          end
-          ret
-        end
-      end
     end # module LeafMixin
 
     IDL::AST::Leaf.class_eval do
       include LeafMixin
+
+      alias :base_lm_name :lm_name
+      alias :lm_name :ruby_lm_name
     end
 
     module ScannerMixin
 
-      RUBYKW = [
-        '__FILE__', 'and',    'def',      'end',    'in',     'or',     'self',   'unless',
-        '__LINE__', 'begin',  'defined?', 'ensure', 'module', 'redo',   'super',  'until',
-        'BEGIN',    'break',  'do',       'false',  'next',   'rescue', 'then',   'when',
-        'END',      'case',   'else',     'for',    'nil',    'retry',  'true',   'while',
-        'alias',    'class',  'elsif',    'if',     'not',    'return', 'undef',  'yield',
-      ].collect! { |w| w.to_sym }
+      RUBYKW = %w(__FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo
+          super until BEGIN break do false next rescue then when END case else for nil retry true while
+          alias class elsif if not return undef yield).collect! { |w| w.to_sym }
 
       def chk_identifier(ident)
         # prefix Ruby keywords with 'r_'

data/lib/ridlbe/ruby/walker.rb

@@ -977,7 +977,7 @@ module IDL
     end
 
     def visit_enum(node)
-      printiln(format("class %s < ::Fixnum", node.rubyname))
+      printiln(format("class %s < ::R2CORBA::FIXNUM_KLASS", node.rubyname))
       nest {
         printiln(format("def %s._tc", node.rubyname))
         nest {

data/rakelib/config.rb

@@ -273,7 +273,7 @@ module R2CORBA
       @@is_osx
     end
 
-    @@cpu_cores = (@@is_linux ? `cat /proc/cpuinfo | grep processor | wc -l`.to_i : 1)
+    @@cpu_cores = (@@is_linux ? `cat /proc/cpuinfo | grep processor | wc -l`.to_i : (ENV['NUMBER_OF_PROCESSORS'] || 1).to_i)
 
     def self.cpu_cores
       @@cpu_cores
@@ -540,4 +540,4 @@ end
 include R2CORBA::AccessMethods
 
 # load current config (if any)
-R2CORBA::Config.load
+R2CORBA::Config.load

data/rakelib/gem.rake

@@ -68,7 +68,7 @@ namespace :r2corba do
           gem.description = %Q{TAO sourcecode for building R2CORBA.}
           gem.email = 'mcorino@remedy.nl'
           gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
-          gem.authors = ['Martin Corino']
+          gem.authors = ['Martin Corino', 'Johnny Willemsen']
           gem.files = Dir['lib/taosource/**/*']
           gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"])
           gem.files << 'mkrf_conf_taogem.rb'
@@ -77,6 +77,10 @@ namespace :r2corba do
           gem.executables = []
           gem.required_ruby_version = '>= 2.0'
           gem.licenses = ['DOC']
+          gem.metadata = {
+            "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)
       end
@@ -91,7 +95,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     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.authors = ['Martin Corino']
+    gem.authors = ['Martin Corino', 'Johnny Willemsen']
     gem.files = R2CORBA::Gem.manifest
     gem.extensions = ['mkrf_conf_srcgem.rb']
     gem.require_paths = %w{lib}
@@ -99,8 +103,8 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     gem.required_ruby_version = '>= 2.0'
     gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
     gem.require_paths << 'ext'
-    gem.add_dependency 'ridl', '~> 2.5'
-    gem.add_dependency 'rake', '~> 10.0'
+    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",
@@ -130,14 +134,18 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       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.authors = ['Martin Corino']
+      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.0'
+      gem.required_ruby_version = '>= 2.0'
       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"
+      }
     end
     R2CORBA::Gem.build_gem(gemspec)
   ensure
@@ -169,24 +177,28 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       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.authors = ['Martin Corino']
+      gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = R2CORBA::Gem.manifest(:bin)
       gem.require_paths = %w{lib}
       gem.executables = %w{ridlc rins r2corba}
       gem.extensions = ['mkrf_conf_bingem.rb']
       if defined?(JRUBY_VERSION)
         gem.require_paths << 'jacorb/lib'
-        gem.required_ruby_version = '>= 1.7.0'
+        gem.required_ruby_version = '>= 2.0'
         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 = '>= 1.9.3'
+        gem.required_ruby_version = '>= 2.0'
         gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
         gem.require_paths << 'ext'
       end
-      gem.add_dependency 'ridl', '~> 2.5'
-      gem.add_dependency 'rake', '~> 10.0'
+      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"
+      }
     end
     R2CORBA::Gem.build_gem(gemspec)
   ensure
@@ -208,13 +220,17 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
       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.authors = ['Martin Corino']
+      gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = 'lib/rubygems_plugin.rb'
       gem.require_paths = %w{lib}
       gem.executables = []
       gem.extensions = []
       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"
+      }
     end
     R2CORBA::Gem.build_gem(gemspec)
   end

data/test/Nil/test.rb

@@ -16,7 +16,7 @@ include TestUtil::Assertions
 OPTIONS = {
   :use_implement => false,
   :orb_debuglevel => 0,
-  :ior => 'corbaname::foo'
+  :ior => 'foo'
 }
 
 ARGV.options do |opts|
@@ -53,11 +53,15 @@ end
 orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
-  tmp = orb.string_to_object(OPTIONS[:ior])
+  begin
+    tmp = orb.string_to_object(OPTIONS[:ior])
 
-  assert 'No Nil object reference returned on invalid IOR', CORBA.is_nil(tmp)
+    assert 'No Nil object reference returned on invalid IOR', CORBA.is_nil(tmp)
 
-  assert 'No Nil object returned on invalid IOR', tmp.nil?
+    assert 'No Nil object returned on invalid IOR', tmp.nil?
+  rescue CORBA::INV_OBJREF
+    tmp = nil
+  end
 
   assert 'No Nil object reference returned on #_narrow of nil', CORBA.is_nil(Test::Hello._narrow(tmp))
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: r2corba
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Martin Corino
+- Johnny Willemsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridl
@@ -16,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: 'OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby.
   Depends on ridl gem for providing native Ruby IDL compiler. '
 email: mcorino@remedy.nl
@@ -327,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: CORBA language mapping implementation for Ruby