lexdrill 0.19.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c04d80068319a1be565d64c8325ce808f242d7a71609f34796b348cc04b0571
-  data.tar.gz: 2b06d6b6d48cc3556c77524bce72c77e18404aceadd802cb3ae40134a29cfc3d
+  metadata.gz: 03c53271701afc42f6f8b239bd2fb8c85d5d88a55d72c7781573504241d1ad1c
+  data.tar.gz: 231518970e268aa36342feda3885f0771293a0042df918c28b17a63a136ab001
 SHA512:
-  metadata.gz: c15dac65d6521acd98fb4a81f016466882d4397587a9de255544364cbcb0a9bc535e399c91dd7979ea4fadc5206ca86c4c2f04db62898baa298d2a82a24f908d
-  data.tar.gz: b8f7dd159de9b89f81cafd9a73d50d2e7db6541ed3fcd0028f4dbee6b344301f085e3be7f7c78a669bb1494845afc65eaba886f17a164355dd99521a9a6d4c6b
+  metadata.gz: b1b115d135527fbc032faa1ad8ea63b48708eda8ce9a9ce8501d59f95f315ab191545a4b8d355d0ab54c2b924ee1267a4873239bc779c8e5290e6f76d16d539f
+  data.tar.gz: 3a038930e2e0a901b1d09227bda97588d7eb2073418156c05151e663413cb0f01c20fbf0457335d5386c6ff20c17e629a2d30c070c41167aea1c132f888499a0

data/README.md

@@ -280,7 +280,7 @@ 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 config directory, word count, counter value, toggle, beat, rand, and color 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) |
@@ -293,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/cli.rb

@@ -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
@@ -77,7 +78,8 @@ class Lexdrill::CLI
         drill remote <url>          Set the Google Sheet used by a local service account key
                                     (~/.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)
@@ -343,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 run_wb
+    url = Lexdrill::RemoteTarget.url
+    return print_no_remote unless url
 
-  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
-
-    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
@@ -453,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/inspector.rb

@@ -15,10 +15,15 @@ module Lexdrill::Inspector
       Beat:          #{beat_summary}
       Rand:          #{rand_summary}
       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/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/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/version.rb

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

data/lib/lexdrill.rb

@@ -11,6 +11,7 @@ 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexdrill
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Siarhei Kisliak
@@ -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