fit4ruby 0.0.12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d92abaf5b344ec25f3c770d21b13eee0eff886e
-  data.tar.gz: 99df97374c43548739d233b1a66f15fb59165d3a
+  metadata.gz: 3ba139e33bb80954cf3785eb9f73e46123a6b585
+  data.tar.gz: a3dc959723487d30ba8e18a4f6c32a615a74a559
 SHA512:
-  metadata.gz: 36609441b31b1653e7b6dc391ff9d13fa5e23e09110cd975e78d375a2d01d1e6c159714fbc8a7a5c4ebac6424432505c35da6f4ddfb3dca768682dd296b54e91
-  data.tar.gz: 0075651ab07203c2ea73949a00e118fe2881b568377f74ddc37543662836aafb4349b2e1367b2cfac3250251805d52b13f096b0064242b8c2e022be1e379c30a
+  metadata.gz: 711dd3bfb66971ceb48db285ba3c9a694ccc34c26a2d37c713096bb5de00c9639e144ed2633b4c3bb33bd45195a5dd143b12054e8066a3eb7b1a44768afd7493
+  data.tar.gz: 8e03437ad93539ea7bc00bb03e0e29db2782a214e06cfd40d3e785ca25c5d74e54f783ae3d3a59e81c9b9d6d569b7f9ddef77562d4c44390bec5b4acf908e30c

data/lib/fit4ruby/Activity.rb

@@ -12,6 +12,7 @@
 
 require 'fit4ruby/FitDataRecord'
 require 'fit4ruby/FileId'
+require 'fit4ruby/EPO_Data'
 require 'fit4ruby/FileCreator'
 require 'fit4ruby/DeviceInfo'
 require 'fit4ruby/DataSources'
@@ -30,7 +31,8 @@ module Fit4Ruby
   # equivalents of the message record structures used in the FIT file.
   class Activity < FitDataRecord
 
-    attr_accessor :file_id, :file_creator, :device_infos, :data_sources,
+    attr_accessor :file_id, :epo_data,
+                  :file_creator, :device_infos, :data_sources,
                   :user_profiles, :sessions, :laps, :records, :hrv,
                   :events, :personal_records
 
@@ -43,6 +45,7 @@ module Fit4Ruby
       @num_sessions = 0
 
       @file_id = FileId.new
+      @epo_data = nil
       @file_creator = FileCreator.new
       @device_infos = []
       @data_sources = []
@@ -365,6 +368,8 @@ module Fit4Ruby
       case record_type
       when 'file_id'
         @file_id = (record = FileId.new(field_values))
+      when 'epo_data'
+        @epo_data = (record = EPO_Data.new(field_values))
       when 'file_creator'
         @file_creator = (record = FileCreator.new(field_values))
       when 'device_info'

data/lib/fit4ruby/Converters.rb

@@ -49,6 +49,15 @@ module Fit4Ruby
       end
     end
 
+    def secsToHM(secs)
+      secs = secs.to_i
+      s = secs % 60
+      mins = secs / 60
+      m = mins % 60
+      h = mins / 60
+      "#{h}:#{'%02d' % m}"
+    end
+
     def secsToHMS(secs)
       secs = secs.to_i
       s = secs % 60

data/lib/fit4ruby/FitMessageRecord.rb

@@ -68,7 +68,7 @@ module Fit4Ruby
         # file, but we have to discard all bytes from the first null byte
         # onwards.
         if value.is_a?(String) && (null_byte = value.index("\0"))
-          value = value[0..(null_byte - 1)]
+          value = null_byte == 0 ? '' : value[0..(null_byte - 1)]
         end
 
         field_name, field_def = get_field_name_and_global_def(field, obj)

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -78,6 +78,7 @@ module Fit4Ruby
     entry 3, 'acceleration' # Just a guess
     entry 4, 'barometric_pressure' # Just a guess
     entry 1, 'antfs'
+    entry 10, 'optical_heart_rate' # Just a guess
     entry 11, 'bike_power'
     entry 12, 'environment_sensor_legacy'
     entry 13, 'multi_sport_speed_distance'
@@ -205,6 +206,7 @@ module Fit4Ruby
     entry 2173, 'fr620_taiwan'
     entry 2188, 'fenix3_china'
     entry 2189, 'fenix3_twn'
+    entry 2413, 'fenix3_hr'
     entry 10007, 'sdm4'
     entry 20119, 'training_center'
     entry 65532, 'android_antplus_plugin'

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -60,7 +60,7 @@ module Fit4Ruby
     field 16, 'uint8', 'avg_heart_rate', :unit => 'bpm'
     field 17, 'uint8', 'max_heart_rate', :unit => 'bpm'
     alt_field 18, 'sport' do
-      field :default, 'uint8', 'avg_candence', :unit => 'rpm'
+      field :default, 'uint8', 'avg_cadence', :unit => 'rpm'
       field 'running', 'uint8', 'avg_running_cadence', :unit => 'strides/min'
     end
     alt_field 19, 'sport' do
@@ -160,7 +160,7 @@ module Fit4Ruby
     field 15, 'uint8', 'avg_heart_rate', :unit => 'bpm'
     field 16, 'uint8', 'max_heart_rate', :unit => 'bpm'
     alt_field 17, 'sport' do
-      field :default, 'uint8', 'avg_candence', :unit => 'rpm'
+      field :default, 'uint8', 'avg_cadence', :unit => 'rpm'
       field 'running', 'uint8', 'avg_running_cadence', :unit => 'strides/min'
     end
     alt_field 18, 'sport' do
@@ -326,6 +326,7 @@ module Fit4Ruby
     field 11, 'uint8', 'battery_status', :dict => 'battery_status'
     field 15, 'uint32', 'rx_packets_ok' # just a guess
     field 16, 'uint32', 'rx_packets_err' # just a guess
+    field 17, 'string', 'undocumented_field_17'
     field 20, 'uint8z', 'ant_transmission_type'
     field 21, 'uint16z', 'ant_device_number'
     field 22, 'enum', 'ant_network', :dict => 'ant_network'
@@ -516,8 +517,9 @@ module Fit4Ruby
     field 19, 'uint8', 'undocumented_field_19'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
-    # Not part of the official ANT SDK doc
-    message 141, 'gps_ephemeris'
+    # Not part of the official ANT SDK doc. The message name is guessed and
+    # may change in the future.
+    message 141, 'epo_data'
     field 0, 'enum', 'valid' # 0 if no data cached, 1 else
     field 1, 'uint32', 'interval_start', :type => 'date_time'
     field 2, 'uint32', 'interval_end', :type => 'date_time'
@@ -526,6 +528,10 @@ module Fit4Ruby
     field 5, 'sint32', 'undocumented_field_5'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    message 211, 'undocumented_211'
+    field 0, 'uint8', 'undocumented_field_0'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
   end
 
 end

data/lib/fit4ruby/Log.rb

@@ -20,6 +20,10 @@ module Fit4Ruby
   # errors.
   class Error < StandardError ; end
 
+  # This is the Exception type that will be thrown for all program errors that
+  # are caused by user error rather than program logic errors.
+  class Abort < StandardError ; end
+
   # The ILogger class is a singleton that provides a common logging mechanism
   # to all objects. It exposes essentially the same interface as the Logger
   # class, just as a singleton and with some additional methods like 'fatal'
@@ -28,7 +32,7 @@ module Fit4Ruby
 
     include Singleton
 
-    @@logger = Logger.new(STDOUT)
+    @@logger = Logger.new($stdout)
 
     # Redirect all log messages to the given IO.
     # @param io [IO] Output file descriptor
@@ -36,7 +40,7 @@ module Fit4Ruby
       begin
         @@logger = Logger.new(io)
       rescue => e
-        @@logger = Logger.new(STDERR)
+        @@logger = Logger.new($stderr)
         Log.fatal "Cannot open log file: #{e.message}"
       end
     end
@@ -51,8 +55,16 @@ module Fit4Ruby
       @@logger.respond_to?(method)
     end
 
-    # Print an error message via the Logger and raise and Fit4Ruby::Error.
-    # code 1.
+    # Print an error message via the Logger and raise a Fit4Ruby::Abort.
+    # This method should be used to abort the program in case of user errors.
+    def abort(msg, &block)
+      @@logger.error(msg, &block)
+      raise Abort, msg
+    end
+
+    # Print an error message via the Logger and raise a Fit4Ruby::Error.
+    # This method should be used to abort the program in case of program logic
+    # errors.
     def fatal(msg, &block)
       @@logger.error(msg, &block)
       raise Error, msg

data/lib/fit4ruby/version.rb

@@ -1,4 +1,4 @@
 module Fit4Ruby
   # The version number of the library.
-  VERSION = '0.0.12'
+  VERSION = '1.0.0'
 end

data/tasks/gem.rake

@@ -10,8 +10,6 @@ task :gem => [:clobber] do
   Rake::Task[:changelog].invoke
   Rake::Task[:permissions].invoke
 
-  load 'fit4ruby.gemspec';
-
   # Build the gem file according to the loaded spec.
   if RUBY_VERSION >= "2.0.0"
     Gem::Package.build(GEM_SPEC)
@@ -30,8 +28,7 @@ task :permissions do
   # Find the bin and test directories relative to this file.
   baseDir = File.expand_path('..', File.dirname(__FILE__))
 
-  execs = Dir.glob("#{baseDir}/bin/*") +
-          Dir.glob("#{baseDir}/test/**/genrefs")
+  execs = Dir.glob("#{baseDir}/bin/*")
 
   Find.find(baseDir) do |f|
     # Ignore the whoke pkg directory as it may contain links to the other

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library to read GARMIN FIT files.