git-fit 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5ac295fe113517b660831a4cdaf826ac0905781ccdc591174117e0ec91973b
-  data.tar.gz: ecafcdedbdb2469570e946bd2b885d2605d92bf43a65fed7668f0074709a9a09
+  metadata.gz: d61225229494679f4d293ddcfe384f79d9b6a2b7ea4007728fe45a2b47464506
+  data.tar.gz: 9e5934dc3360b9bf9a3dd925006379647f59140b3e2efb852b048ca3704d6fa8
 SHA512:
-  metadata.gz: a588657ec9decf802ec4b2dc68bce7eb9e3c149282fd67e10a8e80a07c69c22cb418aef44513ba62e4de59c153475ba37dbf66da596b330d88d64601ea89f5a1
-  data.tar.gz: 2f1cdbe55b0f3ddd59406bb3b01c8d43ea09d491ec9a47a3fb316356e35cf6834633a1aa0315e495f5f26e623b214052b6934bd025a3c620d6f869c50d707a1e
+  metadata.gz: 4c1637ae4f4ac30c144703f4e9043b92278e7a30d6972c47c579740a7838207c1bedfd781724cfa74baaa4d40ecd5db4a22876f9e428e3492411bd85e18abb58
+  data.tar.gz: f51296343450139ecb8d8446a697648464c307902e05e25d76621af17cd3af2554b8e5b5eb324a5a5e005d05e681007684ced428e1513aeb1c2a508a96a21870

data/db/migrations/002_add_device_app_lineage.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Issue workouts#37: device / app / lineage columns
+#   device  — physical hardware that produced the track file (e.g. "XOSS SPRINT")
+#   app     — software the user directly interacted with (e.g. "Garmin Connect")
+#   lineage — denormalized "device → app → source" chain for query/display
+Sequel.migration do
+  up do
+    alter_table(:activities) do
+      add_column :device, String
+      add_column :app, String
+      add_column :lineage, String
+      add_index :device
+      add_index :app
+      add_index :lineage
+    end
+  end
+
+  down do
+    alter_table(:activities) do
+      drop_index :lineage
+      drop_index :app
+      drop_index :device
+      drop_column :lineage
+      drop_column :app
+      drop_column :device
+    end
+  end
+end

data/lib/git-fit.rb

@@ -7,6 +7,22 @@ require 'fileutils'
 module GitFit
   SPORT_CATEGORIES = %w[run ride hike walk swim ski workout other].freeze
 
+  # Per-source default app label (used when an adapter doesn't set `app` itself).
+  # Dynamic sources (strava per-device, apple_health per sourceName) set `app` explicitly.
+  DEFAULT_APPS = {
+    'garmin' => 'Garmin Connect',
+    'garmin_cn' => 'Garmin Connect',
+    'keep' => 'Keep',
+    'igpsport' => 'iGPSPORT',
+    'xoss' => 'XOSS',
+    'codoon' => 'Codoon',
+    'joyrun' => 'Joyrun',
+    'xingzhe' => 'XingZhe',
+    'strava' => 'Strava',
+    '2bulu' => '2bulu',
+    'apple_health' => 'Apple Health',
+  }.freeze
+
   @registered_configs = []
 
   class << self
@@ -37,6 +53,24 @@ module GitFit
       }
     end
 
+    # Resolved `app` label for an activity: explicit value wins, else DEFAULT_APPS, else raw source.
+    def default_app(app, source)
+      return app unless app.nil? || app.to_s.empty?
+      DEFAULT_APPS.fetch(source, source)
+    end
+
+    # Lineage chain "device → app → source"; blank parts dropped, case-insensitive
+    # dedup so app==source collapses (Keep + keep → "Keep"). Display-only, never
+    # used for dedup decisions (workouts#37).
+    def build_lineage(device, app, source)
+      seen = []
+      [device, app, source].each do |part|
+        next if part.nil? || part.to_s.empty?
+        seen << part unless seen.any? { |s| s.casecmp?(part) }
+      end
+      seen.join(' → ')
+    end
+
     def format_time(seconds)
       return nil unless seconds
       hours = seconds / 3600

data/lib/git_fit/ability/computer.rb

@@ -44,13 +44,11 @@ module GitFit
       def normalize_as_of(as_of)
         return nil if as_of.nil? || as_of.to_s.empty?
 
-        valid = as_of.to_s.match?(/\A\d{4}-\d{2}-\d{2}\z/)
-        unless valid
-          raise ArgumentError, "Ability: invalid --as-of '#{as_of}' (expected YYYY-MM-DD)\n" \
-                               '  Fix: git fit ability compute --as-of 2025-03-15'
-        end
-
+        Date.iso8601(as_of.to_s)
         as_of
+      rescue Date::Error
+        raise ArgumentError, "Ability: invalid --as-of '#{as_of}' (expected YYYY-MM-DD)\n" \
+                             '  Fix: git fit ability compute --as-of 2025-03-15'
       end
 
       def load_rows
@@ -99,21 +97,19 @@ module GitFit
       # --- fitness layer ---
 
       def fitness_snapshots(rows)
-        base = {}
-        Snapshot::PERIOD_TYPES.each do |type|
-          buckets = bucketize(rows, type)
-          buckets.each { |key, period_rows| base[[type, key]] = fitness_fields(type, key, period_rows) }
-        end
-        out = []
-        Snapshot::PERIOD_TYPES.each do |type|
-          bucketize(rows, type).keys.sort.each do |key|
+        buckets = Snapshot::PERIOD_TYPES.to_h { |type| [type, bucketize(rows, type)] }
+        base = buckets.flat_map do |type, per|
+          per.map do |key, period_rows|
+            [[type, key], fitness_fields(type, key, period_rows)]
+          end
+        end.to_h
+        Snapshot::PERIOD_TYPES.flat_map do |type|
+          buckets[type].keys.sort.map do |key|
             fields = base[[type, key]]
-            prev_key = Snapshot.previous_key(type, key)
-            prev = prev_key && base[[type, prev_key]]
-            out << fields.merge('trend_vs_prev' => prev ? trend_fields(fields, prev) : nil)
+            prev = Snapshot.previous_key(type, key)&.then { |pk| base[[type, pk]] }
+            fields.merge('trend_vs_prev' => prev ? trend_fields(fields, prev) : nil)
           end
         end
-        out
       end
 
       def bucketize(rows, type)

data/lib/git_fit/ability/snapshot.rb

@@ -84,21 +84,18 @@ module GitFit
           format('%<year>04d-W%<week>02d', year: date.cwyear, week: date.cweek)
         end
 
-        # Distinct ISO weeks overlapping [start, end].
+        # Distinct ISO weeks overlapping [start, end] (cwyear*53+cweek is monotonic;
+        # cweek never exceeds 53).
         def week_count(start_date, end_date)
-          keys = {}
-          (start_date..end_date).each { |d| keys[week_key_of_date(d)] = true }
-          keys.size
+          (end_date.cwyear * 53 + end_date.cweek) - (start_date.cwyear * 53 + start_date.cweek) + 1
         end
 
         # Sample-count confidence: <3 low (prompt-excluded), 3-9 medium, >=10 high.
         def confidence_for(count)
           if count < 3
             'low'
-          elsif count < 10
-            'medium'
           else
-            'high'
+            count < 10 ? 'medium' : 'high'
           end
         end
 

data/lib/git_fit/cli/ability.rb

@@ -29,33 +29,5 @@ module GitFit
     rescue StandardError => e
       say_status :error, "Ability compute failed: #{e.message}", :red
     end
-
-    desc 'show', 'Print a single ability snapshot by period key'
-    option :period, type: :string, required: true, desc: 'Period key, e.g. 2025-03 / 2025-Q1 / 2025-W12 / 2025 / all'
-    option :output, type: :string, aliases: '-o', desc: 'ability.json path to read'
-
-    def show
-      path = options[:output] || git_fit_config.export_config.dig('ability', 'path') || 'site/ability.json'
-      doc = JSON.parse(File.read(path))
-      snapshot = find_snapshot(doc, options[:period])
-      if snapshot
-        puts JSON.pretty_generate(snapshot)
-      else
-        say_status :warn, "Ability: no snapshot for period '#{options[:period]}' in #{path}", :yellow
-      end
-    rescue StandardError => e
-      say_status :error, "Ability show failed: #{e.message}", :red
-    end
-
-    private
-
-    def find_snapshot(doc, period_key)
-      candidates = (doc.dig('fitness', 'snapshots') || []) +
-                   (doc['sports'] || {}).values.flat_map { |s| s['snapshots'] || [] }
-      matches = candidates.select { |s| s['period_key'] == period_key }
-      return matches.first if matches.one?
-
-      matches # both fitness and sport layers may carry the key — print all
-    end
   end
 end

data/lib/git_fit/export/json.rb

@@ -85,6 +85,9 @@ module GitFit
           elevation_max: a[:elevation_max_terrain] || a[:elevation_max],
           steps: a[:steps],
           source: a[:source],
+          device: a[:device],
+          app: a[:app],
+          lineage: a[:lineage],
         }
         if a[:divisions]
           base[:divisions] = ::JSON.parse(a[:divisions])