git-fit 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b529b539d17dfce5129f5b5e9a26c87d29fc2c42d01cc28b33663951e019ce2
-  data.tar.gz: 491038827bc8844b30ec1f42d6f2a13582543419c028710ed4c76329eb2b8cc3
+  metadata.gz: 7c031091e27306d5f66a2754029c00d6047d07945b11f1a45a18332a1d0b0e02
+  data.tar.gz: 3fb56126e52afdf6f0d89e4aa54665fee7e9dd2fad37f3f3b36cf8b451f0f0eb
 SHA512:
-  metadata.gz: 73a4d04e598d30851db5ee28bc74452c4556b18dbbd7a95c82c904072276a0b6afe88ca2662c41682484c771a53dc74f30d5d2939fbe32294bcc56406e640e74
-  data.tar.gz: 0fdbf72996b45cb0c03fb9f92f156257950632080730f5288e9af056ae63fce74faa53333a323a7290577a2abc64a3da01d330f8d97c6b8261c86533db9ce161
+  metadata.gz: ed9cce62705d3685fa03d604e4ae3acaaf68e224779ccaec522ad6d3572a9edfbf24180617ac3aadd6458cef63883606c760f6c59180ab9c094da15332d22af3
+  data.tar.gz: '06758cbad1a0e60576a6662cc69b29449d98cd5fb24f3b1fd97b3a2b72bc211fbd59bb19add5b54693fecade1e9b756eccb6dcba8ac9b2d7885cc3da03177d65'

data/lib/git_fit/cli/export.rb

@@ -13,7 +13,9 @@ module GitFit
 
     def json
       config = git_fit_config
-      db = GitFit::DB::Connection.new(config.db_path).db
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
       path = options[:output] || config.export_config.dig("json", "path") || "site/activities.json"
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
       count = Export::JSON.new(db: db, output: path, activity_filter: filter).call

data/lib/git_fit/cli/geo_cli.rb

@@ -10,7 +10,9 @@ module GitFit
     option :"dry-run", type: :boolean, desc: "Don't write to DB"
     def detect
       config = GitFit::Config.new
-      db = GitFit::DB::Connection.new(config.db_path).db
+        conn = GitFit::DB::Connection.new(config.db_path)
+        conn.migrate!
+        db = conn.db
       amap_key = ENV["AMAP_API_KEY"] || config.sync_config("amap")["api_key"]
       detector = GitFit::Geo::DivisionDetector.new(
         db: db,

data/lib/git_fit/cli/import_cli.rb

@@ -18,7 +18,9 @@ module GitFit
       end
 
       config = GitFit::Config.new
-      db = GitFit::DB::Connection.new(config.db_path).db
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
       time_budget = config.dig("sync", "time_budget")
       sport_override = options[:sport]
@@ -53,7 +55,9 @@ module GitFit
     option :sport, type: :string, desc: "Override sport_category for GPX files"
     def gpx
       config = GitFit::Config.new
-      db = GitFit::DB::Connection.new(config.db_path).db
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
       time_budget = config.dig("sync", "time_budget")
       sport_override = options[:sport]
@@ -84,7 +88,9 @@ module GitFit
     option :activity, type: :array, desc: "Filter by sport type", aliases: "--act"
     def tcx
       config = GitFit::Config.new
-      db = GitFit::DB::Connection.new(config.db_path).db
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
       time_budget = config.dig("sync", "time_budget")
 
@@ -113,7 +119,9 @@ module GitFit
     option :activity, type: :array, desc: "Filter by sport type", aliases: "--act"
     def fit
       config = GitFit::Config.new
-      db = GitFit::DB::Connection.new(config.db_path).db
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
       time_budget = config.dig("sync", "time_budget")
 
@@ -142,7 +150,9 @@ module GitFit
     option :activity, type: :array, desc: "Filter by sport type", aliases: "--act"
     def apple_health
       config = GitFit::Config.new
-      db = GitFit::DB::Connection.new(config.db_path).db
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
       time_budget = config.dig("sync", "time_budget")
 

data/lib/git_fit/cli/sync.rb

@@ -10,7 +10,7 @@ module GitFit
         sources = if source
           [source]
         else
-          configured = (git_fit_config["sync"] || {}).keys
+          configured = (git_fit_config["sync"] || {}).select { |_k, v| v.is_a?(Hash) }.keys
           builtin = GitFit::Sync::Base.adapters
                       .map { |c| c.config_key }
           if ENV["GIT_FIT_ENVIRONMENT"] == "testing"

data/lib/git_fit/cli.rb

@@ -113,7 +113,9 @@ module GitFit
       end
 
       def connect_db
-        GitFit::DB::Connection.new(git_fit_config.db_path).db
+        conn = GitFit::DB::Connection.new(git_fit_config.db_path)
+        conn.migrate!
+        conn.db
       end
 
       def deep_dup(obj)

data/lib/git_fit/config.rb

@@ -46,7 +46,8 @@ module GitFit
     end
 
     def sync_config(source)
-      @data.dig("sync", source) || {}
+      val = @data.dig("sync", source)
+      val.is_a?(Hash) ? val : {}
     end
 
     def privacy_config

data/lib/git_fit/db/cli.rb

@@ -6,7 +6,8 @@ module GitFit
       desc "migrate", "Run database migrations"
       def migrate
         config = GitFit::Config.new
-        GitFit::DB::Connection.new(config.db_path)
+        conn = GitFit::DB::Connection.new(config.db_path)
+        conn.migrate!
         say_status :done, "Migrations up to date", :green
       rescue => e
         say_status :error, "Migration failed: #{e.message}", :red

data/lib/git_fit/db/connection.rb

@@ -9,22 +9,49 @@ module GitFit
         @db = Sequel.sqlite(db_path)
         @db.run("PRAGMA journal_mode=WAL")
         @db.run("PRAGMA busy_timeout=5000")
-        run_migrations
+        @migrations_path = File.expand_path("../../../db/migrations", __dir__)
       end
 
       def db
         @db
       end
 
+      def migrate!
+        dedup_schema_migrations
+        run_migrations
+      end
+
       private
 
+      def dedup_schema_migrations
+        return unless @db.table_exists?(:schema_migrations)
+
+        cols = @db.schema(:schema_migrations).map(&:first)
+        return unless cols.include?(:filename)
+
+        duplicates = @db.fetch(<<~SQL).all
+          SELECT filename, COUNT(*) AS cnt
+          FROM schema_migrations
+          GROUP BY filename
+          HAVING cnt > 1
+        SQL
+
+        duplicates.each do |row|
+          @db.fetch(<<~SQL, row[:filename], row[:filename]).all
+            DELETE FROM schema_migrations
+            WHERE filename = ? AND rowid NOT IN (
+              SELECT MIN(rowid) FROM schema_migrations WHERE filename = ?
+            )
+          SQL
+        end
+      end
+
       def run_migrations
         Sequel.extension :migration
-        path = File.expand_path("../../../db/migrations", __dir__)
-        Sequel::Migrator.run(@db, path)
+        Sequel::Migrator.run(@db, @migrations_path)
       rescue Sequel::Migrator::Error
-        GitFit::DB::Rebuild.call(@db, @db.opts[:database], path)
-        Sequel::Migrator.run(@db, path)
+        GitFit::DB::Rebuild.call(@db, @db.opts[:database], @migrations_path)
+        Sequel::Migrator.run(@db, @migrations_path)
       end
     end
   end

data/lib/git_fit/db/rebuild.rb

@@ -13,7 +13,7 @@ module GitFit
           FileUtils.cp(src, "#{backup}#{ext}") if File.exist?(src)
         end
 
-        tables = db.tables - [:schema_migrations]
+        tables = db.tables
         data = {}
         tables.each { |t| data[t] = export_table(db, t) }
 

data/lib/git_fit/sync/runner.rb

@@ -60,7 +60,7 @@ module GitFit
       def init_pending
         @sources.each do |source|
           cfg = @config.sync_config(source)
-          next if cfg.nil? || cfg.empty?
+          next if cfg.nil? || (cfg.respond_to?(:empty?) ? cfg.empty? : true)
           @source_queue << source
         end
         @unfinished = @source_queue.size

data/lib/git_fit/version.rb

@@ -1,3 +1,3 @@
 module GitFit
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

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