eagletree-log 0.0.2 → 0.0.3

data/lib/eagletree/log/file.rb

@@ -19,19 +19,25 @@ module EagleTree
       attr_reader :version
 
       def initialize uri
+        @sessions = []
 
         open(uri, 'rb') do |file|
           @name = file.gets.chomp
           @meta = file.gets.chomp.split
+          session_count = @meta[27].to_i
 
           if 'All Sessions' != file.gets.chomp
             raise RuntimeError, "No 'All Sessions' marker found"
           end
 
-          all_range = file.gets.chomp.split.map(&:to_i).map { |v| v * @meta[22].to_i }
+          # empty files are still valid, just have no sessions
+          if session_count.zero?
+            break
+          end
+
+          # read off the full file range
+          all_sessions_range = file.gets.chomp.split.map(&:to_i)
 
-          @sessions = []
-          session_count = @meta[27].to_i
           session_count.times do |expected|
             num = /Session (?<num>\d)/.match(file.gets)[:num].to_i
             if (expected + 1) != num
@@ -42,15 +48,11 @@ module EagleTree
             @sessions << Session.new(num, range)
           end
 
-          if all_range != [@sessions.first.range[0], @sessions.last.range[1]]
-            raise RuntimeError, 'File did not appear to contain all sessions'
-          end
-
           session_index = 0
           session = @sessions[session_index]
           session_rows = []
           CSV.new(file, { :col_sep => ' ', :headers => true }).each do |csv|
-            if !((session.range[0]..session.range[1]).include? csv[0].to_i)
+            if !((session.range[0]..(session.range[1]-1)).include? csv[0].to_i)
               session.rows = session_rows
               session_index += 1
               session = @sessions[session_index]
@@ -59,15 +61,15 @@ module EagleTree
 
             session_rows << csv
           end
-          session.rows = session_rows
+          session.rows = session_rows unless session.nil?
 
         end
 
         @hardware = @meta[23] # TODO interpret correctly
         @version = @meta[25].to_f
 
-      rescue
-        raise ArgumentError, 'File does not appear to be an Eagle Tree log'
+      #rescue
+      #  raise ArgumentError, 'File does not appear to be an Eagle Tree log'
       end
 
     end

data/lib/eagletree/log/version.rb

@@ -1,5 +1,5 @@
 module EagleTree
   module Log
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/file_spec.rb

@@ -2,12 +2,84 @@ require 'spec_helper'
 
 describe EagleTree::Log::File do
 
-  context 'data file trex_600.fdr' do
+  context 'data file empty.fdr' do
 
-    subject { EagleTree::Log::File.new(data_file('trex_600.fdr')) }
+    subject { EagleTree::Log::File.new(data_file('empty.fdr')) }
+
+    it { should have(0).sessions }
+
+    its(:name) { should eql('Skywalker') }
+
+    its(:hardware) { should eql('74') }
+
+    its(:version) { should eql(10.04) }
+
+  end
+
+  context 'data file funjet-gps.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('funjet-gps.fdr')) }
+
+    it { should have(1).sessions }
+
+    its(:name) { should eql('FunJet') }
+
+    its(:hardware) { should eql('73') }
+
+    its(:version) { should eql(8.03) }
+
+  end
+
+  context 'data file multi-session-1.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('multi-session-1.fdr')) }
+
+    it { should have(3).sessions }
+
+    its(:name) { should eql('Helis') }
+
+    its(:hardware) { should eql('73') }
+
+    its(:version) { should eql(6.93) }
+
+  end
+
+  context 'data file multi-session-2.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('multi-session-2.fdr')) }
+
+    it { should have(3).sessions }
+
+    its(:name) { should eql('Losi XXX4') }
+
+    its(:hardware) { should eql('71') }
+
+    its(:version) { should eql(6.02) }
+
+  end
+
+  context 'data file t600-1.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('t600-1.fdr')) }
 
     it { should have(1).sessions }
 
+    its(:name) { should eql('T-Rex 600') }
+
+    its(:hardware) { should eql('73') }
+
+    its(:version) { should eql(6.93) }
+
+  end
+
+  context 'data file t600-2.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('t600-2.fdr')) }
+
+    it { should have(1).sessions }
+
+    its(:name) { should eql('T-Rex 600') }
+
     its(:hardware) { should eql('73') }
 
     its(:version) { should eql(6.93) }

data/spec/session_spec.rb

@@ -2,13 +2,93 @@ require 'spec_helper'
 
 describe EagleTree::Log::Session do
 
-  context 'data file trex_600.fdr' do
+  context 'data file multi-session-1.fdr' do
 
-    subject { EagleTree::Log::File.new(data_file('trex_600.fdr')).sessions[0] }
+    let(:file) { EagleTree::Log::File.new(data_file('multi-session-1.fdr')) }
+
+    subject { file }
+
+    it { should have(3).sessions }
+
+    context 'session 1' do
+
+      subject { file.sessions[0] }
+
+      it { should have(3555).rows }
+
+      its(:duration) { should be_within(0.1).of(355.5) }
+
+    end
+
+    context 'session 2' do
+
+      subject { file.sessions[1] }
+
+      it { should have(3699).rows }
+
+      its(:duration) { should be_within(0.1).of(369.9) }
+
+    end
+
+    context 'session 3' do
+
+      subject { file.sessions[2] }
+
+      it { should have(4241).rows }
+
+      its(:duration) { should be_within(0.1).of(424.0) }
+
+    end
+
+  end
+
+  context 'data file multi-session-2.fdr' do
+
+    let(:file) { EagleTree::Log::File.new(data_file('multi-session-2.fdr')) }
+
+    subject { file }
+
+    it { should have(3).sessions }
+
+    context 'session 1' do
+
+      subject { file.sessions[0] }
+
+      it { should have(226).rows }
+
+      its(:duration) { should be_within(0.1).of(22.6) }
+
+    end
+
+    context 'session 2' do
+
+      subject { file.sessions[1] }
+
+      it { should have(124).rows }
+
+      its(:duration) { should be_within(0.1).of(12.4) }
+
+    end
+
+    context 'session 3' do
+
+      subject { file.sessions[2] }
+
+      it { should have(6336).rows }
+
+      its(:duration) { should be_within(0.1).of(633.5) }
+
+    end
+
+  end
+
+  context 'data file t600-1.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('t600-1.fdr')).sessions[0] }
 
     it { should have(692).rows }
 
-    its(:duration) { should eql(69.2) }
+    its(:duration) { should be_within(0.1).of(69.2) }
 
     its(:altitudes?) { should be_false }
 
@@ -48,4 +128,50 @@ describe EagleTree::Log::Session do
 
   end
 
+  context 'data file t600-2.fdr' do
+
+    subject { EagleTree::Log::File.new(data_file('t600-2.fdr')).sessions[0] }
+
+    it { should have(865).rows }
+
+    its(:duration) { should be_within(0.1).of(86.5) }
+
+    its(:altitudes?) { should be_false }
+
+    its(:airspeeds?) { should be_false }
+
+    its(:servo_currents?) { should be_false }
+
+    its(:throttles?) { should be_false }
+
+    its(:pack_voltages?) { should be_true }
+
+    it 'should have a few select pack voltages' do
+      subject.pack_voltages[0].should be_within(0.1).of(46.6)
+      subject.pack_voltages[100].should be_within(0.1).of(46.6)
+      subject.pack_voltages[250].should be_within(0.1).of(46.6)
+      subject.pack_voltages[500].should be_within(0.1).of(42.3)
+    end
+
+    its(:amps?) { should be_true }
+
+    it 'should have a few select amps' do
+      subject.amps[0].should be_within(0.01).of(0.18)
+      subject.amps[100].should be_within(0.01).of(0.0)
+      subject.amps[250].should be_within(0.01).of(0.0)
+      subject.amps[500].should be_within(0.01).of(19.9)
+    end
+
+    its(:temps1?) { should be_false }
+
+    its(:temps2?) { should be_false }
+
+    its(:temps3?) { should be_false }
+
+    its(:rpms?) { should be_true }
+
+    its(:rpms2?) { should be_false }
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eagletree-log
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -88,7 +88,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- data/trex_600.fdr
+- data/empty.fdr
+- data/funjet-gps.fdr
+- data/multi-session-1.fdr
+- data/multi-session-2.fdr
+- data/old-1.fdr
+- data/old-2.fdr
+- data/old-3.fdr
+- data/t600-1.fdr
+- data/t600-2.fdr
 - eagletree-log.gemspec
 - lib/eagletree/log.rb
 - lib/eagletree/log/file.rb