smartware 0.1.2 → 0.1.6

data/bin/smartware

@@ -15,10 +15,17 @@ require 'dante'
 
 runner = Dante::Runner.new('smartware')
 runner.description = "Smartkiosk hardware control daemon"
+runner.with_options do |opts|
+  opts.on("-c", "--config-file FILE", String, "Hardware config file to use. Sample: --config-file=/path/to/smartware.yml") do |x|
+    options[:config] = x
+  end
+end
 
 runner.execute do |opts|
+  abort "You should specify hardware configuration file path(--config-file=/path/to/smartware.yml)" if opts[:config].nil?
+
   begin
-    Smartware::Service.start
+    Smartware::Service.start(opts[:config])
   rescue => e
     raise e if $DEBUG
     STDERR.puts e.message

data/lib/smartware/clients/cash_acceptor.rb

@@ -5,11 +5,8 @@ module Smartware
 
     module CashAcceptor
 
-      def self.configure(port, driver)
-        DRb.start_service
-        @device = DRbObject.new_with_uri('druby://localhost:6001')
-        @device.configure!(port, driver)
-      end
+      DRb.start_service
+      @device = DRbObject.new_with_uri('druby://localhost:6001')
 
       def self.open(limit_min = nil, limit_max = nil)
         @device.open_session(limit_min, limit_max)

data/lib/smartware/clients/modem.rb

@@ -5,11 +5,14 @@ module Smartware
 
     module Modem
 
-      def self.configure(port, driver)
-        DRb.start_service
-        @device = DRbObject.new_with_uri('druby://localhost:6002')
-        @device.configure!(port, driver)
-      end
+      DRb.start_service
+      @device = DRbObject.new_with_uri('druby://localhost:6002')
+
+      #def self.configure(port, driver)
+      #  DRb.start_service
+      #  @device = DRbObject.new_with_uri('druby://localhost:6002')
+      #  @device.configure!(port, driver)
+      #end
 
       def self.error
         @device.error

data/lib/smartware/clients/printer.rb

@@ -5,11 +5,14 @@ module Smartware
 
     module Printer
 
-      def self.configure(port, driver)
-        DRb.start_service
-        @device = DRbObject.new_with_uri('druby://localhost:6005')
-        @device.configure!(port, driver)
-      end
+      DRb.start_service
+      @device = DRbObject.new_with_uri('druby://localhost:6005')
+
+      #def self.configure(port, driver)
+      #  DRb.start_service
+      #  @device = DRbObject.new_with_uri('druby://localhost:6005')
+      #  @device.configure!(port, driver)
+      #end
 
       def self.error
         @device.error

data/lib/smartware/drivers/modem/standard.rb

@@ -0,0 +1,74 @@
+# coding: utf-8
+require 'serialport'
+
+module Smartware
+  module Driver
+    module Modem
+
+      class Standard
+
+        def initialize(port)
+          # @port Class variable needs for ussd request
+          @port = port
+          @sp = SerialPort.new(@port, 115200, 8, 1, SerialPort::NONE)
+        end
+
+        def error
+          false
+        end
+
+        def model
+          res = send 'ATI' rescue -1
+          return -1 unless res.last == "OK"
+
+          res.shift
+          res.pop
+          res.join(' ')
+        rescue
+          -1
+        end
+
+        #
+        # Returns signal level in dbm
+        #
+        def signal_level
+          res = send 'AT+CSQ'
+          return -1 if res.last != "OK"
+          value = res[1].gsub("+CSQ: ",'').split(',')[0].to_i
+          "#{(-113 + value * 2)} dbm"
+        rescue
+          -1
+        end
+
+        #
+        # Method send ussd to operator and return only valid answer body
+        # Don`t call with method synchronously from app, method waits USSD answer 3 sec,
+        # Use some scheduler and buffer for balance value
+        #
+        def ussd(code="*100#")
+          port = SerialPort.new(@port, 115200, 8, 1, SerialPort::NONE)
+          port.read_timeout = 3000
+          port.write "AT+CUSD=1,\"#{code}\",15\r\n"
+          ussd_body = port.read.split(/[\r\n]+/).last.split(",")[1].gsub('"','') # Get only USSD message body
+          port.close
+          ussd_body.scan(/\w{4}/).map{|i| [i.hex].pack("U") }.join # Encode USSD message from broken ucs2 to utf-8
+        rescue
+          -1
+        end
+
+        private
+          def send cmd
+            @sp.write "#{ cmd }\r\n"
+            answer = ''
+            while IO.select [@sp], [], [], 0.25
+              chr = @sp.getc.chr
+              answer << chr
+            end
+            answer.split(/[\r\n]+/)
+          end
+
+      end
+
+    end
+  end
+end

data/lib/smartware/interfaces/cash_acceptor.rb

@@ -19,10 +19,12 @@ module Smartware
       #
       # (re)configure device
       #
-      def self.configure!(port, driver)
-        @device = Smartware::Driver::CashAcceptor.const_get(driver).new(port)
+      def self.configure!(port=nil, driver=nil)
+        @device = Smartware::Driver::CashAcceptor.const_get(
+            Smartware::Service.config['cash_acceptor_driver']).new(
+            Smartware::Service.config['cash_acceptor_port'])
         @session.kill if @session and @session.alive?
-		@commands = %w(monitor)
+		    @commands = %w(monitor)
         @device.cancel_accept
         @session = self.start_poll!
         Smartware::Logging.logger.info "Cash acceptor monitor started"
@@ -112,7 +114,7 @@ module Smartware
 
                   @commands.shift
                 when 'monitor'
-                  @status[:error] = @device.error
+                  @status[:error] = @device.error || ''
                   @status[:model] = @device.model
                   @status[:cassette] = @device.cassette?
                   @commands.shift
@@ -124,6 +126,7 @@ module Smartware
           end
         end
 
+      self.configure!
     end
   end
 end

data/lib/smartware/interfaces/modem.rb

@@ -1,5 +1,5 @@
 require 'drb'
-require 'smartware/drivers/modem/standart'
+require 'smartware/drivers/modem/standard'
 require 'smartware/drivers/modem/dummy'
 
 module Smartware
@@ -10,11 +10,14 @@ module Smartware
       @configured = false
       @status = {}
 
-      def self.configure!(port, driver)
-        @device = Smartware::Driver::Modem.const_get(driver).new(port)
+      def self.configure!(port=nil, driver=nil)
+        @device = Smartware::Driver::Modem.const_get(
+            Smartware::Service.config['modem_driver']).new(
+            Smartware::Service.config['modem_port'])
         @session.kill if @session
         @session = self.poll_status!
         @configured = true
+        Smartware::Logging.logger.info 'Modem monitor started'
         @status = {}
       rescue => e
         Smartware::Logging.logger.error e.message
@@ -70,8 +73,9 @@ module Smartware
             end
           end
         end
-    end
 
+      self.configure!
+    end
   end
 end
 

data/lib/smartware/interfaces/printer.rb

@@ -11,8 +11,10 @@ module Smartware
       @status = {:error => ''}
       @queue = []
 
-      def self.configure!(port, driver)
-        @device = Smartware::Driver::Printer.const_get(driver).new(port)
+      def self.configure!(port=nil, driver=nil)
+        @device = Smartware::Driver::Printer.const_get(
+            Smartware::Service.config['printer_driver']).new(
+            Smartware::Service.config['printer_port'])
         @session.kill if @session and @session.alive?
         @session = self.start_monitor!
         Smartware::Logging.logger.info 'Printer monitor started'
@@ -64,6 +66,7 @@ module Smartware
           end
         end
 
+      self.configure!
     end
   end
 end

data/lib/smartware/service.rb

@@ -1,11 +1,19 @@
 require 'thread'
+require 'yaml'
 require 'smartware/logging'
 
 module Smartware
   module Service
-    def self.start
+
+    def self.config
+      @config
+    end
+
+    def self.start(config_file)
       $stdout.sync = true
       
+      @config = YAML.load File.read(File.expand_path(config_file))
+
       Smartware::Logging.logger = Logger.new($stdout)
       Smartware::Logging.logger.info "Smartware started at #{Time.now}"
 
@@ -24,6 +32,7 @@ module Smartware
       Smartware::Logging.logger.info "Smartware shutdown at #{Time.now}"
       exit 0
     end
+
   end
 end
 

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport
@@ -66,6 +66,7 @@ files:
 - lib/smartware/drivers/cash_acceptor/ccnet.rb
 - lib/smartware/drivers/cash_acceptor/dummy.rb
 - lib/smartware/drivers/modem/dummy.rb
+- lib/smartware/drivers/modem/standard.rb
 - lib/smartware/drivers/modem/standart.rb
 - lib/smartware/drivers/printer/dummy.rb
 - lib/smartware/drivers/printer/tg24xx.rb