spektrum-log 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c5526710a152f84a57087a9e04b6b11bbff9de
-  data.tar.gz: fff8907b1912b94aa3f5d6b039023133f9e596f1
+  metadata.gz: c8f4d301e8cb4eb91a0a7c28f263b45363331501
+  data.tar.gz: 9045b0d5ab3f64de16bc132050e95cdf2e339c7e
 SHA512:
-  metadata.gz: ab81bcce78e95b0de66d204efe78a1821b95227f0f7980c02d0a35c226a680a0fbc99f216560bd0dc7fd360af5d62239c73a092cc9edd98fe2a2bae8e670a362
-  data.tar.gz: a1d9d3fab34d2c5250ec389a200c89ec762b97c78c46d63919f651c75b1ed32130f484c9d53825cabfbcfb145d285889717910afd8655bae74409590577c47d3
+  metadata.gz: 493ff189a92654995314cd6a5b545a87c290381d048287a659bb581aa344cc3c7cd15d9efb8373a691d22ecf7313d9ca16e91c4c245ddb50493232ca9a702af8
+  data.tar.gz: b2432d1fb1b638843c2d47371a9485e785b7bb2c33831a254df71466aed8bc37ecc9bd9e3023ce3e92ad3baa60243cb1c189d89573b5f3e071546188caa51e2d

data/lib/spektrum/log.rb

@@ -1,5 +1,6 @@
-require "spektrum/log/flight"
-require "spektrum/log/headers"
-require "spektrum/log/file"
-require "spektrum/log/records"
-require "spektrum/log/version"
+require 'spektrum/log/buffered_file'
+require 'spektrum/log/file'
+require 'spektrum/log/flight'
+require 'spektrum/log/headers'
+require 'spektrum/log/records'
+require 'spektrum/log/version'

data/lib/spektrum/log/buffered_file.rb

@@ -0,0 +1,36 @@
+require 'open-uri'
+
+module Spektrum
+  module Log
+
+    class BufferedFile
+
+      def initialize(uri, mode)
+        @io = open(uri, mode)
+        @buffer = StringIO.new
+      end
+
+      def read(length)
+        fetch_chunk if (@buffer.length - @buffer.pos) < length
+        @buffer.read(length)
+      end
+
+      def close
+        @buffer = nil
+        @io.close
+      end
+
+      private
+
+      def fetch_chunk
+        @buffer = StringIO.new.tap do |b|
+          b << @buffer.read
+          b << @io.read(4096)
+          b.seek(0)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/spektrum/log/file.rb

@@ -1,5 +1,3 @@
-require 'open-uri'
-
 module Spektrum
   module Log
 
@@ -23,51 +21,52 @@ module Spektrum
 
         first_word = true
 
-        open(uri, 'rb') do |file|
-          loop do
-            first4 = file.read(4)
+        file = BufferedFile.new(uri, 'rb')
+        loop do
+          first4 = file.read(4)
 
-            # quick check to see if this could even be a Spektrum TLM file
-            if first_word
-              if first4.nil? || (0xFFFFFFFF != first4.unpack('V')[0])
-                raise ArgumentError, 'File does not appear to be an Spektrum log'
-              end
-              first_word = false
+          # quick check to see if this could even be a Spektrum TLM file
+          if first_word
+            if first4.nil? || (0xFFFFFFFF != first4.unpack('V')[0])
+              raise ArgumentError, 'File does not appear to be a Spektrum log'
             end
+            first_word = false
+          end
 
-            if first4.nil?
-              if headers_complete || !records.empty?
-                # we have records, this is a new entry
-                @flights << Flight.new(headers, records)
-                headers = []
-                records = []
-              end
-              break
+          if first4.nil?
+            if headers_complete || !records.empty?
+              # we have records, this is a new entry
+              @flights << Flight.new(headers, records)
+              headers = []
+              records = []
             end
+            break
+          end
 
-            first = first4.unpack('V')[0]
-            if 0xFFFFFFFF == first
-              if headers_complete || !records.empty?
-                # we have records, this is a new entry
-                @flights << Flight.new(headers, records)
-                headers = []
-                records = []
-                headers_complete = false
-              end
-
-              rest = file.read(32)
-              headers << Headers.create(rest)
-
-              headers_complete = rest.unpack('S')[0] == 0x1717
-            else
-              data = file.read(16)
-              type = data[0].unpack('C')[0]
-              records << Records.create(type, first, data)
+          first = first4.unpack('V')[0]
+          if 0xFFFFFFFF == first
+            if headers_complete || !records.empty?
+              # we have records, this is a new entry
+              @flights << Flight.new(headers, records)
+              headers = []
+              records = []
+              headers_complete = false
             end
+
+            rest = file.read(32)
+            headers << Headers.create(rest)
+
+            headers_complete = rest.unpack('S')[0] == 0x1717
+          else
+            data = file.read(16)
+            type = data[0].unpack('C')[0]
+            records << Records.create(type, first, data)
           end
         end
-      rescue
-        raise ArgumentError, 'File does not appear to be an Spektrum log'
+      rescue => e
+        raise ArgumentError, "File does not appear to be a Spektrum log (#{e})"
+      ensure
+        file.close
       end
 
       # Gets the total duration of all flights contained within.

data/lib/spektrum/log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.1.2"
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -56,84 +56,84 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_kml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 description: Read and interpret Spektrum TLM log files.
@@ -143,14 +143,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/spektrum/log.rb
+- lib/spektrum/log/buffered_file.rb
 - lib/spektrum/log/file.rb
 - lib/spektrum/log/flight.rb
 - lib/spektrum/log/headers.rb
@@ -200,17 +201,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Spektrum TLM log file reader