opensips-mi 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1956c21f6f508a1106aed87e99dbdc17925f529dc2d799554e6080a3ece2a23d
-  data.tar.gz: 0f2e9e1dbc906f5ed4fc92dd6cae377e1fd1e0d38866d66318258465832a9b54
+  metadata.gz: 135298241a7da04c8011bdc51fd903c62b04dbfb05de49cce7610544fee9f274
+  data.tar.gz: 25a7bede110b7b35b121baddb04c2da6588d6fb8de3d9914cc84f6fd79041ef2
 SHA512:
-  metadata.gz: 3c23130f92a3209b265ffe553fde481ae9c70897b1b13c31514358bdbfc6ed2329455ec3826fa4e99627498cd2a820a05a1e18c1ce51e22f4bb54b60e0c729e0
-  data.tar.gz: 5fa13a5dc0c8652625e1c1e14b740e816a8cdec36a2a32b50c688ffb8f642c4d92578a39a15da0d4e23a8dda6b152d669e65e5945fdd78fe862990a33f04fea6
+  metadata.gz: 273474a444d49d471180eb7051cd57dc34e1c8c21146429cb649fab1134c5b4c6f604c0762a3a97005c4f340c7c4d379e95a0e89935d7511a1f5c1654c7edbc6
+  data.tar.gz: 7aca0cdf36610f3f4db77864d215ec9b214acaebfcac25345e2f8042997614f62e44f47e8914f06717f0d1cb9186e62df391524a2ae5bcef7246f7c3adb278c4

data/.gitignore

@@ -7,6 +7,7 @@
 Gemfile*.lock
 .bundle
 .config
+.byebug_history
 coverage
 log
 InstalledFiles

data/README.md

@@ -73,12 +73,14 @@ opensips = Opensips::MI.connect :fifo,
 require 'opensips/mi'
 opensips = Opensips::MI.connect :datagram, 
                                 :host => "sipproxy.com", 
-                                :port => 8809
+                                :port => 8809,
+                                :timeout => 5
 ```
 **Parameters hash:**
 
 * host: Hostname or IP address of OpenSIPs server
 * port: Datagram port. See mi_datagram module configuration parameter: `modparam("mi_datagram", "socket_name", "udp:192.168.2.133:8080")`
+* timeout: Timeout in seconds to wait send/recv commands. Optional. Default 3 seconds.
 
 ### XMLRPC
 ```ruby

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

@@ -1,8 +1,11 @@
+require 'timeout'
+
 module Opensips
   module MI
     module Transport
       class Datagram < Opensips::MI::Command
         RECVMAXLEN = 2**16 - 1
+        TIMEOUT = 3
 
         class << self
           def init(params)
@@ -14,6 +17,7 @@ module Opensips
           host_valid? params
           @sock = UDPSocket.new
           @sock.connect params[:host], params[:port]
+          @timeout = params[:timeout].to_i
         end
 
         def command(cmd, params = [])
@@ -21,12 +25,20 @@ module Opensips
           params.each do |c|
             request << "#{c}\n"
           end
-          @sock.send request, 0
+          Timeout::timeout(tout, nil, "Timeout send request to datagram MI") {
+            @sock.send request, 0
+          }
           # will raise Errno::ECONNREFUSED if failed to connect
-          response, = @sock.recvfrom RECVMAXLEN
+          Timeout::timeout(tout,nil,"Timeout receive respond from datagram MI") {
+            response, = @sock.recvfrom RECVMAXLEN
+          }
           Opensips::MI::Response.new response.split(?\n)
         end
 
+        def tout
+          @timeout > 0 ? @timeout : TIMEOUT
+        end
+
       end
     end
   end

data/lib/opensips/mi/version.rb

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

data/opensips-mi.gemspec

@@ -6,8 +6,9 @@ require 'opensips/mi/version'
 Gem::Specification.new do |spec|
   spec.name          = "opensips-mi"
   spec.version       = Opensips::MI::VERSION
+  spec.licenses      = ['MIT']
   spec.authors       = ["Stas Kobzar"]
-  spec.email         = ["stas@modulis.ca"]
+  spec.email         = ["staskobzar@gmail.com"]
   spec.description   = %q{Ruby module for interacting with OpenSIPs management interface}
   spec.summary       = %q{OpenSIPs management interface}
   spec.homepage      = "http://github.com/staskobzar/opensips-mi"
@@ -18,8 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "xmlrpc", "~> 0.3"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.8"
-  spec.add_development_dependency('rdoc')
+  spec.add_development_dependency "bundler", "~>2.2.5"
+  spec.add_development_dependency "rake", "~>13.0.3"
+  spec.add_development_dependency "rspec", "~>3.10.0"
 end

data/spec/transport_spec.rb

@@ -67,9 +67,26 @@ describe Transport do
         Opensips::MI.connect :datagram, {:host => "10.0.0.1", :port => 0}
       }.to raise_error SocketError
     end
+
+    it "default timeout is 3 sec" do
+      mi=Opensips::MI.connect :datagram, {:host => "10.0.0.1", :port => 8088}
+      expect(mi.tout).to be(3)
+    end
+
+    it "must set timeout from params" do
+      mi=Opensips::MI.connect :datagram, {:host => "10.0.0.1", :port => 8088, :timeout => 15}
+      expect(mi.tout).to be(15)
+    end
+
+    it "must foo" do
+      mi=Opensips::MI.connect :datagram, {:host => "10.0.0.1", :port => 8088, :timeout => 1}
+      expect {
+        mi.uptime
+      }.to raise_error Timeout::Error
+    end
   end
 
-  context "datagram" do
+  context "xmlrpc" do
     it "must raise if empty host" do
       expect {
         Opensips::MI.connect :xmlrpc, {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opensips-mi
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Stas Kobzar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmlrpc
@@ -30,59 +30,45 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  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'
+        version: 3.10.0
 description: Ruby module for interacting with OpenSIPs management interface
 email:
-- stas@modulis.ca
+- staskobzar@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -111,9 +97,10 @@ files:
 - spec/spec_helper.rb
 - spec/transport_spec.rb
 homepage: http://github.com/staskobzar/opensips-mi
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: OpenSIPs management interface
 test_files: