cw 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9afa759907fb0e7b21040a2ded39c2f63afa1c
-  data.tar.gz: 80e9d68f993ec46c96c4ca791f8a9330b24ce110
+  metadata.gz: bb7266c839627f6135e9adf8e83b3e59f5112177
+  data.tar.gz: b0da0ee8068f18450a1fedfee2e0b0df2d3b4053
 SHA512:
-  metadata.gz: 7a46e8ee242b6b3d6e1c1dd603dd7afae2e945debdc32cd3eb9e9c5256ab4260c7690fbcbe34bd582f269444eed110977c2dc210521574fc5b3f55e1e1e0e5b4
-  data.tar.gz: f4adad501d5e1a397eceeb966a2339af495bc49c5a60565d11da97e40924c99c195336ed050d84ced79c1ae6385100f1a22c2ac60e89a69321fa289b2d0a9e53
+  metadata.gz: edadbf29105e8f07f58d899b9446bcd7e23dd0d70e9c9f455b4b93182ed21418a0dda8a813651f2461e493a2e9b4ac55240e20710de157de1582778761de16a3
+  data.tar.gz: f1ec5443a2fd3a574460318171438d77511a4450f273f44d03b8f9674c26b38b01b30dfed56dff53c84dc7a06d4cb3dc7cdfebeccfc089885727e17f6901309c

data/.cw_config

@@ -4,6 +4,9 @@ volume         = 1
 success_colour = green
 fail_colour    = red
 list_colour    = default
+tx_colour      = red
+rx_colour      = blue
+menu_colour    = default
 ebook2cw_path  = /usr/bin/ebook2cw
 run_default    = test_letters
-word_count     = 16
+word_count     = 9999

data/.gitignore

@@ -42,3 +42,5 @@ audio/audio_output.wav
 /.yardoc/
 /.yardoc/
 /.cw/
+/dev/
+/.ruby-version

data/Gemfile

@@ -1,4 +1,10 @@
 # CW Gemfile
 
 source "https://rubygems.org"
+
+require 'rbconfig'
+
+if RbConfig::CONFIG['target_os'].include?('darwin')
+  gem 'coreaudio', '~> 0.0.11'
+end
 gemspec

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/cw.gemspec

@@ -19,22 +19,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "audio", "data/text", "test"]
 
   spec.required_ruby_version = '>= 2.0.0'
-  spec.add_runtime_dependency 'feedjira', '>= 2.0.0'
+  spec.add_runtime_dependency 'oga', '~>2.7'
+  spec.add_runtime_dependency 'httpclient'
   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.2.0'
+  spec.add_runtime_dependency 'sanitize', '~> 4.4.0'
   spec.add_runtime_dependency 'wavefile', '>= 0.7.0'
   spec.add_runtime_dependency 'parseconfig', '~> 1.0.8'
+  spec.add_runtime_dependency 'rubyserial', '~> 0.4.0'
   spec.add_dependency         'os', '~> 0.9.6'
 
-# remove dependency for live version (used for reading on OSX)  spec.add_runtime_dependency 'coreaudio', '~> 0.0.11'
-
   spec.add_development_dependency 'version', '>= 1.0.0'
-  spec.add_development_dependency 'minitest',  '>= 5.8.4'
+  spec.add_development_dependency 'minitest',  '>= 5.10.1'
   spec.add_development_dependency 'simplecov', '>= 0.12.0'
   spec.add_development_dependency 'yard', '~> 0.9.5'
-  spec.add_development_dependency 'sequel', '~> 4.38.0'
+  spec.add_development_dependency 'sequel', '~> 4.42.0'
   spec.add_development_dependency 'sqlite3',  '~> 1.3.11'
 end

data/lib/cw.rb

@@ -32,14 +32,20 @@ require_relative 'cw/test_letters'
 require_relative 'cw/repeat_word'
 require_relative 'cw/reveal'
 require_relative 'cw/book'
-#require_relative 'cw/tx'
 require_relative 'cw/tone_generator'
 require_relative 'cw/progress'
 require_relative 'cw/common_words'
 require_relative 'cw/callsign'
-
 #require_relative 'cw/read.rb'
 
+require 'rbconfig'
+
+if RbConfig::CONFIG['target_os'].include?('darwin')
+  require_relative 'cw/coreaudio'
+  require_relative 'cw/tx'
+  require_relative 'cw/winkey'
+end
+
 def cw &block
   CW.new do
     instance_eval(&block)

data/lib/cw/audio_player.rb

@@ -74,7 +74,10 @@ module CWG
     def play
       cmd = play_command + ' ' + play_filename
       @pid = ! @dry_run ? Process.spawn(cmd) : cmd
-      Process.waitpid(@pid)
+      begin
+        Process.waitpid(@pid) if @pid.is_a?(Fixnum)
+      rescue Errno::ECHILD
+      end
     end
 
     def stop

data/lib/cw/config.rb

@@ -11,9 +11,9 @@ module CWG
       :book_name,:book_dir,:play_command,:size,:run_default,:word_spacing,
       :command_line,:author,:title,:quality,:ebook2cw_path,:noise,:tone,
       :word_count,:volume,:list_colour,:success_colour,:fail_colour,
-      :no_run,:run,:print_letters,:no_print,:use_ebook2cw,
-      :dictionary,:containing,:begin,:end,:including,:word_filename,:max,:min,
-      :exit, :quit
+      :tx_colour,:rx_colour,:menu_colour,:no_run,:run,:print_letters,:no_print,
+      :use_ebook2cw,:dictionary,:containing,:begin,:end,:including,
+      :word_filename,:max,:min,:exit, :quit
     ]
 
     def self.config

data/lib/cw/coreaudio.rb

@@ -0,0 +1,144 @@
+require 'coreaudio'
+
+module CWG
+
+  class Coreaudio
+
+    include ToneHelpers
+
+    def initialize
+      dev = CoreAudio.default_output_device
+      @buf = dev.output_buffer(8192)
+    end
+
+    def ramp_filter(size, count)
+      @max_amplitude = 1
+      ramp = 0.03
+      ramp_point =  @max_amplitude / ramp
+      ampl = (count < ramp_point) ? (ramp * count) : @max_amplitude
+      (count > (size - ramp_point)) ? (ramp * (size - count)) : ampl
+    end
+
+    def generate_tone(number_of_samples)
+      @sample_rate = 44100
+      @frequency = 1000
+      @w = (@frequency * TWO_PI) / @sample_rate
+      ary = []
+      number_of_samples.round.times do |sample_number|
+        amplitude = ramp_filter(number_of_samples, sample_number)
+        sine_radians = @w * sample_number
+        temp = (amplitude * Math.sin(sine_radians) * 0x7FFF).round
+        ary << temp
+      end
+      @buf << ary
+    end
+
+    def generate_silence(number_of_samples)
+      ary = []
+      number_of_samples.round.times do |sample_number|
+        ary << 0.0
+      end
+      @buf << ary
+    end
+
+    def start
+      @buf.start
+    end
+
+    def stop
+      @buf.stop
+    end
+
+#    def play_tone(wpm)
+#      #      phase = Math::PI * 2.0 * 440.0 / dev.nominal_rate
+#      th = Thread.start do
+#        #        i = 0
+#        #        loop do
+#        #        wav = NArray.sint(1024)
+##        p @buf
+#        1.times do
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm * 3)
+#
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm * 3)
+#
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm * 3)
+#
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm * 3)
+#
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm * 3)
+#
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm * 3)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm * 3)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm)
+#          generate_tone(1024 * wpm)
+#          generate_silence(1024 * wpm * 3)
+#          generate_silence(1024 * wpm * 3)
+#        end
+#      end
+#      @buf.start
+#      th.join
+#      @buf.stop
+#      puts "#{@buf.dropped_frame} frame dropped."
+#      th.kill.join
+#
+#      #     def listen words
+#      #       play_tone
+#      # #      @words = words
+#      # #      p @words
+#      # #      @cw_threads = CWThreads.new(self, thread_processes)
+#      # #      @cw_threads.run
+#      # #      reset_stdin
+#      # #      print.newline
+#      #     end
+#      #
+#      #   end
+#
+#    end
+  end
+end

data/lib/cw/cw_dsl.rb

@@ -51,13 +51,10 @@ module CWG
       test_letters.run @words
     end
 
-    #todo
-    #    def tx
-    #      @words.add ["abc"]
-    #      Cfg.config.params["no_run"] = true
-    #      tx = Tx.new
-    #      tx.listen @words
-    #    end
+    def tx str
+      Cfg.config.params["no_run"] = true
+      Tx.new.tx(str)
+    end
 
     # Test user against complete words rather than letters.
     #
@@ -126,7 +123,6 @@ module CWG
 
     def read_rss(source, article_count = 3)
       rss, = Rss.new
-
       # don't go online if CW_ENV == test
       if(ENV["CW_ENV"] == "test")
         @words.assign ['test', 'rss', 'stub']
@@ -136,6 +132,9 @@ module CWG
       loop do
         article = rss.next_article
         return unless article
+        Cfg.config.params["no_run"] = false
+        Cfg.config.params["exit"] = false
+        Cfg.config.params["quit"] = false
         @words.assign article
         run
       end
@@ -290,12 +289,12 @@ module CWG
     def letters_numbers        ;      @words.letters_numbers    ; end
     def load_codes             ; load_text Q_CODES              ; end
     def alpha                  ; 'a'.upto('z').collect{|ch| ch} ; end
-    def vowels                 ; ['a','e','i','o','u']          ; end
-    def dot_letters            ; ['e','i','s','h']              ; end
-    def dash_letters           ; ['t','m','o']                  ; end
+    def vowels                 ; %w(a e i o u)                  ; end
+    def dot_letters            ; %w(e i s h)                    ; end
+    def dash_letters           ; %w(t m o)                      ; end
     def load_vowels            ; @words.assign vowels           ; end
     def load_consonants        ; @words.assign alpha - vowels   ; end
