postrunner 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c470dc3a2d1c211ae2c294e98392d9a2621b2ade
-  data.tar.gz: 201bf757b216cb48ab8bf4cf9ace6fae602b7730
+  metadata.gz: 9758b2893a319550c0ee7f653680bf2ccca06c32
+  data.tar.gz: 074ef7f186b98726a3519bd9c2c94d05d60ab7e3
 SHA512:
-  metadata.gz: 2e9a5edc603c22081b74c538f5249943eabc266bb9eb54083c57e7664f948df27f9881a83f47d2db28862360c614e81cd2139b9775819ce46c7321b1d59a104e
-  data.tar.gz: 9bcd6103ac667230b1309b1bf31bcdda583ba651d016dee32510786faa8da52d13f4d06daf8c069f0ff4bdfb3d0563a1a324f865f55e80ef82ede97bbc291b20
+  metadata.gz: 8f2dfbc2814b86b58260b5ee431903b4cc784bfe3edac8b9f59204a10ffa238e4a7e372ca47e5fb9cf63266d50b9d3ef00ff4aa8fca043c27463100f1624630b
+  data.tar.gz: f19618a36b8b04c73ef7292b659e40fa5c7703a15e6e0163fad5fcb5a338378bbc6e637d471eb6f9507e4313db2224225111a8d2a81e1915fc00f972ca9b85fc

data/lib/postrunner/DailySleepAnalyzer.rb

@@ -487,7 +487,9 @@ module PostRunner
     def determine_resting_heart_rate
       # Find the smallest heart rate. TODO: While being awake.
       @heart_rate.each_with_index do |heart_rate, idx|
-        next unless heart_rate && heart_rate > 0
+        next unless heart_rate && heart_rate > 0 &&
+                    @activity_type[idx] != :resting
+
         if @resting_heart_rate.nil? || @resting_heart_rate > heart_rate
           @resting_heart_rate = heart_rate
         end

data/lib/postrunner/EventList.rb

@@ -96,10 +96,10 @@ module PostRunner
         value = event.speed_low_alert
       when 'cad_high_alert'
         name = 'Cadence high alert'
-        value = "#{event.cad_high_alert} spm"
+        value = "#{2 * event.cad_high_alert} spm"
       when 'cad_low_alert'
         name = 'Cadence low alert'
-        value = "#{event.cad_low_alert} spm"
+        value = "#{2 * event.cad_low_alert} spm"
       when 'power_high_alert'
         name = 'Power high alert'
         value = event.power_high_alert
@@ -134,6 +134,12 @@ module PostRunner
       when 'vo2max'
         name = 'VO2Max'
         value = event.vo2max
+      when 'lactate_threshold_heart_rate'
+        name = 'Lactate Threshold Heart Rate'
+        value = "#{event.lactate_threshold_heart_rate} bpm"
+      when 'lactate_threshold_speed'
+        name = 'Lactate Threshold Pace'
+        value = pace(event, 'lactate_threshold_speed')
       else
         name = event.event
         value = event.data
@@ -143,6 +149,18 @@ module PostRunner
       table.cell(value)
     end
 
+    def pace(fdr, field, show_unit = true)
+      speed = fdr.get(field)
+      case @unit_system
+      when :metric
+        "#{speedToPace(speed)}#{show_unit ? ' min/km' : ''}"
+      when :statute
+        "#{speedToPace(speed, 1609.34)}#{show_unit ? ' min/mi' : ''}"
+      else
+        Log.fatal "Unknown unit system #{@unit_system}"
+      end
+    end
+
   end
 
 end

data/lib/postrunner/FitFileStore.rb

@@ -211,6 +211,23 @@ module PostRunner
       list.sort
     end
 
+    # Read in all Monitoring_B FIT files that overlap with the given interval.
+    # @param start_date [Time] Interval start time
+    # @param end_date [Time] Interval end date
+    # @return [Array of Monitoring_B] Content of Monitoring_B FIT files
+    def monitorings(start_date, end_date)
+      monitorings = []
+      @store['devices'].each do |id, device|
+        monitorings += device.monitorings(start_date.gmtime, end_date.gmtime)
+      end
+
+      monitorings.reverse.map do |m|
+        read_fit_file(File.join(fit_file_dir(m.fit_file_name, m.device.long_uid,
+                                             'monitor'), m.fit_file_name))
+      end
+    end
+
+
     # Return the reference index of the given FFS_Activity.
     # @param activity [FFS_Activity]
     # @return [Fixnum] Reference index as used in the UI
@@ -320,7 +337,6 @@ module PostRunner
     end
 
     def daily_report(day)
-      monitorings = []
       # 'day' specifies the current day. But we don't know what timezone the
       # watch was set to for a given date. The files are always named after
       # the moment of finishing the recording expressed as GMT time.
@@ -328,17 +344,12 @@ module PostRunner
       # file. Recording is always flipped to a new file at midnight GMT but
       # there are usually multiple files per GMT day.
       day_as_time = Time.parse(day).gmtime
-      @store['devices'].each do |id, device|
-        # To get weekly intensity minutes we need 7 days of data prior to the
-        # current date and 1 day after to include the following night. We add
-        # at least 12 extra hours to accomodate time zone changes.
-        monitorings += device.monitorings(day_as_time - 8 * 24 * 60 * 60,
-                                          day_as_time + 36 * 60 * 60)
-      end
-      monitoring_files = monitorings.reverse.map do |m|
-        read_fit_file(File.join(fit_file_dir(m.fit_file_name, m.device.long_uid,
-                                             'monitor'), m.fit_file_name))
-      end
+      # To get weekly intensity minutes we need 7 days of data prior to the
+      # current date and 1 day after to include the following night. We add
+      # at least 12 extra hours to accomodate time zone changes.
+      monitoring_files = monitorings(day_as_time - 8 * 24 * 60 * 60,
+                                     day_as_time + 36 * 60 * 60)
+
       puts MonitoringStatistics.new(monitoring_files).daily(day)
     end
 
@@ -352,16 +363,12 @@ module PostRunner
       # to a new file at midnight GMT but there are usually multiple files per
       # GMT day.
       day_as_time = Time.parse(day).gmtime
-      @store['devices'].each do |id, device|
-        # We are looking for all files that potentially overlap with our
-        # localtime day.
-        monitorings += device.monitorings(day_as_time - 8 * 24 * 60 * 60,
-                                          day_as_time + 33 * 24 * 60 * 60)
-      end
-      monitoring_files = monitorings.sort.map do |m|
-        read_fit_file(File.join(fit_file_dir(m.fit_file_name, m.device.long_uid,
-                                             'monitor'), m.fit_file_name))
-      end
+      # To get weekly intensity minutes we need 7 days of data prior to the
+      # current month start and 1 after to inclide the following night. We add
+      # at least 12 extra hours to accomondate time zone changes.
+      monitoring_files = monitorings(day_as_time - 8 * 24 * 60 * 60,
+                                     day_as_time + 32 * 24 * 60 * 60)
+
       puts MonitoringStatistics.new(monitoring_files).monthly(day)
     end
 

data/lib/postrunner/Main.rb

@@ -154,7 +154,7 @@ EOT
           Log.level = Logger::DEBUG
         end
         opts.on('-h', '--help', 'Show this message') do
-          $stderr.puts opts
+          $stdout.puts opts
           return nil
         end
         opts.on('--version', 'Show version number') do
@@ -189,7 +189,7 @@ import [ <fit file> | <directory> ]
            previous import is being used.
 
 list
-           List all FIT files stored in the data base.
+           List all FIT files stored in the database.
 
 monthly [ <YYYY-MM-DD> ]
 

data/lib/postrunner/MonitoringStatistics.rb

@@ -197,11 +197,12 @@ module PostRunner
       t = FlexiTable.new
       left = { :halign => :left }
       right = { :halign => :right }
-      t.set_column_attributes([ left ] + [ right ] * 7)
+      t.set_column_attributes([ left ] + [ right ] * 10)
       t.head
-      t.row([ 'Day', 'Steps', '%', 'Goal', 'Intensity', '%',
-              'Floors', '% of 10' ])
-      t.row([ '', '', '', '', 'Minutes', 'Week', '', '' ])
+      t.row([ 'Day', 'Steps', '% of', 'Goal', 'Wk. Int.', '% of',
+              'Floors', '% of', 'Floors', 'Dist.', 'Cals.' ])
+      t.row([ '', '', 'Goal', 'Steps', 'Minutes', '150', 'clmbd.', '10',
+              'descd.', 'km', 'kCal' ])
       t.body
       totals = Hash.new(0)
       counted_days = 0
@@ -238,9 +239,23 @@ module PostRunner
 
         floors = analyzer.total_floors
         floors_climbed = floors[:floors_climbed]
-        totals[:floors] += floors_climbed
+        totals[:floors_climbed] += floors_climbed
         t.cell(floors_climbed)
         t.cell(percent(floors_climbed, 10))
+
+        floors_descended = floors[:floors_descended]
+        totals[:floors_descended] += floors_descended
+        t.cell(floors_descended)
+
+
+        distance = steps_distance_calories[:distance]
+        totals[:distance] += distance
+        t.cell(distance.to_i)
+
+        calories = steps_distance_calories[:calories]
+        totals[:calories] += calories
+        t.cell(calories.to_i)
+
         t.new_row
         counted_days += 1
       end
@@ -252,8 +267,11 @@ module PostRunner
       t.cell(totals[:steps_goal])
       t.cell(totals[:intensity_minutes].to_i)
       t.cell('')
-      t.cell(totals[:floors])
+      t.cell(totals[:floors_climbed])
       t.cell('')
+      t.cell(totals[:floors_descended])
+      t.cell(totals[:distance].to_i)
+      t.cell(totals[:calories].to_i)
       t.new_row
 
       if counted_days > 0
@@ -263,8 +281,11 @@ module PostRunner
         t.cell((totals[:steps_goal] / counted_days).to_i)
         t.cell((totals[:intensity_minutes] / counted_days).to_i)
         t.cell(percent(totals[:intensity_minutes], (counted_days / 7.0) * 150))
-        t.cell((totals[:floors] / counted_days).to_i)
+        t.cell((totals[:floors_climbed] / counted_days).to_i)
         t.cell(percent(totals[:floors] / counted_days, 10))
+        t.cell((totals[:floors_descended] / counted_days).to_i)
+        t.cell('%.0f' % (totals[:distance] / counted_days))
+        t.cell((totals[:calories] / counted_days).to_i)
       end
 
       t
@@ -354,7 +375,7 @@ module PostRunner
             ma.intensity_minutes[:moderate_minutes] +
             2 * ma.intensity_minutes[:vigorous_minutes]
 
-          break if current_date.wday == @first_day_of_week
+          break if date.wday == @first_day_of_week
         end
       end
 

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/postrunner.gemspec

@@ -27,7 +27,7 @@ should work on other operating systems as well.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.0'
 
-  spec.add_dependency 'fit4ruby', '~> 1.1.0'
+  spec.add_dependency 'fit4ruby', '~> 1.2.0'
   spec.add_dependency 'perobs', '~> 2.2'
   spec.add_dependency 'nokogiri', '~> 1.6'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement