postrunner 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 351aade063aa03b50f3563a29ff77549c336970b
-  data.tar.gz: 9850c9ea5c0a0b59697423a7a70851d7292647ec
+SHA256:
+  metadata.gz: bb8a80028ee50a8f543d589b44fd41523208483a1743d29ec86e37525ff84a13
+  data.tar.gz: 9834c6dc556e9e118fca144a8edd33e9cecc51eb9bc4487d43218973f5dae719
 SHA512:
-  metadata.gz: b55b1de8af615a5213e5b9a185d8b3c4e93219a64ea2fefbd394ebd6e4a3e1c83a5ea39c28d76cc4d9528409ea0ba754d718418e413f8f23170bff620f40ba88
-  data.tar.gz: fdb2911f5ef016648f9d426a98de321ad5e46387ed6500348d86bdd34a00bb49900dae6012dab25611fca08fdcdfa5c3aea15368d77e34bf9a00cd51eadec690
+  metadata.gz: 8544b0aca1e86a9ca4e90aa437684a9fc56ac925cefe115ac9453816d1373242fcf6aa94d86ea779ea947ebb982b318141c45df43197d77a78b2375aeb5f6724
+  data.tar.gz: d5354f1f321685cb7181c75cee537d36695bddb0cecea175cd703de678af9055db10e089740f6719f1c6097e3fc2a2713951ae396b558b3ffc39a5bbfbe9f722

data/lib/postrunner/Activity.rb

@@ -380,7 +380,7 @@ module PostRunner
     end
 
     def activity_sub_type
-      ActivitySubTypes[@sub_sport] || 'Undefined "#{@sub_sport}"'
+      ActivitySubTypes[@sub_sport] || "Undefined #{@sub_sport}"
     end
 
     def distance(timestamp, unit_system)

data/lib/postrunner/ActivitySummary.rb

@@ -316,7 +316,7 @@ module PostRunner
           if zone.type == 18
             total_time = 0.0
             if zone.time_in_hr_zone
-              zone.time_in_hr_zone.each { |tiz| total_time += tiz }
+              zone.time_in_hr_zone.each { |tiz| total_time += tiz if tiz }
             end
             break if total_time <= 0.0
             if zone.heart_rate_zones
@@ -354,12 +354,22 @@ module PostRunner
     def local_value(fdr, field, format, units)
       unit = units[@unit_system]
       value = fdr.get_as(field, unit)
+      if value.nil? && field == 'avg_speed'
+        # New fit files used 'enhanced_avg_speed' instead of the older
+        # 'avg_speed'.
+        value = fdr.get_as('enhanced_avg_speed', unit)
+      end
       return '-' unless value
       "#{format % [value, unit]}"
     end
 
     def pace(fdr, field, show_unit = true)
       speed = fdr.get(field)
+      if speed.nil? && field == 'avg_speed'
+        # New fit files used 'enhanced_avg_speed' instead of the older
+        # 'avg_speed'.
+        speed = fdr.get('enhanced_avg_speed')
+      end
       case @unit_system
       when :metric
         "#{speedToPace(speed)}#{show_unit ? ' min/km' : ''}"

data/lib/postrunner/ChartView.rb

@@ -73,6 +73,14 @@ module PostRunner
           :colors => '#900000',
           :show => false
         },
+        {
+          :id => 'respiration_rate',
+          :label => 'Respiration Rate',
+          :unit => 'brpm',
+          :graph => :line_graph,
+          :colors => '#9cd6ef',
+          :show => true
+        },
         {
           :id => 'performance_condition',
           :label => 'Performance Condition',

data/lib/postrunner/FFS_Activity.rb

@@ -253,7 +253,7 @@ module PostRunner
     end
 
     def activity_sub_type
-      ActivitySubTypes[@sub_sport] || 'Undefined'
+      ActivitySubTypes[@sub_sport] || "Undefined #{@sub_sport}"
     end
 
     def distance(timestamp, unit_system)

data/lib/postrunner/FFS_Device.rb

@@ -3,7 +3,7 @@
 #
 # = FFS_Device.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2015, 2016, 2018 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2015, 2016, 2018, 2020 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -83,7 +83,8 @@ module PostRunner
           return nil
         end
       else
-        # Don't add the entity if has deleted before and overwrite isn't true.
+        # Don't add the entity if it has deleted before and overwrite isn't
+        # true.
         path = @store['file_store'].fit_file_dir(File.basename(fit_file_name),
                                                  long_uid, type)
         fq_fit_file_name = File.join(path, File.basename(fit_file_name))

data/lib/postrunner/FitFileStore.rb

@@ -44,7 +44,7 @@ module PostRunner
     # Setup non-persistent variables.
     def restore
       @data_dir = @store['config']['data_dir']
-      # Ensure that we have an Array in the store to hold all known devices.
+      # Ensure that we have a Hash in the store to hold all known devices.
       @store['devices'] = @store.new(PEROBS::Hash) unless @store['devices']
 
       @devices_dir = File.join(@data_dir, 'devices')
@@ -69,8 +69,58 @@ module PostRunner
     end
 
     # Version upgrade logic.
-    def handle_version_update
-      # Nothing here so far.
+    def handle_version_update(from_version, to_version)
+      if from_version <= Gem::Version.new('0.12.0')
+        # PostRunner up until version 0.12.0 was using a long_uid with
+        # manufacturer name and product name. This was a bad idea since unknown
+        # devices were resolved to their numerical ID. In case the unknown ID
+        # was later added to the dictionary in fit4ruby version update, it
+        # resolved to its name and the device was recognized as a new device.
+        # Versions after 0.12.0 only use the numerical versions for the device
+        # long_uid and directory names.
+        uid_remap = {}
+        @store['devices'].each do |uid, device|
+          old_uid = uid
+
+          if (first_activity = device.activities.first)
+            first_activity.load_fit_file
+            if  (fit_activity = first_activity.fit_activity)
+              if (device_info = fit_activity.device_infos.first)
+                new_uid = "#{device_info.numeric_manufacturer}-" +
+                  "#{device_info.numeric_product}-#{device_info.serial_number}"
+
+                uid_remap[old_uid] = new_uid
+                puts first_activity.fit_file_name
+              end
+            end
+          end
+        end
+
+        @store.transaction do
+          pwd = Dir.pwd
+          base_dir_name = @store['config']['devices_dir']
+          Dir.chdir(base_dir_name)
+
+          uid_remap.each do |old_uid, new_uid|
+            if Dir.exist?(old_uid) && !Dir.exist?(new_uid) &&
+                !File.symlink?(old_uid)
+              # Rename the directory from the old (string) scheme to the
+              # new numeric scheme.
+              FileUtils.mv(old_uid, new_uid)
+              # Create a symbolic link with that points the old name to
+              # the new name.
+              File.symlink(new_uid, old_uid)
+            end
+
+            # Now update the long_uid in the FFS_Device object
+            @store['devices'][new_uid] = device = @store['devices'][old_uid]
+            device.long_uid = new_uid
+            @store['devices'].delete(old_uid)
+          end
+
+          Dir.chdir(pwd)
+        end
+      end
     end
 
     # Add a file to the store.
@@ -95,7 +145,8 @@ module PostRunner
       # Generate a String that uniquely identifies the device that generated
       # the FIT file.
       id = extract_fit_file_id(fit_entity)
-      long_uid = "#{id[:manufacturer]}-#{id[:product]}-#{id[:serial_number]}"
+      long_uid = "#{id[:numeric_manufacturer]}-" +
+        "#{id[:numeric_product]}-#{id[:serial_number]}"
 
       # Make sure the device that created the FIT file is properly registered.
       device = register_device(long_uid)
@@ -187,6 +238,7 @@ module PostRunner
       @store['records'].generate_html_reports
       generate_html_index_pages
     end
+
     # Determine the right directory for the given FIT file. The resulting path
     # looks something like /home/user/.postrunner/devices/garmin-fenix3-1234/
     # activity/5A.
@@ -462,6 +514,8 @@ module PostRunner
             return {
               :manufacturer => di.manufacturer,
               :product => di.garmin_product || di.product,
+              :numeric_manufacturer => di.numeric_manufacturer,
+              :numeric_product => di.numeric_product,
               :serial_number => di.serial_number
             }
           end
@@ -483,6 +537,8 @@ module PostRunner
         return {
           :manufacturer => fid.manufacturer,
           :product => fid.garmin_product || fid.product,
+          :numeric_manufacturer => di.numeric_manufacturer,
+          :numeric_product => di.numeric_product,
           :serial_number => fid.serial_number
         }
       end
@@ -502,7 +558,8 @@ module PostRunner
           @store.new(FFS_Device, short_uid, long_uid)
 
         # Create the directory to store the FIT files of this device.
-        create_directory(File.join(@devices_dir, long_uid), long_uid)
+        create_directory(File.join(@devices_dir, long_uid),
+                         long_uid)
       end
 
       @store['devices'][long_uid]

data/lib/postrunner/Main.rb

@@ -107,7 +107,7 @@ module PostRunner
 
         opts.separator <<"EOT"
 
-Copyright (c) 2014, 2015, 2016, 2017 by Chris Schlaeger
+Copyright (c) 2014, 2015, 2016, 2017, 2018, 2019, 2020 by Chris Schlaeger
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of version 2 of the GNU General Public License as published by the
@@ -597,10 +597,17 @@ EOT
 
     def handle_version_update
       if @db['config']['version'] != VERSION
-        Log.warn "PostRunner version upgrade detected."
-        @ffs.handle_version_update
+        puts "Work needed"
+        from_version = Gem::Version.new(@db['config']['version'])
+        to_version = Gem::Version.new(VERSION)
+
+        Log.warn "PostRunner version upgrade from #{from_version} to " +
+          "#{to_version} started."
+        @ffs.handle_version_update(from_version, to_version)
+
         @db['config']['version'] = VERSION
-        Log.info "Version upgrade completed."
+        Log.warn "PostRunner version upgrade from #{from_version} to " +
+          "#{to_version} completed."
       end
     end
 

data/lib/postrunner/UserProfileView.rb

@@ -18,6 +18,8 @@ module PostRunner
 
   class UserProfileView
 
+    include Fit4Ruby::Converters
+
     def initialize(fit_activity, unit_system)
       @fit_activity = fit_activity
       @unit_system = unit_system
@@ -44,16 +46,18 @@ module PostRunner
       user_profile = @fit_activity.user_profiles.first
       hr_zones = @fit_activity.heart_rate_zones.first
 
-      if user_data.height
+      if user_data && user_data.height
         unit = { :metric => 'm', :statute => 'ft' }[@unit_system]
         height = user_data.get_as('height', unit)
         t.cell('Height:', { :width => '40%' })
         t.cell("#{'%.2f' % height} #{unit}", { :width => '60%' })
         t.new_row
       end
-      if user_data.weight
+      if (user_data && user_data.weight) ||
+          (user_profile && user_profile.weight)
         unit = { :metric => 'kg', :statute => 'lbs' }[@unit_system]
-        weight = user_data.get_as('weight', unit)
+        weight = (user_profile && user_profile.get_as('weight', unit)) ||
+                 (user_data && user_data.get_as('weight', unit))
         t.row([ 'Weight:', "#{'%.1f' % weight} #{unit}" ])
       end
       t.row([ 'Gender:', user_data.gender ]) if user_data.gender
@@ -66,15 +70,23 @@ module PostRunner
          (max_hr = hr_zones.max_heart_rate)
         t.row([ 'Max. Heart Rate:', "#{max_hr} bpm" ])
       end
-      if (lthr = user_data.running_lactate_threshold_heart_rate)
-        t.row([ 'Running LTHR:', "#{lthr} bpm" ])
+      if user_profile && (date = user_profile.time_last_lthr_update)
+        t.row([ 'Last Lactate Threshold Update:', date ])
+      end
+      if user_data && (lthr = user_data.running_lactate_threshold_heart_rate)
+        t.row([ 'Running LT Heart Rate:', "#{lthr} bpm" ])
+      end
+      if user_profile && (speed = user_profile.functional_threshold_speed)
+        unit = { :metric => 'min/km', :statute => 'min/mile' }[@unit_system]
+        t.row([ 'Running LT Pace:', "#{speedToPace(speed)} #{unit}" ])
       end
       if (activity_class = user_data.activity_class)
         t.row([ 'Activity Class:', activity_class ])
       end
-      if (metmax = user_data.metmax)
-        t.row([ 'METmax:', "#{metmax} MET" ])
-      end
+      # It's unlikely that anybody ever cares about the METmax value.
+      #if (metmax = user_data.metmax)
+      #  t.row([ 'METmax:', "#{metmax} MET" ])
+      #end
       if (vo2max = @fit_activity.vo2max)
         t.row([ 'VO2max:', "#{'%.1f' % vo2max} ml/kg/min" ])
       end

data/lib/postrunner/version.rb

@@ -3,7 +3,7 @@
 #
 # = version.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014, 2015, 2016, 2017 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2017, 2020 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '0.12.0'
+  VERSION = '1.0.0'
 end

data/postrunner.gemspec

@@ -28,8 +28,8 @@ operating systems as well.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.4'
 
-  spec.add_dependency 'fit4ruby', '~> 3.3.0'
-  spec.add_dependency 'perobs', '~> 4.1.0'
+  spec.add_dependency 'fit4ruby', '~> 3.6.0'
+  spec.add_dependency 'perobs', '~> 4.2.0'
   spec.add_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/FitFileStore_spec.rb

@@ -3,7 +3,7 @@
 #
 # = PostRunner_spec.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014, 2015, 2016 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2020 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -51,7 +51,7 @@ describe PostRunner::FitFileStore do
     expect(@activities[-1]).not_to be_nil
 
     expect(@ffs.devices.length).to eq(1)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
     expect(@ffs.activities.length).to eq(1)
     expect(@ffs.ref_by_activity(@activities[0])).to eq(1)
   end
@@ -60,7 +60,7 @@ describe PostRunner::FitFileStore do
     expect(@ffs.add_fit_file(@fit_file_names[0])).to be_nil
 
     expect(@ffs.devices.length).to eq(1)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
     expect(@ffs.activities.length).to eq(1)
   end
 
@@ -69,8 +69,8 @@ describe PostRunner::FitFileStore do
     expect(@activities[-1]).not_to be_nil
 
     expect(@ffs.devices.length).to eq(2)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
-    expect(@ffs.devices.include?('garmin-fenix3-123456791')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456791')).to be true
     expect(@ffs.activities.length).to eq(2)
     expect(@ffs.ref_by_activity(@activities[1])).to eq(1)
   end
@@ -80,8 +80,8 @@ describe PostRunner::FitFileStore do
     expect(@activities[-1]).not_to be_nil
 
     expect(@ffs.devices.length).to eq(2)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
-    expect(@ffs.devices.include?('garmin-fenix3-123456791')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456791')).to be true
     expect(@ffs.activities.length).to eq(3)
     expect(@ffs.ref_by_activity(@activities[2])).to eq(1)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Application to manage and analyze Garmin FIT files.