git-fit 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c616974f43c0eef2a07460e664450cffb887629d63b0e7d9f64e9da73dec09
-  data.tar.gz: 8924a27a358440f1f1a2bd1b233d6a11589d5aca0eb9c68be63bd31679e5e9af
+  metadata.gz: 6128a0ade228a52d4521a69f4cf036c2edd0507db418bdab7a27439c7675463e
+  data.tar.gz: 889d4c1a82660bd67a5e00344e66bd05ce36071926cde030dda1a88f6272008c
 SHA512:
-  metadata.gz: 42ea6e2aaef24cfb9f3aecf136ac365542bca0ce9824ee0bbba2b1e970c28a1f7a3db201be81cd3717a3bc85283c89274051e6ecef7d83df89105599e83a588b
-  data.tar.gz: 30f1c4f88ac926e4581159e7a76ed92e0fc88ef764e9145d5901efacbab53baf387bbe7aad2864afdd46ecaa5d548043b1cd9e61ed2ed8009bf169d9d70145f8
+  metadata.gz: ca1456122456538768205397ff39ac128f1cdec115dcbeacd9c37874fa62bae20011ed4b98560c68d762f1a2fb80ab8ec5e42e8a5539713ed66f73a6f7eec079
+  data.tar.gz: 0edbddf20214183b02caa9dab86d17c20ae7f87a5cdfdf450e939c45a32bd23acc5c5a30209293b53c1def43e85ed090920804123aa21e5cdce9e604e6d54777

data/lib/git-fit.rb

@@ -72,6 +72,7 @@ require_relative 'git_fit/sync/xoss'
 require_relative 'git_fit/sync/xingzhe'
 require_relative 'git_fit/sync/runner'
 require_relative 'git_fit/cli/sync'
+require_relative 'git_fit/cli/checkpointable'
 require_relative 'git_fit/db/rebuild'
 require_relative 'git_fit/db/connection'
 require_relative 'git_fit/db/activity'

data/lib/git_fit/cli/checkpointable.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Cli
+    module Checkpointable
+      def checkpoint_db(db)
+        result = db.fetch('PRAGMA wal_checkpoint(TRUNCATE)').first
+        say_status :checkpoint, "WAL checkpoint: #{result[:checkpointed]} pages", :green
+        result
+      rescue StandardError => e
+        say_status :error, "Checkpoint failed: #{e.message}", :red
+        nil
+      end
+    end
+  end
+end

data/lib/git_fit/cli/geo_cli.rb

@@ -4,6 +4,8 @@ require 'thor'
 
 module GitFit
   class GeoCLI < Thor
+    include Cli::Checkpointable
+
     desc 'detect', 'Detect administrative divisions for activities with GPS data'
     option :limit,    type: :numeric, aliases: '-l', desc: 'Max activities to process'
     option :batch,    type: :numeric, aliases: '-b', desc: 'Batch size', default: 20

data/lib/git_fit/cli/import_cli.rb

@@ -4,6 +4,7 @@ require 'thor'
 
 module GitFit
   class ImportCLI < Thor
+    include Cli::Checkpointable
     FILE_SOURCES = %w[gpx fit tcx].freeze
 
     desc 'all', 'Import from all sources (gpx, fit, tcx)'

data/lib/git_fit/cli.rb

@@ -6,6 +6,7 @@ module GitFit
   class CLI < Thor
     package_name 'git-fit'
     include Cli::Sync
+    include Cli::Checkpointable
 
     class_option :config, type: :string, desc: 'Config file path', aliases: '-c'
 
@@ -162,15 +163,6 @@ module GitFit
         conn.db
       end
 
-      def checkpoint_db(db)
-        result = db.fetch('PRAGMA wal_checkpoint(TRUNCATE)').first
-        say_status :checkpoint, "WAL checkpoint: #{result[:checkpointed]} pages", :green
-        result
-      rescue StandardError => e
-        say_status :error, "Checkpoint failed: #{e.message}", :red
-        nil
-      end
-
       def deep_dup(obj)
         case obj
         when Hash then obj.each_with_object({}) { |(k, v), h| h[k] = deep_dup(v) }

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Lax
@@ -254,6 +254,7 @@ files:
 - lib/git_fit/auth/garmin_token.rb
 - lib/git_fit/auth/strava.rb
 - lib/git_fit/cli.rb
+- lib/git_fit/cli/checkpointable.rb
 - lib/git_fit/cli/export.rb
 - lib/git_fit/cli/geo_cli.rb
 - lib/git_fit/cli/gh_cli.rb
@@ -305,7 +306,6 @@ files:
 - lib/git_fit/source.rb
 - lib/git_fit/source/base.rb
 - lib/git_fit/source/keep.rb
-- lib/git_fit/source/tally.rb
 - lib/git_fit/sport_mapper.rb
 - lib/git_fit/std/resolver.rb
 - lib/git_fit/strava_web/file_check.rb

data/lib/git_fit/source/tally.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module GitFit
-  module Source
-    class Tally
-      DIGITS = %w[零 一 二 三 四 五 六 七 八 九 十]
-
-      def initialize(count = 0)
-        @count = count
-      end
-
-      def add(n = 1)
-        @count += n
-      end
-
-      def to_s
-        return @count.to_s if @count > 9999
-        chinese_numeral
-      rescue StandardError
-        @count.to_s
-      end
-
-      private
-
-      def chinese_numeral
-        n = @count
-        return DIGITS[0] if n == 0
-        return DIGITS[n] if n <= 10
-
-        result = ''
-        thousands = n / 1000
-        n %= 1000
-        result += DIGITS[thousands] + '千' if thousands > 0
-
-        hundreds = n / 100
-        n %= 100
-        if hundreds > 0
-          result += DIGITS[hundreds] + '百'
-        elsif thousands > 0 && n > 0
-          result += '零'
-        end
-
-        tens = n / 10
-        ones = n % 10
-        if tens > 0
-          join_ten = tens > 1 || !result.empty?
-          result += (join_ten ? DIGITS[tens] : '') + '十'
-        elsif !result.empty? && tens == 0 && ones > 0 && !result.end_with?('零')
-          result += '零'
-        end
-
-        result += DIGITS[ones] if ones > 0
-        result
-      end
-    end
-  end
-end