comunika_gsm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 568dc5d37841896c35d14728c73eb3cdec519bf3
-  data.tar.gz: 42ebbba6ae081b8a197e40d59bc0a1dda984c2de
+  metadata.gz: 28460a08eeb3f50c8dbd9877f380f67b92f74fe5
+  data.tar.gz: b8b85e09297e5d3b2762e456dbe1b7e5e65df057
 SHA512:
-  metadata.gz: 09e376be6b8382c7d9764ff8cb2aad917f6636c4b305cde15836a9f968cb35b90745362441dece1b1dd42c68913339ba80096fd022b90671de9d66c12783d7df
-  data.tar.gz: e9db3624809f468ad50a949f0a0a979deffad074028876fd3f014d8984420e158a62bf0564b2953f0269e90978e28929065c8b70c5325309e646776fa77f4941
+  metadata.gz: 85fd3a28f8c6828a45a5be191d2e8b27c65aedf9f317308990921eab07615516a1a457c775bb21d10a52395039f27eb27ff905ad5ec6cf1acec488cf1ef2f8da
+  data.tar.gz: 973889bd1e78d0d65d6ec7577e140490193e38cb9e9d6c68532ff835f3f7ec279dc3dfb10a0e81154db19e5ed283957927d68485dd6a3cad73adf41284b28680

data/lib/comunika_gsm/gsm.rb

@@ -1,6 +1,6 @@
 module ComunikaGsm
   class GSM
-    attr_accessor :status
+    attr_reader :status
     def initialize(params)
       return nil if params.empty?
       begin
@@ -8,10 +8,12 @@ module ComunikaGsm
         @@port.read_timeout = 1000 ## Set timeout of command
 
         @@debug = params[:debug]
+        @status = false
 
-        return nil unless check_port ## Send command AT to modem
+        cmd("ATE0\r\n") ## Set echo off
+        return unless cmd("AT\r\n").eql?("OK") ## Test if running AT ok
+        cmd("AT+CMGF=0\r\n") ## Set PDU mode
         @status = true
-        load_modem
       rescue Errno::ENOENT
         @status = false
       end
@@ -33,22 +35,26 @@ module ComunikaGsm
       buffer
     end
 
+    def close
+      @@port.close
+    end
 
-    private
-    ## Load modem from send sms ##
-    def load_modem
-      cmd("ATE0\r\n") ## Echo off events
-      cmd("AT+CMGF=0\r\n") ## Set PDU mode
+    def imei
+      cmd("AT+CGSN\r\n")
     end
 
-    def check_port
-      cmd("AT\r\n").eql?("OK")
+    def iccid
+      cmd("AT+CRSM=176,12258,0,0,10\r\n")
     end
 
-    public
+    def provider
+      cmd("AT+COPS?\r\n")
+    end
+
+
     def normalize(cmd,res)
       case cmd.gsub(/\r\n/,'')
-      when 'AT'
+      when 'AT' || 'ATE0'
         res.scan(/\r\n(\S+)\r\n/)[0].first unless res.empty?
       when 'AT+COPS?'
         res.scan(/\"(.*?)\"/)[0].first

data/lib/comunika_gsm/modem.rb

@@ -0,0 +1,94 @@
+module ComunikaGsm
+  module Device
+    #TODO run methed of the usb_modeswith
+    @@devices = []
+
+    def self.ports
+      ports = %x{ls /dev | grep ttyUSB*}.split(/\n/)
+    end
+
+    ## Get all devices intances
+    def self.all
+      @@devices
+    end
+
+    # Initialize devices
+    def self.load(params={})
+      threads = []
+      id = 0
+      self.ports.each_with_index do |port,idx|
+        threads << Thread.new{
+          gsm = GSM.new(:port => port, :debug => params[:debug])
+          if gsm.status
+            imei = gsm.imei
+            iccid = gsm.iccid
+            provider = gsm.provider
+
+            unless @@devices.find {|d| d.imei == imei}
+              @@devices << Modem.new(id: id += 1 ,:gsm => gsm, :imei => imei, :iccid => iccid, :provider => provider, :port => port)
+            end
+          else
+            g.close
+          end
+
+          Thread.current.kill
+        }
+      end
+
+      while threads.count > 0
+        threads.delete_if{|t| !t.alive? }
+      end
+
+      @@devices
+    end
+
+    class Modem
+      attr_accessor :id,:port, :imei, :iccid, :provider, :gsm, :total
+      def initialize(params)
+        @id = params[:id]; @port = params[:port]; @imei = params[:imei]; @gsm = params[:gsm]; @total = params[:total] || 0
+      end
+
+      def send_sms(msg)
+        return {id: nil, status: "ERROR", code: "304"} if msg[:number].length == 0
+        return {id: nil, status: "ERROR", code: "304"} if msg[:number].length < 11
+        return {id: nil, status: "ERROR", code: "503"} if msg[:message].length == 0
+
+        ## GENERATE PDU TO MESSAGE ##
+        pdu = PDU.encode(:number => msg[:number].prepend("+55"), :smsc => msg[:smsc], :message => msg[:message])
+
+        # cmd("AT+CMGS=\"#{options[:number]}\"\r")
+        # res = cmd("#{options[:message][0..160]}#{26.chr}")
+        @gsm.cmd("AT+CMGS=#{pdu.size}\r")
+        res = @gsm.cmd("#{pdu.body}#{26.chr}")
+
+        sleep 3
+        while res.length == 0
+          res = @gsm.wait
+        end
+
+        if res.include?('+CMGS')
+          res = res.scan(/\+(\S+)\: (\d+)\r\n/)
+          status = 'OK'
+          code = "-1"
+          id = res.first[1]
+        elsif res.include?('+CMS')
+          res = res.scan(/\+CMS (\S+)\: (\d+)/).first
+          status = 'ERROR'
+          code = res[1]
+          id = nil
+        end
+        @total += 1
+        {:id => id, :code => code, :status => status}
+      end
+
+      def messages
+        sms = @gsm.cmd("AT+CMGL=4\r\n")
+        msgs = sms.scan(/\+CMGL\:\s*?(\d+),\s*?(\d+),.*?\,s*?(\d+)\r\n(.*)/)
+
+        ## IDS: 0 - ID, 1 -- ,2 - size, 3 - PDU
+        msgs.collect!{ |m| PDU::PDUDecode.new(connection: @gsm, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
+      end
+    end
+
+  end
+end

data/lib/comunika_gsm/sms.rb

@@ -1,7 +1,8 @@
 module ComunikaGsm
   module SMS
     class Provider
-      attr_reader :gsm, :total
+      attr_reader :gsm
+      attr_accessor :total
       def initialize(port,debug=false)
         @gsm = GSM.new(:port => port, :debug => debug)
         @total = 0
@@ -49,6 +50,3 @@ module ComunikaGsm
     end
   end
 end
-
-## TODO create method reader sms and remove
-## .sub(/(\d+)\D+(\d+)\D+(\d+)/, '\1/\2/20\3')

data/lib/comunika_gsm/version.rb

@@ -1,3 +1,3 @@
 module ComunikaGsm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/comunika_gsm.rb

@@ -6,6 +6,7 @@ require "comunika_gsm/version"
 require "comunika_gsm/gsm"
 require "comunika_gsm/sms"
 require "comunika_gsm/pdu"
+require "comunika_gsm/modem"
 
 
 module ComunikaGsm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comunika_gsm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jefferson Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - lib/comunika_gsm/gsm.rb
 - lib/comunika_gsm/js/pdu.js
 - lib/comunika_gsm/js/pdu.min.js
+- lib/comunika_gsm/modem.rb
 - lib/comunika_gsm/pdu.rb
 - lib/comunika_gsm/sms.rb
 - lib/comunika_gsm/version.rb