comunika_gsm 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e83d4112815af17ab005e1769a7bc98d43420f
-  data.tar.gz: 2e18b980945f7ab62ce8db61307368bd71450fbc
+  metadata.gz: 1a0a190ee77641764e442423fbe8ea8997db3133
+  data.tar.gz: ac227aa30e9dcf8b65f715186df8cb4029d92545
 SHA512:
-  metadata.gz: b94eb847e2f56a1f107a9c799193408e6267eb9e16c3aac43805e0a9d3834342a28674bf043a138b10960d8b9091dffab61bd4116af48a4d1bf0beb4d5019145
-  data.tar.gz: f797081a63de2d54fec0bf95cae4bc211966d592f99761522736f14afd03d95f958b9357bce6e42791e43db2bfa55c6e7bff3c470ea765d8bd457ad0a69fd163
+  metadata.gz: 2f1bb1d2cf1430aa6b450c144d37b515bfafe6111ff2a4228a4d82edd14425eefd9ae3344e018766d243ddcce09900348e0c73c2c49a6ed4fa1c70ca8560842c
+  data.tar.gz: c5cb62174d8db05fe364d6c538e4a9a92af59b9812a6deabddecf2454743a480e4dd603691623204ba862dd446907f370de5c0b3bbbe126069d17a3d0c22d988

data/lib/comunika_gsm/modem.rb

@@ -22,21 +22,13 @@ module ComunikaGsm
       threads = []
       self.ports.each do |port|
         threads << Thread.new {
-          gsm = GSM2.new(:port => port, :debug => params[:debug])
-          if gsm.status
-            result = gsm.cmd("AT\r\n")
-            if result.to_s.length > 0
-              imei = gsm.cmd("AT+CGSN\r\n")
-              iccid = gsm.cmd("AT+CRSM=176,12258,0,0,10\r\n")
-              provider = gsm.cmd("AT+COPS?\r\n")
-              signal = gsm.cmd("AT+CSQ\r\n")
-              unless @@devices.find {|m| m[:imei] == imei}
-                @@devices << {:port => port,:gsm => gsm, :imei => imei, :iccid => iccid, :provider => provider, :signal => signal}
-              end
-            else
-              gsm.close
-            end
+          ## Check port and add in to devices ##
+          modem = self.load_modem(port, params[:debug])
+          if modem
+            self.add(modem)
           end
+
+          Thread.current.kill
         }
       end
 
@@ -47,6 +39,29 @@ module ComunikaGsm
       @@devices.collect! {|d| Device.new(d) }#.uniq {|d| d[:imei] }#.find_all{|dev| dev.status == true }.uniq!{|d| d.imei }
     end
 
+    def add(device)
+      @@devices << device
+    end
+
+    def load_modem(port, debug=false)
+      gsm = GSM2.new(:port => port, :debug => debug)
+      if gsm.status
+        result = gsm.cmd("AT\r\n")
+        if result.to_s.length > 0
+          imei = gsm.cmd("AT+CGSN\r\n")
+          iccid = gsm.cmd("AT+CRSM=176,12258,0,0,10\r\n")
+          provider = gsm.cmd("AT+COPS?\r\n")
+          signal = gsm.cmd("AT+CSQ\r\n")
+          unless @@devices.find {|m| m[:imei] == imei}
+            return Device.new(:port => port,:gsm => gsm, :imei => imei, :iccid => iccid, :provider => provider, :signal => signal)
+          end
+        else
+          gsm.close
+          return nil
+        end
+      end
+    end
+
     class Device
       attr_accessor :port, :gsm, :imei, :iccid, :provider, :signal
       def initialize(params)

data/lib/comunika_gsm/version.rb

@@ -1,3 +1,3 @@
 module ComunikaGsm
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comunika_gsm
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Jefferson Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gem of use internal