cw 0.3.0 → 0.3.1

data/lib/cw/tone_generator.rb

@@ -23,6 +23,7 @@ module CWG
     end
 
     def generate wrds
+
       word_parts(wrds)
       #    progress.init elements.size * 3 + (wrds.size)
       create_element_methods
@@ -31,7 +32,7 @@ module CWG
     end
 
     def play_filename
-      File.join(AUDIO,Cfg.config["audio_filename"])
+      @play_filename ||= File.join(audio_dir, audio_filename)
     end
 
     def play
@@ -49,16 +50,16 @@ module CWG
 
     def data
       { :dot => {:name => :dot,
-                 :filename => DOT_FILENAME,
+                 :filename => dot_path,
                  :spb => (@sample_rate * 1.2 / @wpm).to_i },
         :dash  => {:name => :dash,
-                   :filename => DASH_FILENAME,
+                   :filename => dash_path,
                    :spb => (@sample_rate * 3.6 / @wpm).to_i },
         :space => {:name => :space,
-                   :filename   => SPACE_FILENAME   ,
+                   :filename   => space_path,
                    :spb => (@sample_rate * 1.2 / @wpm).to_i },
         :e_space => {:name => :e_space,
-                     :filename => E_SPACE_FILENAME ,
+                     :filename => e_space_path,
                      :spb => (@sample_rate * 1.2 / @effective_wpm).to_i }}
     end
 
@@ -105,7 +106,6 @@ module CWG
 
     def create_element_methods
       elements.each do |ele|
-        #      progress.increment
         create_element_method ele
       end
     end
@@ -117,7 +117,6 @@ module CWG
 
     def compile_fundamentals
       elements.each do |ele|
-        #      progress.increment
         audio_samples = generate_samples ele
         buffer = generate_buffer(audio_samples, ele)
         write_element_audio_file ele, buffer
@@ -154,11 +153,9 @@ module CWG
       @word_parts
     end
 
-
     def make_word_parts
       parts = []
       @word_parts.each do |part|
-        #      progress.increment
         parts += send_char part.downcase
       end
       parts
@@ -167,7 +164,6 @@ module CWG
     def prepare_buffers
       @buffers = {}
       elements.each do |ele|
-        #      progress.increment
         @buffers[ele] = []
         WaveFile::Reader.new(data[ele][:filename]).
           each_buffer(data[ele][:spb]) do |buffer|
@@ -201,7 +197,6 @@ module CWG
                   :pcm_16,
                   @sample_rate)) do |writer|
         yield.each do |char|
-          #        progress.increment
           char.each do |fta|
             writer.write(@buffers[fta[:name]])
           end

data/lib/cw/words.rb

@@ -89,7 +89,7 @@ module CWG
     end
 
     def count word_count
-      @words = @words.take(word_count)
+      @words = @words.take(word_count.to_i)
     end
 
     def including_letter(letr)

data/run_script_tests.rb

@@ -8,7 +8,7 @@ class RunScriptTests
   NO_RSS_FEED = DEBUG ? true : false
   PATH_TO_CW_SCRIPTS = '/Users/martyn/jekyll/documentation-theme-jekyll/cw_scripts'
   ROOT = '/Users/martyn/cw/cw_clone'
-  PROGRESS_FILE = "data/text/progress.txt"
+  PROGRESS_FILE = ".cw/bookmark.txt"
   DB = Sequel.sqlite(File.join(ROOT, 'test.sqlite'))  unless(TEST_ON_MEMORY_DATABASE)
   DB = Sequel.sqlite if(TEST_ON_MEMORY_DATABASE)
 

data/test/test_config.rb

@@ -35,18 +35,6 @@ class TestConfig < MiniTest::Test
     assert_equal "25", CWG::Cfg.config["wpm"]
   end
 
-  def test_book_name_default
-    assert_equal "book.txt", CWG::Cfg.config["book_name"]
-  end
-
-  def test_book_dir_default
-    assert_equal "data/text/", CWG::Cfg.config["book_dir"]
-  end
-
-#  def test_play_command_default
-#    assert_equal "/usr/bin/afplay", CWG::Cfg.config["play_command"]
-#  end
-
   def test_success_colour_default
     assert_equal "green", CWG::Cfg.config["success_colour"]
   end
@@ -67,14 +55,6 @@ class TestConfig < MiniTest::Test
     assert_equal "test_letters", CWG::Cfg.config["run_default"]
   end
 
-  def test_dictionary_dir_default
-    assert_equal "data/text/", CWG::Cfg.config["dictionary_dir"]
-  end
-
-  def test_dictionary_name_default
-    assert_equal "english.txt", CWG::Cfg.config["dictionary_name"]
-  end
-
   def test_accessing_unknown_method_returns_nil
     refute CWG::Cfg.config["unknown"]
   end

data/test/test_cw.rb

@@ -408,18 +408,18 @@ Ending:     x
 
   def test_set_N_param_in_noise_mode
     @cw.noise
-    assert @cw.instance_variable_get('@cl').cl_noise.include?('-N 5 '), 'noise N param invalid'
+    assert @cw.instance_variable_get('@cl').cl_noise.include?('-N 10 '), 'noise N param invalid'
   end
 
   def test_set_B_param_in_noise_mode
     @cw.noise
-    assert @cw.instance_variable_get('@cl').cl_noise.include?('-B 1000 '), 'noise B param invalid'
+    assert @cw.instance_variable_get('@cl').cl_noise.include?('-B 800 '), 'noise B param invalid'
   end
 
-  def test_set_default_filename
-    assert @cw.instance_variable_get('@cl').cl_audio_filename.
-      include?('audio_output'), 'default audio output filename invalid'
-  end
+#  def test_set_default_filename
+#    assert @cw.instance_variable_get('@cl').cl_audio_filename.
+#      include?('audio_output'), 'default audio output filename invalid'
+#  end
 
   def test_set_audio_filename_to_given_name
     @cw.audio_filename('some name')
@@ -457,14 +457,14 @@ Ending:     x
       include?( '-x "some custom command"'), 'custom command invalid'
   end
 
-  def test_cl_echo_returns_correct_string
-    str = ''
-    CW.new do
-      str = @cl.cl_echo('some words')
-      no_run
-    end
-    assert str.include?('some words')
-  end
+#  def test_cl_echo_returns_correct_string
+#    str = ''
+#    CW.new do
+#      str = @cl.cl_echo('some words')
+#      no_run
+#    end
+#    assert str.include?('some words')
+#  end
 
   def test_words_exist
     temp = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cw
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Martyn Jago
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: wavefile
   requirement: !ruby/object:Gem::Requirement
@@ -196,30 +196,30 @@ dependencies:
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.38.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
 description: A ruby library to help learn and practice morse code
 email:
 - martyn.jago@btinternet.com
@@ -241,7 +241,14 @@ files:
 - Vagrantfile
 - audio/.gitkeep
 - bin/cw
+- calculator.rb
+- chart.rb
+- chart2.rb
+- chart3.rb
+- chart4.rb
 - cw.gemspec
+- data/callsign/callsign.yaml
+- data/code/code.yaml
 - data/text/abbreviations.txt
 - data/text/book.txt
 - data/text/book_to_read.txt
@@ -256,6 +263,7 @@ files:
 - lib/cw/audio_player.rb
 - lib/cw/book.rb
 - lib/cw/book_details.rb
+- lib/cw/callsign.rb
 - lib/cw/cl.rb
 - lib/cw/common_words.rb
 - lib/cw/config.rb
@@ -274,6 +282,7 @@ files:
 - lib/cw/process.rb
 - lib/cw/progress.rb
 - lib/cw/randomize.rb
+- lib/cw/read.rb
 - lib/cw/repeat_word.rb
 - lib/cw/reveal.rb
 - lib/cw/rss.rb