lexdrill 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160443af001778081e3f6599911f3f3ab828b19fae27606ab7e9d472d5af85f3
-  data.tar.gz: b5400da446623b84d04ab9f27df807c3bb52ff6e2c857af365407318aa4732a5
+  metadata.gz: a20cfbe4b7db3dbc41bec9f5e6bac7954660f81c5396bd39337b620f78038cfd
+  data.tar.gz: 6a26fc1605e888f21569d4109f774d85d753e6e17f6e0a40b220d071cda5549c
 SHA512:
-  metadata.gz: 7375919dc3b144de3feeb5f53ae8868b1aead949d85c5193833e12a428387b20e862e65ea2bc32caf176b2c0737ee5e5769b9e20998396cd1aba78f730802790
-  data.tar.gz: f588b965a909cb7c97e05dd22e4ce61a0170ce5e15803d386a942bfb39777f209038829fd43da4c585c51f99f79f5b836afb84928c150103648454e4d59f9867
+  metadata.gz: 664c053ae57b8f89b78364699dc865067e461086145c8be708e84473df83642966751bdec82c42e977f185dba6ca3799ae8aa65faa2ddd4e34f27245054a79ed
+  data.tar.gz: 6d3c8d58b6b1b198857287546c215e519b023d051020bd4980ffe1958a7103bdc1d2167811f28aa1db42d8b93233b85923137b5f39e107c4224042c60fdce7c4

data/README.md

@@ -192,7 +192,8 @@ anything.
 | `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 add <text>` | Append a new item to the end of the list |
-| `drill list` | Print all items as `<count>\t<phrase>` (tab-separated), sorted by show count, highest first |
+| `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`) |
-| `drill stats` | Show how many times each item has been shown, numbered |
-| `drill rand <n>` | Shell hook shows a word ~1-in-`n` times (`n=1` is every time, the default) |
+| `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 |

data/lib/lexdrill/beat.rb

@@ -80,6 +80,12 @@ module Lexdrill::Beat
     loop_info(word_count, step).index
   end
 
+  # The inverse of index_for: the earliest step that lands on target_index,
+  # for `drill go` to jump the counter straight to a specific word.
+  def self.step_for_index(word_count, target_index)
+    (0...cycle_length(word_count)).find { |step| index_for(word_count, step) == target_index }
+  end
+
   # Full detail on where `step` falls: word index, the current loop's word
   # range, which repeat pass it is, and how many total. A single "loop"
   # spanning the whole list (shown once) when no beat is configured.

data/lib/lexdrill/cli.rb

@@ -16,7 +16,8 @@ class Lexdrill::CLI
     run_list: %w[list],
     run_open: %w[open],
     run_stats: %w[stats],
-    run_rand: %w[rand]
+    run_rand: %w[rand],
+    run_go: %w[go]
   }.freeze
 
   def self.start(argv = ARGV)
@@ -63,10 +64,11 @@ class Lexdrill::CLI
                         Shorthand for a fixed loop size (2 through 8, in order)
         drill format simple|full   Set the output style (simple is the default)
         drill add <text>   Append a new item to the end of the list
-        drill list         Print items as <count>\t<phrase>, tab-separated, highest count first
+        drill list         Show how many times each item has been shown
         drill open         Open the list file in $EDITOR/$VISUAL (falls back to vi)
-        drill stats        Show how many times each item has been shown
+        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)
+        drill go <number>  Jump so the next `next` shows item <number> (1-based, see drill list)
     HELP
     0
   end
@@ -220,8 +222,7 @@ class Lexdrill::CLI
     return print_no_words(Lexdrill::WordList::PATH) if words.empty?
 
     counts = Lexdrill::Stats.counts
-    pairs = words.map { |word| [counts.fetch(word, 0), word] }.sort_by { |count, _word| -count }
-    pairs.each { |count, word| puts "#{count}\t#{word}" }
+    words.each_with_index { |word, index| puts "#{index + 1}. #{word} (#{counts.fetch(word, 0)})" }
     0
   end
 
@@ -235,7 +236,8 @@ class Lexdrill::CLI
     return print_no_words(Lexdrill::WordList::PATH) if words.empty?
 
     counts = Lexdrill::Stats.counts
-    words.each_with_index { |word, index| puts "#{index + 1}. #{word} (#{counts.fetch(word, 0)})" }
+    pairs = words.map { |word| [counts.fetch(word, 0), word] }.sort_by { |count, _word| -count }
+    pairs.each { |count, word| puts "#{count}\t#{word}" }
     0
   end
 
@@ -252,6 +254,37 @@ class Lexdrill::CLI
     1
   end
 
+  def run_go
+    words = Lexdrill::WordList.words
+    return print_no_words(Lexdrill::WordList::PATH) if words.empty?
+
+    total = words.size
+    number = argv[1].to_s.to_i
+    return print_go_usage(total) unless (1..total).cover?(number)
+
+    target = words[number - 1]
+    return print_go_graduated(target) if Lexdrill::Stats.graduated?(target)
+
+    jump_to(target)
+    0
+  end
+
+  def jump_to(target)
+    active = Lexdrill::WordList.active_words
+    step = Lexdrill::Beat.step_for_index(active.size, active.index(target))
+    Lexdrill::Counter.new(Lexdrill::WordList::COUNTER_PATH).set(step)
+  end
+
+  def print_go_usage(total)
+    warn "usage: drill go <number>   (1 through #{total}, see drill list)"
+    1
+  end
+
+  def print_go_graduated(word)
+    warn "drill: #{word.inspect} has already graduated and won't be selected by next"
+    1
+  end
+
   def print_unknown_command(command)
     warn "drill: unknown command #{command.inspect}"
     print_help

data/lib/lexdrill/counter.rb

@@ -17,6 +17,10 @@ class Lexdrill::Counter
     File.write(path, (value + 1).to_s)
   end
 
+  def set(step)
+    File.write(path, step.to_s)
+  end
+
   def reset
     File.write(path, "0")
   end

data/lib/lexdrill/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexdrill
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Siarhei Kisliak