smartware 0.1.29 → 0.1.30

data/bin/smartware

@@ -3,28 +3,24 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'smartware'
-require 'dante'
+require 'trollop'
 
-Smartkiosk::Common::Patches.dante_should_log_with Smartware::Logging.logger
-
-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
+opts = Trollop.options do
+  version "Smartware #{Smartware::VERSION}"
+  banner "Smartware - Smartkiosk hardware control service"
+  opt :config, "Hardware config file to use (smartware.yml, absolute path)", type: String, required: true
+  opt :log, "Log file to use", type: String
 end
 
-runner.execute do |opts|
-  abort 'You should specify hardware configuration file path(--config-file=/path/to/smartware.yml)' if opts[:config].nil?
+p opts[:log]
+
+Smartware::Logging.destination = opts[:log] if opts[:log]
+Smartware::Logging.init
 
-  begin
-    Smartware::Logging.destination = opts[:log_path] if opts[:log_path]
-    Smartware::Service.start(opts[:config])
-  rescue => e
-    raise e if $DEBUG
-    STDERR.puts e.message
-    STDERR.puts e.backtrace.join("\n")
-    exit 1
-  end
-end
+begin
+  Smartware::Service.start(opts[:config])
+rescue => e
+  Smartware::Logging.logger.error e.message
+  Smartware::Logging.logger.error e.backtrace.join("\n")
+  exit 1
+end

data/lib/smartware.rb

@@ -1,4 +1,5 @@
 require 'smartkiosk/common'
+require 'smartware/version'
 require 'smartware/logging'
 require 'smartware/service'
 require 'smartware/clients/cash_acceptor'

data/lib/smartware/service.rb

@@ -13,37 +13,35 @@ module Smartware
 
       @config = YAML.load File.read(File.expand_path(config_file))
 
-      Smartware::Logging.logger = Logging.init
       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 = Smartware::Service.config["#{iface}_driver"].downcase
+                            driver = Service.config["#{iface}_driver"].downcase
 
                             require "smartware/drivers/#{iface}/#{driver}"
                             require "smartware/interfaces/#{iface}"
                           rescue => e
-                            Smartware::Logging.logger.fatal "During startup of #{iface}:"
-                            Smartware::Logging.logger.fatal e.message
-                            Smartware::Logging.logger.fatal e.backtrace.join("\n")
+                            Logging.logger.fatal "During startup of #{iface}:"
+                            Logging.logger.fatal e.message
+                            Logging.logger.fatal e.backtrace.join("\n")
                           end
                         end
                       end
 
       @threads.map(&:join)
     rescue => e
-      Smartware::Logging.logger.fatal e.message
-      Smartware::Logging.logger.fatal e.backtrace.join("\n")
+      Logging.logger.fatal e.message
+      Logging.logger.fatal e.backtrace.join("\n")
     end
 
     def self.stop
       @threads.map(&:kill)
-      Smartware::Logging.logger.info "Smartware shutdown at #{Time.now}"
+      Logging.logger.info "Smartware shutdown at #{Time.now}"
       exit 0
     end
 

data/lib/smartware/version.rb

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

data/smartware.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
-  requirement: &70338350434340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70338350434340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: serialport
-  requirement: &70338350433660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338350433660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dante
-  requirement: &70338350432680 !ruby/object:Gem::Requirement
+  name: cmux
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338350432680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cmux
-  requirement: &70338350431700 !ruby/object:Gem::Requirement
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +70,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338350431700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smartware is the Smartkiosk hardware control daemon
 email:
 - e.sudarchikov@roundlake.ru
@@ -110,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Smartware is the Smartkiosk hardware control daemon
 test_files: []
-has_rdoc: