zeroc-ice 3.7.0 → 3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 93920645e2f018c3dde695ab7e7857aff1ce8253
-  data.tar.gz: b525f62af73aa729b8f44467b708bf65cabb9fb4
+SHA256:
+  metadata.gz: c38f872e39a6b9af1443df29c2d3376b5fd53c98bbd10ed71eaf3eafe37bf546
+  data.tar.gz: a20e7aaa56ba6a40cd9e3a72fc00d128c886cfb8ec04195cec01ea2cdf846ed7
 SHA512:
-  metadata.gz: b0d76be8430a9956ec88239efa35a1e2d7c22f6c46fc07c524e712a0cc34d853c6086461220531239c071c85e55cc66aa47905ee5ade2ef596954c8b4c4969e6
-  data.tar.gz: c8890aa3f0aed7994d20a2e410ec903d58c86bc62c4b74f24c9eb2db58fa8b83d983b4cd7fd5d87889af94e1adc09c064a740597af6c897f54ec44e7e2ae2b8f
+  metadata.gz: 6fa6f95c6ff53febde412f0f1128cf100b10a9d56cacd320066ca742ee0c73da63d21e4ac1118ee676761050afc0786828e7c24b420bb4acadcd804af2a1f073
+  data.tar.gz: 3529adbf0defea81f833879a5476f86e3b2437e4f52cbfc208f82d0a8a242db3c57fb8affce8c17f4f4276970337f361cdba04476da5ad4f58ecdb92f87a40a0

data/ICE_LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+Copyright (c) ZeroC, Inc. All rights reserved.
 
 This copy of Ice is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as

data/bin/slice2rb

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Ice'
 sliceDir = Ice.getSliceDir()

data/ext/Communicator.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <ImplicitContext.h>
@@ -56,9 +51,30 @@ IceRuby_Communicator_free(Ice::CommunicatorPtr* p)
     delete p;
 }
 
+namespace
+{
+
+class CommunicatorDestroyer
+{
+public:
+
+    CommunicatorDestroyer(const Ice::CommunicatorPtr& c) : _communicator(c) {}
+
+    ~CommunicatorDestroyer()
+    {
+        _communicator->destroy();
+    }
+
+private:
+
+    Ice::CommunicatorPtr _communicator;
+};
+
+}
+
 extern "C"
 VALUE
-IceRuby_initialize(int argc, VALUE* argv, VALUE self)
+IceRuby_initialize(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -72,6 +88,8 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
         // Ice::initialize(args, initData)
         // Ice::initialize(args, configFile)
         //
+        // An implicit block is optional.
+        //
 
         if(argc > 2)
         {
@@ -189,6 +207,9 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
             data.properties = Ice::createProperties(seq, data.properties);
         }
 
+        // Always accept cycles in Ruby
+        data.properties->setProperty("Ice.AcceptClassCycles", "1");
+
         //
         // Remaining command line options are passed to the communicator
         // as an argument vector in case they contain plugin properties.
@@ -269,7 +290,40 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
         }
         _communicatorMap.insert(CommunicatorMap::value_type(communicator, reinterpret_cast<const VALUE&>(result)));
 
-        return result;
+        //
+        // If an implicit block was provided, yield to the block and pass it the communicator instance.
+        // We destroy the communicator after the block is finished, and return the result of the block.
+        //
+        if(rb_block_given_p())
+        {
+            CommunicatorDestroyer destroyer(communicator);
+            //
+            // Examine the arity of the block procedure. If it accepts one argument, pass it the
+            // communicator. If it accepts two arguments, pass it the communicator and the
+            // argument vector.
+            //
+            VALUE proc = callRuby(rb_block_proc);
+            int arity = rb_proc_arity(proc);
+            if(arity == 1)
+            {
+                return callRuby(rb_yield, result);
+            }
+            else if(arity == 2)
+            {
+                VALUE blockArgs = createArray(2);
+                RARRAY_ASET(blockArgs, 0, result);
+                RARRAY_ASET(blockArgs, 1, args);
+                return callRuby(rb_yield, blockArgs);
+            }
+            else
+            {
+                throw RubyException(rb_eArgError, "block must accept one or two arguments");
+            }
+        }
+        else
+        {
+            return result;
+        }
     }
     ICE_RUBY_CATCH
     return Qnil;
@@ -277,7 +331,7 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
 
 extern "C"
 VALUE
