smartware 0.2 → 0.2.1

data/lib/smartware/clients/printer.rb

@@ -44,6 +44,12 @@ module Smartware
         'No device'
       end
 
+      def self.print_markdown(text, max_time = 30)
+        @device.print_markdown text, max_time
+      rescue => e
+        'No device'
+      end
+
     end
   end
 end

data/lib/smartware/drivers/cash_acceptor/dummy.rb

@@ -14,8 +14,7 @@ module Smartware
         end
 
         def version
-          # TODO: implement this
-          "not implemented"
+          "1.0"
         end
 
         def cassette?

data/lib/smartware/interfaces/cash_acceptor.rb

@@ -126,8 +126,7 @@ module Smartware
       end
 
       def execute_monitor
-
-        error = @device.error || ''
+        error = @device.error
         model = @device.model
         version = @device.version
         cassette = @device.cassette?

data/lib/smartware/interfaces/modem.rb

@@ -34,7 +34,7 @@ module Smartware
               @status[:signal_level] = @device.signal_level
               @status[:model] = @device.model
               @status[:version] = @device.version
-              @status[:error] = @device.error || ''
+              @status[:error] = @device.error
               @status[:balance] = @device.balance
             end
           end

data/lib/smartware/interfaces/printer.rb

@@ -16,7 +16,7 @@ module Smartware
       end
 
       def test
-        print_text <<-EOS
+        print_markdown <<-EOS
 Smartware: **#{Smartware::VERSION}**
 
 Driver:  **#{@config["driver"]}**
@@ -30,10 +30,14 @@ EOS
 
       def print(file, max_time = 30)
         File.open(file, "r") do |io|
-          print_text io.read, max_time
+          print_markdown io.read, max_time
         end
       end
 
+      def print_markdown(text, max_time = 30)
+        print_text @markdown.render(text), max_time
+      end
+
       def print_text(text, max_time = 30)
         Smartware::Logging.logger.info "Started printing"
 
@@ -45,7 +49,7 @@ EOS
           loop do
             case @device.status
             when :ready, :warning
-              @device.print @markdown.render(text)
+              @device.print text
 
               query_printer
 
@@ -68,7 +72,7 @@ EOS
 
         Smartware::Logging.logger.info "Completed"
 
-        self.error.nil? || self.error < 1000
+        self.error.nil? || self.error >= 1000
       end
 
       private

data/lib/smartware/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common