smartware 0.1.30 → 0.2

data/lib/smartware/interfaces/printer.rb

@@ -1,80 +1,98 @@
-require 'drb'
-
 module Smartware
   module Interface
+    class Printer < Interface
 
-    module Printer
-
-      @configured = false
-      @status = {:error => ''}
-      @queue = []
-
-      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'
-        @configured = true
-      rescue => e
-        @configured = false
-        Smartware::Logging.logger.error "Printer initialization failed: #{e.to_s}"
-      end
+      HARDWARE_ERROR = 1
+      COMMUNICATION_ERROR = 2
+      OUT_OF_PAPER = 3
+      PAPER_NEAR_END = 1000
 
-      def self.configured?
-        @configured
-      end
+      def initialize(config)
+        super
 
-      def self.error
-        @status[:error]
+        @printer_mutex = Mutex.new
+        Thread.new &method(:poll)
+        @markdown = Redcarpet::Markdown.new(@device.new_render)
       end
 
-      def self.model
-        @status[:model]
-      end
+      def test
+        print_text <<-EOS
+Smartware: **#{Smartware::VERSION}**
 
-      def self.version
-        @status[:version]
-      end
+Driver:  **#{@config["driver"]}**
+
+Model:   **#{@device.model}**
 
-      def self.print(filepath)
-        @queue << filepath unless filepath.nil?
+Version: **#{@device.version}**
+
+EOS
       end
 
-      def self.test
-        @queue << '/usr/share/cups/data/testprint'
+      def print(file, max_time = 30)
+        File.open(file, "r") do |io|
+          print_text io.read, max_time
+        end
       end
 
-      private
-        def self.start_monitor!
-          t = Thread.new do
-            loop do
-              begin
-                if @queue.empty?
-                  @status[:error] = @device.error || ''
-                  @status[:model] = @device.model
-                  @status[:version] = @device.version
-                else
-                    `lpr #{@queue[0]}`
-                    Smartware::Logging.logger.info "Printed #{@queue[0]}"
-                    @queue.shift
-                    sleep 5
-                end
-              rescue => e
-                Smartware::Logging.logger.error e.message
-                Smartware::Logging.logger.error e.backtrace.join("\n")
-              end
-              sleep 0.2
+      def print_text(text, max_time = 30)
+        Smartware::Logging.logger.info "Started printing"
+
+        started = Time.now
+
+        @printer_mutex.synchronize do
+          query_printer
+
+          loop do
+            case @device.status
+            when :ready, :warning
+              @device.print @markdown.render(text)
+
+              query_printer
+
+              break
+
+            when :transient_error
+              Smartware::Logging.logger.warn "Transient error #{self.error}."
+
+              now = Time.now
+              break if now - started > max_time
+
+              sleep 0.5
+            when :error
+              Smartware::Logging.logger.warn "Error #{self.error}."
+
+              break
             end
           end
         end
 
-      self.configure!
+        Smartware::Logging.logger.info "Completed"
+
+        self.error.nil? || self.error < 1000
+      end
+
+      private
+
+      def query_printer
+        @device.query
+        update_status do
+          @status[:error] = @device.error
+          @status[:model] = @device.model
+          @status[:version] = @device.version
+        end
+      end
+
+      def poll
+        loop do
+          begin
+            @printer_mutex.synchronize &method(:query_printer)
+            sleep 1
+          rescue => e
+            Smartware::Logging.logger.error e.message
+            Smartware::Logging.logger.error e.backtrace.join("\n")
+          end
+        end
+      end
     end
   end
 end
-
-DRb.start_service('druby://localhost:6005', Smartware::Interface::Printer)
-DRb.thread.join
-

data/lib/smartware/interfaces/watchdog.rb

@@ -0,0 +1,26 @@
+module Smartware
+  module Interface
+    class Watchdog < Interface
+
+      WATCHDOG_NOT_AVAILBLE = 1
+
+      def initialize(config)
+        super
+
+        update_status do
+          @status[:error] = nil
+          @status[:model] = @device.model
+          @status[:version] = @device.version
+        end
+      end
+
+      def reboot_modem
+        @device.reboot_modem
+
+        update_status do
+          @status[:error] = @device.error
+        end
+      end
+    end
+  end
+end

data/lib/smartware/process_manager.rb

@@ -0,0 +1,40 @@
+module Smartware
+  module ProcessManager
+    def self.track(pid, method)
+      @tracked ||= {}
+      @tracked[pid] = method
+    end
+
+    def self.untrack(pid)
+      @tracked ||= {}
+      @tracked.delete pid
+    end
+
+    def self.handle_sigchld(signal)
+      pids = []
+      @tracked ||= {}
+
+      begin
+        loop do
+          pid = Process.wait(-1, Process::WNOHANG)
+          break if pid.nil?
+
+          pids << pid
+        end
+      rescue
+      end
+
+      pids.each do |pid|
+        tracker = @tracked[pid]
+        unless tracker.nil?
+          @tracked.delete pid
+          tracker.call pid
+        end
+      end
+    end
+
+    def self.init
+      trap 'CHLD', ProcessManager.method(:handle_sigchld)
+    end
+  end
+end

data/lib/smartware/service.rb

@@ -1,87 +1,43 @@
-require 'thread'
-require 'yaml'
-
 module Smartware
-  module Service
+  class Service
+    attr_reader :config
 
-    def self.config
-      @config
+    def initialize(config_file)
+      @config = YAML.load File.read(config_file)
+      @interfaces = []
     end
 
-    def self.start(config_file)
-      $stdout.sync = true
-
-      @config = YAML.load File.read(File.expand_path(config_file))
-
-      Smartware::Logging.logger.info "Smartware started at #{Time.now}"
-
-      @threads = %w(modem
-                    cash_acceptor
-                    printer
-                 ).inject([]) do |arr, iface|
-                        arr << Thread.new do
-                          begin
-                            driver = Service.config["#{iface}_driver"].downcase
-
-                            require "smartware/drivers/#{iface}/#{driver}"
-                            require "smartware/interfaces/#{iface}"
-                          rescue => e
-                            Logging.logger.fatal "During startup of #{iface}:"
-                            Logging.logger.fatal e.message
-                            Logging.logger.fatal e.backtrace.join("\n")
-                          end
-                        end
-                      end
+    def start
+      @interfaces = @config["interfaces"].map do |config|
+        interface = Smartware::Interface.const_get(config['name']).new config
 
-      @threads.map(&:join)
-    rescue => e
-      Logging.logger.fatal e.message
-      Logging.logger.fatal e.backtrace.join("\n")
-    end
+        DRb::DRbServer.new config["uri"], interface
+      end
 
-    def self.stop
-      @threads.map(&:kill)
-      Logging.logger.info "Smartware shutdown at #{Time.now}"
-      exit 0
-    end
+      unless @config["connection_timeout"].nil?
+        Thread.new do
+          begin
+            monitor = ConnectionMonitor.new @config["connection_timeout"]
 
-  end
+            monitor.run
+          rescue => e
+            Smartware::Logging.logger.error "Exception in connection monitor thread: #{e}"
+            e.backtrace.each { |line| Smartware::Logging.logger.error line }
+          end
+        end
+      end
 
-  module ProcessManager
-    def self.track(pid, method)
-      @tracked ||= {}
-      @tracked[pid] = method
     end
 
-    def self.untrack(pid)
-      @tracked ||= {}
-      @tracked.delete pid
+    def stop
+      @interfaces.each &:stop_service
     end
 
-    def self.handle_sigchld(signal)
-      pids = []
-      @tracked ||= {}
-
-      begin
-        loop do
-          pid = Process.wait(-1, Process::WNOHANG)
-          break if pid.nil?
-
-          pids << pid
-        end
-      rescue
-      end
-
-      pids.each do |pid|
-        tracker = @tracked[pid]
-        unless tracker.nil?
-          @tracked.delete pid
-          tracker.call pid
-        end
+    def join
+      @interfaces.each do |server|
+        server.thread.join
       end
     end
   end
-
-  trap 'CHLD', ProcessManager.method(:handle_sigchld)
 end
 

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.1.30"
+  VERSION = "0.2"
 end

data/smartware.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'smartkiosk-common', '>= 0.0.2'
   gem.add_dependency 'serialport'
-  gem.add_dependency 'cmux'
+  gem.add_dependency 'cmux', '>= 0.0.2'
   gem.add_dependency 'trollop'
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'redcarpet'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
@@ -46,6 +46,22 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cmux
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -61,7 +77,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -93,20 +125,28 @@ files:
 - Rakefile
 - bin/smartware
 - bin/smartware-ppp-helper
+- config/smartware.yml.sample
 - lib/smartware.rb
 - lib/smartware/clients/cash_acceptor.rb
 - lib/smartware/clients/modem.rb
 - lib/smartware/clients/printer.rb
+- lib/smartware/clients/watchdog.rb
+- lib/smartware/connection_monitor.rb
 - 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/printer/dummy.rb
-- lib/smartware/drivers/printer/tg24xx.rb
+- lib/smartware/drivers/printer/esc_pos.rb
+- lib/smartware/drivers/watchdog/dummy.rb
+- lib/smartware/drivers/watchdog/watchdog_daemon.rb
 - lib/smartware/interfaces/cash_acceptor.rb
+- lib/smartware/interfaces/interface.rb
 - lib/smartware/interfaces/modem.rb
 - lib/smartware/interfaces/printer.rb
+- lib/smartware/interfaces/watchdog.rb
 - lib/smartware/logging.rb
+- lib/smartware/process_manager.rb
 - lib/smartware/service.rb
 - lib/smartware/version.rb
 - smartware.gemspec