-IceRuby_stringToIdentity(VALUE self, VALUE str)
+IceRuby_stringToIdentity(VALUE /*self*/, VALUE str)
 {
     ICE_RUBY_TRY
     {
@@ -291,7 +345,7 @@ IceRuby_stringToIdentity(VALUE self, VALUE str)
 
 extern "C"
 VALUE
-IceRuby_identityToString(int argc, VALUE* argv, VALUE self)
+IceRuby_identityToString(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -363,6 +417,19 @@ IceRuby_Communicator_isShutdown(VALUE self)
     return Qnil;
 }
 
+extern "C"
+VALUE
+IceRuby_Communicator_waitForShutdown(VALUE self)
+{
+    ICE_RUBY_TRY
+    {
+        Ice::CommunicatorPtr p = getCommunicator(self);
+        p->waitForShutdown();
+    }
+    ICE_RUBY_CATCH
+    return Qnil;
+}
+
 extern "C"
 VALUE
 IceRuby_Communicator_stringToProxy(VALUE self, VALUE str)
@@ -684,6 +751,7 @@ IceRuby::initCommunicator(VALUE iceModule)
     rb_define_method(_communicatorClass, "destroy", CAST_METHOD(IceRuby_Communicator_destroy), 0);
     rb_define_method(_communicatorClass, "shutdown", CAST_METHOD(IceRuby_Communicator_shutdown), 0);
     rb_define_method(_communicatorClass, "isShutdown", CAST_METHOD(IceRuby_Communicator_isShutdown), 0);
+    rb_define_method(_communicatorClass, "waitForShutdown", CAST_METHOD(IceRuby_Communicator_waitForShutdown), 0);
     rb_define_method(_communicatorClass, "stringToProxy", CAST_METHOD(IceRuby_Communicator_stringToProxy), 1);
     rb_define_method(_communicatorClass, "proxyToString", CAST_METHOD(IceRuby_Communicator_proxyToString), 1);
     rb_define_method(_communicatorClass, "propertyToProxy", CAST_METHOD(IceRuby_Communicator_propertyToProxy), 1);

data/ext/Communicator.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_COMMUNICATOR_H
 #define ICE_RUBY_COMMUNICATOR_H

data/ext/Config.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_CONFIG_H
 #define ICE_RUBY_CONFIG_H
@@ -42,8 +37,42 @@
 #   include <wincrypt.h>
 #endif
 
+// The ruby.h check for the isfinite macro fails with some C++ standard libraries
+// (libc++ > 4000) because the isfinite macro included from the C library's
+// math.h is undefined and replaced with a function. As a result, Ruby defines isfinite
+// as the finite macro which is deprecated on some platforms (macOS >= 10.9).
+// The warning ends up causing a build failure. We define the HAVE_ISFINITE macro here to
+// ensure ruby.h doesn't redefine it.
+#if defined(__clang__) && defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 4000)
+#define HAVE_ISFINITE 1
+#endif
+
+//
+// BUGFIX: Workaround unused parameter in ruby.h header file
+//
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+//
+// BUGFIX: Workaround clang conversion warnings in ruby headers
+//
+#   pragma clang diagnostic ignored "-Wconversion"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+// BUGFIX Workaround G++ 10 problem with ruby headers
+// see https://bugs.ruby-lang.org/issues/16930
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <ruby.h>
 
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic pop
+#endif
+
 //
 // The Ruby header file win32/win32.h defines a number of macros for
 // functions like shutdown() and close() that wreak havoc.

data/ext/Connection.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Connection.h>
 #include <Endpoint.h>
@@ -26,9 +21,7 @@ static VALUE _udpConnectionInfoClass;
 static VALUE _wsConnectionInfoClass;
 static VALUE _sslConnectionInfoClass;
 
-// **********************************************************************
 // Connection
-// **********************************************************************
 
 extern "C"
 void
@@ -151,7 +144,14 @@ IceRuby_Connection_setACM(VALUE self, VALUE t, VALUE c, VALUE h)
             heartbeat = static_cast<Ice::ACMHeartbeat>(FIX2LONG(heartbeatValue));
         }
 
-        (*p)->setACM(timeout, close, heartbeat);
+        try
+        {
+            (*p)->setACM(timeout, close, heartbeat);
+        }
+        catch(const IceUtil::IllegalArgumentException& ex)
+        {
+            throw RubyException(rb_eArgError, ex.reason().c_str());
+        }
     }
     ICE_RUBY_CATCH
     return Qnil;
@@ -326,9 +326,7 @@ IceRuby_Connection_equals(VALUE self, VALUE other)
     return Qnil;
 }
 
-// **********************************************************************
 // ConnectionInfo
-// **********************************************************************
 
 extern "C"
 void
@@ -512,3 +510,16 @@ IceRuby::initConnection(VALUE iceModule)
     rb_define_attr(_sslConnectionInfoClass, "certs", 1, 0);
     rb_define_attr(_sslConnectionInfoClass, "verified", 1, 0);
 }
+
+Ice::ConnectionPtr
+IceRuby::getConnection(VALUE v)
+{
+    Ice::ConnectionPtr* p = reinterpret_cast<Ice::ConnectionPtr*>(DATA_PTR(v));
+    return *p;
+}
+
+bool
+IceRuby::checkConnection(VALUE v)
+{
+    return callRuby(rb_obj_is_kind_of, v, _connectionClass) == Qtrue;
+}

data/ext/Connection.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_CONNECTION_H
 #define ICE_RUBY_CONNECTION_H
@@ -21,6 +16,9 @@ void initConnection(VALUE);
 VALUE createConnection(const Ice::ConnectionPtr&);
 VALUE createConnectionInfo(const Ice::ConnectionInfoPtr&);
 
+Ice::ConnectionPtr getConnection(VALUE);
+bool checkConnection(VALUE);
+
 }
 
 #endif

data/ext/Endpoint.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Endpoint.h>
 #include <Util.h>
@@ -25,9 +20,7 @@ static VALUE _wsEndpointInfoClass;
 static VALUE _opaqueEndpointInfoClass;
 static VALUE _sslEndpointInfoClass;
 
-// **********************************************************************
 // Endpoint
-// **********************************************************************
 
 extern "C"
 void
@@ -115,9 +108,7 @@ IceRuby_Endpoint_equals(VALUE self, VALUE other)
     return IceRuby_Endpoint_cmp(self, other) == INT2NUM(0) ? Qtrue : Qfalse;
 }
 
-// **********************************************************************
 // EndpointInfo
-// **********************************************************************
 
 extern "C"
 void

data/ext/Endpoint.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_ENDPOINT_H
 #define ICE_RUBY_ENDPOINT_H

data/ext/ImplicitContext.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ImplicitContext.h>
 #include <Util.h>

data/ext/ImplicitContext.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_IMPLICIT_CONTEXT_H
 #define ICE_RUBY_IMPLICIT_CONTEXT_H

data/ext/Init.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <ImplicitContext.h>

data/ext/Logger.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Logger.h>
 #include <Util.h>

data/ext/Logger.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_LOGGER_H
 #define ICE_RUBY_LOGGER_H