cloudi 1.7.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 916554780735fd65981d4280ba0c3cfddfa36324
-  data.tar.gz: 69d7a32a85c80fc720618db3f4913191c0950dd4
+SHA256:
+  metadata.gz: 0471a083e2e81711a27b2efdd1779820cb687f50ea9b1cc8019cbad439c16b30
+  data.tar.gz: aa4a82edf6d025917958595bbc69cee9a72bfb04e4cd2f435f3aa47513b5795c
 SHA512:
-  metadata.gz: 7a31931154e385f0f018d25bdf44a09e911fa52db3f34cbcb6e19539188ab704f4a337e124f8fb51c4378523c709d3f1846ff116cef82251a115c079c91ab1e0
-  data.tar.gz: 9ec7578b5581a491c7e930aa64c4c8fae3703d781acaf64c79574f759acd67b24deac2cf9084fac2b027ba84edc4573f30beda3a5f39f8223a607d9febb45719
+  metadata.gz: 47603319fafe80c8af0ad85bc7e0189663d43d488d72439647b63653dd481474b9d5ff0a21d3eb9d6ba42ac770efe80418e51e69a7673f372f3db5bab7924e98
+  data.tar.gz: 724f8075fee5e275fed0d317604907b0e67e2ff51bd5f0be1e07f513fe85a15ca407db64f1d4bdbf38550c1d9c22ba75562987848d932ba13b54872db8d018be

data.tar.gz.sig

@@ -1,3 +1 @@
-�Zg�a2ϕ)�5
�%d�g['�^�~��鞏
-���P>!�11a��������u�$u��D[�+Qy�|�q�k��gτ�z��4��E��[�0�|�<R���N�yl"���9̬�	�&�I-���D��x�Qr��R��>?��b%T��}�a��R��~j�i;���
-�Ǯ�!w�T�#��Ɉ~OD5nwc�Q����|��4-�2~�G�h�:�C��
+?��S���0��X����g
���t(Y5U:�c)�|!�tZ`����j$��Vx�Fe�N
��"��EOcqy%i�f��q��ߝ��I��A�|���9�}�!<�r�O���qx�_ɃiV4n�ҭoP}��
L�bSv-!$$�/H6|�����헙�YN;���b��y��m�G�d�Nn�Mq����|�����^j��Rh��(㫀4N?e?/2�۱����o�c�7��_�Ä<N�7��

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
@@ -62,7 +63,7 @@ module CloudI
             @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
@@ -253,6 +254,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 +274,31 @@ 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
+                    return_null_response = true
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -321,29 +325,31 @@ 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
+                    return_null_response = true
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -402,7 +408,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 +502,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,24 +628,54 @@ 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 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 info_key_value_parse(message_info)
-            return text_key_value_parse(message_info)
+        def self.info_key_value_new(pairs, response = true)
+            return text_pairs_new(pairs, response)
         end
 
         def self.assert
@@ -643,7 +686,8 @@ module CloudI
         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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudi
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
 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: 2017-09-12 00:00:00.000000000 Z
+date: 2020-06-04 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.2
+        version: 2.0.0
   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.2
+        version: 2.0.0
 - !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.2
+        version: 2.0.0
   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.2
+        version: 2.0.0
 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