postrunner 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a5f5f39dfa3c4aa542ad58f086e6c6a193420274ef291c4a1f5b009665734b
-  data.tar.gz: cccd8e865768fbbd7d7266e4579753ac8ee261f0a35b4551b291e03f4e4684ee
+  metadata.gz: a3573b66dc63e6e6e26ed20c4389a9c4da0ea2aa3a6bba64e5cce363ddbe1531
+  data.tar.gz: 26e721d0ddc3cae1852c7135de1f24d3dc03e32be871c0894c958591ec538f11
 SHA512:
-  metadata.gz: 05b6cb51addbb4f366e9779e3d69c3307078b64a0256b82833a8016dcdee64ee4b2347038ba7f8921cd0a7fe530913d6d3eee1b48258935adf71f9ff06c7ec35
-  data.tar.gz: 075c12e07e651813fa59fefb15d4702510679dba7cbe23aaed7f27400655c72e68f913343820b631b514e6a03e3dfde4b9269441fabfe75bdcd5d51f567907db
+  metadata.gz: eac508a3916d92e2843e3ff34a454fd357ad35dbcf798178e7bdb555ef9b25f9010d5f647567e1907982bf11adb24c71592d3e3e3af1b3fe46d9c921cb36ea31
+  data.tar.gz: 51994f58aefd6354123655260a45772cc4d7e301d236b76628d27ce2af5370297aecd3c669e2147f8bf0ae91ffcbd5c7c2fbd171bf4fa6eff0a4015f7705a2ef

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu]
+        ruby: [2.4, 2.5, 2.6, 2.7, 3.0, head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Test with RSpec
+      run: bundle exec rspec

data/README.md

@@ -48,23 +48,47 @@ typing.
 
 ## Usage
 
+### Mounting the watch
+
+Watches that expose their data as FAT file system. Typically after connecting
+your garmin watch, they are mount automatically if you have installed the
+udev package.
+
+For watches that expose their data via MTP (Media Transfer Procotol). For
+Debian buster running `sudo apt install jmtpfs mtp-tools` will install the
+needed packages.
+
+`mkdir /tmp/forerunner; jmtpfs  /tmp/forerunner`
+
+This has been tested with a Garmin Forerunner 945.
+
+For more information about MTP under Windows have a look at the
+[Garmin FAQ](https://support.garmin.com/?faq=Itl8M6ARrh4gBQMHFqdqK8)
+
 ### Importing FIT files
 
 To get started you need to connect your device to your computer and
-mount it as a disk drive. Only devices that expose their data as FAT file
+mount it as a disk drive. Only devices that expose their data as FAT or MTP file
 system are supported. Older devices use proprietary drivers and are
 not supported by PostRunner. Once the device is mounted find out the
 full path to the directory that contains your FIT files. You can then
 import all files on the device.
 
+* for USB-FAT
 ```
 $ postrunner import /run/media/$USER/GARMIN/GARMIN/ACTIVITY/
 ```
-    
-The above command assumes that your device is mounted as
-/run/media/$USER. Please replace $USER with your login name and the
-path with the path to your device. Files that have been imported
-previously will not be imported again. 
+The above command assumes that your device is mounted as /run/media/$USER.
+Please replace $USER with your login name and the path with the path to
+your device.
+
+* for MTP (assuming you mounted it as described above)
+```
+$ postrunner import /tmp/forerunner/Primary/GARMIN/Activity
+```
+
+* Note
+Files that have been imported previously will not be imported again.
 
 ### Viewing FIT file data on the console
 

data/Rakefile

@@ -1,24 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__))
-
-# Add the lib directory to the search path if it isn't included already
-lib = File.expand_path('../lib', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
+#!/usr/bin/env ruby
+require_relative 'lib/postrunner/version'
+require 'rake'
+require 'rspec'
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require 'rake/clean'
-require 'yard'
-YARD::Rake::YardocTask.new
-
-Dir.glob( 'tasks/*.rake').each do |fn|
-  begin 
-    load fn;
-  rescue LoadError
-    puts "#{fn.split('/')[1]} tasks unavailable: #{$!}"
-  end
-end
-
-task :default  => :spec
-task :test => :spec
+require 'rspec/core/rake_task'
 
-desc 'Run all unit and spec tests'
+RSpec::Core::RakeTask.new(:spec)
+ 

data/lib/postrunner/Activity.rb

@@ -65,6 +65,37 @@ module PostRunner
       'hiking' => 'Hiking',
       'multisport' => 'Multisport',
       'paddling' => 'Paddling',
+      'training' => 'Training',
+      'flying' => 'Flying',
+      'e_biking' => 'E-Biking',
+      'motorcycling' => 'Motor Cycling',
+      'boating' => 'Boating',
+      'driving' => 'Driving',
+      'golf' => 'Golf',
+      'hang_gliding' => 'Hang Gliding',
+      'horseback_riding' => 'Horseback Riding',
+      'hunting' => 'Hunting',
+      'fishing' => 'Fishing',
+      'inline_skating' => 'Inline Skating',
+      'rock_climbing' => 'Rock Climbing',
+      'sailing' => 'Sailing',
+      'ice_skating' => 'Ice Skating',
+      'sky_diving' => 'Sky Diving',
+      'snowshoeing' => 'Snowshoeing',
+      'snowmobiling' => 'Snowmobiling',
+      'stand_up_paddleboarding' => 'Stand Up Paddleboarding',
+      'surfing' => 'Surfing',
+      'wakeboarding' => 'Wakeboarding',
+      'water_skiing' => 'Water Skiing',
+      'kayaking' => 'Kayaking',
+      'rafting' => 'Rafting',
+      'windsurfing' => 'Windsurfing',
+      'kitesurfing' => 'Kitesurfing',
+      'tactical' => 'Tactical',
+      'jumpmaster' => 'Jumpmaster',
+      'boxing' => 'Boxing',
+      'floor_climbing' => 'Floor Climbing',
+      'diving' => 'Diving',
       'all' => 'All'
     }
     ActivitySubTypes = {
@@ -95,7 +126,43 @@ module PostRunner
       'challenge' => 'Challenge',
       'indoor_skiing' => 'Indoor Skiing',
       'cardio_training' => 'Cardio Training',
+      'e_bike_fitness' => 'E Bike Fittness',
+      'bmx' => 'BMX',
+      'casual_walking' => 'Casual Walking',
+      'speed_walking' => 'Speed Walking',
+      'bike_to_run_transition' => 'Bike to Run Transition',
+      'run_to_bike_transition' => 'Run to Bike Transition',
+      'swim_to_bike_transition' => 'Swim to Bike Transition',
+      'atv' => 'ATV',
+      'motocross' => 'Motocross',
+      'backcountry' => 'Backcountry',
+      'resort' => 'Resort',
+      'rc_drone' => 'RC Drone',
+      'wingsuit' => 'Wingsuite',
+      'whitewater' => 'Whitemaster',
+      'skate_skiing' => 'Skate Skiing',
+      'yoga' => 'Yoga',
+      'pilates' => 'Pilates',
+      'indoor_running' => 'Indoor Running',
+      'gravel_cycling' => 'Gravel Cycling',
+      'e_bike_mountain' => 'E-Bike Mountain',
+      'commuting' => 'Commuting',
+      'mixed_surface' => 'Mixed Surface',
+      'navigate' => 'Navigate',
+      'track_me' => 'Track Me',
+      'map' => 'Map',
+      'single_gas_diving' => 'Single Gas Diving',
+      'multi_gas_diving' => 'Multi Gas Diving',
+      'gauge_diving' => 'Gauge Diving',
+      'apnea_diving' => 'Apnea Diving',
+      'apnea_hunting' => 'Apnea Hunting',
       'virtual_activity' => 'Virtual Activity',
+      'obstacle' => 'Obstacle',
+      'breathing' => 'Breating',
+      'sail_race' => 'Sail Race',
+      'ultra' => 'Ultra',
+      'indoor_climbing' => 'Indoor Climbing',
+      'bouldering' => 'Bouldering',
       'all' => 'All'
     }
 

data/lib/postrunner/Main.rb

@@ -310,6 +310,7 @@ EOT
       handle_version_update
       import_legacy_archive
 
+      retval = 0
       case (cmd = args.shift)
       when 'check'
         if args.empty?
@@ -334,7 +335,9 @@ EOT
         # is given, use the current date.
         @ffs.monthly_report(day_in_localtime(args, '%Y-%m-01'))
       when 'delete'
-        process_activities(args, :delete)
+        unless process_activities(args, :delete)
+          retval = 1
+        end
       when 'dump'
         @filter = Fit4Ruby::FitFilter.new unless @filter
         process_files_or_activities(args, :dump)
@@ -344,9 +347,13 @@ EOT
         if args.empty?
           # If we have no file or directory for the import command, we get the
           # most recently used directory from the runtime config.
-          process_files([ @db['config']['import_dir']  ], :import)
+          unless process_files([ @db['config']['import_dir']  ], :import)
+            retval = 1
+          end
         else
-          process_files(args, :import)
+          unless process_files(args, :import)
+            retval = 1
+          end
           if args.length == 1 && Dir.exists?(args[0])
             # If only one directory was specified as argument we store the
             # directory for future use.
@@ -361,7 +368,9 @@ EOT
         unless (@name = args.shift)
           Log.abort 'You must provide a new name for the activity'
         end
