cloudi 1.7.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c69109f6c72629dacf32ac289cc1d0fab9b33137
-  data.tar.gz: 371220b7bd79dece478d612221cd7ad4018bc712
+SHA256:
+  metadata.gz: 017a451955dbea2edcffbee125fb2c91ddfbe3df71e8eccfc170466048766940
+  data.tar.gz: 5e3a49115f6fab85d2ec77077aa0a145bc5314358be030d7be8514bb50028e66
 SHA512:
-  metadata.gz: 8cd17f308816b1b69a94e94f76df9b5bf27668c25f4ca5d48c43b711e8df70caef57af10eda13d2e6f17e8b2a4385252a966ee4919d1835e8a0f3e090790d8f3
-  data.tar.gz: 8235c839ff81032fd6dbd57fb3eb51a5d19a99803a5e58922b5ba2378d43023486ae706458f1e0e44081b7bdd5beca06b3dfef2862aff0b34da809b5f15fa191
+  metadata.gz: 2ea5c45dd5a058b448b2ef3d26ac026de9d9ee14779c54342dcb6997ec8efa0592f0e4e5ec5f5a10f408b00a30e660c9ad5fb13bfe5e1e5d5d29dc586145aee3
+  data.tar.gz: adcbd1247a877d483435fb5ebe9350f3ab66bdda07f6972c6d5c79014a10c1bd8893f9be92ab3e495e19e35b71cb34ab67a1ef638436abe271aab248fe1044b1

data/README.markdown

@@ -4,14 +4,14 @@
 [![Build Status](https://travis-ci.org/CloudI/cloudi_api_ruby.png)](https://travis-ci.org/CloudI/cloudi_api_ruby)
 [![Gem Package Version](https://img.shields.io/gem/v/cloudi.svg?maxAge=2592000)](https://rubygems.org/gems/cloudi)
 
-Ruby [CloudI API](http://cloudi.org/api.html#1_Intro)
+Ruby [CloudI API](https://cloudi.org/api.html#1_Intro)
 
 Available as a [Ruby gem at `https://rubygems.org/gems/cloudi`](https://rubygems.org/gems/cloudi).
 
 Author
 ------
 
-Michael Truog (mjtruog [at] gmail (dot) com)
+Michael Truog (mjtruog at protonmail dot com)
 
 License
 -------

data/lib/cloudi.rb

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2017 Michael Truog <mjtruog at gmail dot com>
+# Copyright (c) 2011-2020 Michael Truog <mjtruog at protonmail dot com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,6 +31,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 require 'erlang'
+require 'stringio'
 
 module CloudI
     class API
@@ -56,13 +57,14 @@ module CloudI
                 @s.sync = true
                 @use_header = true
             else
+                $stderr.puts 'CloudI service execution must occur in CloudI'
                 raise InvalidInputException
             end
             @initialization_complete = false
             @terminate = false
             @size = buffer_size_str.to_i
             @callbacks = Hash.new
-            @timeout_terminate = 1000 # TIMEOUT_TERMINATE_MIN
+            @timeout_terminate = 10 # TIMEOUT_TERMINATE_MIN
             send(Erlang.term_to_binary(:init))
             poll_request(nil, false)
         end
@@ -181,7 +183,7 @@ module CloudI
                                         OtpErlangBinary.new(request),
                                         timeout, priority,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ForwardAsyncException.new()
+            raise ForwardAsyncException
         end
 
         def forward_sync(name, request_info, request,
@@ -191,7 +193,7 @@ module CloudI
                                         OtpErlangBinary.new(request),
                                         timeout, priority,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ForwardSyncException.new()
+            raise ForwardSyncException
         end
 
         def return_(request_type, name, pattern, response_info, response,
@@ -213,7 +215,7 @@ module CloudI
                                         OtpErlangBinary.new(response),
                                         timeout,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ReturnAsyncException.new()
+            raise ReturnAsyncException
         end
 
         def return_sync(name, pattern, response_info, response,
@@ -223,7 +225,7 @@ module CloudI
                                         OtpErlangBinary.new(response),
                                         timeout,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ReturnSyncException.new()
+            raise ReturnSyncException
         end
 
         def recv_async(timeout=nil, trans_id=nil, consume=true)
@@ -253,6 +255,7 @@ module CloudI
                 function = function_queue.shift
                 function_queue.push(function)
             end
+            return_null_response = false
             case command
             when MESSAGE_SEND_ASYNC
                 begin
@@ -272,29 +275,39 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
-                rescue InvalidInputException => e
-                    raise e
                 rescue MessageDecodingException => e
-                    raise e
+                    @terminate = true
+                    return_null_response = true
                 rescue TerminateException => e
-                    raise e
+                    return_null_response = true
                 rescue ReturnAsyncException
                     return
-                rescue ForwardAsyncException
-                    return
                 rescue ReturnSyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
+                    return
+                rescue ForwardAsyncException
                     return
                 rescue ForwardSyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
                     return
+                rescue StandardError => e
+                    return_null_response = true
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                rescue SystemExit => e
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                    raise
                 rescue
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                    exit(1)
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -321,29 +334,39 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
-                rescue InvalidInputException => e
-                    raise e
                 rescue MessageDecodingException => e
-                    raise e
+                    @terminate = true
+                    return_null_response = true
                 rescue TerminateException => e
-                    raise e
+                    return_null_response = true
                 rescue ReturnSyncException
                     return
-                rescue ForwardSyncException
-                    return
                 rescue ReturnAsyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
+                    return
+                rescue ForwardSyncException
                     return
                 rescue ForwardAsyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
                     return
+                rescue StandardError => e
+                    return_null_response = true
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                rescue SystemExit => e
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                    raise
                 rescue
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                    exit(1)
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -402,7 +425,11 @@ module CloudI
 
         def poll_request(timeout, external)
             if @terminate
-                return false
+                if external
+                    return false
+                else
+                    raise TerminateException.new(@timeout_terminate)
+                end
             elsif external and not @initialization_complete
                 send(Erlang.term_to_binary(:polling))
                 @initialization_complete = true
@@ -492,6 +519,9 @@ module CloudI
                     callback(command, name, pattern, request_info, request,
                              request_timeout, priority, trans_id,
                              Erlang.binary_to_term(pid))
+                    if @terminate
+                        return false
+                    end
                 when MESSAGE_RECV_ASYNC, MESSAGE_RETURN_SYNC
                     i += j; j = 4
                     response_info_size = data[i, j].unpack('L')[0]
@@ -615,35 +645,66 @@ module CloudI
             return poll_request(timeout, true)
         end
 
-        def text_key_value_parse(text)
-            result = {}
-            data = text.split(NULL.chr)
-            (0...(data.length)).step(2).each do |i|
-                value = result[data[i]]
+        def shutdown(reason=nil)
+            if reason.nil?
+                reason = ''
+            end
+            send(Erlang.term_to_binary([:shutdown, reason]))
+        end
+
+        def self.text_pairs_parse(text)
+            pairs = {}
+            text_segments = text.split(NULL.chr)
+            (0...(text_segments.length)).step(2).each do |i|
+                value = pairs[text_segments[i]]
                 if value == nil
-                    result[data[i]] = data[i + 1]
+                    pairs[text_segments[i]] = text_segments[i + 1]
                 elsif value.kind_of?(Array)
-                    value << data[i + 1]
+                    value << text_segments[i + 1]
                 else
-                    result[data[i]] = [value, data[i + 1]]
+                    pairs[text_segments[i]] = [value, text_segments[i + 1]]
                 end
             end
-            return result
+            return pairs
         end
 
-        def info_key_value_parse(message_info)
-            return text_key_value_parse(message_info)
+        def self.text_pairs_new(pairs, response)
+            text_stream = StringIO.new
+            pairs.each do |key, values|
+                if values.kind_of?(String)
+                    text_stream.write "#{key}\0#{values}\0"
+                else
+                    values.each do |value|
+                        text_stream.write "#{key}\0#{value}\0"
+                    end
+                end
+            end
+            text = text_stream.string
+            if response and text == ''
+                return "\0"
+            else
+                return text
+            end
+        end
+
+        def self.info_key_value_parse(info)
+            return text_pairs_parse(info)
+        end
+
+        def self.info_key_value_new(pairs, response = true)
+            return text_pairs_new(pairs, response)
         end
 
         def self.assert
-            raise 'Assertion failed !' unless yield # if $DEBUG
+            raise AssertionError unless yield # if $DEBUG
         end
 
         private :null_response
         private :callback
         private :handle_events
         private :poll_request
-        private :text_key_value_parse
+        private_class_method :text_pairs_parse
+        private_class_method :text_pairs_new
         private
 
         def send(data)
@@ -729,5 +790,11 @@ module CloudI
         end
         attr_reader :timeout
     end
+
+    class AssertionError < Exception
+    end
+
+    class FatalError < Exception
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudi
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Truog
@@ -10,27 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MRAwDgYDVQQDDAdtanRy
-  dW9nMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  HhcNMTcwOTEzMDYwMzAwWhcNMTgwOTEzMDYwMzAwWjA+MRAwDgYDVQQDDAdtanRy
-  dW9nMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPlZFk7xAzMnUiNr/uHQV1
-  xPPNZmqevvZgfY9SMS2C7c4kGTNBePRvmr3ihTW8yFTEXNRdCO3Ibm9zp7YFmlzz
-  l7lyxHnEsrmPDmb5Ry+gIfrJ2M7lHqhbtvk3+5n5VB4npxEwXX3rsFWixO/8IOdX
-  s9fuALCwdRbWwSBSgp+8SGHIl16G7iTxD7moHNsqW4i8ryyRr05jnhxJBSCcZShE
-  Oa//izbIxWRvBk2Ibn/YlwZ2SrJXJ/DWxFkeXOcEFRQYy0vTn577GK0f4NTzoab5
-  G5FKKk0oMtl5W+kaF6+qd7XkotSMCC4jG9dU17G9HkbHfjPKS4mkbMnlYIXlN5ZJ
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSkVYwB
-  WjkE89b0x4Kq7W1UH82QODAcBgNVHREEFTATgRFtanRydW9nQGdtYWlsLmNvbTAc
-  BgNVHRIEFTATgRFtanRydW9nQGdtYWlsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEA
-  YO8ZXcsUY/3m6/JFCTqL9qL2wR4zfcYwo/uYDo2S7FR/EGsy1M+qLJB8V13AR2Li
-  d/2mLm+SnhAgR32fMOaM58pbyFhlGaaEIs11xYywwbEbVe3eRxunsaJBcJxYeRZ+
-  V+c3ebJejEGUNJ4dRSB6WvWr9zl7FozsWBNSYJoWDMfkC2B2zHo08va5DRSActEn
-  27W/V+TnP3ONYvcoDcOr7sNOhNISlpgB5kDcl7stP85hm99IVK7vZi8t2jX/8GTT
-  +H4JAL4xk2aIYYf48338kxyZ8y9BNgp8cGbMEDtRSCgJnYk820Yt/fhM2DZtCbBL
-  tOEdFrZvpA23/sCoGvunHw==
+  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRAwDgYDVQQDDAdtanRy
+  dW9nMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFpbDETMBEGCgmSJomT8ixkARkW
+  A2NvbTAeFw0xOTExMjkwMjM1MzJaFw0yMDExMjgwMjM1MzJaMEMxEDAOBgNVBAMM
+  B21qdHJ1b2cxGjAYBgoJkiaJk/IsZAEZFgpwcm90b25tYWlsMRMwEQYKCZImiZPy
+  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5Ar67eHx
+  R/cmFgsj58SkbsqEQWZOQ5GNO25IKuwjGHqznJXszXM1NW0YFLjgXjsXVdTXPeIC
+  CbkfoR8Yc1CEI6FYOWqhO0JqpPfYzt0s27o3Ua2x8j6n+31iRkbArIX2IVEjvBNd
+  UiTg6mG4Hc3KLqrBRDxZ+uyzqH/FEGPi5Ggak/E5xKwSdPWBPqDYKcze+suXxYO7
+  u38NwloGxpatQGgHgNGf83RfWDPaiYHGdPAsvUDzRFauxcG8sYRbmohc0TmE5+TQ
+  KMviZJNaNOaQkW1/twRQpo9PEv8bxEzEXT+tNOMEHrXgKv4+xEZYBM7D1FdP8gKj
+  wMXN22ZkLWzP8wIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQUT8+9UATmehNm5Lg1aBx8HLK7MZwwIQYDVR0RBBowGIEWbWp0cnVvZ0Bw
+  cm90b25tYWlsLmNvbTAhBgNVHRIEGjAYgRZtanRydW9nQHByb3Rvbm1haWwuY29t
+  MA0GCSqGSIb3DQEBBQUAA4IBAQANj/kudiIbxJaurULxhML4palEaqIeWCw24bxj
+  X72RvO4Ti6DDKpeccK0QF26tZCOw4ngxPPY0w1Zzq96iYMVPlKVBYVDCtjIkFNDt
+  Q/0hupNd8lLloTlIJ7jzHohfPtzUjsdC0d0cwXZLkjxhw67N7QPDxsCEa+jiHaWd
+  i+DxiISAPKf9ugw5kej0v2j15juXiK5pwKIDDGAFfv3WAFbJXleLoqdM87rbC/vq
+  KH+3FIhF8jYeRqq/8g4k6zsZZwRewPjObe3Wm4yEv0f0dxdQRuWcuE7s7z0Bss5J
+  YQYB6UQUREuP9rhSHKbAZd9CPR3XW+S7PkeQiWc8ceLFVsfK
   -----END CERTIFICATE-----
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erlang_rb
@@ -38,42 +38,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: erlang_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.0.1
 description: Ruby CloudI API
-email: mjtruog@gmail.com
+email: mjtruog@protonmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -81,7 +81,7 @@ extra_rdoc_files:
 files:
 - README.markdown
 - lib/cloudi.rb
-homepage: http://cloudi.org
+homepage: https://cloudi.org
 licenses:
 - MIT
 metadata: {}
@@ -100,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CloudI API

metadata.gz.sig

@@ -1,3 +1,2 @@
-3��;��~������>�i�aA�*0F\=�&���rX+7d�Fȃ�����5Xu���
-��+��QUa�3S�OUy���y����-�T�1�G�'���9�!���\��)��ñev����7�DH}�<��P�>Â)�5D�fW��=��������x����|s��$�Qo����a	�{�UX5j��?[*������wDͤ���Q�N*F��oI%�ڴӗKl_�8�yN
-��gA�A!Y,?V
+�2>��ux.&P�&��zu(���P�u}�.�hٕ>O�v��c�����C`��	M*�;AƢ���xX��zi�&��
+�FK��t�?[aH��:�|��d*Ҥ�sG�w�Yoj�9@@