cycle_analyst_logger 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3011f180df601db59efd523a1ee9ccb6ffd6521
-  data.tar.gz: f53a937549e43c562ad8c0e1a594235f9946cf83
+  metadata.gz: 271a460b2211a9d5021cc3994a43ed5380cbeb43
+  data.tar.gz: 3ad2cd453f30f2f6809864578967d0f6cbe3f368
 SHA512:
-  metadata.gz: 96c66ff2178ae54788ab15ec4221fe4fda695b777426316f1c80d7c592f1c8a9f8a5cb90595e0062c7d181239c537f0ffd5f6690dc94c7e6737cfef5cc13002f
-  data.tar.gz: 69cc29521879ff250579f6b1ff3e9db483c3d550d5686bf4b73a4a40443009953f936285ce9d5d4c79188ede57b3b453264ada57d1070e5ccf89a1f911f58578
+  metadata.gz: a49ee57ab3196de2b29bcfad840a932ad17640490da5434cff0ee52ca85b3e4e7e262b29033709deb15803f01c01c25d04e8fcf6724b7b7438f25b77b26745d4
+  data.tar.gz: 59882320fe416ab40be3170d398c38598025ff454565d463d49b30f797138f0bcf2a2dbe0fc8f3fcbfb79b2a54f3f3abf73d7af6405e4d38251b0e3aab62ce44

data/.gitignore

@@ -38,3 +38,4 @@ Gemfile.lock
 *.csv
 *.log
 nmea.*.txt
+/LOCAL/

data/README.rdoc

@@ -97,28 +97,28 @@ There is a working systemd service unit file
 +resources/cycle_analyst_logger.service+. You can copy it into
 +/lib/systemd/system+ and do a
 
-+systemctl daemon-reload+ to load it into systemd
+<tt>systemctl daemon-reload</tt> to load it into systemd
 
 * If you want it to start when the system is booted say:
 
-+systemctl enable cycle_analyst_logger.service+
+  <tt>systemctl enable cycle_analyst_logger.service</tt>
 
 * To disable:
 
-+systemctl disable cycle_analyst_logger.service+
+  <tt>systemctl disable cycle_analyst_logger.service</tt>
 
 * To start it manually (have to do this also the first time you do an enable and
   want it to run then):
 
-+systemctl start cycle_analyst_logger.service+
+  <tt>systemctl start cycle_analyst_logger.service</tt>
 
 * You can check the status:
 
-+systemctl status cycle_analyst_logger.service+
+  <tt>systemctl status cycle_analyst_logger.service</tt>
 
 * To see the logs:
 
-+journalctl -u cycle_analyst_logger.service+
+  <tt>journalctl -u cycle_analyst_logger.service</tt>
 
 This file assumed that rvm was installed in my home directory and an rvm wrapper
 was created so it the service unit file could just exec it. I am currently using
@@ -126,7 +126,7 @@ Ruby 2.4.1.
 
 The command used to create the wrapper was run as my normal user:
 
-+rvm alias create cycle_analyst_logger 2.4.1+
+<tt>rvm alias create cycle_analyst_logger 2.4.1</tt>
 
 == License and Copyright
 

data/lib/cycle_analyst_logger/cli.rb

@@ -80,7 +80,16 @@ module CycleAnalystLogger
         end
       end
 
-      pre do |global,command,options,args|
+      desc 'Transform logs to CA format'
+      arg_name 'log_filename'
+      command :to_ca_file do |to_ca_file|
+        to_ca_file.action do |global_options, options, args|
+          log_filename = args[0]
+          CycleAnalyst.log_to_ca_file(log_filename)
+        end
+      end
+
+     pre do |global,command,options,args|
         # Pre logic here
         # Return true to proceed; false to abort and not call the
         # chosen command

data/lib/cycle_analyst_logger/cycle_analyst.rb

@@ -49,6 +49,9 @@ module CycleAnalystLogger
       13 => { address: 12, name: "Limit Flags", units: "bit flags", scale: 1}
     }
 
+    # CA_STD_HEADER
+    CA_STD_HEADER = %w(Ah V A S D Deg RPM HW Nm ThI ThO AuxA AuxD Flgs)
+
     # CycleAnalyst New
     def initialize(opts)
       @baudrate = opts[:baud_ca]
@@ -136,5 +139,34 @@ module CycleAnalystLogger
         break if idx >= loop_count
       end
     end
+
+    def self.valid_timestamp(input)
+      begin
+        Time.parse(input)
+      rescue ArgumentError
+        nil
+      end
+    end
+
+    def self.log_to_ca_file(log_filename)
+      output_filename = log_filename.sub(
+        /cycle_analyst\.(\d\d\d\d\-\d\d\-\d\d_\d\d\-\d\d\-\d\d).csv/,
+        'CALog_\1.txt'
+      )
+      out_fd = File.open(output_filename, 'w')
+
+      File.readlines(log_filename).each.with_index do |log_line, idx|
+        log_record = log_line.split(',')
+        if idx == 0
+          out_fd.puts CA_STD_HEADER.join("\t")
+          next
+        end
+
+        # Check that the line has a valid timestamp, skip this line if it isn't
+        next unless (timestamp = valid_timestamp log_record[0])
+
+        out_fd.puts log_record[1..CA_STD_HEADER.length].join("\t")
+      end
+    end
   end
 end

data/lib/cycle_analyst_logger/version.rb

@@ -1,3 +1,3 @@
 module CycleAnalystLogger
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cycle_analyst_logger
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Robert J. Berger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli