lexdrill 0.17.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fae028c5269ace52ee6fadc58941617f30b35a4d47f42c0654fcb88a478dd8
-  data.tar.gz: d1744556c29c18a5cf8f3b2ed8e23e2b4660bf3b0455bbde57abb1f29f954035
+  metadata.gz: 03c53271701afc42f6f8b239bd2fb8c85d5d88a55d72c7781573504241d1ad1c
+  data.tar.gz: 231518970e268aa36342feda3885f0771293a0042df918c28b17a63a136ab001
 SHA512:
-  metadata.gz: c8df12b5210838e036736c62940ca427d07e490da114145fc798dc3d37b8f915c0ed70ab550e287502999ac450491c7539f68589cc37fe5790693c39fb587d66
-  data.tar.gz: ab045c1f53749f1e0654d70a614b5a9ab5699984dd39d5578a742a42d174be74edb1119eb2404c2613e56992263a85922dbcdef69794c1fd768badb0ae057805
+  metadata.gz: b1b115d135527fbc032faa1ad8ea63b48708eda8ce9a9ce8501d59f95f315ab191545a4b8d355d0ab54c2b924ee1267a4873239bc779c8e5290e6f76d16d539f
+  data.tar.gz: 3a038930e2e0a901b1d09227bda97588d7eb2073418156c05151e663413cb0f01c20fbf0457335d5386c6ff20c17e629a2d30c070c41167aea1c132f888499a0

data/README.md

@@ -3,6 +3,8 @@
 The `lexdrill` gem installs a `drill` command that prints a vocabulary word or
 phrase on demand, tracking how often each one has been shown.
 
+![lexdrill demo](docs/demo.gif)
+
 ## Installation
 
 ```bash
@@ -31,8 +33,9 @@ this — rvm keeps gem executable directories on `PATH` automatically.
 
 ## Usage
 
-Create a `.drill.txt` file — one word or phrase per line — in your home directory,
-or in a specific project directory to give that project its own list:
+All of lexdrill's state lives in one place: `~/.drill/` (mode `0700`). It's a
+single global config — no per-project lists, no environment variable
+overrides. Create `~/.drill/words` yourself — one word or phrase per line:
 
 ```
 apple
@@ -40,27 +43,18 @@ banana
 cherry
 ```
 
-If you don't create one, `drill next` seeds `~/.drill.txt` with a default
+If you don't create one, `drill next` seeds `~/.drill/words` with a default
 starter list (a set of NLP presuppositions) the first time it runs, so
 there's always something to drill.
 
 Run `drill next` to print the current word and advance to the next one.
-There are two output styles (`drill format simple|full`, `simple` is the
-default):
-
-**simple** — the drill sign (always blue), a space, then the word (colored
-by its show count — see "Mastery" below), all on one line:
+Output is `counter/total` (the word's own 1-based position in the list)
+and the drill sign, together in yellow, a space, then the word (colored by
+its show count — see "Mastery" below), all on one line:
 ```
-⟳ apple
+1/6⟳ apple
 ```
-
-**full** — `counter/total⟳[loop_start-loop_end]` on one line, the word on
-the next, colored by the word's show count:
-```
-1/6⟳[1-3]
-apple
-```
-(word 1 of 6 total; currently in the loop spanning words 1-3)
+(word 1 of 6 total)
 
 ### Shell integration (one-time setup)
 
@@ -131,9 +125,7 @@ before moving on:
 drill beat 3 2     # loop size 3, repeat each loop 2 times
 ```
 
-`drill beat none` turns it back off (plain word-by-word again). This is a
-**global** setting — it applies everywhere, independent of which project's
-`.drill.txt` is currently active.
+`drill beat none` turns it back off (plain word-by-word again).
 
 There are also named shortcuts for common loop sizes, one word/phrase apart:
 
@@ -169,16 +161,18 @@ exits 0.
 
 ### Mastery (color by show count)
 
-Every time `next` shows a word it's tracked in `.drill.stats` (see
-[`drill stats`](#commands) below). On an **odd** show count, the word's
-color follows a blue → red gradient, one step per 100 shows — so at a
-glance, blue words are fresh and red words are heavily drilled. On an
-**even** show count, it's a vivid random color instead, just for visual
-variety. Once a word hits 1200 shows it's considered mastered and `next`
-stops selecting it (it still appears in `drill list`/`drill stats`, just no
-longer comes up automatically). If every word in the list has been
-mastered, `next` reports that on stderr and exits 1 instead of showing
-anything.
+Every time `next` shows a word it's tracked in `~/.drill/stats` (see
+[`drill stats`](#commands) below). By default (`drill color default`), the
+word's color follows a blue → red gradient, one step per 10 shows — so at
+a glance, blue words are fresh and red words are heavily drilled. Once a
+word hits 120 shows it's considered mastered and `next` stops selecting it
+(it still appears in `drill list`/`drill stats`, just no longer comes up
+automatically). If every word in the list has been mastered, `next`
+reports that on stderr and exits 1 instead of showing anything.
+
+Prefer a vivid random color every time instead of the gradient? Run
+`drill color random` (and `drill color default` to switch back — this is
+the default, so it's also the way to undo `random`).
 
 ### Google Sheets export
 
@@ -202,7 +196,7 @@ Either way, `export` always **overwrites** the named tab (creating it
 first if it doesn't exist yet) with the current word list, one phrase per
 row, so it stays an exact mirror even if the list shrinks. `import` is the
 reverse: it reads column A of the tab (ignoring any other columns, like an
-old export's show counts) and **replaces** your local `.drill.txt` —
+old export's show counts) and **replaces** your local `~/.drill/words` —
 useful for editing the list in Sheets and pulling changes back down, or
 seeding a fresh machine from an existing sheet.
 
@@ -228,9 +222,9 @@ a real secret you must keep local.
    field in the downloaded JSON).
 5. Open your target Google Sheet → **Share** → paste that email → grant
    **Editor** access → uncheck "Notify people" → Share.
-6. Save the downloaded key file to `~/.drill.gcp-service-account.json` on
-   your machine (`drill` reads it from that fixed path and sets it to mode
-   `0600`; it's never embedded in the gem or committed anywhere).
+6. Save the downloaded key file to `~/.drill/gcp-service-account.json` on
+   your machine (`drill` reads it from that fixed path; it's never embedded
+   in the gem or committed anywhere).
 
 ```bash
 drill remote 'https://docs.google.com/spreadsheets/d/1opBP4APL5SUvepm9qwjIYRNtDZdoY1Ee87F5PWdxaMg/edit?usp=sharing'
@@ -245,7 +239,7 @@ short-lived JWT with the local key file.
 Uses the OAuth 2.0 **Device Authorization Grant** ("visit this URL, enter
 this code," the same style of flow `gcloud auth login` uses) — you approve
 access to your own account once, and the resulting token is cached locally
-at `~/.drill.gcp-token.json` (mode `0600`), never published or shared.
+at `~/.drill/gcp-token.json` (mode `0600`), never published or shared.
 
 The OAuth client id/secret embedded in `lib/lexdrill/google_auth.rb` are
 **not** secret for this use — Google's own docs say client credentials for
@@ -286,11 +280,11 @@ itself automatically).
 |---|---|
 | `drill next` | Print the current word and advance |
 | `drill start` / `drill stop` | Pause/resume the automatic per-prompt hook (doesn't affect manual `next`) |
-| `drill inspect` | Show the active `.drill.txt`/`.drill.counter`/`.drill.stats` paths, word count, counter value, toggle, beat, and rand state |
+| `drill inspect` | Show the active config directory, word count, counter value, toggle, beat, rand, color, and remote state |
 | `drill hook zsh\|bash` | Print the shell integration snippet (used above) |
 | `drill beat <2-8> <repetitions>` / `drill beat none` | Set or disable the rhythm |
 | `drill polka\|waltz\|rock\|jazz\|jiga\|balkan\|samba <repetitions>` | Shorthand for a fixed loop size (see table above) |
-| `drill format simple\|full` | Set the output style (`simple` is the default) |
+| `drill color random\|default` | Color each shown word randomly, or by its show count (`default`) |
 | `drill add <text>` | Append a new item to the end of the list |
 | `drill list` | Show how many times each item has been shown, numbered |
 | `drill open` | Open the list file in `$EDITOR`/`$VISUAL` (falls back to `vi`) |
@@ -299,6 +293,7 @@ itself automatically).
 | `drill go <number>` | Jump so the next `drill next` shows item `<number>` (1-based, see `drill list`) — prints nothing itself; refuses a graduated item; has no effect while `drill beat rand` is active, since that mode ignores the counter entirely |
 | `drill remote <url>` | Set the Google Sheet used by the service account flow (global, parses the spreadsheet id out of a normal share URL); whichever of `drill remote`/`drill oauth` was set more recently wins |
 | `drill oauth <url>` | Set the Google Sheet used by the OAuth (personal-login) flow (global, parses the spreadsheet id out of a normal share URL); whichever of `drill remote`/`drill oauth` was set more recently wins |
-| `drill sheet` | Print a link to whichever spreadsheet (`drill remote`/`drill oauth`) is currently active |
+| `drill wb` | Print a link to whichever workbook (spreadsheet) is currently active (`drill remote`/`drill oauth`) |
+| `drill sheets` | List the tab names in the currently active workbook |
 | `drill export <sheet-name>` | Export the word list text to the named tab (created if it doesn't exist), overwriting it; uses whichever of `drill remote`/`drill oauth` was configured most recently (first OAuth use triggers a one-time Google device-flow sign-in) |
 | `drill import <sheet-name>` | Replace the local word list with column A of the named tab |

data/lib/lexdrill/beat.rb

@@ -3,14 +3,13 @@
 require "fileutils"
 
 # Global rhythm config: repeats loops of `loop_size` consecutive words
-# `repetitions` times before advancing to the next loop. Lives at
-# ~/.drill.beat, independent of whichever project's .drill.txt is active.
-# Disabled (plain word-by-word advance) unless explicitly configured.
-# `drill beat rand` selects a third mode (marked by the literal contents
-# "rand") where WordList.next ignores the counter/rhythm entirely and picks
-# a uniformly random word each time instead.
+# `repetitions` times before advancing to the next loop. Disabled (plain
+# word-by-word advance) unless explicitly configured. `drill beat rand`
+# selects a third mode (marked by the literal contents "rand") where
+# WordList.next ignores the counter/rhythm entirely and picks a uniformly
+# random word each time instead.
 module Lexdrill::Beat
-  PATH = File.join(Dir.home, ".drill.beat")
+  PATH = Lexdrill::Config.path("beat")
   MIN_LOOP_SIZE = 2
   MAX_LOOP_SIZE = 8
   DEFAULT_REPETITIONS = 8

data/lib/lexdrill/cli.rb

@@ -11,7 +11,7 @@ class Lexdrill::CLI
     run_inspect: %w[inspect],
     run_beat: %w[beat],
     run_beat_alias: %w[polka waltz rock jazz jiga balkan samba],
-    run_format: %w[format],
+    run_color: %w[color],
     run_add: %w[add],
     run_list: %w[list],
     run_open: %w[open],
@@ -20,7 +20,8 @@ class Lexdrill::CLI
     run_go: %w[go],
     run_remote: %w[remote],
     run_oauth: %w[oauth],
-    run_sheet: %w[sheet],
+    run_wb: %w[wb],
+    run_sheets: %w[sheets],
     run_export: %w[export],
     run_import: %w[import]
   }.freeze
@@ -67,7 +68,7 @@ class Lexdrill::CLI
         drill beat rand                 Ignore the counter/rhythm; show a random item each time
         drill polka|waltz|rock|jazz|jiga|balkan|samba [repetitions]
                         Shorthand for a fixed loop size (2 through 8, in order)
-        drill format simple|full   Set the output style (simple is the default)
+        drill color random|default   Color each word randomly, or by its show count (default)
         drill add <text>   Append a new item to the end of the list
         drill list         Show how many times each item has been shown
         drill open         Open the list file in $EDITOR/$VISUAL (falls back to vi)
@@ -75,9 +76,10 @@ class Lexdrill::CLI
         drill rand <n>     drill next shows a word ~1-in-n times (n=1 is every time)
         drill go <number>  Jump so the next `next` shows item <number> (1-based, see drill list)
         drill remote <url>          Set the Google Sheet used by a local service account key
-                                    (~/.drill.gcp-service-account.json) — no interactive sign-in
+                                    (~/.drill/gcp-service-account.json) — no interactive sign-in
         drill oauth <url>           Set the Google Sheet used by the OAuth (personal-login) flow
-        drill sheet                 Print a link to the currently active spreadsheet
+        drill wb                    Print a link to the currently active workbook (spreadsheet)
+        drill sheets                List the tab names in the currently active workbook
         drill export <sheet-name>   Export the word list text to the given tab (overwrites its
                                     contents); uses whichever of drill remote/drill oauth was set
                                     more recently (oauth opens a one-time sign-in on first use)
@@ -92,7 +94,7 @@ class Lexdrill::CLI
     word = Lexdrill::WordList.next
     return print_next_failure unless word
 
-    puts colored_line(word)
+    puts Lexdrill::LineFormatter.format(word)
     0
   end
 
@@ -107,14 +109,6 @@ class Lexdrill::CLI
     1
   end
 
-  def colored_line(word)
-    text = Lexdrill::LineFormatter.format(word)
-    return text if Lexdrill::Format.simple?
-
-    count = Lexdrill::Stats.counts.fetch(word, 0)
-    Lexdrill::Colorizer.paint_by_count(text, count)
-  end
-
   def print_no_words(path)
     warn "drill: no words found in #{path}"
     1
@@ -203,16 +197,22 @@ class Lexdrill::CLI
     1
   end
 
-  def run_format
+  def run_color
     mode = argv[1]
-    return print_format_usage unless Lexdrill::Format::VALID.include?(mode)
+    return print_color_usage unless mode
+    return print_invalid_color(mode) unless Lexdrill::Color::VALID.include?(mode)
 
-    Lexdrill::Format.set(mode)
+    Lexdrill::Color.set(mode)
     0
   end
 
-  def print_format_usage
-    warn "usage: drill format <#{Lexdrill::Format::VALID.join('|')}>"
+  def print_color_usage
+    warn "usage: drill color <#{Lexdrill::Color::VALID.join('|')}>"
+    1
+  end
+
+  def print_invalid_color(mode)
+    warn "drill: unknown color mode #{mode.inspect} (expected #{Lexdrill::Color::VALID.join(' or ')})"
     1
   end
 
@@ -345,37 +345,36 @@ class Lexdrill::CLI
   # either command always takes effect. Returns [spreadsheet_id,
   # access_token], or nil if neither is configured.
   def sheets_target
-    kind = latest_remote_kind
-    spreadsheet_id = spreadsheet_id_for(kind)
+    kind = Lexdrill::RemoteTarget.kind
+    spreadsheet_id = Lexdrill::RemoteTarget.spreadsheet_id
     return unless spreadsheet_id
 
     [spreadsheet_id, kind == :remote ? Lexdrill::ServiceAccountAuth.fetch_token! : Lexdrill::GoogleAuth.ensure_token!]
   end
 
-  def spreadsheet_id_for(kind)
-    case kind
-    when :remote then Lexdrill::Remote.spreadsheet_id
-    when :oauth then Lexdrill::OauthRemote.spreadsheet_id
-    end
-  end
-
-  def latest_remote_kind
-    remote_set = Lexdrill::Remote.configured?
-    oauth_set = Lexdrill::OauthRemote.configured?
-    return :remote if remote_set && (!oauth_set || newer?(Lexdrill::Remote::PATH, Lexdrill::OauthRemote::PATH))
-    return :oauth if oauth_set
+  def run_wb
+    url = Lexdrill::RemoteTarget.url
+    return print_no_remote unless url
 
-    nil
+    puts url
+    0
   end
 
-  def newer?(path, other_path) = File.mtime(path) >= File.mtime(other_path)
-
-  def run_sheet
-    spreadsheet_id = spreadsheet_id_for(latest_remote_kind)
-    return print_no_remote unless spreadsheet_id
+  def run_sheets
+    target = sheets_target
+    return print_no_remote unless target
 
-    puts "https://docs.google.com/spreadsheets/d/#{spreadsheet_id}/edit"
+    spreadsheet_id, token = target
+    Lexdrill::SheetsClient.sheet_titles(spreadsheet_id, token).each { |title| puts title }
     0
+  rescue Lexdrill::GoogleAuth::AuthError, Lexdrill::ServiceAccountAuth::AuthError => error
+    warn "drill: #{error.message}"
+    1
+  rescue Lexdrill::SheetsClient::ApiError => error
+    print_sheets_api_error(error)
+  rescue Lexdrill::HTTPClient::NetworkError => error
+    warn "drill: network error talking to Google (#{error.message})"
+    1
   end
 
   def run_export
@@ -455,18 +454,23 @@ class Lexdrill::CLI
     1
   end
 
-  def print_sheets_api_error(error, sheet_name)
+  def print_sheets_api_error(error, sheet_name = nil)
     status = error.status
     message = error.message
     case status
     when 404 then warn "drill: spreadsheet not found or not accessible (check `drill remote`/`drill oauth`)"
     when 403 then warn "drill: access denied — make sure the spreadsheet is shared with the right account"
-    when 400 then warn "drill: #{message} (is #{sheet_name.inspect} a real tab in the spreadsheet?)"
+    when 400 then print_400_error(message, sheet_name)
     else warn "drill: Google Sheets API error (#{status}): #{message}"
     end
     1
   end
 
+  def print_400_error(message, sheet_name)
+    hint = " (is #{sheet_name.inspect} a real tab in the spreadsheet?)" if sheet_name
+    warn "drill: #{message}#{hint}"
+  end
+
   def print_unknown_command(command)
     warn "drill: unknown command #{command.inspect}"
     print_help

data/lib/lexdrill/color.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Global "how to color a shown word" setting: "default" colors by show
+# count (see Lexdrill::Colorizer's blue -> red gradient); "random" picks a
+# vivid random color every time instead. An absent file (or any
+# unrecognized value) means "default".
+module Lexdrill::Color
+  PATH = Lexdrill::Config.path("color")
+  RANDOM = "random"
+  DEFAULT = "default"
+  VALID = [RANDOM, DEFAULT].freeze
+
+  def self.set(mode)
+    File.write(PATH, mode)
+  end
+
+  def self.current
+    return DEFAULT unless File.exist?(PATH)
+
+    value = File.read(PATH).strip
+    VALID.include?(value) ? value : DEFAULT
+  end
+
+  def self.random?
+    current == RANDOM
+  end
+end

data/lib/lexdrill/colorizer.rb

@@ -3,10 +3,11 @@
 # Wraps text in an ANSI color code. `paint_by_count` maps a word's show
 # count onto a blue -> red truecolor gradient, one step per
 # Lexdrill::Stats::BUCKET_SIZE shows, so a word's color reflects how many
-# times it's been drilled — except on an even count, where a random vivid
-# color is used instead, for a bit of visual variety.
+# times it's been drilled — unless `drill color random` is set (see
+# Lexdrill::Color), in which case a vivid random color is used every time
+# instead.
 module Lexdrill::Colorizer
-  BLUE = 34
+  YELLOW = 33
   GRADIENT_STEPS = Lexdrill::Stats::GRADUATION_THRESHOLD / Lexdrill::Stats::BUCKET_SIZE
   HUE_DEGREES = 360
   # Which of {peak, trough, 0} each RGB channel takes in each 60-degree hue
@@ -20,12 +21,12 @@ module Lexdrill::Colorizer
     %i[peak zero trough]
   ].freeze
 
-  def self.paint_blue(text)
-    wrap(text, BLUE)
+  def self.paint_yellow(text)
+    wrap(text, YELLOW)
   end
 
   def self.paint_by_count(text, count)
-    code = count.even? ? random_code : gradient_code(count)
+    code = Lexdrill::Color.random? ? random_code : gradient_code(count)
     wrap(text, code)
   end
 

data/lib/lexdrill/config.rb

@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
+require "fileutils"
+
+# All of lexdrill's persisted state lives under this one directory in the
+# user's home folder — a single global config, with no per-project or
+# per-directory overrides.
 module Lexdrill::Config
-  FILENAME = ".drill.txt"
-  COUNTER_FILENAME = ".drill.counter"
-  STATS_FILENAME = ".drill.stats"
+  DIR = File.join(Dir.home, ".drill")
 
-  def self.dir_path
-    cwd = Dir.pwd
-    cwd if File.exist?(File.join(cwd, FILENAME))
-  end
+  # 0700: this directory can hold real secrets (OAuth refresh token, service
+  # account key), same reasoning as their own individual 0600 chmods.
+  FileUtils.mkdir_p(DIR, mode: 0o700)
 
-  def self.base_path
-    ENV.fetch("LEXDRILL_PATH", nil) || dir_path || Dir.home
+  def self.path(filename)
+    File.join(DIR, filename)
   end
-
-  def self.home_drill_path
-    File.join(Dir.home, FILENAME)
-  end
-
-  DRILL_PATH = File.join(base_path, FILENAME)
-  COUNTER_PATH = File.join(base_path, COUNTER_FILENAME)
-  STATS_PATH = File.join(base_path, STATS_FILENAME)
 end

data/lib/lexdrill/default_words.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# The starter list seeded into ~/.drill.txt on first run, when neither an
-# LEXDRILL_PATH override nor a project-local .drill.txt exists yet.
+# The starter list seeded into the words file on first run.
 module Lexdrill::DefaultWords
   WORDS = [
     "The map is not the territory",

data/lib/lexdrill/google_auth.rb

@@ -14,7 +14,7 @@ require "fileutils"
 # PATH below, obtained only after this specific user's own interactive
 # consent, which never leaves this machine and is never published.
 module Lexdrill::GoogleAuth
-  PATH = File.join(Dir.home, ".drill.gcp-token.json")
+  PATH = Lexdrill::Config.path("gcp-token.json")
 
   CLIENT_ID = "608056429593-ncdgh4bnfpuf9486l2rlt7g763h1gl6g.apps.googleusercontent.com"
   CLIENT_SECRET = "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"

data/lib/lexdrill/inspector.rb

@@ -14,11 +14,16 @@ module Lexdrill::Inspector
       Toggle:        #{toggle_summary}
       Beat:          #{beat_summary}
       Rand:          #{rand_summary}
-      Format:        #{Lexdrill::Format.current}
-      LEXDRILL_PATH: #{ENV.fetch('LEXDRILL_PATH', '(not set)')}
+      Color:         #{Lexdrill::Color.current}
+      Remote:        #{remote_summary}
+      Config dir:    #{Lexdrill::Config::DIR}
     REPORT
   end
 
+  def self.remote_summary
+    Lexdrill::RemoteTarget.url || "not configured"
+  end
+
   def self.words_summary
     return "missing" unless File.exist?(Lexdrill::WordList::PATH)
 

data/lib/lexdrill/line_formatter.rb

@@ -1,34 +1,24 @@
 # frozen_string_literal: true
 
-# Formats a shown word for display. In "simple" mode: the drill sign (in
-# blue), a space, then the word (colored by its show count, blue -> red as
-# it's drilled more), all on one line. In "full" mode (the default):
-# "{counter}/{total}{SEPARATOR}[{loop_start}-{loop_end}]\n{word}" — counter
-# is the word's own 1-based position in the list, re-derived through
-# Lexdrill::Beat so it stays meaningful even when a rhythm repeats steps.
+# Formats a shown word for display, on one line:
+# "{index}/{total}{SEPARATOR} {word}" — index is the word's own 1-based
+# position in the list, re-derived through Lexdrill::Beat so it stays
+# meaningful even when a rhythm repeats steps. The counter/total and the
+# separator are painted yellow, as one unit; the word is colored by its
+# show count (see Lexdrill::Colorizer).
 module Lexdrill::LineFormatter
   SEPARATOR = "⟳"
 
   def self.format(word)
-    return simple(word) if Lexdrill::Format.simple?
-
-    full(word)
-  end
-
-  def self.simple(word)
-    count = Lexdrill::Stats.counts.fetch(word, 0)
-    "#{Lexdrill::Colorizer.paint_blue(SEPARATOR)} #{Lexdrill::Colorizer.paint_by_count(word, count)}"
-  end
-
-  def self.full(word)
     total = Lexdrill::WordList.words.size
-    info = loop_info(total)
-    "#{info.index + 1}/#{total}#{SEPARATOR}[#{info.chunk_start}-#{info.chunk_end}]\n#{word}"
+    count = Lexdrill::Stats.counts.fetch(word, 0)
+    prefix = Lexdrill::Colorizer.paint_yellow("#{loop_index(total) + 1}/#{total}#{SEPARATOR}")
+    "#{prefix} #{Lexdrill::Colorizer.paint_by_count(word, count)}"
   end
 
-  def self.loop_info(total)
+  def self.loop_index(total)
     counter = Lexdrill::Counter.new(Lexdrill::WordList::COUNTER_PATH)
     step_used = counter.value - 1
-    Lexdrill::Beat.loop_info(total, step_used)
+    Lexdrill::Beat.loop_info(total, step_used).index
   end
 end

data/lib/lexdrill/oauth_remote.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Global "which Google Sheet to export to via the OAuth device-flow login"
-# setting. Lives at ~/.drill.oauth-remote as a plain spreadsheet id, parsed
-# out of a normal Google Sheets share URL. Set via `drill oauth <url>`.
-# See Lexdrill::Remote for the separate, service-account-based flow.
+# setting. Stored as a plain spreadsheet id, parsed out of a normal
+# Google Sheets share URL. Set via `drill oauth <url>`. See
+# Lexdrill::Remote for the separate, service-account-based flow.
 module Lexdrill::OauthRemote
-  PATH = File.join(Dir.home, ".drill.oauth-remote")
+  PATH = Lexdrill::Config.path("oauth-remote")
   URL_PATTERN = %r{/spreadsheets/d/([a-zA-Z0-9_-]+)}
 
   def self.set(url)

data/lib/lexdrill/rand.rb

@@ -2,10 +2,10 @@
 
 # Global "how often to actually show a word" setting, applied by
 # `drill next` itself (both automatic hook-triggered calls and manual
-# invocations respect it equally). Lives at ~/.drill.rand as a plain
-# integer; defaults to 1 (show every time).
+# invocations respect it equally). Stored as a plain integer; defaults to
+# 1 (show every time).
 module Lexdrill::Rand
-  PATH = File.join(Dir.home, ".drill.rand")
+  PATH = Lexdrill::Config.path("rand")
   DEFAULT = 1
 
   def self.value

data/lib/lexdrill/remote.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # Global "which Google Sheet to export to via a service account" setting.
-# Lives at ~/.drill.remote as a plain spreadsheet id, parsed out of a normal
-# Google Sheets share URL. Set via `drill remote <url>` — the user shares
-# that spreadsheet with their service account's email directly in Google
+# Stored as a plain spreadsheet id, parsed out of a normal Google Sheets
+# share URL. Set via `drill remote <url>` — the user shares that
+# spreadsheet with their service account's email directly in Google
 # Sheets, so no interactive Google sign-in is needed at export/import time.
 # See Lexdrill::OauthRemote for the separate, personal-login-based flow.
 module Lexdrill::Remote
-  PATH = File.join(Dir.home, ".drill.remote")
+  PATH = Lexdrill::Config.path("remote")
   URL_PATTERN = %r{/spreadsheets/d/([a-zA-Z0-9_-]+)}
 
   def self.set(url)

data/lib/lexdrill/remote_target.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Resolves which configured Google Sheet target (drill remote / drill
+# oauth) is currently active — whichever was set more recently — so
+# `drill export`/`drill import`, `drill sheet`, and `drill inspect` all
+# agree on a single answer.
+module Lexdrill::RemoteTarget
+  def self.kind
+    remote_set = Lexdrill::Remote.configured?
+    oauth_set = Lexdrill::OauthRemote.configured?
+    return :remote if remote_set && (!oauth_set || newer?(Lexdrill::Remote::PATH, Lexdrill::OauthRemote::PATH))
+    return :oauth if oauth_set
+
+    nil
+  end
+
+  def self.spreadsheet_id
+    case kind
+    when :remote then Lexdrill::Remote.spreadsheet_id
+    when :oauth then Lexdrill::OauthRemote.spreadsheet_id
+    end
+  end
+
+  def self.url
+    id = spreadsheet_id
+    "https://docs.google.com/spreadsheets/d/#{id}/edit" if id
+  end
+
+  def self.newer?(path, other_path)
+    File.mtime(path) >= File.mtime(other_path)
+  end
+  private_class_method :newer?
+end

data/lib/lexdrill/service_account_auth.rb

@@ -13,7 +13,7 @@ require "base64"
 # published, and lexdrill never writes or transmits it anywhere except in
 # the signed JWT sent directly to Google's own token endpoint.
 module Lexdrill::ServiceAccountAuth
-  PATH = File.join(Dir.home, ".drill.gcp-service-account.json")
+  PATH = Lexdrill::Config.path("gcp-service-account.json")
   TOKEN_URL = "https://oauth2.googleapis.com/token"
   SCOPE = "https://www.googleapis.com/auth/spreadsheets"
   GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer"

data/lib/lexdrill/sheets_client.rb

@@ -77,6 +77,13 @@ module Lexdrill::SheetsClient
     data.fetch("values", []).filter_map { |row| row[0]&.strip }.reject(&:empty?)
   end
 
+  # The titles of every tab in the workbook, for `drill sheets`.
+  def self.sheet_titles(spreadsheet_id, access_token)
+    url = "#{BASE_URL}/#{spreadsheet_id}?fields=sheets.properties.title"
+    data = handle_response(Lexdrill::HTTPClient.json_get(url, headers: auth_header(access_token)))
+    data.fetch("sheets", []).map { |sheet| sheet.dig("properties", "title") }
+  end
+
   def self.auth_header(token)
     { "Authorization" => "Bearer #{token}" }
   end

data/lib/lexdrill/stats.rb

@@ -3,15 +3,14 @@
 require "json"
 
 # Tracks how many times each word/phrase has been shown by `next`, persisted
-# as a word => count JSON object at `.drill.stats` (same base path as
-# `.drill.txt`/`.drill.counter`). Every BUCKET_SIZE shows moves a word into
-# the next display-color bucket (see Lexdrill::Colorizer); once a word
-# reaches GRADUATION_THRESHOLD shows it's considered mastered and `next`
-# stops selecting it.
+# as a word => count JSON object in the stats file. Every BUCKET_SIZE shows
+# moves a word into the next display-color bucket (see Lexdrill::Colorizer);
+# once a word reaches GRADUATION_THRESHOLD shows it's considered mastered
+# and `next` stops selecting it.
 module Lexdrill::Stats
-  PATH = Lexdrill::Config::STATS_PATH
-  BUCKET_SIZE = 100
-  GRADUATION_THRESHOLD = 1200
+  PATH = Lexdrill::Config.path("stats")
+  BUCKET_SIZE = 10
+  GRADUATION_THRESHOLD = 120
 
   def self.record(word)
     data = load

data/lib/lexdrill/toggle.rb

@@ -2,11 +2,10 @@
 
 require "fileutils"
 
-# Global pause/resume switch for the shell hook, independent of which
-# project's .drill.txt is active. Enabled by default; the marker file's
-# presence means stopped.
+# Global pause/resume switch for the shell hook. Enabled by default; the
+# marker file's presence means stopped.
 module Lexdrill::Toggle
-  PATH = File.join(Dir.home, ".drill.disabled")
+  PATH = Lexdrill::Config.path("disabled")
 
   def self.enabled?
     !File.exist?(PATH)

data/lib/lexdrill/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lexdrill
-  VERSION = "0.17.0"
+  VERSION = "0.21.0"
 end

data/lib/lexdrill/word_list.rb

@@ -1,28 +1,26 @@
 # frozen_string_literal: true
 
-# Reads vocabulary words/phrases from a `.drill.txt` file, one per line, and
+# Reads vocabulary words/phrases from the words file, one per line, and
 # advances a persisted counter to show "the current word" each time. On a
-# fresh install with no project-local or LEXDRILL_PATH-overridden list, seeds
-# ~/.drill.txt with a default starter list instead of coming up empty. Words
-# that have graduated (see Lexdrill::Stats) are excluded from `.next` but
-# remain in `.words` for `list`/`stats` to report.
+# fresh install, seeds the file with a default starter list instead of
+# coming up empty. Words that have graduated (see Lexdrill::Stats) are
+# excluded from `.next` but remain in `.words` for `list`/`stats` to report.
 class Lexdrill::WordList
-  PATH = Lexdrill::Config::DRILL_PATH
-  COUNTER_PATH = Lexdrill::Config::COUNTER_PATH
-  HOME_PATH = Lexdrill::Config.home_drill_path
+  PATH = Lexdrill::Config.path("words")
+  COUNTER_PATH = Lexdrill::Config.path("counter")
 
   def self.words
-    seed_default_at_home
+    seed_default
     @words ||= File.exist?(PATH) && File.readlines(PATH, encoding: "UTF-8").map(&:strip).reject(&:empty?)
     @words ||= []
   end
 
-  def self.seed_default_at_home
-    return if PATH != HOME_PATH || File.exist?(PATH)
+  def self.seed_default
+    return if File.exist?(PATH)
 
     File.write(PATH, Lexdrill::DefaultWords::TEXT, encoding: "UTF-8")
   end
-  private_class_method :seed_default_at_home
+  private_class_method :seed_default
 
   def self.next
     active = active_words

data/lib/lexdrill.rb

@@ -11,13 +11,14 @@ require_relative "lexdrill/toggle"
 require_relative "lexdrill/rand"
 require_relative "lexdrill/remote"
 require_relative "lexdrill/oauth_remote"
+require_relative "lexdrill/remote_target"
 require_relative "lexdrill/http_client"
 require_relative "lexdrill/google_auth"
 require_relative "lexdrill/service_account_auth"
 require_relative "lexdrill/sheets_client"
 require_relative "lexdrill/shell_snippet"
 require_relative "lexdrill/inspector"
+require_relative "lexdrill/color"
 require_relative "lexdrill/colorizer"
-require_relative "lexdrill/format"
 require_relative "lexdrill/line_formatter"
 require_relative "lexdrill/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lexdrill
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Siarhei Kisliak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-11 00:00:00.000000000 Z
+date: 2026-07-14 00:00:00.000000000 Z
 dependencies: []
 description: lexdrill prints a vocabulary word or phrase on demand, tracking how often
   each one has been shown.
@@ -27,11 +27,11 @@ files:
 - lib/lexdrill.rb
 - lib/lexdrill/beat.rb
 - lib/lexdrill/cli.rb
+- lib/lexdrill/color.rb
 - lib/lexdrill/colorizer.rb
 - lib/lexdrill/config.rb
 - lib/lexdrill/counter.rb
 - lib/lexdrill/default_words.rb
-- lib/lexdrill/format.rb
 - lib/lexdrill/google_auth.rb
 - lib/lexdrill/http_client.rb
 - lib/lexdrill/inspector.rb
@@ -39,6 +39,7 @@ files:
 - lib/lexdrill/oauth_remote.rb
 - lib/lexdrill/rand.rb
 - lib/lexdrill/remote.rb
+- lib/lexdrill/remote_target.rb
 - lib/lexdrill/service_account_auth.rb
 - lib/lexdrill/sheets_client.rb
 - lib/lexdrill/shell_snippet.rb

data/lib/lexdrill/format.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# Global display mode for `next`'s output: "simple" (the drill sign + word)
-# or "full" (position + loop info). Lives at ~/.drill.format; defaults to
-# "simple".
-module Lexdrill::Format
-  PATH = File.join(Dir.home, ".drill.format")
-  SIMPLE = "simple"
-  FULL = "full"
-  VALID = [SIMPLE, FULL].freeze
-
-  def self.current
-    return SIMPLE unless File.exist?(PATH)
-
-    value = File.read(PATH).strip
-    VALID.include?(value) ? value : SIMPLE
-  end
-
-  def self.set(mode)
-    File.write(PATH, mode)
-  end
-
-  def self.simple?
-    current == SIMPLE
-  end
-end