lexdrill 0.24.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b139f554503da2fe92b647d869ffa88bdbe8a7d73e3ce9af8a757b93699013
-  data.tar.gz: 4c9e554c485de8f52a503f64a400f95bb1e6f5d2bb6e717d23ea1245f49b3b75
+  metadata.gz: 1d3dc4600b6ad7303df0b607b7b9ded50b00cf4b3a7ca98e4fa05ca0e1663121
+  data.tar.gz: 90c8bedb7c4145f633b88506cd190f840ec9f87b5bbc1286803aa264da56eb8d
 SHA512:
-  metadata.gz: 6482d9523500b1b71634c4d11b104dc4612cbe1711f98a0585ff9cbfc80fc9f7bfbb8851eb74824de6e60d081d0cc5e1a912c854a91e3100751b3cb1411cecc0
-  data.tar.gz: 72ad7861817b7f33fefbed9fd723ad1c8f9e57a5af7af28f0320da218b6ee5e41f98c9f6842fc1410b740f1899658a43b0d27dceb520c916244da8281317cdb3
+  metadata.gz: a3d24e21d27f2b7bfbba4fdd738adce07c6a7006e53334fde2a9e061351c15da86b3e1f7b24e5dc90828e4aa0577af0669eec4d331fa3d36ae1abaa9ba31e998
+  data.tar.gz: 4558b0d82b02be2c20a7921c741ca066d857f3aa43cdfa006318647dc709757ff360fbba0a0cdafb160254311fb8a43486e491e033a85b8a4ab68260b165039e

data/README.md

@@ -48,11 +48,11 @@ 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.
-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:
+Output is the drill sign and `counter/total` (the word's own 1-based
+position in the list), together in yellow, a space, then the word (colored
+by its show count — see "Mastery" below), all on one line:
 ```
-1/6⟳ apple
+⟳1/6 apple
 ```
 (word 1 of 6 total)
 
@@ -299,7 +299,7 @@ drill sh
 drill sh use Sheet1
 ```
 
-`drill sh` (or `drill sh index`) lists the tabs in the active workbook,
+`drill sh` (or `drill sh index`, or `drill ls`) lists the tabs in the active workbook,
 marking the active one with the drill sign (⟳). `drill sh use <name>`
 switches to a tab **and immediately pulls it** — replacing your local
 word list with that tab's column A. `drill sh add <name>` creates a new,
@@ -338,14 +338,15 @@ stderr; the word is still added locally either way.
 | `drill polka\|waltz\|rock\|jazz\|jiga\|balkan\|samba <repetitions>` | Shorthand for a fixed loop size (see table above) |
 | `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; also pushes to the active tab, if one is selected |
-| `drill list` | Show how many times each item has been shown, numbered |
+| `drill list` | Show how many times each item has been shown, numbered (`drill all` also works) |
 | `drill edit` | Open the list file in `$EDITOR`/`$VISUAL` (falls back to `vi`) |
 | `drill stats` | Print all items as `<count>\t<phrase>` (tab-separated), sorted by show count, highest first |
 | `drill rand <n>` | `drill next` shows a word ~1-in-`n` times (`n=1` is every time, the default) |
 | `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` / `drill oauth` | Choose the Google Sheets auth mode: local service account key, or personal OAuth login (global, applies to every workbook) |
 | `drill wb` / `wb index` / `add <url>` / `remove <name>` / `use <name>` | List (bare `drill wb` is an alias for `wb index`)/add/forget/switch known workbooks; `add` names the workbook after the spreadsheet's own title; the active one is marked with the drill sign |
-| `drill sh` / `sh index` / `add <name>` / `remove <name>` / `use <name>` | List (bare `drill sh` is an alias for `sh index`)/create/delete/switch tabs in the active workbook; `use` also pulls the tab's contents; the active one is marked with the drill sign |
+| `drill sh` / `drill ls` / `sh index` / `add <name>` / `remove <name>` / `use <name>` | List (`drill sh`/`drill ls` are aliases for `sh index`)/create/delete/switch tabs in the active workbook; `use` also pulls the tab's contents; the active one is marked with the drill sign |
+| `drill use <name>` | Alias for `drill sh use <name>` |
 | `drill open` | Open the active tab in your default browser |
 | `drill push` | Overwrite the active tab with the current word list text |
 | `drill pull` | Replace the local word list with column A of the active tab |

data/lib/lexdrill/cli.rb

@@ -13,7 +13,7 @@ class Lexdrill::CLI
     run_beat_alias: %w[polka waltz rock jazz jiga balkan samba],
     run_color: %w[color],
     run_add: %w[add],
-    run_list: %w[list],
+    run_list: %w[list all],
     run_edit: %w[edit],
     run_stats: %w[stats],
     run_rand: %w[rand],
@@ -21,7 +21,8 @@ class Lexdrill::CLI
     run_remote: %w[remote],
     run_oauth: %w[oauth],
     run_wb: %w[wb],
-    run_sh: %w[sh],
+    run_sh: %w[sh ls],
+    run_use: %w[use],
     run_open: %w[open],
     run_push: %w[push],
     run_pull: %w[pull]
@@ -71,7 +72,7 @@ class Lexdrill::CLI
                         Shorthand for a fixed loop size (2 through 8, in order)
         drill color random|default   Color each word randomly, or by its show count (default)
         drill add <text>   Append a new item to the list (and push, if a sheet is selected)
-        drill list         Show how many times each item has been shown
+        drill list         Show how many times each item has been shown (drill all also works)
         drill edit         Open the list file in $EDITOR/$VISUAL (falls back to vi)
         drill stats        Print items as <count>\t<phrase>, tab-separated, highest count first
         drill rand <n>     drill next shows a word ~1-in-n times (n=1 is every time)
@@ -84,11 +85,12 @@ class Lexdrill::CLI
         drill wb add <url>           Add a workbook by URL (named after its own title)
         drill wb remove <name>       Forget a workbook
         drill wb use <name>          Switch the active workbook
-        drill sh                     Alias for drill sh index
+        drill sh                     Alias for drill sh index (drill ls also works)
         drill sh index               List the tabs in the active workbook
         drill sh add <name>          Create a new tab
         drill sh remove <name>       Delete a tab
         drill sh use <name>          Switch the active tab (pulls its contents)
+        drill use <name>             Alias for drill sh use <name>
         drill open                   Open the active tab in your browser
         drill push                   Push the word list text to the active tab (overwrites it)
         drill pull                   Replace the local word list with the active tab's column A
@@ -582,7 +584,17 @@ class Lexdrill::CLI
   end
 
   def run_sh_use
-    name = argv[2]
+    use_sheet(argv[2])
+  end
+
+  # `drill use <name>` is a shortcut for `drill sh use <name>` — the name
+  # sits at a different argv position, so this and run_sh_use share the
+  # same underlying logic rather than duplicating it.
+  def run_use
+    use_sheet(argv[1])
+  end
+
+  def use_sheet(name)
     return print_sh_use_usage unless name
 
     spreadsheet_id = Lexdrill::Workbooks.current_id
@@ -611,7 +623,7 @@ class Lexdrill::CLI
   end
 
   def print_sh_use_usage
-    warn "usage: drill sh use <name>"
+    warn "usage: drill sh use <name> (or drill use <name>)"
     1
   end
 

data/lib/lexdrill/http_client.rb

@@ -18,9 +18,17 @@ module Lexdrill::HTTPClient
 
   class NetworkError < StandardError; end
 
+  # Net::HTTP's 2-arg instance `#post(path, body)` sends no Content-Type
+  # header at all — most token endpoints tolerate that (defaulting to
+  # form-urlencoded), but not all do, so this sets it explicitly.
   def self.post_form(url, params)
     uri = URI(url)
-    perform(uri) { |http| http.post(uri.path, URI.encode_www_form(params)) }
+    perform(uri) do |http|
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request["Content-Type"] = "application/x-www-form-urlencoded"
+      request.body = URI.encode_www_form(params)
+      http.request(request)
+    end
   end
 
   def self.json_post(url, body:, headers: {})

data/lib/lexdrill/line_formatter.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 # Formats a shown word for display, on one line:
-# "{index}/{total}{SEPARATOR} {word}" — index is the word's own 1-based
+# "{SEPARATOR}{index}/{total} {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).
+# meaningful even when a rhythm repeats steps. The separator and
+# counter/total 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)
     total = Lexdrill::WordList.words.size
     count = Lexdrill::Stats.counts.fetch(word, 0)
-    prefix = Lexdrill::Colorizer.paint_yellow("#{loop_index(total) + 1}/#{total}#{SEPARATOR}")
+    prefix = Lexdrill::Colorizer.paint_yellow("#{SEPARATOR}#{loop_index(total) + 1}/#{total}")
     "#{prefix} #{Lexdrill::Colorizer.paint_by_count(word, count)}"
   end
 

data/lib/lexdrill/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lexdrill
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Siarhei Kisliak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-14 00:00:00.000000000 Z
+date: 2026-07-16 00:00:00.000000000 Z
 dependencies: []
 description: lexdrill prints a vocabulary word or phrase on demand, tracking how often
   each one has been shown.