postrunner 0.0.11 → 0.1.0

data/lib/postrunner/RecordListPageView.rb

@@ -17,6 +17,7 @@ require 'postrunner/View'
 require 'postrunner/ViewFrame'
 require 'postrunner/ViewButtons'
 require 'postrunner/PagingButtons'
+require 'postrunner/Activity'
 
 module PostRunner
 
@@ -27,16 +28,15 @@ module PostRunner
     include Fit4Ruby::Converters
 
     # Create a RecordListPageView object.
-    # @param db [ActivityDB] Activity database
+    # @param ffs [FitFileStore] Activity database
     # @param records [PersonalRecords] Database with personal records
     # @param page_count [Fixnum] Number of total pages
     # @param page_index [Fixnum] Index of the page
-    def initialize(db, records, page_count, page_index)
-      @db = db
-      @unit_system = @db.cfg[:unit_system]
+    def initialize(ffs, records, page_count, page_index)
+      #@unit_system = ffs.store['config']['unit_system']
       @records = records
 
-      views = @db.views
+      views = ffs.views
       views.current_page = "records-0.html"
 
       pages = PagingButtons.new((0..(page_count - 1)).map do |i|
@@ -55,7 +55,7 @@ module PostRunner
           ViewFrame.new("All-time #{@sport_name} Records",
                         frame_width, @records.all_time).to_html(@doc)
 
-          @records.yearly.sort{ |y1, y2| y2[0] <=> y1[0] }.
+          @records.yearly.sort{ |y1, y2| y2[0].to_i <=> y1[0].to_i }.
                           each do |year, record|
             next if record.empty?
             ViewFrame.new("#{year} #{@sport_name} Records",

data/lib/postrunner/UserProfileView.rb

@@ -57,6 +57,10 @@ module PostRunner
       if profile.activity_class
         t.row([ 'Activity Class:', profile.activity_class ])
       end
+      if profile.metmax
+        t.row([ 'METmax:', "#{profile.metmax} MET" ])
+        t.row([ 'VO2max:', "#{'%.1f' % (profile.metmax * 3.5)} ml/kg/min" ])
+      end
       t
     end
 

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/misc/postrunner/trackview.js

@@ -0,0 +1,99 @@
+/*
+ * TrackView.rb -- PostRunner - Manage the data from your Garmin sport devices.
+ *
+ * Copyright (c) 2014 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.
+ */
+
+var pr_trackview_init = function(center_long, center_lat) {
+  lm_w = 40;
+  lm_h = 100;
+
+  pr_transformer = function(coords, i, arr) {
+    arr[i] = ol.proj.transform(coords, 'EPSG:4326', 'EPSG:900913');
+  };
+
+  pr_track_points.forEach(pr_transformer);
+  pr_lap_markers.forEach(pr_transformer);
+
+  var map = new ol.Map({
+    view: new ol.View({
+      center: ol.proj.transform([ center_long, center_lat ],
+                                'EPSG:4326', 'EPSG:900913'),
+      zoom: 14,
+    }),
+    layers: [
+      new ol.layer.Tile({
+        source: new ol.source.MapQuest({layer: 'osm'})
+      }),
+      new ol.layer.Vector({
+        source: source_vector = new ol.source.Vector({
+          features: [
+            new ol.Feature({
+              geometry: new ol.geom.LineString(pr_track_points)
+            })
+          ]
+        }),
+        style: [
+          new ol.style.Style({
+            stroke: new ol.style.Stroke({
+              color: 'red',
+              width: 5
+            }),
+            fill: new ol.style.Fill({
+              color: 'white'
+            })
+          })
+        ]
+      }),
+      new ol.layer.Vector({
+        source: lap_marker_source = new ol.source.Vector(),
+        style: function(feature, resolution) {
+          return [
+            new ol.style.Style({
+              stroke: new ol.style.Stroke({
+                color: 'black',
+                width: 2
+              }),
+              fill: new ol.style.Fill({
+                color: feature.get('color')
+              }),
+              text: new ol.style.Text({
+                font: '' + (lm_w / resolution) + 'px helvetica,sans-serif',
+                text: resolution < (lm_w / 8.0) ? feature.get('name') : '',
+                fill: new ol.style.Fill({
+                  color: 'black'
+                })
+              })
+            })
+          ];
+        }
+      })
+    ],
+    target: "map"
+  });
+  for (var i in pr_lap_markers) {
+    x = pr_lap_markers[i][0];
+    y = pr_lap_markers[i][1];
+    lap_marker_source.addFeature(
+      new ol.Feature({
+        geometry: new ol.geom.Polygon([[[ x - lm_w, y + lm_h ],
+                                        [ x, y ],
+                                        [ x + lm_w, y + lm_h ],
+                                        [ x - lm_w, y + lm_h ]]])
+      })
+    );
+    lap_marker_source.addFeature(
+      new ol.Feature({
+        geometry: new ol.geom.Circle([ x, y + lm_h ], lm_w),
+        name: (i == 0 ? 'S' : i == pr_lap_markers.length - 1 ? 'F' : i),
+        color: (i == 0 ? 'green' :
+		         i == pr_lap_markers.length - 1 ? 'red' : 'yellow'),
+      })
+    );
+  };
+};
+

data/postrunner.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |spec|
   spec.name          = "postrunner"
   spec.version       = PostRunner::VERSION
   spec.authors       = ["Chris Schlaeger"]
-  spec.email         = ["chris@taskjuggler.org"]
+  spec.email         = ["cs@taskjuggler.org"]
   spec.summary       = %q{Application to manage and analyze Garmin FIT files.}
-  spec.description   = %q{This application will allow you to manage and analyze .FIT files such as those generated by Garmin GPS devices. The application was developed and tested with the Garmin Forerunner 620 and Fenix 3. Other devices may work as well. They need to export the data as USB Mass Storage devices.}
+  spec.description   = %q{This application will allow you to manage and analyze .FIT files such as those generated by Garmin GPS devices. The application was developed and tested with the Garmin Forerunner 620 and Fenix 3. Other devices may work as well. They need to export the data as USB Mass Storage devices. It is an offline alternative to Garmin Connect.}
   spec.homepage      = 'https://github.com/scrapper/postrunner'
   spec.license       = "GNU GPL version 2"
 
@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.0'
 
-  spec.add_dependency 'fit4ruby', '~> 0.0.8'
-  spec.add_dependency 'perobs', '~> 1.0.0'
+  spec.add_dependency 'fit4ruby', '~> 0.0.9'
+  spec.add_dependency 'perobs', '~> 2.2'
   spec.add_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 0.9.6'
-  spec.add_development_dependency 'rspec', '~> 2.14.1'
+  spec.add_development_dependency 'rspec', '~> 3.4.1'
   spec.add_development_dependency 'yard', '~> 0.8.7'
 end

data/spec/ActivitySummary_spec.rb

@@ -18,16 +18,27 @@ end
 
 describe PostRunner::ActivitySummary do
 
+  before(:all) do
+    capture_stdio
+    create_working_dirs
+    create_fit_file_store
+  end
+
   before(:each) do
-    fa = create_fit_activity('2014-08-26-19:00', 30)
-    a = Activity.new(fa, 'running')
-    @as = PostRunner::ActivitySummary.new(a, :metric,
+    acfg = { :t => '2014-08-26T19:00', :duration => 30, :serial => 123456790 }
+    fn = create_fit_activity_file(@fit_dir, acfg)
+    fa = @ffs.add_fit_file(fn)
+    @as = PostRunner::ActivitySummary.new(fa, :metric,
                           { :name => 'test', :type => 'Running',
                             :sub_type => 'Street' })
   end
 
+  after(:all) do
+    cleanup
+  end
+
   it 'should create a metric summary' do
-    puts @as.to_s #TODO: Fix aggregation first
+    @as.to_s #TODO: Fix aggregation first
   end
 
 end

data/spec/FitFileStore_spec.rb

@@ -0,0 +1,133 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = PostRunner_spec.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2014, 2015, 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 'spec_helper'
+
+require 'fit4ruby/FileNameCoder'
+require 'postrunner/RuntimeConfig'
+require 'postrunner/FitFileStore'
+require 'postrunner/PersonalRecords'
+
+describe PostRunner::FitFileStore do
+
+  before(:all) do
+    capture_stdio
+    create_working_dirs
+    create_fit_file_store
+
+    # Create some test fit files
+    @fit_file_names = []
+    [
+      { :t => '2015-10-21T21:00', :duration => 10, :serial => 123456790 },
+      { :t => '2015-10-22T08:10', :duration => 15, :serial => 123456791 },
+      { :t => '2015-11-01T13:30', :duration => 20, :serial => 123456790 }
+    ].each do |config|
+      f = create_fit_activity_file(@fit_dir, config)
+      @fit_file_names << f
+    end
+    @activities = []
+  end
+
+  after(:all) do
+    cleanup
+  end
+
+  it 'should be empty at start' do
+    expect(@ffs.devices.length).to eq(0)
+    expect(@ffs.activities.length).to eq(0)
+  end
+
+  it 'should store a FIT file' do
+    @activities << @ffs.add_fit_file(@fit_file_names[0])
+    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.activities.length).to eq(1)
+    expect(@ffs.ref_by_activity(@activities[0])).to eq(1)
+  end
+
+  it 'should not store the same FIT file twice' 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.activities.length).to eq(1)
+  end
+
+  it 'should store another FIT file as 2nd device' do
+    @activities << @ffs.add_fit_file(@fit_file_names[1])
+    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.activities.length).to eq(2)
+    expect(@ffs.ref_by_activity(@activities[1])).to eq(1)
+  end
+
+  it 'should store another activity of a known device' do
+    @activities << @ffs.add_fit_file(@fit_file_names[2])
+    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.activities.length).to eq(3)
+    expect(@ffs.ref_by_activity(@activities[2])).to eq(1)
+  end
+
+  it 'should find activities by index' do
+    expect(@ffs.find('0')).to eq([])
+    expect(@ffs.find('1')).to eq([ @activities[2] ])
+    expect(@ffs.find('2')).to eq([ @activities[1] ])
+    expect(@ffs.find('3')).to eq([ @activities[0] ])
+    expect(@ffs.find('1-2')).to eq([ @activities[2], @activities[1] ])
+    expect(@ffs.find('2-1')).to eq([])
+    expect(@ffs.find('')).to eq([])
+  end
+
+  it 'should check all stored fit files' do
+    @ffs.check
+  end
+
+  it 'should know the successor of each activity' do
+    expect(@ffs.successor(@activities[2])).to be_nil
+    expect(@ffs.successor(@activities[1])).to eq(@activities[2])
+    expect(@ffs.successor(@activities[0])).to eq(@activities[1])
+  end
+
+  it 'should know the predecessor of each activity' do
+    expect(@ffs.predecessor(@activities[2])).to eq(@activities[1])
+    expect(@ffs.predecessor(@activities[1])).to eq(@activities[0])
+    expect(@ffs.predecessor(@activities[0])).to be_nil
+  end
+
+  it 'should delete activities' do
+    @ffs.delete_activity(@activities[1])
+    expect(@ffs.find('1')).to eq([ @activities[2] ])
+    expect(@ffs.find('2')).to eq([ @activities[0] ])
+    expect(@ffs.find('3')).to eq([])
+
+    @ffs.delete_activity(@activities[2])
+    expect(@ffs.find('1')).to eq([ @activities[0] ])
+    expect(@ffs.find('2')).to eq([])
+  end
+
+  it 'should rename an activity' do
+    @ffs.rename_activity(@activities[0], 'new name')
+    expect(@activities[0].name).to eq('new name')
+    expect(@activities[0].fit_file_name).to eq(File.basename(@fit_file_names[0]))
+  end
+
+end
+

data/spec/FlexiTable_spec.rb

@@ -26,7 +26,7 @@ describe PostRunner::FlexiTable do
 |ccc|ddddd|
 +---+-----+
 EOT
-    t.to_s.should == ref
+    expect(t.to_s).to eq(ref)
   end
 
 end

data/spec/PersonalRecords_spec.rb

@@ -0,0 +1,206 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = PostRunner_spec.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2014, 2015, 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 'spec_helper'
+require 'perobs'
+
+require 'fit4ruby/FileNameCoder'
+require 'postrunner/FitFileStore'
+require 'postrunner/PersonalRecords'
+
+describe PostRunner::PersonalRecords do
+
+  class Mock_Activity < PEROBS::Object
+
+    po_attr :name, :fit_file_name
+
+    def initialize(store, name = nil)
+      super(store)
+      init_attr(:name, name)
+      init_attr(:fit_file_name, name)
+    end
+
+  end
+
+  class Mock_FitFileStore < PEROBS::Object
+
+    po_attr :activities
+
+    def initialize(store)
+      super
+      init_attr(:activities, @store.new(PEROBS::Array))
+    end
+
+    def add_activity(a)
+      @activities << a
+    end
+
+    def ref_by_activity(a)
+      @activities.index(a) + 1
+    end
+
+  end
+
+  before(:all) do
+    @log = StringIO.new
+    Fit4Ruby::Log.open(@log)
+    @work_dir = tmp_dir_name(__FILE__)
+    Dir.mkdir(@work_dir)
+
+    # Create the FitFileStore
+    @store = PEROBS::Store.new(File.join(@work_dir, 'db'))
+    @store['config'] = @store.new(PEROBS::Hash)
+    @store['config']['data_dir'] = @work_dir
+    @ffs = @store['file_store'] = @store.new(Mock_FitFileStore)
+    @records = @store['records'] = @store.new(PostRunner::PersonalRecords)
+  end
+
+  after(:all) do
+    FileUtils.rm_rf(@work_dir)
+  end
+
+  it 'should initialize properly' do
+    expect(@records.to_s).to eq('')
+  end
+
+  it 'should register a record' do
+    a = @store.new(Mock_Activity, 'Activity 1')
+    @ffs.add_activity(a)
+    t = Time.parse('2014-11-08T09:16:00')
+    expect(@records.register_result(a, 'running', 5000.0, 20 * 60,
+                                    t)).to be true
+    expect(@records.register_result(a, 'running', 5000.0, nil, t)).to be true
+    expect(@records.activity_records(a).length).to eq(4)
+    expect(tables_to_arrays(@records.to_s)).to eq([
+      [["5 km", "0:20:00", "4:00", "1", "Activity 1", "2014-11-08"],
+       ["Longest Distance", "5.000 km", "-", "1", "Activity 1", "2014-11-08"]],
+      [["5 km", "0:20:00", "4:00", "1", "Activity 1", "2014-11-08"],
+       ["Longest Distance", "5.000 km", "-", "1", "Activity 1", "2014-11-08"]]
+    ])
+  end
+
+  it 'should register another record' do
+    a = @store.new(Mock_Activity, 'Activity 2')
+    @ffs.add_activity(a)
+    t = Time.parse('2014-11-09T09:16:00')
+    expect(@records.register_result(a, 'running', 10000.0,
+                                    42 * 60, t)).to be true
+    expect(@records.register_result(a, 'running', 10000.0,
+                                    nil, t)).to be true
+    expect(@records.activity_records(a).length).to eq(4)
+    expect(tables_to_arrays(@records.to_s)).to eq([
+      [["5 km", "0:20:00", "4:00", "1", "Activity 1", "2014-11-08"],
+       ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+      [["5 km", "0:20:00", "4:00", "1", "Activity 1", "2014-11-08"],
+       ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+    ])
+  end
+
+  it 'should replace an old record with a new one' do
+    a = @store.new(Mock_Activity, 'Activity 3')
+    @ffs.add_activity(a)
+    t = Time.parse('2014-11-11T09:16:00')
+    expect(@records.register_result(a, 'running', 5000.0,
+                                    19 * 60, t)).to be true
+    expect(@records.activity_records(a).length).to eq (2)
+    expect(@records.activity_records(@ffs.activities[0]).length).to eq(0)
+    expect(tables_to_arrays(@records.to_s)).to eq([
+      [["5 km", "0:19:00", "3:47", "3", "Activity 3", "2014-11-11"],
+       ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+      [["5 km", "0:19:00", "3:47", "3", "Activity 3", "2014-11-11"],
+       ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+    ])
+  end
+
+  it 'should add a new table for a new year' do
+    a = @store.new(Mock_Activity, 'Activity 4')
+    @ffs.add_activity(a)
+    t = Time.parse('2015-01-01T06:00:00')
+    expect(@records.register_result(a, 'running', 5000.0,
+                                    21 * 60, t)).to be true
+    expect(@records.activity_records(a).length).to eq(1)
+    expect(tables_to_arrays(@records.to_s)).to eq([
+      [["5 km", "0:19:00", "3:47", "3", "Activity 3", "2014-11-11"],
+       ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+      [["5 km", "0:21:00", "4:12", "4", "Activity 4", "2015-01-01"]],
+      [["5 km", "0:19:00", "3:47", "3", "Activity 3", "2014-11-11"],
+       ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+    ])
+  end
+
+  it 'should not add a new record for poor result' do
+    a = @store.new(Mock_Activity, 'Activity 5')
+    @ffs.add_activity(a)
+    t = Time.parse('2015-01-02T10:00:00')
+    expect(@records.register_result(a, 'running', 5000.0, 22 * 60,
+                                    t)).to be false
+    expect(@records.activity_records(a).length).to eq(0)
+  end
+
+  it 'should not delete a record for non-record activity' do
+    expect(@records.delete_activity(@ffs.activities[0])).to be false
+  end
+
+  it 'should delete a record for a record activity' do
+    expect(@records.delete_activity(@ffs.activities[2])).to be true
+    expect(tables_to_arrays(@records.to_s)).to eq([
+      [["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+      [["5 km", "0:21:00", "4:12", "4", "Activity 4", "2015-01-01"]],
+      [["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+    ])
+  end
+
+  it 'should add a new distance record' do
+    a = @store.new(Mock_Activity, 'Activity 6')
+    @ffs.add_activity(a)
+    t = Time.parse('2015-01-10T07:00:00')
+    expect(@records.register_result(a, 'running', 15000.0, nil, t)).to be true
+    expect(@records.activity_records(a).length).to eq(2)
+    expect(tables_to_arrays(@records.to_s)).to eq([
+      [ ["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "15.000 km", "-", "6", "Activity 6", "2015-01-10"]],
+      [["5 km", "0:21:00", "4:12", "4", "Activity 4", "2015-01-01"],
+       ["Longest Distance", "15.000 km", "-", "6", "Activity 6", "2015-01-10"]],
+      [["10 km", "0:42:00", "4:12", "2", "Activity 2", "2014-11-09"],
+       ["Longest Distance", "10.000 km", "-", "2", "Activity 2", "2014-11-09"]],
+    ])
+  end
+
+  it 'should not register a record for a bogus sport' do
+    a = @store.new(Mock_Activity, 'Activity 5')
+    @ffs.add_activity(a)
+    t = Time.parse('2015-04-01T11:11:11')
+    expect(@records.register_result(a, 'foobaring', 5000.0, 10 * 60,
+                                    t)).to be false
+  end
+
+  it 'should not register a record for unknown distance' do
+    a = @store.new(Mock_Activity, 'Activity 6')
+    @ffs.add_activity(a)
+    expect { @records.register_result(a, 'cycling', 42.0, 10 * 60,
+             Time.parse('2015-04-01T11:11:11'))}.to raise_error(Fit4Ruby::Error)
+  end
+
+  it 'should delete all records' do
+    @records.delete_all_records
+    expect(@records.to_s).to eq('')
+  end
+
+end