postrunner 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27854d18dbc179f4111f3b678e7004dbe2ef2ea
-  data.tar.gz: 11c3167f322b25abd1b3428f5c58d8d14ba28e66
+  metadata.gz: ea10a2814c3c25363117c69d85a1f5e0d4c07c2c
+  data.tar.gz: f0c72064a97183bfee97978e11a534bd9c2d5c5e
 SHA512:
-  metadata.gz: 91ebf4ab3b416459ac7f5f43e2f9817d7d998af7e2dcba7b8bcc13f13ad14f54d917de5f4ce5c618ce83821ca1462ae605d73cdad4c66615b4c5fc5b93ce953f
-  data.tar.gz: 4ab49219c002a4c63ead0cc007d52b2df0c5edeb97d662f39ebfbefa7ecafda64a56007a21057a5723872651a3446724dbc11947cb9b55524336d2ad75f00f52
+  metadata.gz: 644edbd1db0ad2fe562e74a2d09b61ad2664942b1b0aaf31647a96d948cb9c2eb5951fd79a07302d4d2099215f76189b20524071fdd5a1b5d46d340dad851c8a
+  data.tar.gz: b2d3a31c489a3bc506c4d3d809abc35f4eb059edcf94fee1a8b630b52dbdc3e9e580b94825209123890ca670dc6999f28074a1e618c05342935d14a7abd4c167

data/lib/postrunner.rb

@@ -3,7 +3,7 @@
 #
 # = postrunner.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2016 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
@@ -21,6 +21,6 @@ require 'postrunner/Main'
 
 module PostRunner
 
-  Main.new(ARGV)
+  Main.new.main(ARGV)
 
 end

data/lib/postrunner/ActivitySummary.rb

@@ -75,14 +75,12 @@ module PostRunner
                             { :metric => 'km', :statute => 'mi'}) ])
       end
       t.row([ 'Time:', secsToHMS(session.total_timer_time) ])
+      t.row([ 'Avg. Speed:',
+              local_value(session, 'avg_speed', '%.1f %s',
+                          { :metric => 'km/h', :statute => 'mph' }) ])
       if @activity.sport == 'running' || @activity.sport == 'multisport'
         t.row([ 'Avg. Pace:', pace(session, 'avg_speed') ])
       end
-      if @activity.sport != 'running'
-        t.row([ 'Avg. Speed:',
-                local_value(session, 'avg_speed', '%.1f %s',
-                            { :metric => 'km/h', :statute => 'mph' }) ])
-      end
       t.row([ 'Total Ascent:',
               local_value(session, 'total_ascent', '%.0f %s',
                           { :metric => 'm', :statute => 'ft' }) ])
