cw 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ccadeafd51d75edae90d0f494a0ccfe735ab1a
-  data.tar.gz: 1a975942e7a54e6db6745b2d5b5cd5a3fae176a1
+  metadata.gz: 537188b46a4831f8cd940de47cfb43cc6132d808
+  data.tar.gz: c6bab61e11fc00d6be7b050771447d75252f6405
 SHA512:
-  metadata.gz: 025e1005cadcac8a29d9f31b2c50498c757749982ee32d78045dd1a71ada9b3a005b403076c49c91f2a87fd15734d87c9d4b848a871cb4d2ca2d4cfc1a1177a5
-  data.tar.gz: 6aadbbecd1d18c43a864e29c12a066491bba27443ef411db412a2a92afe30ce9fefa55f3fa6279f8e76df461599c0bfb422a072bfee717cb5d3b2c14a41e9902
+  metadata.gz: 84542e912bc0fa2875c4e8498dfffc18b0f1daab024ae3ff0300cd166ed301a72cef5b223ea57c4a6593b0790e165a558123cbca51d3fb1972c16632bfd9ec5c
+  data.tar.gz: c4b5ac21b98efa1c0b4ee0b42d57a18e5a86f83c41d38ab73c3b45f681a33604ccca823bf48609dcc55339777366cc026f526234ab2836d40e939c4ef9c6ecd1

data/.gitignore

@@ -26,3 +26,9 @@ doc/
 /.ruby_version/
 
 audio/audio_output.wav
+/audio/dash.wav
+/audio/audio_output.wav
+/audio/dot.wav
+/audio/e_space.wav
+/audio/space.wav
+/audio/audio_output.wav0000.mp3

data/README.md

@@ -81,7 +81,7 @@ ruby test/test_cw.rb
 wpm = 16
 
 test = CW.new
-test.comment 'test words beginning with b (repeat word)'
+test.comment 'test words beginning with "b" (repeat word)'
 test.shuffle
 test.wpm             wpm
 test.beginning_with  'b'
@@ -91,31 +91,39 @@ puts test.to_s
 test.repeat_word
 
 test = CW.new
-test.comment 'test words beginning with b (test letters)'
+test.comment 'test words ending with "ing" (test letters)'
 test.shuffle
 test.wpm             wpm
-test.beginning_with  'b'
+test.ending_with     'e'
 test.word_size        4
 test.word_count       2
 puts test.to_s
 test.test_letters
 
 test = CW.new
-test.comment 'test words beginning with b (test words)'
+test.comment 'test words including "th" (test words)'
 test.shuffle
 test.wpm             wpm
-test.beginning_with  'b'
+test.including       'th'
 test.word_size        4
 test.word_count       2
 puts test.to_s
 test.test_words
 
 test = CW.new
-test.comment 'test words beginning with b (print letters)'
+test.comment 'test words no longer than 6 letters (test letters)'
 test.shuffle
 test.wpm             wpm
-test.beginning_with  'b'
-test.word_size        4
+test.no_longer_than   6
+test.word_count       2
+puts test.to_s
+test.test_letters
+
+test = CW.new
+test.comment 'test words no shorter than 6 letters (print letters)'
+test.shuffle
+test.wpm             wpm
+test.no_shorter_than  6
 test.word_count       2
 puts test.to_s
 test.print_letters

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.1.0'
+  spec.version     = '0.2.0'
   spec.date        = '2016-05-21'
   spec.authors     = ["Martyn Jago"]
   spec.email       = ["martyn.jago@btinternet.com"]
@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   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')

data/lib/cw.rb

@@ -13,7 +13,7 @@ require_relative 'cw/words'
 require_relative 'cw/cl'
 require_relative 'cw/cw_params'
 require_relative 'cw/key_input'
-require_relative 'cw/stream'
+require_relative 'cw/cw_stream'
 require_relative 'cw/timing'
 require_relative 'cw/print'
 require_relative 'cw/audio_player'

data/lib/cw/audio_player.rb

@@ -40,7 +40,7 @@ class AudioPlayer
       Process.kill(:TERM, @pid)
       Process.wait(@pid)
     rescue
-      puts 'Error: Failed to kill pid ' + @pid
+      puts 'Error: Failed to kill pid ' + @pid.to_s
       exit 1
     end
   end

data/lib/cw/cw_encoding.rb

@@ -6,9 +6,17 @@
       encode(char)
     end
 
+    def encodings
+      @encodings ||= construct_encodings
+    end
+
+    def construct_encodings
+      @encodings = encode_a_n().merge(encode_0_2);
+      @encodings.merge!(encode_3_space)
+    end
+
     def encode char
-      e = encode_a_n().merge!(encode_0_2);
-      (e.merge(encode_3_space))[char]
+      encodings[char]
     end
 
     def encode_a_n

data/lib/cw/{stream.rb → cw_stream.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Stream
+class CwStream
 
   attr_accessor :active_region
 

data/lib/cw/tester.rb

@@ -19,7 +19,7 @@ module Tester
   def key_input            ; @key_input ||= KeyInput.new       ; end
   def is_relevant_char?    ; key_input.is_relevant_char?       ; end
   def quit_key_input?      ; key_input.quit_input?             ; end
-  def stream               ; @stream ||= Stream.new            ; end
+  def stream               ; @stream ||= CwStream.new          ; end
   def reset_stdin          ; key_input.reset_stdin             ; end
   def current_word         ; @current_word ||= CurrentWord.new ; end
   def init_char_timer      ; timing.init_char_timer            ; end

data/test/test_stream.rb

@@ -139,10 +139,10 @@ require_relative '../lib/cw/stream'
 #    end
 #  end
 
-class TestStream < MiniTest::Test
+class TestCwStream < MiniTest::Test
 
   def setup
-    @stream = Stream.new
+    @stream = CwStream.new
   end
 
   def test_assert

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cw
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Martyn Jago
@@ -14,126 +14,126 @@ dependencies:
   name: wavefile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: feedjira
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A ruby library to help learn and practice morse code
@@ -143,23 +143,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".travis.yml"
-- ".yardoc/checksums"
-- ".yardoc/object_types"
-- ".yardoc/objects/root.dat"
-- ".yardoc/proxy_types"
+- .codeclimate.yml
+- .gitignore
+- .travis.yml
+- .yardoc/checksums
+- .yardoc/object_types
+- .yardoc/objects/root.dat
+- .yardoc/proxy_types
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- audio/audio_output.wav
-- audio/audio_output.wav0000.mp3
-- audio/dash.wav
-- audio/dot.wav
-- audio/e_space.wav
-- audio/space.wav
+- audio/.gitkeep
 - cw.gemspec
 - daily.rb
 - data/text/abbreviations.txt
@@ -179,6 +174,7 @@ files:
 - 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/file_details.rb
 - lib/cw/key_input.rb
@@ -194,7 +190,6 @@ files:
 - lib/cw/speak.rb
 - lib/cw/spoken.rb
 - lib/cw/str.rb
-- lib/cw/stream.rb
 - lib/cw/test_letters.rb
 - lib/cw/test_words.rb
 - lib/cw/tester.rb
@@ -218,17 +213,17 @@ require_paths:
 - test
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: CW tutor / exerciser