millworker 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.1.1 / 2012-09-18
+
+* 1 bug fix:
+
+    * Serial port initialization updates for Windows 7
+
+
 === 1.0.0 / 2012-08-22
 
 * 1 major enhancement

data/README.md

@@ -23,7 +23,7 @@ command terminal and typed `tweet_id.rb RFID_TAG_ID_HERE`.
 
 Install the millworker gem (see below for instructions).
 
-In order read from the correct port on your computer, we need to do a bit of
+In order to read from the correct port on your computer, we need to do a bit of
 setup.
 
 ```bash

data/bin/millworker

@@ -35,7 +35,10 @@ def config
 end
 
 def serial_port
-  SerialPort.new(SERIAL_PORT || config[:serial_port])
+  return @serial_port unless @serial_port.nil?
+  @serial_port ||= SerialPort.new(SERIAL_PORT || config[:serial_port],{"baud" => 9600, "parity" => SerialPort::NONE, "data_bits" => 8})
+  @serial_port.read_timeout = 1000
+  @serial_port
 end
 
 
@@ -72,9 +75,11 @@ command :start do |c|
   c.switch :stdin, desc: 'Read input from STDIN (command line) instead of a serial port.'
 
   c.action do |g, options, args|
-    Dante::Runner.new('millworker').execute(daemonize: !options[:stdin],
-                                            pid_path: PID_PATH,
-                                            log_path: DAEMON_LOG_PATH) {
+    runner = Dante::Runner.new('millworker')
+
+    runner.execute(daemonize: !options[:stdin],
+                   pid_path: PID_PATH,
+                   log_path: DAEMON_LOG_PATH) {
 
       FileUtils.mkdir_p(LOG_DIR) unless File.directory?(LOG_DIR)
       logger = Logger.new(LOG_PATH)
@@ -83,27 +88,30 @@ command :start do |c|
 
       loop do
         data = input.gets
-
-        unless data.nil? || data.empty?
-          data.strip! # Take off newline from serial read
-
-          logger.info "received: '#{data.chomp}'"
-
-          # Read task list in every time so the daemon does not need to be
-          # restarted after changes
-          tasks = Dir["#{TASKS_DIR}/*"]
-
-          if tasks.empty?
-            logger.warn "No tasks to execute in '#{TASKS_DIR}'. Skipping."
-            next
-          else
-            tasks.each do |task|
-              command = "#{task} #{data}"
-
-              execute(command) { |result|
-                logger.info("executed: '#{command}', result: #{result}")
-              }
-            end
+        next if data.nil? || data.empty?
+
+        # Take off newline from serial read
+        data.strip!
+        logger.info "received: '#{data.inspect}'"
+
+        # Take off start & end of text unicode characters
+        rfid_id = data.slice(/\u0002(.*)\u0003/, 1)
+        next if rfid_id.nil?
+
+        # Read task list in every time so the daemon does not need to be
+        # restarted after changes
+        tasks = Dir["#{TASKS_DIR}/*"]
+
+        if tasks.empty?
+          logger.warn "No tasks to execute in '#{TASKS_DIR}'. Skipping."
+          next
+        else
+          tasks.each do |task|
+            command = "#{task} #{data}"
+
+            execute(command) { |result|
+              logger.info("executed: '#{command}', result: #{result}")
+            }
           end
         end
       end

data/lib/millworker/version.rb

@@ -1,3 +1,3 @@
 module Millworker
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: millworker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   L1dHTHNEVk9tZ0orZzR4b09pQ2U5WkVrZGE4SytsL0YKeVhXcUluUmxGSWxU
   dXdGVHhqMjZqYXVCb3NrQlBvejViZmtaRmphVlJoeVVuUm5Ha2E2Nmx2Y0RP
   R2ZrUlpXUQpOVkFESkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli