opensips-mi 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135298241a7da04c8011bdc51fd903c62b04dbfb05de49cce7610544fee9f274
-  data.tar.gz: 25a7bede110b7b35b121baddb04c2da6588d6fb8de3d9914cc84f6fd79041ef2
+  metadata.gz: 0fc7093889a67efa9694b4fbd1617044d7fab88d876e7aba8ba20b5385ba67f5
+  data.tar.gz: a03613f39146e109c1de1949b48802fdcf84b2a73ae41247858dcab5429b38b6
 SHA512:
-  metadata.gz: 273474a444d49d471180eb7051cd57dc34e1c8c21146429cb649fab1134c5b4c6f604c0762a3a97005c4f340c7c4d379e95a0e89935d7511a1f5c1654c7edbc6
-  data.tar.gz: 7aca0cdf36610f3f4db77864d215ec9b214acaebfcac25345e2f8042997614f62e44f47e8914f06717f0d1cb9186e62df391524a2ae5bcef7246f7c3adb278c4
+  metadata.gz: 955848e500a74ebe27065494ad83353ae04c8c0710f824242d02195b3dfdffefb0a2a8d984b73dd7b4bb578bcf26dcf7f799e79d31e54d10598657fb70ffdc3f
+  data.tar.gz: b24b7f8e3f27c9b9bc4f544bd0f60c63da346cbd759a61e2be5628907d671782e564fa013ba930465f3ebb23b27313c8fb55588d4e10920c05f494c856a4aa28

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.3.8
+  - 2.6.3

data/README.md

@@ -11,6 +11,9 @@ This library supports following management interfaces OpenSIPs modules:
 * mi_datagram
 * mi_xmlrpc
 
+## Disclamer
+This is old version and works only with olde openisips versions (older then v3)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/opensips/mi.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 require 'fcntl'
 require 'securerandom'
-require 'socket'
+require 'socketry'
 require 'xmlrpc/client'
 
 require "opensips/mi/version"

data/lib/opensips/mi/transport/datagram.rb

@@ -1,5 +1,3 @@
-require 'timeout'
-
 module Opensips
   module MI
     module Transport
@@ -15,8 +13,7 @@ module Opensips
 
         def initialize(params)
           host_valid? params
-          @sock = UDPSocket.new
-          @sock.connect params[:host], params[:port]
+          @sock = Socketry::UDP::Socket.connect(params[:host], params[:port])
           @timeout = params[:timeout].to_i
         end
 
@@ -25,13 +22,7 @@ module Opensips
           params.each do |c|
             request << "#{c}\n"
           end
-          Timeout::timeout(tout, nil, "Timeout send request to datagram MI") {
-            @sock.send request, 0
-          }
-          # will raise Errno::ECONNREFUSED if failed to connect
-          Timeout::timeout(tout,nil,"Timeout receive respond from datagram MI") {
-            response, = @sock.recvfrom RECVMAXLEN
-          }
+          response = send(request)
           Opensips::MI::Response.new response.split(?\n)
         end
 
@@ -39,6 +30,14 @@ module Opensips
           @timeout > 0 ? @timeout : TIMEOUT
         end
 
+        private
+        def send(request)
+          @sock.send request
+          response = @sock.recvfrom RECVMAXLEN, timeout: tout
+          response.message
+        rescue => e
+          "500 #{e}"
+        end
       end
     end
   end

data/lib/opensips/mi/version.rb

@@ -1,5 +1,5 @@
 module Opensips
   module MI
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/opensips-mi.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "xmlrpc", "~> 0.3"
+  spec.add_dependency "socketry", "~> 0.5"
 
-  spec.add_development_dependency "bundler", "~>2.2.5"
-  spec.add_development_dependency "rake", "~>13.0.3"
-  spec.add_development_dependency "rspec", "~>3.10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/spec/transport_spec.rb

@@ -78,11 +78,11 @@ describe Transport do
       expect(mi.tout).to be(15)
     end
 
-    it "must foo" do
+    it "must return socket error" do
       mi=Opensips::MI.connect :datagram, {:host => "10.0.0.1", :port => 8088, :timeout => 1}
-      expect {
-        mi.uptime
-      }.to raise_error Timeout::Error
+      expect(mi.uptime.code).to be(500)
+      expect(mi.uptime.success).to be_falsey
+      expect(mi.uptime.message).to eq("recvfrom timed out after 1 seconds")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opensips-mi
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Stas Kobzar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmlrpc
@@ -25,47 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: socketry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '0'
 description: Ruby module for interacting with OpenSIPs management interface
 email:
 - staskobzar@gmail.com