smartware 0.1.27 → 0.1.28

data/bin/smartware

@@ -1,35 +1,22 @@
 #!/usr/bin/env ruby
 
-trap 'TTIN' do
-  Thread.list.each do |thread|
-    puts "Thread #{thread}:"
-    if thread.backtrace
-      puts thread.backtrace.join("\n")
-    else
-      puts "<no backtrace available>"
-    end
-  end
-end
-
-require "rubygems"
-begin
-  require "bundler/setup"
-rescue
-end
-
-require 'smartware/service'
+require 'rubygems'
+require 'bundler/setup'
+require 'smartware'
 require 'dante'
 
+Smartkiosk::Common::Patches.dante_should_log_with Smartware::Logging.logger
+
 runner = Dante::Runner.new('smartware')
-runner.description = "Smartkiosk hardware control daemon"
+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|
+  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?
+  abort 'You should specify hardware configuration file path(--config-file=/path/to/smartware.yml)' if opts[:config].nil?
 
   begin
     Smartware::Service.start(opts[:config])

data/bin/smartware-ppp-helper

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require "bundler/setup"
-require "cmux"
+require 'rubygems'
+require 'bundler/setup'
+require 'cmux'
 
 device, apn = ARGV
 

data/lib/smartware/logging.rb

@@ -1,31 +1,5 @@
-require 'logger'
-
 module Smartware
-  module Logging
-
-    def self.logdir=(dir)
-      @logdir = dir
-    end
-
-    def self.logger
-      @logger ||= begin
-        log = Logger.new(STDOUT)
-        log.level = Logger::INFO
-        log
-      end
-    end
-
-    def self.logger=(val)
-      @logger = (val ? val : Logger.new('/dev/null'))
-    end
-
-    def self.logfile=(val)
-      @logfile = val
-    end
-
-    def self.logfile
-      @logfile
-    end
-
+  module Logging extend Smartkiosk::Common::Logging
+    self.service = 'Smartware'
   end
 end

data/lib/smartware/service.rb

@@ -1,6 +1,5 @@
 require 'thread'
 require 'yaml'
-require 'smartware/logging'
 
 module Smartware
   module Service
@@ -14,7 +13,7 @@ module Smartware
 
       @config = YAML.load File.read(File.expand_path(config_file))
 
-      Smartware::Logging.logger = Logger.new($stdout)
+      Smartware::Logging.logger = Logging.init
       Smartware::Logging.logger.info "Smartware started at #{Time.now}"
 
 

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.1.27"
+  VERSION = "0.1.28"
 end

data/lib/smartware.rb

@@ -1,3 +1,6 @@
+require 'smartkiosk/common'
+require 'smartware/logging'
+require 'smartware/service'
 require 'smartware/clients/cash_acceptor'
 require 'smartware/clients/printer'
 require 'smartware/clients/modem'
@@ -20,6 +23,4 @@ module Smartware
     Smartware::Client::Modem
   end
 
-end
-
-
+end

data/smartware.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'smartkiosk-common'
   gem.add_dependency 'serialport'
   gem.add_dependency 'dante'
   gem.add_dependency 'cmux'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: serialport
-  requirement: !ruby/object:Gem::Requirement
+  name: smartkiosk-common
+  requirement: &70285475109180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70285475109180
+- !ruby/object:Gem::Dependency
+  name: serialport
+  requirement: &70285475108760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70285475108760
 - !ruby/object:Gem::Dependency
   name: dante
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70285475108340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70285475108340
 - !ruby/object:Gem::Dependency
   name: cmux
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70285475107900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,12 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70285475107900
 description: Smartware is the Smartkiosk hardware control daemon
 email:
 - e.sudarchikov@roundlake.ru
@@ -114,8 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Smartware is the Smartkiosk hardware control daemon
 test_files: []
+has_rdoc: