px4_log_reader 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6071ae755e8bf6039fffcfddd4f08d38396509a
-  data.tar.gz: 1407b35a16ba00b5e2def9f4d2869269c7caaad4
+  metadata.gz: 0490cff29bd96afe03a73177375e181a7c5ee9f1
+  data.tar.gz: 98611a918006a2d12bbaedf6656db34b39f2ed9f
 SHA512:
-  metadata.gz: 1378a7bc49c3a8dc49acd0977712b8e696641b8d64f162a895097911c325b6648abc4f5c07e2be093c7b4708281d3493215d83a543091e12cb172a21e3633f50
-  data.tar.gz: 3818474002ba766ed277d0e98b39de6eef9d46211f4a2c921c30f02729e3068a50958e60008085e8c7c564497b619ab13b9b190ed0458a03b139de694a48694e
+  metadata.gz: cf1783f773a16c17214a83167cf16ae520c6b3c59e2521068f54fd3620d6f3d244d1ca01b6546f3a85935a849279bd9cfc0b28c14004f247a5436f5102131ef4
+  data.tar.gz: 8f653267c2e89885394f3a2a990e28b9af69cda03eef319d65c90cc6b7431a8a75fe206d2e3d971c2024051b5324e5f01feade8ea784b447cb300d261fba4ba4

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+sudo: false
+cache: bundler
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2
+script: bundle exec rake test

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'rake', '10.4.2'
+gem 'minitest', '>= 5.4.0'
+

data/lib/px4_log_reader/log_file.rb

@@ -115,20 +115,24 @@ module Px4LogReader
 
 			begin
 
-				data = buffered_io.read(2)
+				data = buffered_io.read_nonblock( HEADER_MARKER.length )
 
-				if data && data.length == 2
+				if data && ( data.length == HEADER_MARKER.length )
 
 					while !data.empty? && message_type.nil? do
 
-						if ( byte = buffered_io.read(1) )
+						if ( byte = buffered_io.read_nonblock( 1 ) )
 							data << byte
 						end
 
-						if data.unpack('CCC')[0,2] == HEADER_MARKER
-							message_type = data.unpack('CCC').last & 0xFF
+						if data.length >= ( HEADER_MARKER.length + 1 )
+							if data.unpack('CCC')[0,2] == HEADER_MARKER
+								message_type = data.unpack('CCC').last & 0xFF
+							else
+								data = data[1..-1]
+							end
 						else
-							data = data[1..-1]
+							data = []
 						end
 
 					end
@@ -146,9 +150,9 @@ module Px4LogReader
 
 
 		def self.write_message( io, message )
-			io.write HEADER_MARKER.pack('CC')
-			io.write [ message.descriptor.type ].pack('C')
-			io.write message.pack
+			io.write( HEADER_MARKER.pack('CC') )
+			io.write( [ message.descriptor.type ].pack('C') )
+			io.write( message.pack )
 		end
 
 	end

data/lib/px4_log_reader/message_descriptor.rb

@@ -209,7 +209,7 @@ module Px4LogReader
 	FORMAT_MESSAGE = Px4LogReader::MessageDescriptor.new({
 		name: 'FMT',
 		type: 0x80,
-		length: 89,
+		length: 86,
 		format: 'BBnNZ',
 		fields: [ "Type", "Length", "Name", "Format", "Labels" ] }).freeze
 

data/lib/px4_log_reader/version.rb

@@ -1,3 +1,3 @@
 module Px4LogReader
-	VERSION = '0.0.6'
+	VERSION = '0.0.7'
 end

data/test/test_log_file.rb

@@ -41,33 +41,96 @@ class TestLogFile < MiniTest::Test
 	def teardown
 	end
 
-	def test_read_descriptors
+	class MockFileIO
 
-		# log_file = open_log_file
-		# descriptors = Px4LogReader::LogFile.read_descriptors( log_file )
+		attr_reader :buffer
 
-		# puts "Found #{descriptors.count} descriptors"
-		# descriptors.each do |type,descriptor|
-		# 	puts "  #{descriptor.name}"
-		# end
+		def initialize
+			@buffer = ''
+		end
 
-		# log_file.close
+		def reset
+			@buffer = ''
+		end
 
-		# TODO
+		def read( byte_count = nil )
+			data = nil
+
+			if byte_count >= @buffer.size
+				data = @buffer.dup
+				@buffer = ''
+			else
+				data = @buffer[ 0, byte_count ].dup
+				@buffer = @buffer[ byte_count .. -1 ]
+			end
+
+			data
+		end
+
+		def read_nonblock( byte_count = nil )
+			return read( byte_count )
+		end
+
+		def write( data )
+			@buffer << data
+		end
 
 	end
 
-	def test_read_message
+	def test_read_header
+
+		# First, test that read_message_header returns null if the file is exhausted
+		# without finding a message header.
+		mock_io = MockFileIO.new
+		mock_io.write( rand_data( 256 ).pack('C*') )
+
+		assert_nil Px4LogReader::LogFile.read_message_header( mock_io )
+		assert_equal true, mock_io.buffer.empty?
+
+
+		# Insert a message header with type = 0x80 into the middle of the data.
+		mock_io = MockFileIO.new
+
+		test_data = rand_data( 256 )
+		test_data.concat( Px4LogReader::LogFile::HEADER_MARKER )
+		test_data.concat( [ Px4LogReader::FORMAT_MESSAGE.type ] )
+		test_data.concat( rand_data( 256 ) )
+		mock_io.write( test_data.pack('C*') )
+
+		assert_equal Px4LogReader::FORMAT_MESSAGE.type, Px4LogReader::LogFile.read_message_header( mock_io )
+		assert_equal 256, mock_io.buffer.size
+
+		assert_nil Px4LogReader::LogFile.read_message_header( mock_io )
+		assert_equal true, mock_io.buffer.empty?
 
-		# log_file = open_log_file
-		# descriptors = Px4LogReader::LogFile.read_descriptors( log_file )
 
-		# log_file.rewind
-		# message = Px4LogReader::LogFile.read_message( log_file, descriptors )
+		# Test with a buffer that ends in a message header sync pattern.
+		mock_io = MockFileIO.new
+
+		test_data = rand_data( 64 )
+		test_data.concat( Px4LogReader::LogFile::HEADER_MARKER )
+		mock_io.write( test_data.pack('C*') )
+
+		assert_nil Px4LogReader::LogFile.read_message_header( mock_io )
+		assert_equal true, mock_io.buffer.empty?
 		
-		# puts message.descriptor
+	end
+
+	def test_write_message
+
+		mock_io = MockFileIO.new
 
-		# TODO
+		fields = [ 0x24, 32, 'test', 'IIbMh', 'id,counts,flag,length,ord' ]
+
+		message = Px4LogReader::LogMessage.new(
+			Px4LogReader::FORMAT_MESSAGE,
+			fields )
+
+		Px4LogReader::LogFile.write_message( mock_io, message )
+
+		expected_length = Px4LogReader::FORMAT_MESSAGE.length + Px4LogReader::LogFile::HEADER_MARKER.length + 1
+		assert_equal expected_length, mock_io.buffer.length 
+		assert_equal [ 0xA3, 0x95, 0x80 ], mock_io.buffer[0,3].unpack('C*')
 
 	end
 
@@ -77,4 +140,19 @@ class TestLogFile < MiniTest::Test
 		log_file
 	end
 
+	# Generate array of random bytes (0-255) that does not contain any message
+	# header bytes.
+	def rand_data( byte_count )
+		test_data = []
+		byte_count.times do
+			byte = 0
+			loop do
+				byte = rand(256)
+				break unless Px4LogReader::LogFile::HEADER_MARKER.include?( byte )
+			end
+			test_data << byte
+		end
+		return test_data
+	end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: px4_log_reader
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Robert Glissmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,6 +32,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile