git-fit 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d97c84ade46b10cea220c7e65086878e6a7159ae7ba7fa7ecb6fd9e9901852e
-  data.tar.gz: c8fcdf324bfd39db52710ed9d41cffbfdb9bae4d4e1c060dd9272615efcec054
+  metadata.gz: 9551667addc842c5ddb8357d32b9d4eb040eedc236eeb3c940f59ea52f8be329
+  data.tar.gz: 3ede4c5df18fd6a3380b5aff8845bf2ac1ca7d1074c2507e647e05363bf745fb
 SHA512:
-  metadata.gz: 2f16d136fcf36ed73a0d87b2a24f4c8ef464e9dc20b9f740076e88f8baa7bab0f1fe50b6c4352846488a545dd602e91fc912022a61fa4dfcae94e2d2b40b8aa5
-  data.tar.gz: 0fff6b9bb61063b69ec46b06aea41296aec5420c5cce1a207a6a95ebef831b1dd2d6fe8b54c745ba401054ee5b4fb1c84118a036339e1316fce2a08a1f3ff640
+  metadata.gz: 437969ed9c1dd8ec94de2449cbe8e71e8201bcfe2299fd3dcdcf44c8ae6b4901482b99fdd3459482395896a10c96c455a1acff8c69fd2e242c81e1befdb88941
+  data.tar.gz: 11ffe29a5aecb4c305f361c81ad3eef6f73394fc9abb00f75486d68a32caac3de565ef941236120622b63c61059b20486f790e32290ef016da93141266d20b5e

data/lib/git-fit.rb

@@ -1,4 +1,22 @@
 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/cli.rb

@@ -4,6 +4,8 @@ module GitFit
   class CLI < Thor
     package_name "git-fit"
 
+    class_option :config, type: :string, desc: "Config file path", aliases: "-c"
+
     def self.exit_on_failure?
       true
     end
@@ -12,5 +14,48 @@ module GitFit
     def version
       puts "git-fit v#{GitFit::VERSION}"
     end
+
+    desc "init", "Generate config.yml"
+    option :output, type: :string, desc: "Output path", aliases: "-o"
+    def init
+      path = options[:output] || "config/config.yml"
+      FileUtils.mkdir_p(File.dirname(path))
+
+      if File.exist?(path)
+        existing = YAML.safe_load(File.read(path)) || {}
+        merged = deep_merge(ConfigTemplate.hash, existing)
+        File.write(path, YAML.dump(merged))
+        say_status :merged, path, :green
+      else
+        File.write(path, ConfigTemplate.generate)
+        say_status :created, path, :green
+      end
+    end
+
+    no_commands do
+      def git_fit_config
+        @git_fit_config ||= GitFit::Config.new(options[:config])
+      end
+
+      def deep_merge(template, existing)
+        result = deep_dup(template)
+        existing.each do |key, val|
+          if val.is_a?(Hash) && result[key].is_a?(Hash)
+            result[key] = deep_merge(result[key], val)
+          else
+            result[key] = val
+          end
+        end
+        result
+      end
+
+      def deep_dup(obj)
+        case obj
+        when Hash then obj.each_with_object({}) { |(k, v), h| h[k] = deep_dup(v) }
+        when Array then obj.map { |v| deep_dup(v) }
+        else obj
+        end
+      end
+    end
   end
 end

data/lib/git_fit/config.rb

@@ -0,0 +1,124 @@
+require "yaml"
+
+module GitFit
+  # 三优先级: env var > YAML > DEFAULTS
+  class Config
+    DEFAULTS = {
+      "database" => { "path" => "db/fit.sqlite3" },
+      "sync" => {},
+      "export" => {
+        "json" => { "path" => "site/activities.json" },
+        "svg" => { "dir" => "site/svg" },
+        "csv" => { "path" => "site/workouts.csv" },
+        "gpx" => { "path" => "site/gpx_out" }
+      },
+      "privacy" => {
+        "start_end_range" => 200
+      },
+      "system" => {
+        "units" => "metric",
+        "log_level" => "info",
+        "timezone" => "Asia/Shanghai"
+      }
+    }.freeze
+
+    DEFAULT_PATH = "config/config.yml"
+    KNOWN_TOP_KEYS = %w[database sync export privacy system].freeze
+
+    def initialize(path = nil)
+      @data = deep_dup(DEFAULTS)
+      load_file(path) if path
+      load_file(DEFAULT_PATH) if !path && File.exist?(DEFAULT_PATH)
+      load_env
+      validate!
+    end
+
+    def [](key)
+      @data[key]
+    end
+
+    def dig(*keys)
+      @data.dig(*keys)
+    end
+
+    def sync_config(source)
+      @data.dig("sync", source) || {}
+    end
+
+    def privacy_config
+      @data["privacy"] || {}
+    end
+
+    def export_config
+      @data["export"] || {}
+    end
+
+    def db_path
+      @data.dig("database", "path") || DEFAULTS["database"]["path"]
+    end
+
+    private
+
+    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!
+      @data.each_key do |k|
+        next if k.empty? || KNOWN_TOP_KEYS.include?(k)
+        warn "Config: unknown top-level key '#{k}'"
+      end
+    end
+
+    def load_file(path)
+      yaml = YAML.safe_load(File.read(path)) || {}
+      deep_merge!(@data, yaml)
+    rescue => e
+      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)
+          deep_merge!(target[key], val)
+        else
+          target[key] = deep_dup(val)
+        end
+      end
+      target
+    end
+
+    def deep_dup(obj)
+      case obj
+      when Hash then obj.each_with_object({}) { |(k, v), h| h[k] = deep_dup(v) }
+      when Array then obj.map { |v| deep_dup(v) }
+      else obj
+      end
+    end
+  end
+end

data/lib/git_fit/config_template.rb

@@ -0,0 +1,44 @@
+module GitFit
+  class ConfigTemplate
+    def self.generate
+      <<~YAML
+        ---
+        database:
+          path: db/fit.sqlite3
+
+        sync:
+          # strava:                                    # env: GIT_FIT_STRAVA_CLIENT_ID
+          #   client_id: ""                            # env: GIT_FIT_STRAVA_CLIENT_SECRET
+          #   refresh_token: ""                        # env: GIT_FIT_STRAVA_REFRESH_TOKEN
+
+          # garmin:                                    # env: GIT_FIT_GARMIN_EMAIL
+          #   email: ""                                # env: GIT_FIT_GARMIN_PASSWORD
+          #   password: ""
+
+          # keep:                                      # env: GIT_FIT_KEEP_PHONE
+          #   phone: ""                                # env: GIT_FIT_KEEP_PASSWORD
+          #   password: ""
+
+          # igpsport:                                  # env: GIT_FIT_IGPSPORT_PHONE
+          #   phone: ""                                # env: GIT_FIT_IGPSPORT_PASSWORD
+          #   password: ""
+
+        export:
+          json:
+            path: site/activities.json
+
+        privacy:
+          start_end_range: 200
+
+        system:
+          units: metric
+          log_level: info
+          timezone: Asia/Shanghai
+      YAML
+    end
+
+    def self.hash
+      YAML.safe_load(generate) || {}
+    end
+  end
+end

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.0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Lax
@@ -35,6 +35,10 @@ files:
 - exe/git-fit
 - lib/git-fit.rb
 - 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: