cw 0.2.0 → 0.2.2

data/cw.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'cw'
-  spec.version     = '0.2.0'
+  spec.version     = '0.2.2'
   spec.date        = '2016-05-21'
   spec.authors     = ["Martyn Jago"]
   spec.email       = ["martyn.jago@btinternet.com"]
@@ -13,16 +13,17 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'http://github.com/mjago/cw'
   spec.files       = `git ls-files`.split($/)
   spec.license     = 'MIT'
+
   spec.require_paths = ["lib", "audio", "data/text", "test"]
-  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency('wavefile')
-  spec.add_dependency('paint')
-  spec.add_dependency('feedjira')
-  spec.add_dependency('htmlentities')
-  spec.add_dependency('sanitize')
-  spec.add_dependency('ruby-progressbar')
-  spec.add_dependency('rake')
+  spec.required_ruby_version = '>= 1.9.3'
+  spec.add_runtime_dependency 'feedjira', '>= 2.0.0'
+  spec.add_runtime_dependency 'htmlentities', '>= 4.3.4'
+  spec.add_runtime_dependency 'paint', '>= 1.0.1'
+  spec.add_runtime_dependency 'rake', '>= 11.2.2'
+  spec.add_runtime_dependency 'ruby-progressbar', '>= 1.8.1'
+  spec.add_runtime_dependency 'sanitize', '>= 4.0.1'
+  spec.add_runtime_dependency 'wavefile', '>= 0.7.0'
 
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "simplecov"

data/lib/cw.rb

@@ -2,6 +2,10 @@
 
 require_relative 'cw/file_details'
 require_relative 'cw/process'
+require_relative 'cw/text_helpers'
+require_relative 'cw/tone_helpers'
+require_relative 'cw/element'
+require_relative 'cw/current_word'
 require_relative 'cw/cw_dsl'
 require_relative 'cw/randomize'
 require_relative 'cw/sentence'
@@ -32,8 +36,8 @@ require_relative 'cw/progress'
 
 class CW < CwDsl
 
-  attr_accessor :dry_run
-  attr_accessor :quit
+#FIXME dry_run
+#  attr_accessor :dry_run
 
   # Test user against letters rather than words.
   #

data/lib/cw/audio_player.rb

@@ -14,6 +14,7 @@ class AudioPlayer
     @play_filename ||= "#{Params.audio_dir}/#{Params.audio_filename}0000.mp3"
   end
 
+#FIXME dry_run
   def convert_words_with_ebook2cw words
     words = words.delete("\n")
     cl = Cl.new.cl_echo(words)
@@ -30,6 +31,7 @@ class AudioPlayer
     tone.play_filename
   end
 
+#FIXME dry_run
   def play
     cmd = play_command + ' ' + play_filename
     @pid = ! @dry_run ? Process.spawn(cmd) : cmd

data/lib/cw/book.rb

@@ -151,34 +151,7 @@ class Book < FileDetails
     end
   end
 
-  def process_letters letr
-    loop do
-      process_space_maybe(letr) unless @book_details.args[:output] == :letter
-      process_word_maybe
-      if change_repeat_or_quit?
-        break
-      end
-      break if timing.char_delay_timeout?
-    end
-  end
-
-  def process_words words
-    (words + space).each_char do |letr|
-      process_letter letr
-      stream.add_char(letr) if @book_details.args[:output] == :letter
-      process_letters letr
-      print.prn letr if print_letters?
-      break if change_repeat_or_quit?
-    end
-  end
-
-  def print_words words
-    timing.init_char_timer
-    process_words words
-  end
-
   def print_words_for_current_sentence
-#    puts current_sentence
     print_words current_sentence
   end
 

data/lib/cw/book_details.rb

@@ -5,16 +5,38 @@ class BookDetails
   attr_reader :args
 
   HERE = File.dirname(__FILE__) + '/'
-  BOOK_DIRECTORY = HERE + '../../data/text/'
-  BOOK_NAME      = 'adv_of_sh_holmes.txt'
+  GEM_BOOK_DIRECTORY     = HERE + '../../data/text/'
+  GEM_BOOK_NAME          = 'adv_of_sh_holmes.txt'
+  DEFAULT_BOOK_DIRECTORY = 'books'
 
   def initialize
-    @book_name      =  BOOK_NAME
-    @book_directory =  BOOK_DIRECTORY
+    book_directory
+    book_name
+  end
+
+  def is_default_book_dir?
+    if File.exist? DEFAULT_BOOK_DIRECTORY
+      if File.directory? DEFAULT_BOOK_DIRECTORY
+        return true
+      end
+    end
+    false
+  end
+
+  def book_name
+    Params.book_name ||= GEM_BOOK_NAME
+  end
+
+  def book_directory
+    book_dir = GEM_BOOK_DIRECTORY
+    if is_default_book_dir?
+      book_dir = DEFAULT_BOOK_DIRECTORY
+    end
+    Params.book_dir ||= book_dir
   end
 
   def book_location
-    @book_directory + @book_name
+    File.expand_path(File.join Params.book_dir, Params.book_name)
   end
 
   def arguments args

data/lib/cw/current_word.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+class CurrentWord
+
+  include TextHelpers
+
+  def initialize
+    @current_word = ''
+  end
+
+  def current_word
+    @current_word ||= String.new
+  end
+
+  def push_letter letr
+    @current_word += letr
+  end
+
+  def to_s
+    @current_word
+  end
+
+  def clear
+    @current_word.clear
+    @current_word = ''
+  end
+
+  def strip
+    @current_word.strip!
+  end
+
+  def process_letter letr
+    letr.downcase!
+    push_letter letr
+  end
+
+end

data/lib/cw/cw_dsl.rb

@@ -27,7 +27,8 @@ class CwDsl
    :pause,         :noise,
    :shuffle,       :mark_words,
    :double_words,  :single_words,
-   :audio_dir,     :def_word_count
+   :audio_dir,     :def_word_count,
+   :book_name,     :book_dir
   ].each do |method|
     define_method method do |arg = nil|
       arg ? Params.send("#{method}=", arg) : Params.send("#{method}")
@@ -61,7 +62,7 @@ class CwDsl
       :word_filename, :author, :title, :quality, :frequency, :shuffle, :effective_wpm,
       :max, :min, :word_spacing, :noise, :begin, :end, :word_count, :including,
       :word_size, :size, :beginning_with, :ending_with, :mark_words, :audio_dir,
-      :use_ebook2cw, :def_word_count
+      :use_ebook2cw, :def_word_count, :book_dir, :book_name
     end
 
     config_defaults
@@ -102,6 +103,11 @@ class CwDsl
     Params.size
   end
 
+  def word_count(wordcount)
+    Params.word_count = wordcount
+    @words.count wordcount
+  end
+
   def beginning_with(* letters)
     @words.beginning_with letters
     Params.begin = letters
@@ -112,11 +118,6 @@ class CwDsl
     Params.end = letters
   end
 
-  def word_count(wordcount)
-    Params.word_count = wordcount
-    @words.count wordcount
-  end
-
   def including(* letters)
     Params.including = letters
     @words.including letters

data/lib/cw/cw_params.rb

@@ -26,4 +26,25 @@ module Params
   def config( & block)
     instance_eval( & block)
   end
+
+  def shuffle_str
+    shuffle ? "Shuffle:    #{shuffle ? 'yes' : 'no'}\n" : nil
+  end
+
+  def word_count_str
+    word_count ? "Word count: #{word_count}\n" : nil
+  end
+
+  def wpm_str
+    "WPM:        #{wpm}\n"
+  end
+
+  def word_size_str
+    size ? "Word size:  #{size}\n" : nil
+  end
+
+  def delim_str
+    "#{'=' * Params.name.size}\n"
+  end
+
 end

data/lib/cw/cw_stream.rb

@@ -2,7 +2,10 @@
 
 class CwStream
 
+  include Element
+
   attr_accessor :active_region
+  attr_accessor   :stream
 
   def initialize
     @active_region = 6
@@ -13,10 +16,6 @@ class CwStream
     @stream, @success, @first_element, @last_element = {},{}, 0, 0
   end
 
-  def count
-    @last_element - @first_element
-  end
-
   def add_word word
     @stream[@last_element] = word.strip
     @success[@last_element] = nil
@@ -29,14 +28,6 @@ class CwStream
     inc_last_element
   end
 
-  def inc_last_element
-    @last_element += 1
-  end
-
-  def inc_first_element
-    @first_element += 1
-  end
-
   def mark(element, type)
     @success[element] = type
   end
@@ -113,61 +104,4 @@ class CwStream
     end
   end
 
-  def element type
-    return @last_element - 1 if type == :last
-    first = @last_element - @active_region - 1
-    first < 0 ? 0 : first
-  end
-
-  def match_first_active_element match
-    if ! stream_empty?
-      found = false
-      first = element(:first)
-      first.upto element(:last) do |ele|
-        if found
-          first.upto found - 1 do |failed|
-            @success[failed] = false # unless @success[ele]
-          end
-          break
-        elsif((@stream[ele] == match) && (! @success[ele]))
-          @success[ele], found = true, ele
-        else
-          @success[first] = false
-        end
-      end
-    end
-  end
-
-  def match_last_active_element(match)
-    process_last_active_element(match) unless stream_empty?
-  end
-
-  def process_last_active_element(match)
-    first = get_first
-    last  = get_last
-    check_last_element_success(match, first, last)
-  end
-
-  def check_last_element_success(match, first, last)
-    found = false
-    last.downto(first) do |element|
-      if found
-        @success[element] = false unless @success[element]
-      elsif((@stream[element] == match) && (! @success[element]))
-        @success[element], found = true, true
-      else
-        @success[first] = false
-      end
-    end
-  end
-
-  def get_first
-    first = @last_element - @active_region - 1
-    first = 0 if(first < 0)
-    first
-  end
-
-  def get_last
-    @last_element - 1
-  end
 end

data/lib/cw/element.rb

@@ -0,0 +1,73 @@
+module Element
+
+  def element type
+    return @last_element - 1 if type == :last
+    first = @last_element - @active_region - 1
+    first < 0 ? 0 : first
+  end
+
+  def match_first_active_element match
+    if ! stream_empty?
+      found = false
+      first = element(:first)
+      first.upto element(:last) do |ele|
+        if found
+          first.upto found - 1 do |failed|
+            @success[failed] = false # unless @success[ele]
+          end
+          break
+        elsif((@stream[ele] == match) && (! @success[ele]))
+          @success[ele], found = true, ele
+        else
+          @success[first] = false
+        end
+      end
+    end
+  end
+
+  def match_last_active_element(match)
+    process_last_active_element(match) unless stream_empty?
+  end
+
+  def process_last_active_element(match)
+    first = get_first
+    last  = get_last
+    check_last_element_success(match, first, last)
+  end
+
+  def check_last_element_success(match, first, last)
+    found = false
+    last.downto(first) do |element|
+      if found
+        @success[element] = false unless @success[element]
+      elsif((@stream[element] == match) && (! @success[element]))
+        @success[element], found = true, true
+      else
+        @success[first] = false
+      end
+    end
+  end
+
+  def get_first
+    first = @last_element - @active_region - 1
+    first = 0 if(first < 0)
+    first
+  end
+
+  def get_last
+    @last_element - 1
+  end
+
+  def count
+    @last_element - @first_element
+  end
+
+  def inc_last_element
+    @last_element += 1
+  end
+
+  def inc_first_element
+    @first_element += 1
+  end
+
+end

data/lib/cw/key_input.rb

@@ -29,7 +29,7 @@ class KeyInput
   end
 
   def is_punctuation?
-    [' ', ',', '.', '!', '?'].detect{|letr| letr == @chr}
+    [' ', ',', '.', '=', '?'].detect{|letr| letr == @chr}
   end
 
   def is_relevant_char?

data/lib/cw/repeat_word.rb

@@ -23,6 +23,7 @@ class RepeatWord < FileDetails
     (words.to_s + space).each_char do |letr|
       process_letter letr
       loop do
+        do_events
         process_space_maybe letr
         process_word_maybe
         break if timing.char_delay_timeout?