git-fit 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e935c4e4949dfd80ef84c659f9f64a727d9c1d3aab7c2b6303d6571f42156b
-  data.tar.gz: 771f645e5ae8a369c89237d3df03c00b06d5887f5331e7cfec306af0c57f8eb6
+  metadata.gz: def93fbb1103170a99f7a1a346e419c92bb147a1a6671a1a485248229a3b6178
+  data.tar.gz: e56db533020db64602a5b62a2d05b2d42f8e2115d0212425594136506668aac5
 SHA512:
-  metadata.gz: 926a648129246714657066e5d7a21b9663682af63516a98d21646e9c58167b4c962150697a8d1d9e14068c834d1d010f9d3696628f8edae9b6ee8f2c614d36cc
-  data.tar.gz: 7bebd70ae9b51e18fc97278f7e691466ea5ca4aec07594c83bc7ca2c9ff913f85566dcf9b98b6013a279a3c2927216fd60ad82d860d8185b8fb133a873fbc5fe
+  metadata.gz: 844d55ba27a60361019e1ee0a26d37d378f777ba4cdcf5b9c6d7140da99f713e0d722d4171446a8a9b846d683145437e56681a3af56a3e1521c96c39446064d0
+  data.tar.gz: ea001dd780c5eb8134c7f0eefed75c917b05b7e63d99cf395a60f7241becde2041617821b4f319142c9e22ce534f568eaeaaab6e70b8fac04143375c582e2b06

data/db/migrations/003_add_elevation_fields.rb

@@ -0,0 +1,19 @@
+Sequel.migration do
+  up do
+    alter_table(:activities) do
+      add_column :elevation_loss, Float
+      add_column :elevation_min, Float
+      add_column :elevation_max, Float
+      add_column :steps, Integer
+    end
+  end
+
+  down do
+    alter_table(:activities) do
+      drop_column :steps
+      drop_column :elevation_max
+      drop_column :elevation_min
+      drop_column :elevation_loss
+    end
+  end
+end

data/lib/git-fit.rb

@@ -33,6 +33,7 @@ module GitFit
         average_heartrate: a[:average_heartrate],
         average_speed: a[:average_speed],
         elevation_gain: a[:elevation_gain],
+        elevation_loss: a[:elevation_loss],
       }
     end
 

data/lib/git_fit/auth/garmin.rb

@@ -178,7 +178,7 @@ module GitFit
         end
 
         def config_path
-          File.expand_path(@options[:config] || 'config/config.yml')
+          File.expand_path(@options[:config] || GitFit::Config.default_path)
         end
 
         def garmin_cfg

data/lib/git_fit/auth/strava.rb

@@ -149,7 +149,7 @@ module GitFit
       private
 
       def config_path
-        File.expand_path(@options[:config] || 'config/config.yml')
+        File.expand_path(@options[:config] || GitFit::Config.default_path)
       end
 
       def load_fresh_config
@@ -182,7 +182,7 @@ module GitFit
           <li>填写 Application Name、Website（任意）、Authorization Callback Domain = <code>localhost</code></li>
           <li>复制 Client ID 和 Client Secret</li></ol>
           <p style="color:#aaa;font-size:0.85rem">配置后<b>刷新此页面</b>即可开始授权（无需重启）</p>
-          <div class="box"># config/config.yml
+          <div class="box"># #{GitFit::Config.default_path}
           strava:
             client_id: "your_client_id"
             client_secret: "your_client_secret"

data/lib/git_fit/cli/strava.rb

@@ -10,13 +10,13 @@ module GitFit
   class StravaCLI < Thor
     VALID_FORMATS = %w[original tcx gpx].freeze
 
-    TOKEN_HELP = <<~HELP
+    TOKEN_HELP = <<~HELP.freeze
       Token expired or invalid — generate a fresh one:
         1. Open https://www.strava.com/login and sign in (email + OTP)
         2. F12 → Application → Cookies → https://www.strava.com
         3. Copy the Value of strava_remember_token
         4. Configure it:
-           Local (config/config.yml):
+           Local (#{GitFit::Config.default_path}):
              sync.strava.web_auth.jwt: "<JWT>"
            Env:
              export GIT_FIT_STRAVA_WEB_AUTH_JWT="<JWT>"

data/lib/git_fit/cli/sync.rb

@@ -62,7 +62,7 @@ module GitFit
             puts ''
             puts 'Local config:'
             puts "  #{source}:"
-            puts '    secret: (已自动写入 config/config.yml)'
+            puts "    secret: (已自动写入 #{GitFit::Config.default_path})"
           end
         else
           say_status :error, 'Authentication failed', :red

data/lib/git_fit/cli.rb

@@ -126,7 +126,7 @@ module GitFit
     desc 'init', 'Generate config.yml'
     option :output, type: :string, desc: 'Output path', aliases: '-o'
     def init
-      path = options[:output] || 'config/config.yml'
+      path = options[:output] || GitFit::Config.default_path
       FileUtils.mkdir_p(File.dirname(path))
 
       if File.exist?(path)

data/lib/git_fit/config.rb

@@ -29,13 +29,19 @@ module GitFit
       },
     }.freeze
 
-    DEFAULT_PATH = 'config/config.yml'
     KNOWN_TOP_KEYS = %w[database sync export privacy system].freeze
 
+    # Default config file path: GIT_FIT_CONFIG_PATH env override, else root config.yml.
+    def self.default_path
+      env = ENV['GIT_FIT_CONFIG_PATH'].to_s.strip
+      env.empty? ? 'config.yml' : env
+    end
+
     def initialize(path = nil)
       @data = deep_dup(DEFAULTS)
       load_file(path) if path
-      load_file(DEFAULT_PATH) if !path && File.exist?(DEFAULT_PATH)
+      default = self.class.default_path
+      load_file(default) if !path && File.exist?(default)
       load_env
       validate!
     end

data/lib/git_fit/dedup/field_elector.rb

@@ -17,6 +17,10 @@ module GitFit
         max_cadence: :non_null,
         summary_polyline: :best_polyline,
         elevation_gain: :median,
+        elevation_loss: :median,
+        elevation_min: :min,
+        elevation_max: :max,
+        steps: :median,
         calories: :median,
         average_temperature: :non_null,
         average_speed: :computed,

data/lib/git_fit/export/csv.rb

@@ -11,7 +11,8 @@ module GitFit
         location_country summary_polyline
         average_heartrate max_heartrate average_cadence max_cadence
         average_power max_power calories average_temperature
-        average_speed elevation_gain source dedup_group_id
+        average_speed elevation_gain elevation_loss elevation_min elevation_max
+        steps source dedup_group_id
       ].freeze
 
       def initialize(db:, output:, activity_filter: nil)

data/lib/git_fit/export/json.rb

@@ -80,6 +80,10 @@ module GitFit
           average_temperature: a[:average_temperature],
           average_speed: a[:average_speed],
           elevation_gain: a[:elevation_gain],
+          elevation_loss: a[:elevation_loss],
+          elevation_min: a[:elevation_min],
+          elevation_max: a[:elevation_max],
+          steps: a[:steps],
           source: a[:source],
         }
         if a[:divisions]
@@ -103,7 +107,8 @@ module GitFit
           result
         else
           composite = members.first&.slice(:run_id, :distance, :moving_time, :elapsed_time,
-            :average_heartrate, :max_heartrate, :elevation_gain,
+            :average_heartrate, :max_heartrate, :elevation_gain, :elevation_loss,
+            :elevation_min, :elevation_max, :steps,
             :average_speed, :average_cadence, :max_cadence) || {}
           composite[:summary_polyline] = pick_best_polyline(group_activities)
           composite