cw 0.2.2 → 0.2.4

data/lib/cw/print.rb

@@ -75,8 +75,8 @@ class Print
 
       newline_maybe value
 
-      print Paint["#{value} ", :blue] if success
-      print Paint["#{value} ", :red ] unless (success || type == :pass_only)
+      print Paint["#{value} ", success_colour] if success
+      print Paint["#{value} ", fail_colour ] unless (success || type == :pass_only)
       return true
     end
   end
@@ -86,8 +86,8 @@ class Print
   end
 
   def paint_success_failure(popped)
-    print paint(popped[:value], :blue) if popped[:success]
-    print paint(popped[:value], :red ) unless popped[:success]
+    print paint(popped[:value], success_colour) if popped[:success]
+    print paint(popped[:value], fail_colour ) unless popped[:success]
   end
 
   def char_result popped
@@ -100,39 +100,35 @@ class Print
 
   def heading
     "Current Sentence is     duration:    secs".length.times do
-      print '*'
+      print paint('*', list_colour)
       puts
     end
   end
 
-  def print_blue(word)
-    print paint(word, :blue)
-    cursor_pos = word.size
-    (12 - cursor_pos).times{print ' '}
+  def fail word
+    print paint("#{word}", fail_colour)
   end
 
-  def print_green(word)
-    print_blue(word)
-    print paint("#{word} \r\n", :green)
+  def list word
+    print paint("#{word}", list_colour)
   end
 
-  def print_red word
-    print paint("#{word }\r\n", :red)
+  def success word
+    newline_maybe word
+    return if(@print_count == 0 && word == ' ')
+    print paint("#{word}", success_colour)
   end
 
-  def prn_red word
-    print paint("#{word}", :red)
+  def success_colour
+    Params.success_colour ||= :blue
   end
 
-  def print_fail(word, attempt)
-    print_blue(word)
-    print paint("#{attempt }\r\n", :red)
+  def fail_colour
+    Params.fail_colour ||= :red
   end
 
-  def prn(word)
-    newline_maybe word
-    return if(@print_count == 0 && word == ' ')
-    print paint("#{word}", :blue)
+  def list_colour
+    Params.list_colour ||= :white
   end
 
   def print_advice name

data/lib/cw/repeat_word.rb

@@ -14,7 +14,7 @@ class RepeatWord < FileDetails
   def print_failed_exit_words
     until stream.stream_empty?
       word = stream.pop[:value]
-      print.prn_red word + ' ' unless @repeat_word
+      print.fail word + ' ' unless @repeat_word
     end
   end
 
@@ -28,7 +28,7 @@ class RepeatWord < FileDetails
         process_word_maybe
         break if timing.char_delay_timeout?
       end
-      print.prn letr if print_letters?
+      print.success letr if print_letters?
       break if quit?
     end
   end

data/lib/cw/reveal.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+class Reveal < FileDetails
+
+  include Tester
+
+  def initialize
+    super()
+    @reveal_buf = ''
+    puts 'Reveal mode:'
+  end
+
+  def print_test_advice    ; print.print_advice('Test Words')    ; end
+
+  def print_failed_exit_words
+    until stream.stream_empty?
+      @reveal_buf += stream.pop[:value] + ' '
+    end
+    print.success @reveal_buf
+  end
+
+  def process_input_word_maybe
+    if @word_to_process
+      stream.match_last_active_element @process_input_word.strip
+      @process_input_word = @word_to_process = nil
+    end
+  end
+
+  def build_word_maybe
+    @input_word ||= empty_string
+    @input_word << key_chr if is_relevant_char?
+    move_word_to_process if complete_word?
+  end
+
+  def process_letter letr
+    current_word.process_letter letr
+    sleep_char_delay letr
+  end
+
+  def print_marked_maybe
+    @popped = stream.pop_next_marked
+    if @popped
+      @reveal_buf += @popped[:value] + ' '
+    end
+  end
+
+end

data/lib/cw/sentence.rb

@@ -8,7 +8,8 @@ class Sentence
   def all               ; @sentences             ; end
   def next              ; @next = true           ; end
   def next?             ; @next                  ; end
-  def forward           ; @index += 1            ; end
+#todo  def forward           ; @index += 1            ; end
+  def forward           ; @index                 ; end
   def previous?         ; @previous              ; end
   def repeat?           ; @repeat                ; end
   def change?           ; next? || previous?     ; end
@@ -25,12 +26,31 @@ class Sentence
     @index = @index <= 1 ? 0 : @index - 1
   end
 