-        process_activities(args, :rename)
+        unless process_activities(args, :rename)
+          retval = 1
+        end
       when 'set'
         unless (@attribute = args.shift)
           Log.abort 'You must specify the attribute you want to change'
@@ -369,7 +378,9 @@ EOT
         unless (@value = args.shift)
           Log.abort 'You must specify the new value for the attribute'
         end
-        process_activities(args, :set)
+        unless process_activities(args, :set)
+          retval = 1
+        end
       when 'show'
         if args.empty?
           @ffs.show_list_in_browser
@@ -378,12 +389,18 @@ EOT
           # given day in a browser.
           @ffs.show_monitoring(args[0])
         else
-          process_activities(args, :show)
+          unless process_activities(args, :show)
+            retval = 1
+          end
         end
       when 'sources'
-        process_activities(args, :sources)
+        unless process_activities(args, :sources)
+          retval = 1
+        end
       when 'summary'
-        process_activities(args, :summary)
+        unless process_activities(args, :summary)
+          retval = 1
+        end
       when 'units'
         change_unit_system(args)
       when 'htmldir'
@@ -399,7 +416,7 @@ EOT
       # Ensure that all updates are written to the database.
       @db.sync
 
-      0
+      retval
     end
 
     def help
@@ -409,11 +426,13 @@ EOT
     def process_files_or_activities(files_or_activities, command)
       files_or_activities.each do |foa|
         if foa[0] == ':'
-          process_activities([ foa ], command)
+          return false unless process_activities([ foa ], command)
         else
-          process_files([ foa ], command)
+          return false unless process_files([ foa ], command)
         end
       end
+
+      true
     end
 
     def process_activities(activity_refs, command)
@@ -426,15 +445,19 @@ EOT
           activities = @ffs.find(a_ref[1..-1])
           if activities.empty?
             Log.warn "No matching activities found for '#{a_ref}'"
-            return
+            return false
+          end
+          activities.each do |a|
+            unless process_activity(a, command)
+              return false
+            end
           end
-          activities.each { |a| process_activity(a, command) }
         else
           Log.abort "Activity references must start with ':': #{a_ref}"
         end
       end
 
-      nil
+      true
     end
 
     def process_files(files_or_dirs, command)
@@ -445,12 +468,14 @@ EOT
       files_or_dirs.each do |fod|
         if File.directory?(fod)
           Dir.glob(File.join(fod, '*.FIT'), File::FNM_CASEFOLD).each do |file|
-            process_file(file, command)
+            return false unless process_file(file, command)
           end
         else
-          process_file(fod, command)
+          return false unless process_file(fod, command)
         end
       end
+
+      true
     end
 
     # Process a single FIT file according to the given command.

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/postrunner.gemspec

@@ -28,12 +28,12 @@ operating systems as well.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.4'
 
-  spec.add_dependency 'fit4ruby', '~> 3.8.0'
+  spec.add_dependency 'fit4ruby', '~> 3.9.0'
   spec.add_dependency 'perobs', '~> 4.3.0'
-  spec.add_dependency 'nokogiri', '~> 1.10.10'
+  spec.add_dependency 'nokogiri'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 0.9.6'
-  spec.add_development_dependency 'rspec', '~> 3.6.0'
-  spec.add_development_dependency 'yard', '~> 0.9.20'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Chris Schlaeger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-14 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
@@ -42,72 +42,72 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.10
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0'
 description: |-
   PostRunner is an application to manage FIT files
   such as those produced by Garmin products like the Forerunner 620 (FR620),
@@ -126,6 +126,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - COPYING
 - Gemfile
@@ -324,7 +325,7 @@ homepage: https://github.com/scrapper/postrunner
 licenses:
 - GNU GPL version 2
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -339,8 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Application to manage and analyze Garmin FIT files.
 test_files: