postrunner 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19aaff0f7f7586b68eb837bd1679ce7e31b9cfe7
-  data.tar.gz: a25b3ceb7a05e129edc6560d73ccb65a1ebe0e16
+  metadata.gz: 4dd09a8e49b1feea3d264427dae30981cb842f22
+  data.tar.gz: e9ec20c4cf98828275ab8f82d1230101dd35af53
 SHA512:
-  metadata.gz: e0abfc8cef81ebf908bbcedb7443eb2481537c0f4156502aa65e6730c2b58607117a0c0d58886907b042c049e38ec8043bc3c632e4fc2b3e2a965409a81e7962
-  data.tar.gz: 773ba376b663e6b8aaddbbbb3e84e968b9b57d1d5c5cb0b39d5e809725268afdcf9a667b5647f1e325bdce399198f58d575d1884725c71bac4f27bc240a6e57f
+  metadata.gz: abe3df33c0cc4ae5bf687a365368cc1b969d9b754776097bccc70d134aed86ab6e933896579557a51a1ea3cd59eb7a57b4da861abf2d822e4d865474e3253978
+  data.tar.gz: 97f348e3b2f6faa5ebda4b7cce5517f7f1bf9dafa5d75b006e875a8490dca8963570c2042428783e99ef52b49d1b17b419f372e32c6fe627fbbb7e5872366b8b

data/Rakefile

@@ -1,16 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-# Add the include path for the fit4ruby library. We assume it is located in
-# the same directory as the postrunner directory.
-fit4ruby = File.realpath(File.join(File.dirname(__FILE__), '..',
-                                                'fit4ruby', 'lib'))
-if ENV['RUBYLIB']
-  ENV['RUBYLIB'] += ":#{fit4ruby}"
-else
-  ENV['RUBYLIB'] = fit4ruby
-end
-
 RSpec::Core::RakeTask.new
 
 task :default => :spec

data/lib/postrunner.rb

@@ -10,7 +10,11 @@
 # published by the Free Software Foundation.
 #
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', '..', 'fit4ruby', 'lib'))
+# Some dependencies may not be installed as Ruby Gems but as local sources.
+# Add them to the LOAD_PATH.
+%w( fit4ruby perobs ).each do |lib_dir|
+  $:.unshift(File.join(File.dirname(__FILE__), '..', '..', lib_dir, 'lib'))
+end
 $:.unshift(File.dirname(__FILE__))
 
 require 'postrunner/Main'

data/lib/postrunner/ActivitiesDB.rb

@@ -89,36 +89,26 @@ module PostRunner
     # @param fit_file [String] Name of the FIT file.
     # @return [TrueClass or FalseClass] True if the file could be added. False
     # otherwise.
-    def add(fit_file)
-      base_fit_file = File.basename(fit_file)
-      if @activities.find { |a| a.fit_file == base_fit_file }
-        Log.debug "Activity #{fit_file} is already included in the archive"
-        return false
-      end
+    def add(fit_file_name, fit_activity)
+      base_fit_file_name = File.basename(fit_file_name)
 
-      if File.exists?(File.join(@fit_dir, base_fit_file))
-        Log.debug "Activity #{fit_file} has been deleted before"
+      if @activities.find { |a| a.fit_file == base_fit_file_name }
+        Log.debug "Activity #{fit_file_name} is already included in the archive"
         return false
       end
 
-      begin
-        fit_activity = Fit4Ruby.read(fit_file)
-      rescue Fit4Ruby::Error
-        Log.error $!
-        return false
-      end
-      unless fit_activity
-        Log.error "#{fit_file} does not contain any activity records"
+      if File.exists?(File.join(@fit_dir, base_fit_file_name))
+        Log.debug "Activity #{fit_file_name} has been deleted before"
         return false
       end
 
       begin
-        FileUtils.cp(fit_file, @fit_dir)
+        FileUtils.cp(fit_file_name, @fit_dir)
       rescue StandardError
-        Log.fatal "Cannot copy #{fit_file} into #{@fit_dir}: #{$!}"
+        Log.fatal "Cannot copy #{fit_file_name} into #{@fit_dir}: #{$!}"
       end
 
-      @activities << (activity = Activity.new(self, base_fit_file,
+      @activities << (activity = Activity.new(self, base_fit_file_name,
                                               fit_activity))
       @activities.sort! do |a1, a2|
         a2.timestamp <=> a1.timestamp
@@ -140,7 +130,7 @@ module PostRunner
       end
 
       sync
-      Log.info "#{fit_file} successfully added to archive"
+      Log.info "#{fit_file_name} successfully added to archive"
 
       true
     end

data/lib/postrunner/ActivitySummary.rb

@@ -54,6 +54,11 @@ module PostRunner
       t.row([ 'Distance:',
               local_value(session, 'total_distance', '%.2f %s',
                           { :metric => 'km', :statute => 'mi'}) ])
+      if session.has_geo_data?
+        t.row([ 'GPS Data based Distance:',
+                local_value(@fit_activity, 'total_gps_distance', '%.2f %s',
+                            { :metric => 'km', :statute => 'mi'}) ])
+      end
       t.row([ 'Time:', secsToHMS(session.total_timer_time) ])
       if @activity.sport == 'running' || @activity.sport == 'multisport'
         t.row([ 'Avg. Pace:', pace(session, 'avg_speed') ])

data/lib/postrunner/ChartView.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby -w # encoding: UTF-8
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
 #
 # = ChartView.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
@@ -176,8 +177,9 @@ EOT
           else
             value = (value * 3600.0 * 1000).to_i
           end
+          min_value = 0.0
         else
-          min_value = value if value && (min_value.nil? || min_value > value)
+          min_value = value if (min_value.nil? || min_value > value)
         end
         data_set << [ ((r.timestamp.to_i - start_time) * 1000).to_i, value ]
       end
@@ -190,18 +192,19 @@ EOT
       s << data_set.map do |set|
         "[ #{set[0]}, #{set[1] ? set[1] : 'null'} ]"
       end.join(', ')
+      s << "];\n"
+
+      s << lap_marks(start_time)
 
       chart_id = "#{field}_chart"
       s << <<"EOT"
-	  	];
-
-	  	$.plot(\"##{chart_id}\",
+	  	var plot = $.plot(\"##{chart_id}\",
              [ { data: #{field}_data,
                  #{color ? "color: \"#{color}\"," : ''}
                  lines: { show: true#{field == 'pace' ? '' :
                                       ', fill: true'} } } ],
              { xaxis: { mode: "time" },
-               grid: { hoverable: true }
+               grid: { markings: lap_marks, hoverable: true }
 EOT
       if field == 'pace'
         s << ", yaxis: { mode: \"time\",\n" +
@@ -212,6 +215,7 @@ EOT
         s << ", yaxis: { min: #{0.9 * min_value} }"
       end
       s << "});\n"
+      s << lap_mark_labels(chart_id, start_time)
       s << hover_function(chart_id, y_label, select_unit(unit)) + "\n"
     end
 
@@ -233,11 +237,11 @@ EOT
         # Find the right set by looking at the maximum allowed values for each
         # color.
         colors.each.with_index do |col_max_value, i|
-          col, max_value = col_max_value
-          if max_value.nil? || value < max_value
-            # A max_value of nil means all values allowed. The value is in the
-            # allowed range for this set, so add the value as x/y pair to the
-            # set.
+          col, range_max_value = col_max_value
+          if range_max_value.nil? || value < range_max_value
+            # A range_max_value of nil means all values allowed. The value is
+            # in the allowed range for this set, so add the value as x/y pair
+            # to the set.
             x_val = (r.timestamp.to_i - start_time) * 1000
             data_sets[i] << [ x_val, r.get_as(field, select_unit(unit)) ]
             # Abort the color loop since we've found the right set already.
@@ -260,8 +264,10 @@ EOT
         s << " ];\n"
       end
 
+      s << lap_marks(start_time)
+
       chart_id = "#{field}_chart"
-      s << "$.plot(\"##{chart_id}\", [\n"
+      s << "var plot = $.plot(\"##{chart_id}\", [\n"
       s << data_sets.map do |index, ds|
              "{ data: #{field}_data_#{index},\n" +
              "  color: \"#{colors[index][0]}\",\n" +
@@ -269,7 +275,8 @@ EOT
              "            fill: true, radius: 2 } }"
            end.join(', ')
       s << "], { xaxis: { mode: \"time\" },
-                 grid: { hoverable: true } });\n"
+                 grid: { markings: lap_marks, hoverable: true } });\n"
+      s << lap_mark_labels(chart_id, start_time)
       s << hover_function(chart_id, y_label, select_unit(unit))
 
       s
@@ -302,6 +309,34 @@ EOT
 EOT
     end
 
+    def lap_marks(start_time)
+      # Use vertical lines to mark the end of each lap.
+      s = "var lap_marks = [\n"
+      s += @activity.fit_activity.laps.map do |lap|
+        x = ((lap.timestamp.to_i - start_time) * 1000).to_i
+        "\n  { color: \"#666\", lineWidth: 1, " +
+        "xaxis: { from: #{x} , to: #{x} } }"
+      end.join(",\n")
+      s + "];\n"
+    end
+
+    def lap_mark_labels(chart_id, start_time)
+      # Mark the vertical lap marks with the number of the lap right to the
+      # left at the top end of the line.
+      s = ''
+      @activity.fit_activity.laps[0..-2].each do |lap|
+        x = ((lap.timestamp.to_i - start_time) * 1000).to_i
+        s += "$(\"##{chart_id}\").append(" +
+             "\"<div style='position:absolute;" +
+             "left:\" + (plot.pointOffset({x: #{x}, y: 0}).left - 18) + \"px;" +
+             "top:7px;width:16px;" +
+             "text-align:right;" +
+             "color:#666;font-size:smaller'>" +
+             "#{lap.message_index + 1}</div>\");\n"
+      end
+      s
+    end
+
   end
 
 end

data/lib/postrunner/DeviceList.rb

@@ -66,6 +66,8 @@ module PostRunner
         end
         if (type = device.device_type)
           rename = { 'heart_rate' => 'Heart Rate Sensor',
+                     'barometric_pressure' => 'Barometer',
+                     'position' => 'GPS',
                      'stride_speed_distance' => 'Footpod',
                      'running_dynamics' => 'Running Dynamics' }
           type = rename[type] if rename.include?(type)

data/lib/postrunner/Main.rb

@@ -13,10 +13,12 @@
 require 'optparse'
 require 'logger'
 require 'fit4ruby'
+require 'perobs'
 
 require 'postrunner/version'
 require 'postrunner/RuntimeConfig'
 require 'postrunner/ActivitiesDB'
+require 'postrunner/MonitoringDB'
 require 'postrunner/EPO_Downloader'
 
 module PostRunner
@@ -36,11 +38,13 @@ module PostRunner
       @attribute = nil
       @value = nil
       @activities = nil
+      @monitoring = nil
       @db_dir = File.join(ENV['HOME'], '.postrunner')
 
       return if (args = parse_options(args)).nil?
 
       @cfg = RuntimeConfig.new(@db_dir)
+      @db = PEROBS::Store.new(File.join(@db_dir, 'database'))
       execute_command(args)
     end
 
@@ -188,6 +192,7 @@ EOT
 
     def execute_command(args)
       @activities = ActivitiesDB.new(@db_dir, @cfg)
+      @monitoring = MonitoringDB.new(@db, @cfg)
       handle_version_update
 
       case (cmd = args.shift)
@@ -301,17 +306,44 @@ EOT
       end
     end
 
+    # Process a single FIT file according to the given command.
+    # @param file [String] File name of a FIT file
+    # @param command [Symbol] Processing instruction
+    # @return [TrueClass, FalseClass] true if command was successful, false
+    #         otherwise
     def process_file(file, command)
       case command
       when :check, :dump
         read_fit_file(file)
       when :import
-        @activities.add(file)
+        import_fit_file(file)
       else
         Log.fatal("Unknown file command #{command}")
       end
     end
 
+    # Import the given FIT file.
+    # @param fit_file_name [String] File name of the FIT file
+    # @return [TrueClass, FalseClass] true if file was successfully imported,
+    #         false otherwise
+    def import_fit_file(fit_file_name)
+      begin
+        fit_entity = Fit4Ruby.read(fit_file_name)
+      rescue Fit4Ruby::Error
+        Log.error $!
+        return false
+      end
+
+      if fit_entity.is_a?(Fit4Ruby::Activity)
+        return @activities.add(fit_file_name, fit_entity)
+      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
+      end
+    end
+
     def process_activity(activity, command)
       case command
       when :check

data/lib/postrunner/MonitoringDB.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = MonitoringDB.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2014, 2015 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.
+#
+
+module PostRunner
+
+  class MonitoringDB
+
+    def initialize(store, cfg)
+      @store = store
+    end
+
+    def add(fit_file_name, fit_monitoring_b)
+      start_time = fit_monitoring_b.monitoring_infos[0].timestamp
+
+      fit_monitoring_b.monitorings.each do |monitoring|
+        if (cati = monitoring.current_activity_type_intensity)
+          data.activity_type = decode_activity_type(cati & 0x1F)
+          data.intensity = (cati >> 5) & 0x7
+          #puts "#{monitoring.timestamp}: #{decode_activity_type(cati & 0x1F)}" +
+          #     "  #{(cati >> 5) & 0x7}"
+        end
+      end
+    end
+
+    private
+
+    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/RuntimeConfig.rb

@@ -23,6 +23,7 @@ module PostRunner
     # Create a new RC object.
     # @param dir [String] the directory to hold the config.yml file.
     def initialize(dir)
+      create_directory(dir, 'application data')
       @options = {
         :version => '0.0.0',
         :unit_system => :metric,

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/postrunner.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.0'
 
-  spec.add_dependency 'fit4ruby', '~> 0.0.6'
+  spec.add_dependency 'fit4ruby', '~> 0.0.7'
+  spec.add_dependency 'perobs', '~> 1.0.0'
   spec.add_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/ActivitySummary_spec.rb

@@ -10,8 +10,8 @@
 # published by the Free Software Foundation.
 #
 
-require 'postrunner/ActivitySummary'
 require 'spec_helper'
+require 'postrunner/ActivitySummary'
 
 class Activity < Struct.new(:fit_activity, :sport)
 end

data/spec/FlexiTable_spec.rb

@@ -10,6 +10,7 @@
 # published by the Free Software Foundation.
 #
 
+require 'spec_helper'
 require 'postrunner/FlexiTable'
 
 describe PostRunner::FlexiTable do

data/spec/PostRunner_spec.rb

@@ -12,8 +12,8 @@
 
 require 'fileutils'
 
-require 'postrunner/Main'
 require 'spec_helper'
+require 'postrunner/Main'
 
 describe PostRunner::Main do
 
@@ -38,6 +38,7 @@ describe PostRunner::Main do
     FileUtils.rm_rf(@db_dir)
     FileUtils.rm_rf('FILE1.FIT')
     FileUtils.rm_rf('FILE2.FIT')
+    FileUtils::rm_rf('icons')
   end
 
   it 'should abort without arguments' do

data/spec/View_spec.rb

@@ -10,6 +10,7 @@
 # published by the Free Software Foundation.
 #
 
+require 'spec_helper'
 require 'postrunner/View'
 require 'postrunner/ViewButtons'
 require 'postrunner/PagingButtons'

data/spec/spec_helper.rb

@@ -10,6 +10,12 @@
 # published by the Free Software Foundation.
 #
 
+# Some dependencies may not be installed as Ruby Gems but as local sources.
+# Add them and the postrunner dir to the LOAD_PATH.
+%w( postrunner fit4ruby perobs ).each do |lib_dir|
+  $:.unshift(File.join(File.dirname(__FILE__), '..', '..', lib_dir, 'lib'))
+end
+
 def create_fit_file(name, date, duration_minutes = 30)
   Fit4Ruby.write(name, create_fit_activity(date, duration_minutes))
 end
@@ -29,6 +35,7 @@ def create_fit_activity(date, duration_minutes)
                       :device_index => 0 })
   a.new_device_info({ :timestamp => ts, :manufacturer => 'garmin',
                       :device_index => 1, :battery_status => 'ok' })
+  laps = 0
   0.upto((a.total_timer_time / 60) - 1) do |mins|
     a.new_record({
       :timestamp => ts,
@@ -47,7 +54,9 @@ def create_fit_activity(date, duration_minutes)
     })
 
     if mins > 0 && mins % 5 == 0
-      a.new_lap({ :timestamp => ts, :sport => 'running' })
+      a.new_lap({ :timestamp => ts, :sport => 'running',
+                  :message_index => laps })
+      laps += 1
     end
     ts += 60
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: perobs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +139,7 @@ files:
 - lib/postrunner/FlexiTable.rb
 - lib/postrunner/HTMLBuilder.rb
 - lib/postrunner/Main.rb
+- lib/postrunner/MonitoringDB.rb
 - lib/postrunner/NavButtonRow.rb
 - lib/postrunner/PagingButtons.rb
 - lib/postrunner/PersonalRecords.rb