gpsd_baud_rate 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16dfe1b4f78b68d169e579548fc6fece7cd65dbbd1114f70865af22069418887
-  data.tar.gz: 90a67d3bc104cd38623b856e05d3585e5ef4272de86b3a7aafcc7ebf01b5b166
+  metadata.gz: f05c0bdd5671bb6f2272bba8ba4e6b319b5dd0c791c21e6e8f86d342de904e93
+  data.tar.gz: 8378a5d7dd845c743c505deee617ead09594cadf2c92baf2054dac31c079231d
 SHA512:
-  metadata.gz: 44c84a67ac0ab6f83ed61c3bf1cc75fac39ee958707b8e763ccb6cffa493a2535db77a2646457447eceb1adf97be7f605fa59449c666d729cc6ac752ef04b36d
-  data.tar.gz: 001663ed32e69d5d9353de94faa783ef307d0b3b60d695117df7e3de85052944c61b4b590c8d3ebb4febdde8a2dbce5a482ee02f1016132779578dbe43768b06
+  metadata.gz: 62c69121ae48629e86fd91befc7bb94f11ec0765d8ed65ba447315266355392489e6377607b4047767ec9508f194bc86ab4cafb3079930ceeb61fafa5988bb98
+  data.tar.gz: 9f5bec5a24607407639f40edd156b5aaa6678a824d45760a7933528d2895c52dcec72a944291a163bbbfd18954829bb73c8eb23f8e3dd731be5c76553ceca2fc

data/gpsd_baud_rate.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'serialport', '~> 1.3'
+  spec.add_dependency 'serialport', '>= 1.3.1'
 
 #  spec.add_development_dependency "rspec", "~> 3.2"
 end

data/lib/gpsd_baud_rate.rb

@@ -6,8 +6,7 @@ require 'logger'
 class GpsdBaudRate
   attr_reader :version
 
-  @@logger ||= defined?(Rails.logger) ? Rails.logger : Logger.new(STDOUT)
-  @@version =GpsdBaudRate::VERSION
+  @@version = GpsdBaudRate::VERSION.to_s
 
   @@device = '/dev/ttyAMA0'
   @@service = 'gpsd.service'
@@ -18,58 +17,71 @@ 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}"
 
+    if check_device?
+      @logger.info "Device: #{@@device} not found"
+      raise StandardError.new "Device #{@@device} not found"
+    else
+      @logger.info "Device: #{@@device} Okay"
+    end
 #    pid= %x|pgrep -f "ruby /home/deploy/bin/set_baud.rb"|
-#    @@logger.debug "Pid:  #{pid}, $$: #{$$}, $BASHPID: #{$BASHPID}"
-
+#    @logger.debug "Pid:  #{pid}, $$: #{$$}, $BASHPID: #{$BASHPID}"
+=begin
     @goal_rate = goal_rate.to_i
-    @@logger.debug "Hello from gpsd_baud_rate!"
-    @@logger.debug  "Goal_rate: #{@goal_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
   end #initiallize
 
-#~~~~~~~~~~~~~~~~~~~~~ gosd_status ~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~ gpsd_status ~~~~~~~~~~~~~~~~~
+
+  def self.check_device?
+    # Does the @@device exist and is it a character device
+    0 == %x| test  -c "#{@@device}" ; echo $?|
+
+  end
 
-  def gpsd_active?
+  def self.gpsd_active?
     arry = %x|sudo systemctl status "#{@@socket}"|.split(/\n/)
     s = arry.select!{ |e| e.include? "Active:"}[0].split(/\W+/)[2]
     s == 'active'
   end
 
-  def gpsd_stop
+  def self.gpsd_stop
     %x|sudo systemctl stop "#{@@socket}"|
     %x|sudo systemctl stop "#{@@service}"|
     sleep 1
     %x|sudo systemctl daemon-reload|
   end
 
-  def gpsd_start
+  def self.gpsd_start
     %x|sudo systemctl start "#{@@service}"|
     %x|sudo systemctl start "#{@@socket}"|
     sleep 1
@@ -78,7 +90,7 @@ class GpsdBaudRate
 
   #~~~~~~~~~~~~~~~~~~~~~~~~ baud rate ~~~~~~~~~~~~~~~~~~~
 
-  def baud_rate
+  def self.baud_rate
     %x| sudo stty -F "#{@@device}"|.split('; ')[0].split(/\W+/)[1].to_i
   end
 
@@ -89,7 +101,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 +123,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 +146,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.10"
 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.10
 platform: ruby
 authors:
 - Steven Finnegan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.1
 description: 
 email:
 - steven@rustyshamrock.com