@@ -117,8 +115,8 @@ module PostRunner
       end
       if @activity.sport == 'cycling'
         t.row([ 'Avg. Cadence:',
-                session.avg_candence ?
-                "#{(2 * session.avg_candence).round} rpm" : '-' ])
+                session.avg_cadence ?
+                "#{(2 * session.avg_cadence).round} rpm" : '-' ])
       end
 
       t.row([ 'Training Effect:', session.total_training_effect ?

data/lib/postrunner/DailySleepAnalyzer.rb

@@ -0,0 +1,225 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DailySleepAnalzyer.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2016 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
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby'
+
+module PostRunner
+
+  # This class extracts the sleep information from a set of monitoring files
+  # and determines when and how long the user was awake or had a light or deep
+  # sleep.
+  class DailySleepAnalyzer
+
+    # Utility class to store the interval of a sleep/wake phase.
+    class SleepInterval < Struct.new(:from_time, :to_time, :phase)
+    end
+
+    attr_reader :sleep_intervals, :utc_offset,
+                :total_sleep, :deep_sleep, :light_sleep
+
+    # Create a new DailySleepAnalyzer object to analyze the given monitoring
+    # files.
+    # @param monitoring_files [Array] A set of Monitoring_B objects
+    # @param day [String] Day to analyze as YY-MM-DD string
+    def initialize(monitoring_files, day)
+      @noon_yesterday = @noon_today = @utc_offset = nil
+      @sleep_intervals = []
+
+      # Day as Time object. Midnight UTC.
+      day_as_time = Time.parse(day + "-00:00:00+00:00").gmtime
+      extract_data_from_monitor_files(monitoring_files, day_as_time)
+      fill_sleep_activity
+      smoothen_sleep_activity
+      analyze
+      trim_wake_periods_at_ends
+      calculate_totals
+    end
+
+    private
+
+    def extract_utc_offset(monitoring_file)
+      # The monitoring files have a monitoring_info section that contains a
+      # timestamp in UTC and a local_time field for the same time in the local
+      # time. If any of that isn't present, we use an offset of 0.
+      if (mi = monitoring_file.monitoring_infos).nil? || mi.empty? ||
+         (localtime = mi[0].local_time).nil?
+        return 0
+      end
+
+      # Otherwise the delta in seconds between UTC and localtime is the
+      # offset.
+      localtime - mi[0].timestamp
+    end
+
+    def extract_data_from_monitor_files(monitoring_files, day)
+      # We use an Array with entries for every minute from noon yesterday to
+      # noon today.
+      @sleep_activity = Array.new(24 * 60, nil)
+      monitoring_files.each do |mf|
+        utc_offset = extract_utc_offset(mf)
+        # Noon (local time) the day before the requested day. The time object
+        # is UTC for the noon time in the local time zone.
+        noon_yesterday = day - 12 * 60 * 60 - utc_offset
+        # Noon (local time) of the current day
+        noon_today = day + 12 * 60 * 60 - utc_offset
+
+        mf.monitorings.each do |m|
+          # Ignore all entries outside our 24 hour window from noon the day
+          # before to noon the current day.
+          next if m.timestamp < noon_yesterday || m.timestamp >= noon_today
+
+          if @noon_yesterday.nil? && @noon_today.nil?
+            # The instance variables will only be set once we have found our
+            # first monitoring file that matches the requested day. We use the
+            # local time setting for this first file even if it changes in
+            # subsequent files.
+            @noon_yesterday = noon_yesterday
+            @noon_today = noon_today
+            @utc_offset = utc_offset
+          end
+
+          if (cati = m.current_activity_type_intensity)
+            activity_type = cati & 0x1F
+
+            # Compute the index in the @sleep_activity Array.
+            index = (m.timestamp - @noon_yesterday) / 60
+            if activity_type == 8
+              intensity = (cati >> 5) & 0x7
+              @sleep_activity[index] = intensity
+            else
+              @sleep_activity[index] = false
+            end
+          end
+        end
+      end
+
+    end
+
+    def fill_sleep_activity
+      current = nil
+      @sleep_activity = @sleep_activity.reverse.map do |v|
+        v.nil? ? current : current = v
+      end.reverse
+
+      if $DEBUG
+        File.open('sleep-data.csv', 'w') do |f|
+          f.puts 'Date;Value'
+          @sleep_activity.each_with_index do |v, i|
+            f.puts "#{@noon_yesterday + i * 60};#{v.is_a?(Fixnum) ? v : 8}"
+          end
+        end
+      end
+    end
+
+    def smoothen_sleep_activity
+      window_size = 30
+
+      @smoothed_sleep_activity = Array.new(24 * 60, nil)
+      0.upto(24 * 60 - 1).each do |i|
+        window_start_idx = i - window_size
+        window_end_idx = i
+        sum = 0.0
+        (i - window_size + 1).upto(i).each do |j|
+          sum += j < 0 ? 8.0 :
+                 @sleep_activity[j].is_a?(Fixnum) ? @sleep_activity[j] : 8
+        end
+        @smoothed_sleep_activity[i] = sum / window_size
+      end
+
+      if $DEBUG
+        File.open('smoothed-sleep-data.csv', 'w') do |f|
+          f.puts 'Date;Value'
+          @smoothed_sleep_activity.each_with_index do |v, i|
+            f.puts "#{@noon_yesterday + i * 60};#{v}"
+          end
+        end
+      end
+    end
+
+    def analyze
+      current_phase = :awake
+      current_phase_start = @noon_yesterday
+      @sleep_intervals = []
+
+      @smoothed_sleep_activity.each_with_index do |v, idx|
+        if v < 0.25
+          phase = :deep_sleep
+        elsif v < 1.5
+          phase = :light_sleep
+        else
+          phase = :awake
+        end
+
+        if current_phase != phase
+          t = @noon_yesterday + 60 * idx
+          @sleep_intervals << SleepInterval.new(current_phase_start, t,
+                                                current_phase)
+          current_phase = phase
+          current_phase_start = t
+        end
+      end
+      @sleep_intervals << SleepInterval.new(current_phase_start, @noon_today,
+                                            current_phase)
+    end
+
+    def trim_wake_periods_at_ends
+      first_deep_sleep_idx = last_deep_sleep_idx = nil
+
+      @sleep_intervals.each_with_index do |p, idx|
+        if p.phase == :deep_sleep ||
+           (p.phase == :light_sleep && ((p.to_time - p.from_time) > 15 * 60))
+          first_deep_sleep_idx = idx unless first_deep_sleep_idx
+          last_deep_sleep_idx = idx
+        end
+      end
+
+      return unless first_deep_sleep_idx && last_deep_sleep_idx
+
+      if first_deep_sleep_idx > 0 &&
+         @sleep_intervals[first_deep_sleep_idx - 1].phase == :light_sleep
+         first_deep_sleep_idx -= 1
+      end
+      if last_deep_sleep_idx < @sleep_intervals.length - 2 &&
+         @sleep_intervals[last_deep_sleep_idx + 1].phase == :light_sleep
+        last_deep_sleep_idx += 1
+      end
+
+      @sleep_intervals =
+        @sleep_intervals[first_deep_sleep_idx..last_deep_sleep_idx]
+    end
+
+    def calculate_totals
+      @total_sleep = @light_sleep = @deep_sleep = 0
+      @sleep_intervals.each do |p|
+        if p.phase != :awake
+          seconds = p.to_time - p.from_time
+          @total_sleep += seconds
+          if p.phase == :light_sleep
+            @light_sleep += seconds
+          else
+            @deep_sleep += seconds
+          end
+        end
+      end
+    end
+
+    # Return the begining of the current day in local time as Time object.
+    def begining_of_today(time = Time.now)
+      sec, min, hour, day, month, year = time.to_a
+      sec = min = hour = 0
+      Time.new(*[ year, month, day, hour, min, sec, 0 ]).localtime
+    end
+
+  end
+
+end
+

data/lib/postrunner/DeviceList.rb

@@ -31,6 +31,7 @@ module PostRunner
       'environment_sensor_legacy' => 'GPS',
       'gps' => 'GPS',
       'heart_rate' => 'Heart Rate Sensor',
+      'optical_heart_rate' => 'Optical Heart Rate Sensor',
       'running_dynamics' => 'Running Dynamics',
       'stride_speed_distance' => 'Footpod'
     }
@@ -104,6 +105,15 @@ module PostRunner
           t.new_row
         end
 
+        if type == 'GPS' && (epo = @fit_activity.epo_data) && epo.valid == 1
+          t.cell('EPO Data Start:')
+          t.cell(epo.interval_start)
+          t.new_row
+          t.cell('EPO Data End:')
+          t.cell(epo.interval_end)
+          t.new_row
+        end
+
         if device.serial_number
           t.cell('Serial Number:')
           t.cell(device.serial_number)

data/lib/postrunner/FFS_Activity.rb

@@ -157,10 +157,6 @@ module PostRunner
       load_fit_file(filter)
     end
 
-    def dump(filter)
-      load_fit_file(filter)
-    end
-
     def query(key)
       unless @@Schemata.include?(key)
         raise ArgumentError, "Unknown key '#{key}' requested in query"

data/lib/postrunner/FFS_Device.rb

@@ -12,6 +12,7 @@
 
 require 'perobs'
 require 'postrunner/FFS_Activity'
+require 'postrunner/FFS_Monitoring'
 
 module PostRunner
 
@@ -50,13 +51,12 @@ module PostRunner
     # @return [FFS_Activity or FFS_Monitoring] Corresponding entry in the
     #         FitFileStore or nil if file could not be added.
     def add_fit_file(fit_file_name, fit_entity, overwrite)
-      case fit_entity.class
-      when Fit4Ruby::Activity.class
+      if fit_entity.is_a?(Fit4Ruby::Activity)
         entity = activity_by_file_name(File.basename(fit_file_name))
         entities = @activities
         type = 'activity'
         new_entity_class = FFS_Activity
-      when Fit4Ruby::Monitoring.class
+      elsif fit_entity.is_a?(Fit4Ruby::Monitoring_B)
         entity = monitoring_by_file_name(File.basename(fit_file_name))
         entities = @monitorings
         type = 'monitoring'
@@ -123,6 +123,22 @@ module PostRunner
       @monitorings.find { |a| a.fit_file_name == file_name }
     end
 
+    # Return all monitorings that overlap with the time interval given by
+    # from_time and to_time.
+    # @param from_time [Time] start time of the interval
+    # @param to_time [Time] end time of the interval (not included)
+    # @return [Array] list of overlapping FFS_Monitoring objects.
+    def monitorings(from_time, to_time)
+      list = []
+      @monitorings.each do |m|
+        if (from_time <= m.period_start && m.period_start < to_time) ||
+           (from_time <= m.period_end && m.period_end < to_time)
+          list << m
+        end
+      end
+      list
+    end
+
   end
 
 end

data/lib/postrunner/FFS_Monitoring.rb

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FFS_Monitoring.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2016 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
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby'
+require 'perobs'
+
+module PostRunner
+
+  # The FFS_Monitoring objects can store a reference to the FIT file data and
+  # caches some frequently used values.
+  class FFS_Monitoring < PEROBS::Object
+
+    include DirUtils
+
+    po_attr :device, :fit_file_name, :name, :period_start, :period_end
+
+    # Create a new FFS_Monitoring object.
+    # @param p [PEROBS::Handle] PEROBS handle
+    # @param fit_file_name [String] The fully qualified file name of the FIT
+    #        file to add
+    # @param fit_entity [Fit4Ruby::FitEntity] The content of the loaded FIT
+    #        file
+    def initialize(p, device, fit_file_name, fit_entity)
+      super(p)
+
+      self.device = device
+      self.fit_file_name = fit_file_name ? File.basename(fit_file_name) : nil
+      self.name = fit_file_name ? File.basename(fit_file_name) : nil
+
+      extract_summary_values(fit_entity)
+    end
+
+    # Store a copy of the given FIT file in the corresponding directory.
+    # @param fit_file_name [String] Fully qualified name of the FIT file.
+    def store_fit_file(fit_file_name)
+      # Get the right target directory for this particular FIT file.
+      dir = @store['file_store'].fit_file_dir(File.basename(fit_file_name),
+                                              @device.long_uid, 'monitor')
+      # Create the necessary directories if they don't exist yet.
+      create_directory(dir, 'Device monitoring diretory')
+
+      # Copy the file into the target directory.
+      begin
+        FileUtils.cp(fit_file_name, dir)
+      rescue StandardError
+        Log.fatal "Cannot copy #{fit_file_name} into #{dir}: #{$!}"
+      end
+    end
+
+    # FFS_Monitoring objects are sorted by their start time values and then by
+    # their device long_uids.
+    def <=>(a)
+      @period_start == a.period_start ?
+        a.device.long_uid <=> self.device.long_uid :
+        a.period_start <=> @period_start
+    end
+
+    private
+
+    def extract_summary_values(fit_entity)
+      self.period_start = fit_entity.monitoring_infos[0].timestamp
+
+      period_end = @period_start
+      fit_entity.monitorings.each do |monitoring|
+        period_end = monitoring.timestamp if monitoring.timestamp
+      end
+      self.period_end = period_end
+
+      puts "#{@period_start} - #{@period_end}"
+    end
+
+    def decode_activity_type(activity_type)
+      types = [ :generic, :running, :cycling, :transition,
+                :fitness_equipment, :swimming, :walking, :unknown7,
+                :resting, :unknown9 ]
+      if (decoded_type = types[activity_type])
+        decoded_type
+      else
+        Log.error "Unknown activity type #{activity_type}"
+        :generic
+      end
+    end
+
+  end
+
+end
+

data/lib/postrunner/FitFileStore.rb

@@ -18,6 +18,7 @@ require 'postrunner/DirUtils'
 require 'postrunner/FFS_Device'
 require 'postrunner/ActivityListView'
 require 'postrunner/ViewButtons'
+require 'postrunner/SleepStatistics'
 
 module PostRunner
 
@@ -81,8 +82,8 @@ module PostRunner
       end
 
       unless [ Fit4Ruby::Activity,
-               Fit4Ruby::Monitoring ].include?(fit_entity.class)
-        Log.critical "Unsupported FIT file type #{fit_entity.class}"
+               Fit4Ruby::Monitoring_B ].include?(fit_entity.class)
+        Log.fatal "Unsupported FIT file type #{fit_entity.class}"
       end
 
       # Generate a String that uniquely identifies the device that generated