+  def create_progress_maybe progress_file
+    unless File.exists? progress_file
+      reset_progress progress_file
+    end
+  end
+
+  def reset_progress progress_file
+    @index = 0
+    write_progress progress_file
+  end
+
+  def check_end_of_book progress_file
+    if @index >= @sentences.size
+      reset_progress progress_file
+    end
+  end
+
   def read_progress progress_file
+    create_progress_maybe progress_file
     File.open(progress_file, 'r') {|f| @index = f.readline.to_i}
+    check_end_of_book progress_file
   end
 
   def write_progress progress_file
-    File.open(progress_file, 'w') {|f| f.puts @index.to_s}
+     File.open(progress_file, 'w') {|f| f.puts @index.to_s}
   end
 
   def read_book book

data/lib/cw/test_words.rb

@@ -16,7 +16,7 @@ class TestWords < FileDetails
 
   def print_failed_exit_words
     until stream.stream_empty?
-      print.prn_red stream.pop[:value] + ' '
+      print.fail stream.pop[:value] + ' '
     end
   end
 

data/lib/cw/tester.rb

@@ -65,6 +65,7 @@ module Tester
         break if timing.char_delay_timeout?
       else
         process_space_maybe(letr) if(self.class == TestWords)
+        process_space_maybe(letr) if(self.class == Reveal)
         process_word_maybe
         break if timing.char_delay_timeout?
       end
@@ -81,7 +82,7 @@ module Tester
       stream.add_char(letr) if(self.class == TestLetters)
       end
       process_letters letr
-      print.prn letr if print_letters?
+      print.success letr if print_letters?
       break if(book_class && change_repeat_or_quit?)
       break if ((! book_class) && quit?)
     end
@@ -117,7 +118,7 @@ module Tester
 
   def print_failed_exit_words
     until stream.stream_empty?
-      print.prn_red stream.pop[:value]
+      print.fail stream.pop[:value]
     end
   end
 
@@ -152,6 +153,7 @@ module Tester
       quit
       global_quit
       audio_stop
+      true
     end
   end
 
@@ -163,9 +165,20 @@ module Tester
     @input_word.split(//).last(1).first
   end
 
+  def word_proc_timeout(arg = :status)
+    if arg == :init
+      @wp_timeout = Time.now + 5
+    else
+      return true if(Time.now > @wp_timeout)
+    end
+    return false
+  end
+
   def wait_for_no_word_process
+    word_proc_timeout(:init)
     while @word_to_process
-      sleep 0.1
+      sleep 0.01
+      exit(1) if word_proc_timeout
     end
   end
 
@@ -204,7 +217,7 @@ module Tester
       stream.add_word current_word.strip
       current_word.clear
       letr.clear
-      print.prn space if print_letters?
+      print.success space if print_letters?
     end
   end
 

data/lib/cw/timing.rb

@@ -15,7 +15,7 @@ class Timing
   end
 
   def dot wpm
-    1.2 / wpm
+    1.2 / wpm.to_f
   end
 
   def dot_ms

data/lib/cw/tone_generator.rb

@@ -8,9 +8,9 @@ class ToneGenerator
 
   def initialize
     @max_amplitude = 0.5
-    @wpm = Params.wpm
+    @wpm = Params.wpm.to_f
     @frequency = Params.frequency
-    @effective_wpm = Params.effective_wpm ? Params.effective_wpm : @wpm
+    @effective_wpm = Params.effective_wpm ? Params.effective_wpm.to_f : @wpm
     @sample_rate = 2400
     @print = Print.new
   end

data/lib/cw/words.rb

@@ -13,7 +13,6 @@ class Words
   end
 
   def double_words
-    puts 'here'
     temp = []
     @words.each do |wrd|
       2.times { temp.push wrd }
@@ -73,6 +72,26 @@ class Words
     @words.select{|wrd| wrd.include?(letr)}
   end
 
+  def containing(* letters)
+    lets = letters.flatten.join('').split("")
+    found, temp, @words = false, @words, []
+    temp.each do |wrd|
+      wrd_lets = wrd.split("")
+      wrd_lets.each do |wrd_let|
+        if lets.include?(wrd_let)
+          found = true
+        else
+          found = false
+          break
+        end
+      end
+      if found
+        @words.push wrd
+      end
+    end
+    @words
+  end
+
   def including(* letters)
     @words = letters.flatten.collect{|letr| including_letter(letr)}.flatten
   end

data/test/test_cw.rb

@@ -80,15 +80,6 @@ class TestCW < MiniTest::Test
     assert (Time.now - time) < 1
   end
 
-  def test_default_mp3_filename_is_mp3_output
-    temp = nil
-    cw = CW.new {
-      no_run
-      temp = Params.audio_filename
-    }
-    assert_equal "audio_output.wav", temp
-  end
-
   def test_reload_reloads_dictionary
     cw = CW.new {
       pause
@@ -161,7 +152,7 @@ Ending:     x
   end
 
   def test_wpm_defaults_to_25_if_unset
-    assert_equal 25, @cw.wpm
+    assert_equal '25', @cw.wpm.to_s
   end
 
   def test_effective_wpm_defaults_to_nil
@@ -367,6 +358,12 @@ Ending:     x
     assert_equal 456, @cw.frequency
   end
 
+  def test_play_command_returns_play_command
+    assert_equal 567, @cw.play_command(567)
+    @cw.play_command 456
+    assert_equal 456, @cw.play_command
+  end
+
   #todo
   #  def test_play_builds_correct_command_for_default
   #    @cw.words = "some words"
@@ -460,7 +457,7 @@ Ending:     x
   end
 
   def test_set_default_filename
-    assert @cw.cl.cl_audio_filename.include?('audio_output.wav'), 'default audio output filename invalid'
+    assert @cw.cl.cl_audio_filename.include?('audio_output'), 'default audio output filename invalid'
   end
 
   def test_set_audio_filename_to_given_name

data/test/test_tester.rb

@@ -0,0 +1,62 @@
+$VERBOSE = nil #FIXME
+
+require 'minitest/autorun'
+require 'minitest/pride'
+require_relative '../lib/cw'
+
+class TestTester < MiniTest::Test
+
+#  include Tester
+
+  ROOT = File.expand_path File.dirname(__FILE__) + '/../'
+
+  def setup
+    @object = Object.new
+    @object.extend(Tester)
+#''end    @cw = CW.new
+#    @cw.pause
+  end
+
+  def teardown
+    @cw = nil
+  end
+
+  def test_whatever
+    assert true
+  end
+#
+  def test_quit?
+    @object.instance_eval('@quit = :quit')
+    assert_equal :quit, @object.quit?
+  end
+
+  def test_quit
+    assert_nil @object.quit?
+    @object.quit
+    assert @object.quit?
+  end
+
+  def test_global_quit?
+    @object.instance_eval('@global_quit = :quit')
+    assert_equal :quit, @object.global_quit?
+  end
+
+  def test_global_quit
+    assert_nil @object.global_quit?
+    @object.global_quit
+    assert @object.global_quit?
+  end
+
+  def test_print_instantiates_Print_object
+    assert_equal Print, @object.print.class
+  end
+
+  def test_timing_instantiates_Timing_object
+    assert_equal Timing, @object.timing.class
+  end
+
+  def test_audio_instantiates_AudioPlayer_object
+    assert_equal AudioPlayer, @object.audio.class
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cw
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Martyn Jago
@@ -108,38 +108,53 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 description: A ruby library to help learn and practice morse code
 email:
 - martyn.jago@btinternet.com
-executables: []
+executables:
+- cw
 extensions: []
 extra_rdoc_files: []
 files:
@@ -154,17 +169,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- VERSION
 - audio/.gitkeep
-- classes.svg
-- classes.svg.dot
+- bin/cw
 - cw.gemspec
-- daily.rb
 - data/text/abbreviations.txt
-- data/text/adv_of_sh_holmes.txt
+- data/text/book.txt
 - data/text/common_words.txt
 - data/text/cw_conversation.txt
 - data/text/most_common_words.txt
-- data/text/progress.txt
 - data/text/q_codes.txt
 - example.rb
 - lib/cw.rb
@@ -173,10 +186,10 @@ files:
 - lib/cw/book.rb
 - lib/cw/book_details.rb
 - lib/cw/cl.rb
+- lib/cw/config_file.rb
 - lib/cw/current_word.rb
 - lib/cw/cw_dsl.rb
 - lib/cw/cw_encoding.rb
-- lib/cw/cw_params.rb
 - lib/cw/cw_stream.rb
 - lib/cw/cw_threads.rb
 - lib/cw/element.rb
@@ -184,11 +197,13 @@ files:
 - lib/cw/key_input.rb
 - lib/cw/monitor_keys.rb
 - lib/cw/numbers.rb
+- lib/cw/params.rb
 - lib/cw/print.rb
 - lib/cw/process.rb
 - lib/cw/progress.rb
 - lib/cw/randomize.rb
 - lib/cw/repeat_word.rb
+- lib/cw/reveal.rb
 - lib/cw/rss.rb
 - lib/cw/sentence.rb
 - lib/cw/speak.rb
@@ -205,7 +220,8 @@ files:
 - lib/cw/words.rb
 - test/test_cw.rb
 - test/test_stream.rb
-homepage: http://github.com/mjago/cw
+- test/test_tester.rb
+homepage: http://martynjago.co.uk/CW/
 licenses:
 - MIT
 metadata: {}
@@ -220,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="