green_eye_monitor 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb9382f227f92a98dcc439bc7176ef5c4003147
-  data.tar.gz: 0f4d9dc2d207d4553a535670a3b0fc9f7ee80366
+  metadata.gz: 7663ce5a7fac9acec62f26da6736257acd048c09
+  data.tar.gz: bdf2c0843106306a6fb8ea85750028fdf18a95f6
 SHA512:
-  metadata.gz: 695e3d2ea31df523c48057939184afd5abd2382fae5d3ac22f145ef34c26fb1111ce3f6c555dfbbccc3655a612bde5bd542d611164c063b4140d97f6170dcd5d
-  data.tar.gz: 31d1778a2c5977ea7da9858fdcecf3949fd5ff5556298e53de48a085553b8f64d218749e4d9e488137ab7225ede4fbd4f5f80a1c9141a97139e9662e0c936c67
+  metadata.gz: 2d037172e610ae30773832c2a7d3d31da14e1765626a3d908ea3fab3187c8d931526323ce7f221d935c9fb1ab64a5ab5faa05d63617497072e01bfeab983af59
+  data.tar.gz: e7d7a2748ffbd88b8f94843da8007d71672ddf10d6b18476e277fc562d4e9cb7e7165dd1ddc52cf4b9240eda7348562011d1a28bc970e8f4a31f0e49cc4d21a4

data/.rubocop.yml

@@ -30,7 +30,13 @@ Style/ModuleFunction:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 20
+  Max: 25
+
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+Metrics/PerceivedComplexity:
+  Max: 8
 
 AlignHash:
   EnforcedHashRocketStyle: table

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.0.4 (20160518)
+
+* Don't wait on serial port forever (@johnf)
+
 # 0.0.3 (20160515)
 
 * Add functionality to derive watts based on previous packet (@johnf)

data/exe/green_eye_monitor

@@ -10,7 +10,7 @@ require 'terminal-table'
 
 opts = Slop.parse do |o|
   o.bool '-d', '--debug', 'enable debug mode'
-  o.string '--port', 'serial port', default: '/dev/ttyUSB1'
+  o.string '--port', 'serial port', :default => '/dev/ttyUSB1'
   o.on '--version', 'print the version' do
     puts Slop::VERSION
     exit
@@ -54,13 +54,13 @@ rows << ['ABS Watts'] + data.abs_watts
 rows << ['VA'] + data.va
 rows << ['Polarised Watts'] + data.polarised_watts
 rows << ['Current'] + data.current
-rows.each {|row| row.slice!(15..28)}
+rows.each { |row| row.slice!(15..28) }
 headings = [''] + (1..15).to_a + (30..32).to_a
 puts Terminal::Table.new(:rows => rows, :headings => headings)
 puts
 
 puts "ABS Total: #{data.abs_watts.to_a[0..14].inject(:+)} vs #{data.abs_watts.to_a[28..31].inject(:+)}"
-puts "Polarised Total: #{data.polarised_watts.to_a[0..24].inject(:+)} vs #{data.polarised_watts.to_a[28..31].inject(:+)}"
+puts "Polar Total: #{data.polarised_watts.to_a[0..24].inject(:+)} vs #{data.polarised_watts.to_a[28..31].inject(:+)}"
 puts "VA Total: #{data.va.to_a[0..14].inject(:+)} vs #{data.va.to_a[28..31].inject(:+)}"
 puts "Current Total: #{data.current.to_a[0..14].inject(:+)} vs #{data.current.to_a[28..31].inject(:+)}"
 

data/lib/green_eye_monitor/client.rb

@@ -192,7 +192,7 @@ module GreenEyeMonitor
       read(:expect => /VAL.*END\r\n$/)
     end
 
-    # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
     def send_one_packet(old_packet = nil)
       pf = packet_format
       raise(Errors::NotImplemented, "Unimplemented packet format: #{pf}") unless IMPLEMENTED_FORMATS.include?(pf)
@@ -219,7 +219,7 @@ module GreenEyeMonitor
         Packet::Bin32Abs.read(StringIO.new(packet), old_packet)
       end
     end
-    # rubocop:enable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/MethodLength
 
     private
 
@@ -248,7 +248,6 @@ module GreenEyeMonitor
     def read(options = {})
       wait if options[:wait]
 
-      # TODO: Make :expect an arg if w never need anything else
       if options[:expect]
         data = read_expect(options[:expect])
       elsif options[:length]
@@ -267,7 +266,17 @@ module GreenEyeMonitor
     end
 
     def wait
-      byte = @serial.getbyte while byte.nil?
+      iterations = 5 * 1_000 / @serial.read_timeout
+
+      i = 0
+      loop do
+        byte = @serial.getbyte
+        break if byte.nil?
+
+        i += 1
+        raise(Errors::Timeout, 'Waited too long for data') if i > iterations
+      end
+
       @serial.ungetbyte(byte)
     end
   end

data/lib/green_eye_monitor/errors.rb

@@ -4,5 +4,6 @@ module GreenEyeMonitor
     class BadData < StandardError; end
     class TooShort < StandardError; end
     class NotImplemented < StandardError; end
+    class Timeout < StandardError; end
   end
 end

data/lib/green_eye_monitor/packet/bin_net_base.rb

@@ -93,20 +93,18 @@ module GreenEyeMonitor
       end
 
       def derive_watts(prev_ws_values, curr_ws_values, prev_sec, cur_sec)
-        if prev_sec > cur_sec
-          sec_diff = 256^3 - prev_sec
-          sec_diff += cur_sec
-        else
-          sec_diff = cur_sec - prev_sec
-        end
+        sec_diff = if prev_sec > cur_sec
+                     256 ^ 3 - prev_sec + cur_sec
+                   else
+                     cur_sec - prev_sec
+                   end
 
         prev_ws_values.zip(curr_ws_values).map do |prev_ws, curr_ws|
-          if prev_ws > curr_ws
-            ws_diff = 256^5 - prev_ws
-            ws_diff += curr_ws
-          else
-            ws_diff = curr_ws - prev_ws
-          end
+          ws_diff = if prev_ws > curr_ws
+                      256 ^ 5 - prev_ws + curr_ws
+                    else
+                      curr_ws - prev_ws
+                    end
 
           watts = ws_diff / sec_diff
 

data/lib/green_eye_monitor/version.rb

@@ -1,3 +1,3 @@
 module GreenEyeMonitor
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_eye_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Ferlito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport