git-fit 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e868be2f4295bf56a1af4e653dcadb26bca9c67a3f4cf42e8c5822b55ae380e6
-  data.tar.gz: 49470e6b69e829a484e7347a44cb48241f9366a6cb2a345023da903e4045d00f
+  metadata.gz: 9551667addc842c5ddb8357d32b9d4eb040eedc236eeb3c940f59ea52f8be329
+  data.tar.gz: 3ede4c5df18fd6a3380b5aff8845bf2ac1ca7d1074c2507e647e05363bf745fb
 SHA512:
-  metadata.gz: d5a45ab91987725f37a00dadf6e16f8c2c45a4258a9bde275bebc8203c12bd7376e9d4605dcd87c1f5432c735c50d9ac30e42deb18b4d92611b1a90418834b7f
-  data.tar.gz: 2ce6cd5123f4d55ff5f8316c5cdd6c912dc0be3721db63b5a844c149fa38743792a5d2e4c3d46feb3e2d4d23562a7f0c6f04f17d4f9c29728384eb2647f49e07
+  metadata.gz: 437969ed9c1dd8ec94de2449cbe8e71e8201bcfe2299fd3dcdcf44c8ae6b4901482b99fdd3459482395896a10c96c455a1acff8c69fd2e242c81e1befdb88941
+  data.tar.gz: 11ffe29a5aecb4c305f361c81ad3eef6f73394fc9abb00f75486d68a32caac3de565ef941236120622b63c61059b20486f790e32290ef016da93141266d20b5e

data/lib/git-fit.rb

@@ -2,7 +2,21 @@ require "thor"
 require "yaml"
 require "fileutils"
 
+module GitFit
+  @registered_configs = []
+
+  class << self
+    attr_reader :registered_configs
+
+    def register_config_source(prefix:, keys:, config_path:)
+      @registered_configs << { prefix: prefix, keys: keys, config_path: config_path }
+    end
+  end
+end
+
 require_relative "git_fit/version"
 require_relative "git_fit/config"
 require_relative "git_fit/config_template"
+require_relative "git_fit/sync/base"
+require_relative "git_fit/sync/strava"
 require_relative "git_fit/cli"

data/lib/git_fit/config.rb

@@ -59,10 +59,16 @@ module GitFit
 
     private
 
-    # v0.1.0: 仅支持 DATABASE_PATH 覆盖
-    # v0.1.1+: 引入 register_config 注册机制
     def load_env
       @data["database"]["path"] = ENV["GIT_FIT_DATABASE_PATH"] if ENV["GIT_FIT_DATABASE_PATH"]
+
+      GitFit.registered_configs.each do |reg|
+        reg[:keys].each do |key|
+          env_name = "#{reg[:prefix]}_#{key.to_s.upcase}"
+          next unless ENV.key?(env_name)
+          set_nested(@data, reg[:config_path] + [key.to_s], ENV[env_name])
+        end
+      end
     end
 
     def validate!
@@ -79,6 +85,23 @@ module GitFit
       warn "Config: failed to load #{path}: #{e.message}"
     end
 
+    def set_nested(hash, keys, value)
+      last = keys.pop
+      keys.each { |k| hash[k] ||= {}; hash = hash[k] }
+      hash[last] = typed_value(value)
+    end
+
+    def typed_value(str)
+      case str
+      when /\A\d+\z/ then str.to_i
+      when /\A\d+\.\d+\z/ then str.to_f
+      when /\Atrue\z/i then true
+      when /\Afalse\z/i then false
+      when /\Anil\z/i then nil
+      else str
+      end
+    end
+
     def deep_merge!(target, source)
       source.each do |key, val|
         if val.is_a?(Hash) && target[key].is_a?(Hash)

data/lib/git_fit/config_template.rb

@@ -7,20 +7,20 @@ module GitFit
           path: db/fit.sqlite3
 
         sync:
-          # strava:
-          #   client_id: ""
-          #   refresh_token: ""
+          # strava:                                    # env: GIT_FIT_STRAVA_CLIENT_ID
+          #   client_id: ""                            # env: GIT_FIT_STRAVA_CLIENT_SECRET
+          #   refresh_token: ""                        # env: GIT_FIT_STRAVA_REFRESH_TOKEN
 
-          # garmin:
-          #   email: ""
+          # garmin:                                    # env: GIT_FIT_GARMIN_EMAIL
+          #   email: ""                                # env: GIT_FIT_GARMIN_PASSWORD
           #   password: ""
 
-          # keep:
-          #   phone: ""
+          # keep:                                      # env: GIT_FIT_KEEP_PHONE
+          #   phone: ""                                # env: GIT_FIT_KEEP_PASSWORD
           #   password: ""
 
-          # igpsport:
-          #   phone: ""
+          # igpsport:                                  # env: GIT_FIT_IGPSPORT_PHONE
+          #   phone: ""                                # env: GIT_FIT_IGPSPORT_PASSWORD
           #   password: ""
 
         export:

data/lib/git_fit/sync/base.rb

@@ -0,0 +1,16 @@
+module GitFit
+  module Sync
+    class Base
+      def self.register_config(*keys)
+        return if keys.empty?
+
+        source = name.split("::").last.downcase
+        GitFit.register_config_source(
+          prefix: "GIT_FIT_#{source.upcase}",
+          keys: keys,
+          config_path: ["sync", source]
+        )
+      end
+    end
+  end
+end

data/lib/git_fit/sync/strava.rb

@@ -0,0 +1,7 @@
+module GitFit
+  module Sync
+    class Strava < Base
+      register_config :client_id, :client_secret, :refresh_token
+    end
+  end
+end

data/lib/git_fit/version.rb

@@ -1,3 +1,3 @@
 module GitFit
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lax
@@ -37,6 +37,8 @@ files:
 - lib/git_fit/cli.rb
 - lib/git_fit/config.rb
 - lib/git_fit/config_template.rb
+- lib/git_fit/sync/base.rb
+- lib/git_fit/sync/strava.rb
 - lib/git_fit/version.rb
 homepage: https://github.com/Lax/git-fit
 licenses: