gpsd_baud_rate 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16dfe1b4f78b68d169e579548fc6fece7cd65dbbd1114f70865af22069418887
-  data.tar.gz: 90a67d3bc104cd38623b856e05d3585e5ef4272de86b3a7aafcc7ebf01b5b166
+  metadata.gz: 96a00a30d7ff931c648e4d127ae5f253f9bf328d376e96e6f32650082b306ba4
+  data.tar.gz: 8549c6d82accb16822416fa8a57f4be95348e90a0c50ed894e3474ebe0e4bf15
 SHA512:
-  metadata.gz: 44c84a67ac0ab6f83ed61c3bf1cc75fac39ee958707b8e763ccb6cffa493a2535db77a2646457447eceb1adf97be7f605fa59449c666d729cc6ac752ef04b36d
-  data.tar.gz: 001663ed32e69d5d9353de94faa783ef307d0b3b60d695117df7e3de85052944c61b4b590c8d3ebb4febdde8a2dbce5a482ee02f1016132779578dbe43768b06
+  metadata.gz: 3bc5af12c004b9d533d006409977064bf0b888c6dd0d09cb57b92d7e3bb2f64a0f5debfcc9d52b227ce4a5a7a9b7beedb299cb7f859723993dc0344216a67cae
+  data.tar.gz: 2947d2490fde65c8d28ec4cf2739dcd90a5965e671fb9cf4d1109e8becb50dcdef91646322f939802ddaab0a2480e06c645dbae4ab4b32e3e9830ca3cc1b7796

data/lib/gpsd_baud_rate.rb

@@ -6,7 +6,6 @@ require 'logger'
 class GpsdBaudRate
   attr_reader :version
 
-  @@logger ||= defined?(Rails.logger) ? Rails.logger : Logger.new(STDOUT)
   @@version =GpsdBaudRate::VERSION
 
   @@device = '/dev/ttyAMA0'
@@ -18,40 +17,40 @@ class GpsdBaudRate
 
   def initialize goal_rate = @@baud_rates[0]
 
-#    @@logger.debug "\n\n\n"
-
+    @logger = new_logger path: "log/GpsdbaudRate.log", progname: "GpsdbaudRate", time_format: "'%Y-%m-%d %T.%N %z %Z'", level: Logger::DEBUG
+    @logger.info "GpsdBaudRate Gem - Version: #{@@version}"
 #    pid= %x|pgrep -f "ruby /home/deploy/bin/set_baud.rb"|
-#    @@logger.debug "Pid:  #{pid}, $$: #{$$}, $BASHPID: #{$BASHPID}"
+#    @logger.debug "Pid:  #{pid}, $$: #{$$}, $BASHPID: #{$BASHPID}"
 
     @goal_rate = goal_rate.to_i
-    @@logger.debug "Hello from gpsd_baud_rate!"
-    @@logger.debug  "Goal_rate: #{@goal_rate}"
+    @logger.debug "Hello from gpsd_baud_rate!"
+    @logger.debug  "Goal_rate: #{@goal_rate}"
 
 
     gpsd_start unless gpsd_active?   #make sure it's running
 
-    @@logger.debug "Service Status: #{gpsd_active?}"
-    @@logger.debug "Baud Rate: #{@active_rate = baud_rate}"
+    @logger.debug "Service Status: #{gpsd_active?}"
+    @logger.debug "Baud Rate: #{@active_rate = baud_rate}"
     gpsd_stop
-    @@logger.debug "Service Status: #{gpsd_active?}"
-    @@logger.debug "Baud Rate: #{@inactive_rate = baud_rate}"
+    @logger.debug "Service Status: #{gpsd_active?}"
+    @logger.debug "Baud Rate: #{@inactive_rate = baud_rate}"
 
-    @@logger.debug "\n~~~~~~~~~~~~ Read at #{@active_rate} baud ~~~~~~~~~~~~~~"
+    @logger.debug "\n~~~~~~~~~~~~ Read at #{@active_rate} baud ~~~~~~~~~~~~~~"
     if (read_from_device @active_rate) && (@active_rate != @goal_rate)
-      @@logger.debug "Setting Goal Rate (#{goal_rate})"
+      @logger.debug "Setting Goal Rate (#{goal_rate})"
       set_PMTK_baud_rate @goal_rate
       if read_from_device @goal_rate
-        @@logger.debug "Goal Baud Rate (#{@goal_rate}) has been set"
+        @logger.debug "Goal Baud Rate (#{@goal_rate}) has been set"
       end
     else
-      @@logger.debug "Already at Goal Baud Rate"
+      @logger.debug "Already at Goal Baud Rate"
     end
 
 
 #
 #   Cleanup
     gpsd_start
-    @@logger.debug "Service Status: #{gpsd_active?}"
+    @logger.debug "Service Status: #{gpsd_active?}"
   end #initiallize
 
 #~~~~~~~~~~~~~~~~~~~~~ gosd_status ~~~~~~~~~~~~~~~~~
@@ -89,7 +88,7 @@ class GpsdBaudRate
   # returns original baud_rate
   def baud_rate=( b_rate)
     msg= %x| sudo stty #{b_rate} -F "#{@@device}"|
-    msg.each {|m| @@logger.debug m}
+    msg.each {|m| @logger.debug m}
   end
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -111,20 +110,20 @@ class GpsdBaudRate
       count = 0
       ser = SerialPort.open(@@device, baud.to_i, 8, 1, SerialPort::NONE ) { |ser|
         ser.read_timeout = 900
-        @@logger.debug "ReadTimeout: #{ser.read_timeout} ms"
+        @logger.debug "ReadTimeout: #{ser.read_timeout} ms"
         5.times { results << ser.readline(100)}
-        results.each { |s| @@logger.debug s}
+        results.each { |s| @logger.debug s}
         results.each do |r|
           count += 1 if @@NMEA_sentences.any? { |s| s == r[0,6]}
         end
-        @@logger.debug "Count: #{count}"
+        @logger.debug "Count: #{count}"
       }
     rescue IOError => e
-      @@logger.debug "IOError: #{e.inspect}"
+      @logger.debug "IOError: #{e.inspect}"
     rescue  => e
-      @@logger.debug "Error: #{e.inspect}"
+      @logger.debug "Error: #{e.inspect}"
     end
-    @@logger.debug "SerialPort Closed"
+    @logger.debug "SerialPort Closed"
     gpsd_start
     count >= 2
   end
@@ -134,55 +133,68 @@ class GpsdBaudRate
     results=[]
 
     begin
-      @@logger.debug "Send to device"
+      @logger.debug "Send to device"
       ser = SerialPort.open( @@device, baud, 8, 1, SerialPort::NONE) { |ser|
         count = ser.write cmmd+"\r\n"
       }
     rescue IOError => e
-      @@logger.debug "IOError: #{e.inspect}"
+      @logger.debug "IOError: #{e.inspect}"
     rescue  => e
-      @@logger.debug "Error: #{e.inspect}"
+      @logger.debug "Error: #{e.inspect}"
     end
-    @@logger.debug "Bytes Written: #{count}"
+    @logger.debug "Bytes Written: #{count}"
 
     begin
-      @@logger.debug "Receive response"
+      @logger.debug "Receive response"
       ser = SerialPort.open( @@device, @goal_rate, 8, 1, SerialPort::NONE) { |ser|
         ser.read_timeout = 900
         10.times {results << ser.readline(100)}
       }
     rescue IOError => e
-      @@logger.debug "IOError: #{e.inspect}"
+      @logger.debug "IOError: #{e.inspect}"
     rescue  => e
-      @@logger.debug "Error: #{e.inspect}"
+      @logger.debug "Error: #{e.inspect}"
     end
-    results.each { |r| @@logger.debug "Results: #{r}"}
+    results.each { |r| @logger.debug "Results: #{r}"}
 
   end
 
 
   def find_baud_rate
-    @@logger.debug %x| sudo stty -F "#{@@device}"|
+    @logger.debug %x| sudo stty -F "#{@@device}"|
     gpsd_stop
-    @@logger.debug %x|sudo stty -F "#{@@device}"|
+    @logger.debug %x|sudo stty -F "#{@@device}"|
     gpsd_start
   end
 
   def set_PMTK_baud_rate rate
-    @@logger.debug "In set_PMTK_baud_rate"
+    @logger.debug "In set_PMTK_baud_rate"
     type = 251
     cmmd = nmea_checksum("PMTK#{type},#{rate}")
     write_to_device cmmd, @active_rate
   end
 
   def nmea_checksum cmmd
-    @@logger.debug "In nmea_checksum, cmmd: #{cmmd}"
+    @logger.debug "In nmea_checksum, cmmd: #{cmmd}"
     sum=0
     cmmd.each_byte { |i| sum = sum ^ i.ord}
     sum = sum & 0xff
     new_cmmd = "\$#{cmmd}*#{sum.to_s(16)}".upcase
-    @@logger.debug "new_cmmd: #{new_cmmd}"
+    @logger.debug "new_cmmd: #{new_cmmd}"
     new_cmmd
   end
 
+  LOG_LEVELS = {debug: Logger::DEBUG, info: Logger::INFO, warn: Logger::WARN,
+      error: Logger::ERROR, fatal: Logger::FATAL, unknown: Logger::UNKNOWN}
+
+  def new_logger( progname: nil, path:, format: nil, time_format: nil, level:  LOG_LEVELS[:debug])
+    logger = Logger.new(path)
+    logger.progname = progname if progname
+    logger.format = format if format
+    logger.level = level if level
+    logger.datetime_format = time_format if time_format
+    logger
+  end
+
+
 end

data/lib/gpsd_baud_rate/version.rb

@@ -1,3 +1,3 @@
 class GpsdBaudRate
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpsd_baud_rate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Steven Finnegan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler