cw 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f32cecabf34fb0f987f2c33b7678f5d1de000655
-  data.tar.gz: 38ea73121579a8b0e194021e8997b191939e3bc8
+SHA256:
+  metadata.gz: 2607a56ec12dd2d8582bdf6848e6d43fca1559aab5b903a5ba7eddc716f8f164
+  data.tar.gz: 2420c8070826ac4d596885155c27b74f7bcf0e014f755ec270d0e02f91acc39b
 SHA512:
-  metadata.gz: 3a9c6b660fba1f14a7429d73879cef6cc28790ecb8136576d580e3ad388a35cfdd12d4f8fdcee7d67b0b5427bc0a290db942359d73fa73faec06f2cc119cc2d3
-  data.tar.gz: a0bd05411135bfdbb77dd51091445bf5d3e556c1f05a7afbe5bc60787ec8c2c276e487ec3bd60807a8f4b89b3853f25ae631de76648498f45d05e3aa8c1c3478
+  metadata.gz: 6081dd5de93a4706294f5fb09cbe2dc4ae2384e3ab3daebcfc26ed7de560e803b5bace946209aac1c47dd347887416e6c0c14e943064c0a3d0f98818523add2f
+  data.tar.gz: 658106773af6d4f17e73174f625cdbec1839d5b09bf5c1f88f455f42f83818f51f0cfefbd4cd6afcfe7a21a1a8a3b3d9d3010456a690ddd7b75ea778689232e3

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - "2.0.0"
-  - "2.1.0"
-  - "2.2.3"
+  - "2.2.8"
+  - "2.3.5"
+  - "2.4.2"
 script:
   - rake test

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/cw.gemspec

@@ -18,23 +18,23 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib", "audio", "data/text", "test"]
 
-  spec.required_ruby_version = '>= 2.0.0'
-  spec.add_runtime_dependency 'oga', '~> 2.8'
-  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 'wavefile', '>= 0.7.0'
+  spec.required_ruby_version = '>= 2.2.8'
+  spec.add_runtime_dependency 'oga', '~> 2.11'
+  spec.add_runtime_dependency 'httpclient', '~> 2.8.3'
+  spec.add_runtime_dependency 'htmlentities', '~> 4.3.4'
+  spec.add_runtime_dependency 'paint', '~> 2.0.1'
+  spec.add_runtime_dependency 'rake', '~> 12.3.0'
+  spec.add_runtime_dependency 'ruby-progressbar'
+  spec.add_runtime_dependency 'wavefile', '~> 0.8.1'
   spec.add_runtime_dependency 'parseconfig', '~> 1.0.8'
   spec.add_runtime_dependency 'rubyserial', '~> 0.4.0'
 
-  spec.add_dependency         'os', '~> 0.9.6'
+  spec.add_dependency         'os', '~> 1.0.0'
 
-  spec.add_development_dependency 'version', '>= 1.0.0'
-  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.42.0'
-  spec.add_development_dependency 'sqlite3',  '~> 1.3.11'
+  spec.add_development_dependency 'version', '~> 1.1.1'
+  spec.add_development_dependency 'minitest',  '~> 5.10.3'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
+  spec.add_development_dependency 'yard', '~> 0.9.11'
+  spec.add_development_dependency 'sequel', '~> 5.2.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.13'
 end

data/lib/cw.rb

@@ -8,8 +8,8 @@ require_relative 'cw/text_helpers'
 require_relative 'cw/tone_helpers'
 require_relative 'cw/element'
 require_relative 'cw/current_word'
-require_relative 'cw/cw_encoding'
-require_relative 'cw/cw_dsl'
+require_relative 'cw/encoding'
+require_relative 'cw/dsl'
 require_relative 'cw/randomize'
 require_relative 'cw/sentence'
 require_relative 'cw/alphabet'
@@ -20,11 +20,11 @@ require_relative 'cw/rss_clean'
 require_relative 'cw/words'
 require_relative 'cw/cl'
 require_relative 'cw/key_input'
-require_relative 'cw/cw_stream'
+require_relative 'cw/stream'
 require_relative 'cw/timing'
 require_relative 'cw/print'
 require_relative 'cw/audio_player'
-require_relative 'cw/cw_threads'
+require_relative 'cw/threads'
 require_relative 'cw/book_details'
 require_relative 'cw/tester'
 require_relative 'cw/play'
@@ -48,17 +48,17 @@ if RbConfig::CONFIG['target_os'].include?('darwin')
 end
 
 def cw &block
-  CW.new do
+  Core.new do
     instance_eval(&block)
   end
 end
 
-# CW provides Morse code generation functionality
-# Inherits CwDsl
+# Core provides Morse code generation functionality
+# Inherits Dsl
 
-class CW < CWG::CwDsl
+class Core < CW::Dsl
 
-  # Initialize CW class. Eval block if passed in.
+  # Initialize Core class. Eval block if passed in.
 
   def initialize(&block)
     super

data/lib/cw/alphabet.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Alphabet provides alphabet generation functionality
 

data/lib/cw/audio_player.rb

@@ -3,12 +3,12 @@
 require 'timeout'
 require 'os'
 
-module CWG
+module CW
 
   class AudioPlayer
 
     include FileDetails
-    include CWG::OStest
+    include CW::OStest
 
     def tone
       @tone ||= ToneGenerator.new
@@ -75,7 +75,7 @@ module CWG
       cmd = play_command + ' ' + play_filename
       @pid = ! @dry_run ? Process.spawn(cmd) : cmd
       begin
-        Process.waitpid(@pid) if @pid.is_a?(Fixnum)
+        Process.waitpid(@pid) if @pid.is_a?(1.class)
       rescue Errno::ECHILD
       end
     end

data/lib/cw/book.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   class Book < Tester
 

data/lib/cw/book_details.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   class BookDetails
 
@@ -49,7 +49,7 @@ module CWG
     end
 
     def sentences_complete?
-      if @args.has_key?(:sentences) &&  @args[:sentences].is_a?(Fixnum)
+      if @args.has_key?(:sentences) &&  @args[:sentences].is_a?(1.class)
         if @sentence_count_source
           @sentence_count_source = nil
         else

data/lib/cw/callsign.rb

@@ -1,5 +1,4 @@
-module CWG
-
+module CW
   class Callsign
 
     include FileDetails

data/lib/cw/cl.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Cl performs command-line processing
 
@@ -82,7 +82,7 @@ module CWG
 
     def cl_quality
       quality = Cfg.config["quality"]
-      if quality && quality.class == Fixnum
+      if quality && quality.class == 1.class
         "-q #{quality} "
       else
         coarse_quality quality

data/lib/cw/common_words.rb

@@ -1,4 +1,4 @@
-module CWG
+module CW
 
   class CommonWords
 
@@ -66,7 +66,7 @@ module CWG
     def parse_quantity(quantity = :default)
       if quantity == :default
         return [0, 999]
-      elsif quantity.class == Fixnum
+      elsif quantity.class == 1.class
         [0, quantity - 1]
         (0...quantity).collect {|q| q}
       elsif quantity.class == Range

data/lib/cw/config.rb

@@ -1,10 +1,10 @@
 require 'parseconfig.rb'
 
-module CWG
+module CW
 
   module Cfg
 
-    include CWG::FileDetails
+    include CW::FileDetails
 
     CONFIG_METHODS = [
       :name,:wpm,:effective_wpm,:frequency,:audio_filename,:audio_dir,

data/lib/cw/coreaudio.rb

@@ -1,6 +1,6 @@
 require 'coreaudio'
 
-module CWG
+module CW
 
   class Coreaudio
 
@@ -131,7 +131,7 @@ module CWG
 #      #       play_tone
 #      # #      @words = words
 #      # #      p @words
-#      # #      @cw_threads = CWThreads.new(self, thread_processes)
+#      # #      @cw_threads = Threads.new(self, thread_processes)
 #      # #      @cw_threads.run
 #      # #      reset_stdin
 #      # #      print.newline

data/lib/cw/current_word.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   class CurrentWord
 

data/lib/cw/{cw_dsl.rb → dsl.rb}

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
-# class Cw_dsl provides CW's commands
+# class Dsl provides CW's commands
 
-module CWG
+module CW
 
-  class CwDsl
+  class Dsl
 
-    include CWG::Cfg
-    include CWG::FileDetails
+    include CW::Cfg
+    include CW::FileDetails
     [:wpm, :effective_wpm, :frequency, :audio_filename,:audio_dir,
      :book_name, :book_dir, :play_command, :run_default, :command_line,
      :author, :title, :quality, :ebook2cw_path, :list_colour, :list_colour,
@@ -208,7 +208,7 @@ module CWG
     end
 
     def cw_element_match arg
-      encs = CWG::CwEncoding.new
+      encs = CW::Encoding.new
       encs.match_elements arg
     end
 
@@ -286,7 +286,7 @@ module CWG
     def load_abbreviations     ; load_text ABBREVIATIONS        ; end
     def reverse                ;  @words.reverse                ; end
     def double_words           ; @words.double_words            ; end
-    def letters_numbers        ;      @words.letters_numbers    ; end
+    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                 ; %w(a e i o u)                  ; end
@@ -294,7 +294,7 @@ module CWG
     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          ; end
+    def numbers                ; %w(0 1 2 3 4 5 6 7 8 9)        ; end
     def load_numbers           ; @words.assign numbers          ; end
     def load_dots              ; load_letters(dot_letters)      ; end
     def load_dashes            ; load_letters(dash_letters)     ; end

data/lib/cw/element.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   module Element
 
     def element type

data/lib/cw/{cw_encoding.rb → encoding.rb}

@@ -1,8 +1,7 @@
 # encoding: utf-8
 
-module CWG
-
-  class CwEncoding
+module CW
+  class Encoding
 
     include FileDetails
 

data/lib/cw/file_details.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   module FileDetails
     HERE          = File.dirname(__FILE__)
     WORK_DIR      = Dir.pwd

data/lib/cw/key_input.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class KeyInput
 
     def initialize

data/lib/cw/numbers.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Numbers provides the Number Testing functionality
 

data/lib/cw/os.rb

@@ -1,6 +1,6 @@
 require 'os'
 
-module CWG
+module CW
   module OStest
     def is_mac?
       OS.mac?

data/lib/cw/play.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class Play
 
     def initialize words

data/lib/cw/print.rb

@@ -3,8 +3,7 @@
 require 'paint'
 require 'io/console'
 
-module CWG
-
+module CW
   class Print
 
     class ProgressPrint

data/lib/cw/progress.rb

@@ -2,8 +2,7 @@
 
 require 'ruby-progressbar'
 
-module CWG
-
+module CW
   class Progress
 
     def initialize(title)
@@ -24,7 +23,5 @@ module CWG
     def increment
       @progress.increment
     end
-
   end
-
 end

data/lib/cw/randomize.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Randomize provides character randomising
 
@@ -71,7 +71,5 @@ module CWG
       end
       @words
     end
-
   end
-
 end

data/lib/cw/read.rb

@@ -3,7 +3,7 @@
 #require 'wavefile'
 require 'coreaudio'
 
-module CWG
+module CW
 
   SAMPLE_RATE = 44100
   MAGNITUDE_CUTOFF = 50000 #  200000
@@ -47,7 +47,7 @@ module CWG
       @high = Array.new(3)
       @low = Array.new(2)
       @queue = Queue.new
-      @cw_encoding = CwEncoding.new
+      @cw_encoding = Encoding.new
       @print = Print.new
       @state[START] = 0
       @state[VALUE] = :low

data/lib/cw/repeat_word.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class RepeatWord < Tester
 
     #overloaded #todo
@@ -59,7 +58,7 @@ module CWG
     end
 
     def threads
-      threads ||= CWThreads.new(self, thread_processes)
+      threads ||= Threads.new(self, thread_processes)
     end
 
     def run words