-    def numbers                ; '0'.upto('9').collect{|ch| ch} ; end
+    def numbers                ; '0'.upto('9').collect          ; end
     def load_numbers           ; @words.assign numbers          ; end
     def load_dots              ; load_letters(dot_letters)      ; end
     def load_dashes            ; load_letters(dash_letters)     ; end
@@ -304,6 +303,7 @@ module CWG
 
     alias_method :ewpm,                  :effective_wpm
     alias_method :comment,               :name
+    alias_method :read_feed,             :read_rss
     alias_method :word_length,           :word_size
     alias_method :load_letters,          :load_alphabet
     alias_method :word_shuffle,          :shuffle

data/lib/cw/cw_threads.rb

@@ -7,45 +7,74 @@ module CWG
     attr_reader :threads
 
     def initialize context, processes
+      Thread.abort_on_exception = true
       @context = context
       @processes = processes
+      @threads = []
     end
 
     def start_threads
-      @threads = @processes.collect do |th|
-        {:thread =>
-         Thread.new do
-           @context.send th
-         end,
-         :name => th
-        }
+      @processes.collect do |th|
+        @threads << start_thread(@context, th)
+      end
+    end
+
+    def start_thread context, th
+      {
+        :thread => Thread.new do
+          context.send th
+        end,
+        :name => th
+      }
+    end
+
+    def kill_thread thread
+      thread[:thread].kill
+    end
+
+    def kill_thread_x x
+      @threads.each_with_index do |th,idx|
+        if th[:name] == x
+          kill_thread th
+          @threads.delete_at idx
+        end
       end
     end
 
+    def join x
+      @threads.each do |th|
+        if th[:name] == x
+          th[:thread].join
+        end
+      end
+    end
+
+    def add context, th
+      @threads << start_thread(context, th)
+    end
+
     def monitor_threads
       exiting = false
       loop do
         sleep 0.5
-        @threads.each do |th|
-          if thread_false_or_nil?(th)
-            exiting = true
-            unless Cfg.config["exit"]
-#              puts "** #{th[:name].to_s.gsub('_',' ')} quit unexpectedly!**"
-              if th[:thread].backtrace
-                STDERR.puts th[:thread].backtrace.join("\n    \\_ ")
-              end
-            end
-          end
-        end
+#        @threads.each do |th|
+#          if thread_false_or_nil?(th)
+##todo            exiting = true
+#            unless Cfg.config["exit"]
+##              puts "** #{th[:name].to_s.gsub('_',' ')} quit unexpectedly!**"
+#              if th[:thread].backtrace
+#                STDERR.puts th[:thread].backtrace.join("\n    \\_ ")
+#              end
+#            end
+#          end
         # print_threads_status
         exiting = true if(Cfg.config["exit"])
         break if exiting
       end
-      close_threads if exiting
-    end
-
-    def kill_thread thread
-      thread[:thread].kill
+      @threads.each do |th|
+        th[:thread].kill.join
+      end
+      #close_threads if exiting
     end
 
     def kill_open_threads
@@ -91,7 +120,7 @@ module CWG
       @threads.each do |thread|
         puts "\r"
         print "#{thread[:name]} = "
-        p thread[:thread].status
+        #        p thread[:thread].status
       end
     end
 
@@ -139,6 +168,7 @@ module CWG
       start_threads
       monitor_threads
       system("stty -raw echo")
+      puts "\r"
     end
 
   end

data/lib/cw/key_input.rb

@@ -17,25 +17,32 @@ module CWG
       begin
         system("stty raw -echo")
         @chr = STDIN.getc
+#        @chr = @chr.downcase unless(@chr.include? 'Q')
+        #        puts "@chr = #{@chr}"
+        @chr
       ensure
         system("stty raw -echo")
       end
     end
 
-    def is_letter?
-      @chr >= 'a' && @chr <= 'z'
+    def is_letter? char = nil
+      char = char ? char : @chr
+      char >= 'a' && char <= 'z'
     end
 
-    def is_number?
-      @chr >= '0' && @chr <= '9'
+    def is_number? char = nil
+      char = char ? char : @chr
+      char >= '0' && char <= '9'
     end
 
-    def is_punctuation?
-      [' ', ',', '.', '=', '?'].detect{|letr| letr == @chr}
+    def is_punctuation? char = nil
+      char = char ? char : @chr
+      [' ', ',', '.', '=', '?','/','+'].detect{|letr| letr == char}
     end
 
-    def is_relevant_char?
-      is_letter? || is_number? || is_punctuation? ? true : false
+    def is_relevant_char? char = nil
+      char = char ? char : @chr
+      is_letter?(char) || is_number?(char) || is_punctuation?(char) ? true : false
     end
 
     def reset_stdin