lexdrill 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0510a355aeb50c560e27a73fd9ab70350c8e5c326d5dbd0ad43138e849b0bd2f
-  data.tar.gz: 529f2a86af2ec0b735c3147bd412fe82d276f6d434e6a074deefb650270818eb
+  metadata.gz: 5cc865e919348867e13b05201ac159f40f7f7fce166f44d31b98cd92d0db757b
+  data.tar.gz: c3a93dc3474fe2cafcddb60d4cd25ee3350e66c4f487c8f99878a9d09e71f01f
 SHA512:
-  metadata.gz: d9168c8d3218c457b6cf08662254d7b69f6adaef33cb1962a1dbcf4a0243c653bffbd9a74580e5cd7dbdcce9118fe0406b221d72f42b7347525a3a0adc93ee20
-  data.tar.gz: 552834f01e378765ddf7549410ad964dc254c8c286bc34605f765661f68fb232100003dedad70c18fe025e8215cdba250d0c37f0a60338f235647f3335bb1eee
+  metadata.gz: df405a270f001707c86ad9e9e0d3104bb822e3eb337c7ab6afb0ad3a320aaf4fece4b1f727ccabfaf09f3fc804903876012f1ef348dd613473aeb962b2a1cbd4
+  data.tar.gz: 6849d9d157bd2c634f5687b4ac194bf3d38b2357092d1344ebc38533708723009d52e93a4445988aafe36fcfa3a61b1ec589716588c925f9115fe9d0571f0ae0

data/README.md

@@ -40,10 +40,20 @@ banana
 cherry
 ```
 
+If you don't create one, `drill next` seeds `~/.drill.txt` 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`, `full` is the
+There are two output styles (`drill format simple|full`, `simple` is the
 default):
 
+**simple** — the drill sign (always blue), a space, then the word (in a
+separately-picked random color), all on one line:
+```
+⟳ apple
+```
+
 **full** — `counter/total⟳[loop_start-loop_end]` on one line, the word on
 the next, in a randomly-picked color:
 ```
@@ -52,13 +62,6 @@ apple
 ```
 (word 1 of 6 total; currently in the loop spanning words 1-3)
 
-**simple** — three drill signs (always blue), then the word on its own
-line in a separately-picked random color:
-```
-⟳⟳⟳
-apple
-```
-
 ### Shell integration (one-time setup)
 
 Add one line to your shell's rc file so the current word prints automatically
@@ -107,6 +110,17 @@ everything looks correctly configured.
 hook block above, so it runs first) instead of relying on it only being in
 `~/.zlogin` / `~/.bash_profile`. It's safe to leave it in both places.
 
+#### Word only shows once per session, then stops (bash)
+
+The bash hook works by appending a `$(drill_precmd)` command substitution to
+`PS1`, which bash re-evaluates on every prompt render — this is deliberate,
+since some environments (notably Google Cloud Shell's `bashrc.google`)
+snapshot and unconditionally overwrite `PROMPT_COMMAND` after your `.bashrc`
+runs, silently dropping anything hooked in that way. If you installed an
+older version of the hook and see the word print exactly once and never
+again, re-run `drill hook bash` and update the line in your `.bashrc` to the
+current snippet.
+
 ### Rhythm (`beat`)
 
 By default `next` just advances one word at a time. You can instead have it
@@ -147,4 +161,4 @@ There are also named shortcuts for common loop sizes, one word/phrase apart:
 | `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 (`full` is the default) |
+| `drill format simple\|full` | Set the output style (`simple` is the default) |

data/lib/lexdrill/cli.rb

@@ -55,7 +55,7 @@ class Lexdrill::CLI
         drill beat none                 Disable the rhythm
         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 (full is the default)
+        drill format simple|full   Set the output style (simple is the default)
     HELP
     0
   end

data/lib/lexdrill/config.rb

@@ -13,6 +13,10 @@ module Lexdrill::Config
     ENV.fetch("LEXDRILL_PATH", nil) || dir_path || Dir.home
   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)
 end

data/lib/lexdrill/default_words.rb

@@ -0,0 +1,30 @@
+# 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.
+module Lexdrill::DefaultWords
+  WORDS = [
+    "The map is not the territory",
+    "Respect for other people's model of the world",
+    "Mind and body are parts of the same system",
+    "You cannot not communicate",
+    "The meaning of your communication is the response you get",
+    "People operate out of the best choice available to them",
+    "Every behavior has a positive intention",
+    "People have all the resources they need to succeed",
+    "There is no failure only feedback",
+    "If what you are doing isn't working do something else",
+    "The person with the most flexibility controls the system",
+    "Choice is better than no choice",
+    "If one person can do something anyone can learn to do it",
+    "Modeling successful performance leads to excellence",
+    "All procedures should increase wholeness and choice",
+    "Individuals are not their behaviors",
+    "Resistance in a listener is a sign of a lack of flexibility in the communicator",
+    "We process all information through our five senses",
+    "Clean feedback is the breakfast of champions",
+    "Possible in the world is possible for me it is only a matter of how"
+  ].freeze
+
+  TEXT = "#{WORDS.join("\n")}\n".freeze
+end

data/lib/lexdrill/format.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-# Global display mode for `next`'s output: "full" (position + loop info) or
-# "simple" (just the word). Lives at ~/.drill.format; defaults to "full".
+# 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"
@@ -9,10 +10,10 @@ module Lexdrill::Format
   VALID = [SIMPLE, FULL].freeze
 
   def self.current
-    return FULL unless File.exist?(PATH)
+    return SIMPLE unless File.exist?(PATH)
 
     value = File.read(PATH).strip
-    VALID.include?(value) ? value : FULL
+    VALID.include?(value) ? value : SIMPLE
   end
 
   def self.set(mode)

data/lib/lexdrill/line_formatter.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# Formats a shown word for display. In "simple" mode: three drill signs in
-# blue, then the word on its own line in a separately-picked random color.
-# In "full" mode (the default):
+# Formats a shown word for display. In "simple" mode: the drill sign (in
+# blue), a space, then the word (in a separately-picked random color), 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.
 module Lexdrill::LineFormatter
   SEPARATOR = "⟳"
-  SIMPLE_HEADER = SEPARATOR * 3
 
   def self.format(word)
     return simple(word) if Lexdrill::Format.simple?
@@ -17,7 +16,7 @@ module Lexdrill::LineFormatter
   end
 
   def self.simple(word)
-    "#{Lexdrill::Colorizer.paint_blue(SIMPLE_HEADER)}\n#{Lexdrill::Colorizer.paint(word)}"
+    "#{Lexdrill::Colorizer.paint_blue(SEPARATOR)} #{Lexdrill::Colorizer.paint(word)}"
   end
 
   def self.full(word)

data/lib/lexdrill/shell_snippet.rb

@@ -12,14 +12,21 @@ module Lexdrill::ShellSnippet
     fi
   SNIPPET
 
+  # Hooks via PS1 (re-evaluated on every prompt) rather than PROMPT_COMMAND,
+  # since some environments (e.g. Google Cloud Shell's bashrc.google) snapshot
+  # and overwrite PROMPT_COMMAND after the fact, silently dropping anything
+  # appended to it. Output goes straight to /dev/tty so the word is never
+  # captured into the PS1 string itself (which would need readline's `\[..\]`
+  # non-printing markers to avoid cursor/line-wrap glitches from the color
+  # codes).
   BASH = <<~SNIPPET
     drill_precmd() {
       [ -f "$HOME/.drill.disabled" ] && return
-      command drill next 2>/dev/null
+      command drill next >/dev/tty 2>/dev/null
     }
-    case ";${PROMPT_COMMAND:-};" in
-      *";drill_precmd;"*) ;;
-      *) PROMPT_COMMAND="drill_precmd;${PROMPT_COMMAND}" ;;
+    case "$PS1" in
+      *'$(drill_precmd)'*) ;;
+      *) PS1="${PS1}"'$(drill_precmd)' ;;
     esac
   SNIPPET
 

data/lib/lexdrill/version.rb

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

data/lib/lexdrill/word_list.rb

@@ -1,16 +1,27 @@
 # frozen_string_literal: true
 
 # Reads vocabulary words/phrases from a `.drill.txt` file, one per line, and
-# advances a persisted counter to show "the current word" each time.
+# 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.
 class Lexdrill::WordList
   PATH = Lexdrill::Config::DRILL_PATH
   COUNTER_PATH = Lexdrill::Config::COUNTER_PATH
+  HOME_PATH = Lexdrill::Config.home_drill_path
 
   def self.words
-    @words ||= File.exist?(PATH) && File.readlines(PATH).map(&:strip).reject(&:empty?)
+    seed_default_at_home
+    @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)
+
+    File.write(PATH, Lexdrill::DefaultWords::TEXT, encoding: "UTF-8")
+  end
+  private_class_method :seed_default_at_home
+
   def self.next
     return nil if words.empty?
 

data/lib/lexdrill.rb

@@ -4,6 +4,7 @@ require_relative "lexdrill/version"
 require_relative "lexdrill/config"
 require_relative "lexdrill/counter"
 require_relative "lexdrill/beat"
+require_relative "lexdrill/default_words"
 require_relative "lexdrill/word_list"
 require_relative "lexdrill/toggle"
 require_relative "lexdrill/shell_snippet"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexdrill
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Siarhei Kisliak
@@ -30,6 +30,7 @@ files:
 - lib/lexdrill/colorizer.rb
 - lib/lexdrill/config.rb
 - lib/lexdrill/counter.rb
+- lib/lexdrill/default_words.rb
 - lib/lexdrill/format.rb
 - lib/lexdrill/inspector.rb
 - lib/lexdrill/line_formatter.rb