git-fit 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e935c4e4949dfd80ef84c659f9f64a727d9c1d3aab7c2b6303d6571f42156b
-  data.tar.gz: 771f645e5ae8a369c89237d3df03c00b06d5887f5331e7cfec306af0c57f8eb6
+  metadata.gz: 982b74047f07432a6d3383f54f53b9d585d459465140d7a35fd52dbc23589372
+  data.tar.gz: a8ee0897607fdf8b1f6951e4f601d423f15dcfdbdcbed4b928be8d04ffc4d893
 SHA512:
-  metadata.gz: 926a648129246714657066e5d7a21b9663682af63516a98d21646e9c58167b4c962150697a8d1d9e14068c834d1d010f9d3696628f8edae9b6ee8f2c614d36cc
-  data.tar.gz: 7bebd70ae9b51e18fc97278f7e691466ea5ca4aec07594c83bc7ca2c9ff913f85566dcf9b98b6013a279a3c2927216fd60ad82d860d8185b8fb133a873fbc5fe
+  metadata.gz: 1fc55f0b434a310a583ff62c39c27927ed2f82c65c1f6f5e646a6b605b85f559cdf01177d7fe9dbcd35b98e2b5d3cda7456b4adb1f4a3427b59d6a22c7d64dc8
+  data.tar.gz: 99cde1f2fac8ab122f76405686e04da91a93c404bc41667b8368371bf8c23724deba5adf669aa4cb569d451b3403e0fabd3a009b06cabd63651b6c76e90daeb5

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

@@ -16,7 +16,7 @@ module GitFit
         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/sync/garmin_base.rb

@@ -199,7 +199,7 @@ module GitFit
       end
 
       def save_secret_to_config
-        path = @config['config_path'] || 'config/config.yml'
+        path = @config['config_path'] || GitFit::Config.default_path
         return unless File.exist?(path)
 
         cfg = YAML.safe_load(File.read(path)) || {}
@@ -477,7 +477,7 @@ module GitFit
       end
 
       def reauth_hint
-        "Re-auth: set sync.#{source_prefix}.secret in config/config.yml"
+        "Re-auth: set sync.#{source_prefix}.secret in #{GitFit::Config.default_path}"
       end
 
       def build_attrs(detail, activity_id, type, polyline = nil)

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Lax