@@ -318,6 +319,51 @@ module PostRunner
       end
     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.
+      # Each file contains information about the time zone for the specific
+      # 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|
+        # We are looking for all files that potentially overlap with our
+        # localtime day.
+        monitorings += device.monitorings(day_as_time - 36 * 60 * 60,
+                                          day_as_time + 36 * 60 * 60)
+      end
+      monitoring_files = monitorings.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
+      puts SleepStatistics.new(monitoring_files).daily(day)
+    end
+
+    def monthly_report(day)
+      monitorings = []
+      # 'day' specifies the current month. It must be in the form of
+      # YYYY-MM-01. 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.  Each file contains information
+      # about the time zone for the specific 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|
+        # We are looking for all files that potentially overlap with our
+        # localtime day.
+        monitorings += device.monitorings(day_as_time - 36 * 60 * 60,
+                                          day_as_time + 33 * 24 * 60 * 60)
+      end
+      monitoring_files = monitorings.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
+      puts SleepStatistics.new(monitoring_files).monthly(day)
+    end
+
     private
 
     def read_fit_file(fit_file_name)
@@ -330,16 +376,36 @@ module PostRunner
     end
 
     def extract_fit_file_id(fit_entity)
-      fit_entity.device_infos.each do |di|
-        if di.device_index == 0
-          return {
-            :manufacturer => di.manufacturer,
-            :product => di.garmin_product || di.product,
-            :serial_number => di.serial_number
-          }
+      unless (fid = fit_entity.file_id)
+        Log.fatal 'FIT file has no file_id section'
+      end
+
+      if fid.manufacturer == 'garmin' &&
+         fid.garmin_product == 'fr920xt'
+        # Garmin Fenix3 with firmware before 6.80 is reporting 'fr920xt' in
+        # the file_id section but 'fenix3' in the first device_info section.
+        # To tell the Fenix3 apart from the FR920XT we need to look into the
+        # device_info section for all devices with a garmin_product of
+        # 'fr920xt'.
+        fit_entity.device_infos.each do |di|
+          if di.device_index == 0
+            return {
+              :manufacturer => di.manufacturer,
+              :product => di.garmin_product || di.product,
+              :serial_number => di.serial_number
+            }
+          end
         end
+        Log.fatal "Fit entity has no device info for 0"
+      else
+        # And for all properly developed devices we can just look at the
+        # file_id section.
+        return {
+          :manufacturer => fid.manufacturer,
+          :product => fid.garmin_product || fid.product,
+          :serial_number => fid.serial_number
+        }
       end
-      Log.fatal "Fit entity has no device info for 0"
     end
 
     def register_device(long_uid)

data/lib/postrunner/Main.rb

@@ -30,15 +30,17 @@ module PostRunner
 
     include DirUtils
 
-    def initialize(args)
+    def initialize
       @filter = nil
       @name = nil
       @force = false
       @attribute = nil
       @value = nil
       @db_dir = File.join(ENV['HOME'], '.postrunner')
+    end
 
-      return if (args = parse_options(args)).nil?
+    def main(args)
+      return 0 if (args = parse_options(args)).nil?
 
       unless $DEBUG
         Kernel.trap('INT') do
@@ -51,15 +53,40 @@ module PostRunner
       end
 
       begin
-        main(args)
+        create_directory(@db_dir, 'PostRunner data')
+        @db = PEROBS::Store.new(File.join(@db_dir, 'database'))
+        # Create a hash to store configuration data in the store unless it
+        # exists already.
+        cfg = (@db['config'] ||= @db.new(PEROBS::Hash))
+        cfg['unit_system'] ||= :metric
+        cfg['version'] ||= VERSION
+        # We always override the data_dir as the user might have moved the data
+        # directory. The only reason we store it in the DB is to have it
+        # available throught the application.
+        cfg['data_dir'] = @db_dir
+        # Always update html_dir setting so that the DB directory can be moved
+        # around by the user.
+        cfg['html_dir'] = File.join(@db_dir, 'html')
+
+        setup_directories
+        if $DEBUG && (errors = @db.check) != 0
+          Log.abort "Postrunner database is corrupted: #{errors} errors found"
+        end
+        return execute_command(args)
+
       rescue Exception => e
         if e.is_a?(SystemExit) || e.is_a?(Interrupt)
           $stderr.puts e.backtrace.join("\n") if $DEBUG
+        elsif e.is_a?(Fit4Ruby::Abort)
+          # Programm execution error that does not warrant a backtrace to be
+          # printed.
+          return -1
         else
-          Log.fatal("#{e}\n#{e.backtrace.join("\n")}\n\n" +
+          Log.error("#{e}\n#{e.backtrace.join("\n")}\n\n" +
                     "#{'*' * 79}\nYou have triggered a bug in PostRunner " +
                     "#{VERSION}!")
         end
+        return -1
       end
     end
 
@@ -71,7 +98,7 @@ module PostRunner
 
         opts.separator <<"EOT"
 
-Copyright (c) 2014, 2015 by Chris Schlaeger
+Copyright (c) 2014, 2015, 2016 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
@@ -157,12 +184,19 @@ import [ <fit file> | <directory> ]
            file or directory is provided, the directory that was used for the
            previous import is being used.
 
+daily [ <date> ]
+           Print a report summarizing the current day or the specified day.
+
 delete <ref>
            Delete the activity from the archive.
 
 list
            List all FIT files stored in the data base.
 
+monthly [ <date> ]
+           Print a table with various statistics for each day of the specified
+           month.
+
 records
            List all personal records.
 
@@ -217,35 +251,11 @@ EOT
       begin
         parser.parse!(args)
       rescue OptionParser::InvalidOption
-        Log.fatal "#{$!}"
+        Log.error "#{$!}\n" + help
+        return nil
       end
     end
 
-    def main(args)
-      create_directory(@db_dir, 'PostRunner data')
-      @db = PEROBS::Store.new(File.join(@db_dir, 'database'))
-      # Create a hash to store configuration data in the store unless it
-      # exists already.
-      cfg = (@db['config'] ||= @db.new(PEROBS::Hash))
-      cfg['unit_system'] ||= :metric
-      cfg['version'] ||= VERSION
-      # We always override the data_dir as the user might have moved the data
-      # directory. The only reason we store it in the DB is to have it
-      # available throught the application.
-      cfg['data_dir'] = @db_dir
-      # Always update html_dir setting so that the DB directory can be moved
-      # around by the user.
-      cfg['html_dir'] = File.join(@db_dir, 'html')
-
-      setup_directories
-      if $DEBUG && (errors = @db.check) != 0
-        Log.fatal "Postrunner database is corrupted: #{errors} errors found"
-      end
-      execute_command(args)
-
-      @db.sync
-    end
-
     def setup_directories
       create_directory(@db['config']['html_dir'], 'HTML output')
 
@@ -255,18 +265,18 @@ EOT
         misc_dir = File.realpath(File.join(File.dirname(__FILE__),
                                            '..', '..', 'misc'))
         unless Dir.exists?(misc_dir)
-          Log.fatal "Cannot find 'misc' directory under '#{misc_dir}': #{$!}"
+          Log.abort "Cannot find 'misc' directory under '#{misc_dir}': #{$!}"
         end
         src_dir = File.join(misc_dir, dir)
         unless Dir.exists?(src_dir)
-          Log.fatal "Cannot find '#{src_dir}': #{$!}"
+          Log.abort "Cannot find '#{src_dir}': #{$!}"
         end
         dst_dir = @db['config']['html_dir']
 
         begin
           FileUtils.cp_r(src_dir, dst_dir)
         rescue IOError
-          Log.fatal "Cannot copy auxilliary data directory '#{dst_dir}': #{$!}"
+          Log.abort "Cannot copy auxilliary data directory '#{dst_dir}': #{$!}"
         end
       end
     end
@@ -293,6 +303,14 @@ EOT
         else
           process_files_or_activities(args, :check)
         end
+      when 'daily'
+        # Get the date of requested day in 'YY-MM-DD' format. If no argument
+        # is given, use the current date.
+        @ffs.daily_report(day_in_localtime(args, '%Y-%m-%d'))
+      when 'monthly'
+        # Get the date of requested day in 'YY-MM-DD' format. If no argument
+        # is given, use the current date.
+        @ffs.monthly_report(day_in_localtime(args, '%Y-%m-01'))
       when 'delete'
         process_activities(args, :delete)
       when 'dump'
@@ -319,15 +337,15 @@ EOT
         puts @records.to_s
       when 'rename'
         unless (@name = args.shift)
-          Log.fatal 'You must provide a new name for the activity'
+          Log.abort 'You must provide a new name for the activity'
         end
         process_activities(args, :rename)
       when 'set'
         unless (@attribute = args.shift)
-          Log.fatal 'You must specify the attribute you want to change'
+          Log.abort 'You must specify the attribute you want to change'
         end
         unless (@value = args.shift)
-          Log.fatal 'You must specify the new value for the attribute'
+          Log.abort 'You must specify the new value for the attribute'
         end
         process_activities(args, :set)
       when 'show'
@@ -347,12 +365,19 @@ EOT
       when 'update-gps'
         update_gps_data
       when nil
-        Log.fatal("No command provided. " +
-                  "See 'postrunner -h' for more information.")
+        Log.abort("No command provided. " + help)
       else
-        Log.fatal("Unknown command '#{cmd}'. " +
-                  "See 'postrunner -h' for more information.")
+        Log.abort("Unknown command '#{cmd}'. " + help)
       end
+
+      # Ensure that all updates are written to the database.
+      @db.sync
+
+      0
+    end
+
+    def help
+      "See 'postrunner -h' for more information."
     end
 
     def process_files_or_activities(files_or_activities, command)
@@ -367,7 +392,7 @@ EOT
 
     def process_activities(activity_refs, command)
       if activity_refs.empty?
-        Log.fatal("You must provide at least one activity reference.")
+        Log.abort("You must provide at least one activity reference.")
       end
 
       activity_refs.each do |a_ref|
@@ -379,7 +404,7 @@ EOT
           end
           activities.each { |a| process_activity(a, command) }
         else
-          Log.fatal "Activity references must start with ':': #{a_ref}"
+          Log.abort "Activity references must start with ':': #{a_ref}"
         end
       end
 
@@ -388,7 +413,7 @@ EOT
 
     def process_files(files_or_dirs, command)
       if files_or_dirs.empty?
-        Log.fatal("You must provide at least one .FIT file name.")
+        Log.abort("You must provide at least one .FIT file name.")
       end
 
       files_or_dirs.each do |fod|
@@ -430,10 +455,9 @@ EOT
         return false
       end
 
-      if fit_entity.is_a?(Fit4Ruby::Activity)
+      if fit_entity.is_a?(Fit4Ruby::Activity) ||
+         fit_entity.is_a?(Fit4Ruby::Monitoring_B)
         return @ffs.add_fit_file(fit_file_name, fit_entity, @force)
-      #elsif fit_entity.is_a?(Fit4Ruby::Monitoring_B)
-      #  return @monitoring.add(fit_file_name, fit_entity)
       else
         Log.error "#{fit_file_name} is not a recognized FIT file"
         return false
@@ -477,7 +501,7 @@ EOT
 
     def change_unit_system(args)
       if args.length != 1 || !%w( metric statute ).include?(args[0])
-        Log.fatal("You must specify 'metric' or 'statute' as unit system.")
+        Log.error("You must specify 'metric' or 'statute' as unit system.")
       end
 
       if @db['config']['unit_system'].to_s != args[0]
@@ -488,7 +512,7 @@ EOT
 
     def change_html_dir(args)
       if args.length != 1
-        Log.fatal('You must specify a directory')
+        Log.error('You must specify a directory')
       end
 
       if @db['config']['html_dir'] != args[0]
@@ -530,6 +554,15 @@ EOT
       end
     end
 
+    def day_in_localtime(args, format)
+      begin
+        (args.empty? ? Time.now : Time.parse(args[0])).
+          localtime.strftime(format)
+      rescue ArgumentError
+        Log.abort("#{args[0]} is not a valid date. Use YYYY-MM-DD format.")
+      end
+    end
+
     def handle_version_update
       if @db['config']['version'] != VERSION
         Log.warn "PostRunner version upgrade detected."

data/lib/postrunner/SleepStatistics.rb

@@ -0,0 +1,117 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = SleepStatistics.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2016 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
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby'
+
+require 'postrunner/DailySleepAnalyzer'
+require 'postrunner/FlexiTable'
+
+module PostRunner
+
+  # This class can be used to generate reports for sleep data. It uses the
+  # DailySleepAnalyzer class to compute the data and generates the report for
+  # a certain time period.
+  class SleepStatistics
+
+    include Fit4Ruby::Converters
+
+    # Create a new SleepStatistics object.
+    # @param monitoring_files [Array of Fit4Ruby::Monitoring_B] FIT files
+    def initialize(monitoring_files)
+      @monitoring_files = monitoring_files
+    end
+
+    # Generate a report for a certain day.
+    # @param day [String] Date of the day as YYYY-MM-DD string.
+    def daily(day)
+      analyzer = DailySleepAnalyzer.new(@monitoring_files, day)
+
+      if analyzer.sleep_intervals.empty?
+        return 'No sleep data available for this day'
+      end
+
+      ti = FlexiTable.new
+      ti.head
+      ti.row([ 'From', 'To', 'Sleep phase' ])
+      ti.body
+      utc_offset = analyzer.utc_offset
+      analyzer.sleep_intervals.each do |i|
+        ti.cell(i[:from_time].localtime(utc_offset).strftime('%H:%M'))
+        ti.cell(i[:to_time].localtime(utc_offset).strftime('%H:%M'))
+        ti.cell(i[:phase])
+        ti.new_row
+      end
+
+      tt = FlexiTable.new
+      tt.head
+      tt.row([ 'Total Sleep', 'Deep Sleep', 'Light Sleep' ])
+      tt.body
+      tt.cell(secsToHM(analyzer.total_sleep), { :halign => :right })
+      tt.cell(secsToHM(analyzer.deep_sleep), { :halign => :right })
+      tt.cell(secsToHM(analyzer.light_sleep), { :halign => :right })
+      tt.new_row
+
+      "Sleep Statistics for #{day}\n\n#{ti}\n#{tt}"
+    end
+
+    def monthly(day)
+      day_as_time = Time.parse(day)
+      year = day_as_time.year
+      month = day_as_time.month
+      last_day_of_month = Date.new(year, month, -1).day
+
+      t = FlexiTable.new
+      left = { :halign => :left }
+      right = { :halign => :right }
+      t.set_column_attributes([ left, right, right, right ])
+      t.head
+      t.row([ 'Date', 'Total Sleep', 'Deep Sleep', 'Light Sleep' ])
+      t.body
+      totals = Hash.new(0)
+      counted_days = 0
+
+      1.upto(last_day_of_month).each do |dom|
+        day_str = Time.new(year, month, dom).strftime('%Y-%m-%d')
+        t.cell(day_str)
+
+        analyzer = DailySleepAnalyzer.new(@monitoring_files, day_str)
+
+        if analyzer.sleep_intervals.empty?
+          t.cell('-')
+          t.cell('-')
+          t.cell('-')
+        else
+          totals[:total_sleep] += analyzer.total_sleep
+          totals[:deep_sleep] += analyzer.deep_sleep
+          totals[:light_sleep] += analyzer.light_sleep
+          counted_days += 1
+
+          t.cell(secsToHM(analyzer.total_sleep))
+          t.cell(secsToHM(analyzer.deep_sleep))
+          t.cell(secsToHM(analyzer.light_sleep))
+        end
+        t.new_row
+      end
+      t.foot
+      t.cell('Averages')
+      t.cell(secsToHM(totals[:total_sleep] / counted_days))
+      t.cell(secsToHM(totals[:deep_sleep] / counted_days))
+      t.cell(secsToHM(totals[:light_sleep] / counted_days))
+      t.new_row
+
+      "Sleep Statistics for #{day_as_time.strftime('%B')} #{year}\n\n#{t}"
+    end
+
+  end
+
+end
+

data/lib/postrunner/ViewTop.rb

@@ -56,6 +56,7 @@ module PostRunner
       <<EOT
 .titlebar {
   width: 100%;
+  min-width: 1210px;
   height: 50px;
   margin: 0px;
 	background: linear-gradient(#7FA1FF 0, #002EAC 50px);

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/postrunner.gemspec

@@ -19,7 +19,7 @@ GEM_SPEC = Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.0'
 
-  spec.add_dependency 'fit4ruby', '~> 0.0.12'
+  spec.add_dependency 'fit4ruby', '~> 1.0.0'
   spec.add_dependency 'perobs', '~> 2.2'
   spec.add_dependency 'nokogiri', '~> 1.6'
 

data/spec/PostRunner_spec.rb

@@ -19,13 +19,19 @@ describe PostRunner::Main do
 
   def postrunner(args)
     args = [ '--dbdir', @db_dir ] + args
-    old_stdout = $stdout
-    $stdout = (stdout = StringIO.new)
-    @postrunner = nil
-    GC.start
-    @postrunner = PostRunner::Main.new(args)
-    $stdout = old_stdout
-    stdout.string
+    begin
+      old_stdout = $stdout
+      old_stderr = $stderr
+      $stdout = (stdout = StringIO.new)
+      $stderr = (stderr = StringIO.new)
+      GC.start
+      retval = PostRunner::Main.new.main(args)
+    ensure
+      $stdout = old_stdout
+      $stderr = old_stderr
+    end
+
+    { :retval => retval, :stdout => stdout.string, :stderr => stderr.string }
   end
 
   before(:all) do
@@ -47,11 +53,13 @@ describe PostRunner::Main do
   end
 
   it 'should abort without arguments' do
-    expect { postrunner([]) }.to raise_error(Fit4Ruby::Error)
+    v = postrunner([])
+    expect(v[:retval]).to eql(-1)
   end
 
   it 'should abort with bad command' do
-    expect { postrunner(%w( foobar)) }.to raise_error(Fit4Ruby::Error)
+    v = postrunner(%w( foobar))
+    expect(v[:retval]).to eql(-1)
   end
 
   it 'should support the -v option' do
@@ -79,51 +87,59 @@ describe PostRunner::Main do
   end
 
   it 'should list the imported file' do
-    expect(postrunner(%w( list )).index(File.basename(@file1))).to be_a(Fixnum)
+    v = postrunner(%w( list ))
+    expect(v[:stdout].index(File.basename(@file1))).to be_a(Fixnum)
   end
 
   it 'should import the 2nd FIT file' do
     postrunner([ 'import', @file2 ])
-    list = postrunner(%w( list ))
+    v = postrunner(%w( list ))
+    list = v[:stdout]
     expect(list.index(File.basename(@file1))).to be_a(Fixnum)
     expect(list.index(File.basename(@file2))).to be_a(Fixnum)
   end
 
   it 'should delete the first file' do
     postrunner(%w( delete :2 ))
-    list = postrunner(%w( list ))
+    v = postrunner(%w( list ))
+    list = v[:stdout]
     expect(list.index(File.basename(@file1))).to be_nil
     expect(list.index(File.basename(@file2))).to be_a(Fixnum)
   end
 
   it 'should not import the deleted file again' do
     postrunner([ 'import', @file1 ])
-    list = postrunner(%w( list ))
+    v = postrunner(%w( list ))
+    list = v[:stdout]
     expect(list.index(File.basename(@file1))).to be_nil
     expect(list.index(File.basename(@file2))).to be_a(Fixnum)
   end
 
   it 'should rename FILE2.FIT activity' do
     postrunner(%w( rename foobar :1 ))
-    list = postrunner(%w( list ))
+    v = postrunner(%w( list ))
+    list = v[:stdout]
     expect(list.index(File.basename(@file2))).to be_nil
     expect(list.index('foobar')).to be_a(Fixnum)
   end
 
   it 'should fail when setting bad attribute' do
-    expect { postrunner(%w( set foo bar :1)) }.to raise_error(Fit4Ruby::Error)
+    v = postrunner(%w( set foo bar :1))
+    expect(v[:retval]).to eql(-1)
   end
 
   it 'should set name for 2nd activity' do
     postrunner(%w( set name foobar :1 ))
-    list = postrunner(%w( list ))
+    v = postrunner(%w( list ))
+    list = v[:stdout]
     expect(list.index(@file2)).to be_nil
     expect(list.index('foobar')).to be_a(Fixnum)
   end
 
   it 'should set activity type for 2nd activity' do
     postrunner(%w( set type Cycling :1 ))
-    list = postrunner(%w( summary :1 ))
+    v = postrunner(%w( summary :1 ))
+    list = v[:stdout]
     expect(list.index('Running')).to be_nil
     expect(list.index('Cycling')).to be_a(Fixnum)
   end
@@ -137,18 +153,21 @@ describe PostRunner::Main do
   end
 
   it 'should fail when setting bad activity type' do
-    expect { postrunner(%w( set type foobar :1)) }.to raise_error(Fit4Ruby::Error)
+    v = postrunner(%w( set type foobar :1))
+    expect(v[:retval]).to eql(-1)
   end
 
   it 'should set activity subtype for FILE2.FIT activity' do
     postrunner(%w( set subtype Road :1 ))
-    list = postrunner(%w( summary :1 ))
+    v = postrunner(%w( summary :1 ))
+    list = v[:stdout]
     expect(list.index('Generic')).to be_nil
     expect(list.index('Road')).to be_a(Fixnum)
   end
 
   it 'should fail when setting bad activity subtype' do
-    expect { postrunner(%w( set subtype foobar :1)) }.to raise_error(Fit4Ruby::Error)
+    v = postrunner(%w( set subtype foobar :1))
+    expect(v[:retval]).to eql(-1)
   end
 
   it 'should dump an activity from the archive' do
@@ -170,19 +189,22 @@ describe PostRunner::Main do
   it 'should list records' do
     # Add slow running activity
     postrunner([ 'import', '--force', @file1 ])
-    list = postrunner([ 'records' ])
+    v = postrunner([ 'records' ])
+    list = v[:stdout]
     expect(list.index(File.basename(@file1))).to be_a(Fixnum)
 
     # Add fast running activity
     postrunner([ 'import', @file3 ])
-    list = postrunner([ 'records' ])
+    v =postrunner([ 'records' ])
+    list = v[:stdout]
     expect(list.index(File.basename(@file3))).to be_a(Fixnum)
     expect(list.index(File.basename(@file1))).to be_nil
   end
 
   it 'should ignore records of an activity' do
     postrunner(%w( set norecord true :1 ))
-    list = postrunner([ 'records' ])
+    v = postrunner([ 'records' ])
+    list = v[:stdout]
     expect(list.index(File.basename(@file1))).to be_a(Fixnum)
     expect(list.index(File.basename(@file3))).to be_nil
   end

data/spec/spec_helper.rb

@@ -80,6 +80,10 @@ def create_fit_activity(config)
   ts = Time.parse(config[:t])
   serial = config[:serial] || 12345890
   a = Fit4Ruby::Activity.new({ :timestamp => ts })
+  a.new_file_id({ :manufacturer => 'garmin',
+                  :time_created => ts,
+                  :garmin_product => 'fr920xt',
+                  :serial_number => serial })
   a.total_timer_time = (config[:duration] || 10) * 60
   a.new_user_profile({ :timestamp => ts,
                        :age => 33, :height => 1.78, :weight => 73.0,

data/tasks/gem.rake

@@ -28,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: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.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: fit4ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - lib/postrunner/ActivityView.rb
 - lib/postrunner/BackedUpFile.rb
 - lib/postrunner/ChartView.rb
+- lib/postrunner/DailySleepAnalyzer.rb
 - lib/postrunner/DataSources.rb
 - lib/postrunner/DeviceList.rb
 - lib/postrunner/DirUtils.rb
@@ -142,6 +143,7 @@ files:
 - lib/postrunner/EventList.rb
 - lib/postrunner/FFS_Activity.rb
 - lib/postrunner/FFS_Device.rb
+- lib/postrunner/FFS_Monitoring.rb
 - lib/postrunner/FitFileStore.rb
 - lib/postrunner/FlexiTable.rb
 - lib/postrunner/HRV_Analyzer.rb
@@ -158,6 +160,7 @@ files:
 - lib/postrunner/RecordListPageView.rb
 - lib/postrunner/RuntimeConfig.rb
 - lib/postrunner/Schema.rb
+- lib/postrunner/SleepStatistics.rb
 - lib/postrunner/TrackView.rb
 - lib/postrunner/UserProfileView.rb
 - lib/postrunner/View.rb
@@ -327,7 +330,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: Application to manage and analyze Garmin FIT files.