fit4ruby 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a178c07a618005acb996433ce4c8d1dd4f1cce
-  data.tar.gz: 84ee7b840af9cfac5411bd4480737cdf8e4fcaff
+  metadata.gz: c8031616797fec0865e6ba35680ec240f5b7264f
+  data.tar.gz: c9b0255d76f4776dc2259cc91ce784e8295a3394
 SHA512:
-  metadata.gz: cd71d3ffafc982031ae56a62ab8c76780a329346108717d2f54b3a2f7e82c866da5e424167530a4b5452bc48916ab24ec037ab43c4cdd4e6ce30259e3280bada
-  data.tar.gz: 5e9cab1af4d8a3bd048b73ab44a60cbc475d228e50c20746ca33cc027d0aa6c89d39e928d72ac111e438afc62c3ef0bf1dfd52bdccd46b8f3e18a89f3e2f7361
+  metadata.gz: 14b252ae0a5993c9bc53fc95bcea5a75aa798af444b30e62378a1f1bff10b76196bd18c9f34945136a7c09e5b8022ca56ee96a4f9281b1dee3b347d37c5a7316
+  data.tar.gz: 1028184b60ca4aa62db0378199006f97563c13f96b4b50868256e107043a95d0ae416a30fdabc4f75d0053dc232b6bca4f84ea6c587958eb37342e35d2e55abd

data/lib/fit4ruby/Activity.rb

@@ -195,9 +195,15 @@ module Fit4Ruby
     # Returns the computed VO2max value. This value is computed by the device
     # based on multiple previous activities.
     def vo2max
+      # First check the event log for a vo2max reporting event.
       @events.each do |e|
         return e.vo2max if e.event == 'vo2max'
       end
+      # Then check the user_profile entries for a metmax entry. METmax * 3.5
+      # is same value as VO2max.
+      @user_profiles.each do |u|
+        return u.metmax * 3.5 if u.metmax
+      end
 
       nil
     end

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -245,6 +245,7 @@ module Fit4Ruby
     field 83, 'uint16', 'vertical_ratio', :scale => 100, :unit => '%' # guessed
     field 84, 'uint16', 'gct_balance', :scale => 100, :unit => '%' # guessed
     field 85, 'uint16', 'stride_length', :scale => 10000, :unit => 'm' # guessed
+    field 87, 'uint16', 'undefined_value_87' # first seen on F3 FW6.80
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 21, 'event'
@@ -400,7 +401,7 @@ module Fit4Ruby
 
     # Not part of the official ANT SDK doc
     message 79, 'user_profile'
-    field 0, 'uint16', 'undocumented_field_0' # seems to strongly correlate with vo2max
+    field 0, 'uint16', 'metmax', :scale => 1000, :unit => 'MET' # VO2max / 3.5
     field 1, 'uint8', 'age', :unit => 'years'
     field 2, 'uint8', 'height', :scale => 100, :unit => 'm'
     field 3, 'uint16', 'weight', :scale => 10, :unit => 'kg'

data/lib/fit4ruby/version.rb

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

data/spec/FileNameCoder_spec.rb

@@ -10,6 +10,9 @@
 # published by the Free Software Foundation.
 #
 
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'time'
 require 'fit4ruby/FileNameCoder'
 
 describe Fit4Ruby::FileNameCoder do
@@ -25,35 +28,35 @@ describe Fit4Ruby::FileNameCoder do
 
   it 'should convert a time stamps to a file names' do
     @data.each do |t|
-      Fit4Ruby::FileNameCoder.encode(Time.parse(t[0])).should == t[1]
+      expect(Fit4Ruby::FileNameCoder.encode(Time.parse(t[0]))).to eq(t[1])
     end
   end
 
   it 'should convert file names to time stamps' do
     @data.each do |t|
-      Fit4Ruby::FileNameCoder.decode(t[1]).should == Time.parse(t[0]).utc
+      expect(Fit4Ruby::FileNameCoder.decode(t[1])).to eq(Time.parse(t[0]).utc)
     end
   end
 
   it 'should fail to encode dates before 2010' do
-    lambda {
+    expect {
       Fit4Ruby::FileNameCoder.encode(Time.parse('2009-12-31T00:00'))
-    }.should raise_error
+    }.to raise_error(ArgumentError)
   end
 
   it 'should fail to encode dates after 2033' do
-    lambda {
+    expect {
       Fit4Ruby::FileNameCoder.encode(Time.parse('2034-01-01T00:00+00:00'))
-    }.should raise_error
+    }.to raise_error(ArgumentError)
   end
 
   it 'should fail to decode illegal file names' do
     [ 'A.FIT', '0123ABCD', '5ZNJ1800.FIT',
       '44063106.FIT', '44W63106.FIT',
       '557O1650.FIT', '557G6050.FIT', '557G1660.FIT' ].each do |name|
-      lambda {
+      expect {
         Fit4Ruby::FileNameCoder.decode(name)
-      }.should raise_error
+      }.to raise_error(ArgumentError)
     end
   end
 

data/spec/FitFile_spec.rb

@@ -10,6 +10,8 @@
 # published by the Free Software Foundation.
 #
 
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'fit4ruby'
 
 describe Fit4Ruby do
@@ -104,10 +106,10 @@ describe Fit4Ruby do
 
     File.delete(fit_file) if File.exists?(fit_file)
     Fit4Ruby.write(fit_file, @activity)
-    File.exists?(fit_file).should be_true
+    expect(File.exists?(fit_file)).to be true
 
     b = Fit4Ruby.read(fit_file)
-    b.should == @activity
+    expect(b).to eq(@activity)
     File.delete(fit_file)
   end
 

data/spec/GeoMath_spec.rb

@@ -10,6 +10,8 @@
 # published by the Free Software Foundation.
 #
 
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'fit4ruby/GeoMath'
 
 describe Fit4Ruby::GeoMath do
@@ -25,8 +27,8 @@ describe Fit4Ruby::GeoMath do
       [ 48.17970883101225, 11.611351054161787, 100.225 ]
     ]
     points.each do |p|
-      Fit4Ruby::GeoMath.distance(p0_lat, p0_lon,
-                                 p[0], p[1]).should be_within(0.001).of(p[2])
+      expect(Fit4Ruby::GeoMath.distance(
+        p0_lat, p0_lon, p[0], p[1])).to be_within(0.001).of(p[2])
     end
   end
 

data/tasks/changelog.rake

@@ -155,7 +155,7 @@ task :changelog do
     def getReleaseVersions
       # Get list of release tags from Git repository
       releaseVersions = `git tag`.split("\n").map { |r| r.chomp }.
-        delete_if { |r| ! (/release-\d+\.\d+\.\d+/ =~ r) }.
+        delete_if { |r| ! (/v\d+\.\d+\.\d+/ =~ r) }.
         sort{ |a, b| compareTags(a, b) }
       releaseVersions << 'HEAD'
     end

data/tasks/test.rake

@@ -3,5 +3,5 @@ require 'rspec/core/rake_task'
 
 desc 'Run all RSpec tests in the spec directory'
 RSpec::Core::RakeTask.new(:test) do |t|
-  t.pattern = 'test/*_spec.rb'
+  t.pattern = 'spec/*_spec.rb'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-02-11 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.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Library to read GARMIN FIT files.