cw 0.3.0 → 0.3.1

data/example.rb

@@ -198,6 +198,24 @@ cw do
   word_count 4
 end
 
+cw do
+  comment "test 5 callsigns"
+  wpm 20
+  callsign * 5
+end
+
+puts "cq de callsign k 5 times"
+5.times do
+  cw do
+    comment 'random frequency, random wpm callsign with pre and postamble'
+    frequency 500 + rand(400)
+    wpm 25 + rand(10)
+    callsign
+    (words.unshift "cqde") << 'k'
+    print_letters
+  end
+end
+
 # See documentation for more details - and more commands.
 
 puts 'done'

data/lib/cw.rb

@@ -36,6 +36,9 @@ require_relative 'cw/book'
 require_relative 'cw/tone_generator'
 require_relative 'cw/progress'
 require_relative 'cw/common_words'
+require_relative 'cw/callsign'
+
+#require_relative 'cw/read.rb'
 
 def cw &block
   CW.new do

data/lib/cw/alphabet.rb

@@ -19,19 +19,29 @@ module CWG
       @options = options
     end
 
-    # return string containing alphabet
+    # alphabet()
+    # Returns alphabet as string
+    # == Parameters:
+    # none
 
     def alphabet
       'abcdefghijklmnopqrstuvwxyz'
     end
 
-    # reverse alphabet if :reverse option defined
+    # reverse_alphabet_maybe()
+    # reverse letters if reverse option set
+    # == Parameters:
+    # none
 
     def reverse_alphabet_maybe
       @letters.reverse! if @options[:reverse]
     end
 
+    # shuffle_alphabet_maybe()
     # shuffle alphabet if :shuffle option defined
+    # don't shuffle if in test environment
+    # == Parameters:
+    # none
 
     def shuffle_alphabet_maybe
       unless(ENV["CW_ENV"] == "test")
@@ -39,7 +49,10 @@ module CWG
       end
     end
 
-    # include letters passed in as string if :include defined
+    # include_letters()
+    # include letters if :include option defined
+    # == Parameters:
+    # none
 
     def include_letters
       if @options[:include]
@@ -47,7 +60,10 @@ module CWG
       end
     end
 
-    # exclude letters passed in as string if :exclude defined
+    # exclude_letters()
+    # exclude letters if :exclude option defined
+    # == Parameters:
+    # none
 
     def exclude_letters
       if @options[:exclude]
@@ -55,6 +71,7 @@ module CWG
       end
     end
 
+    # generate()
     # generate alphabet with options acted upon
     # == Returns:
     # alphabet or filtered alphabet
@@ -67,7 +84,5 @@ module CWG
       reverse_alphabet_maybe
       @letters.split('').join(' ')
     end
-
   end
-
 end

data/lib/cw/audio_player.rb

@@ -7,6 +7,7 @@ module CWG
 
   class AudioPlayer
 
+    include FileDetails
     include CWG::OStest
 
     def tone
@@ -33,11 +34,9 @@ module CWG
     end
 
     def play_filename_for_ebook2cw
-      @play_filename ||= File.expand_path(Cfg.config["audio_filename"], audio_dir)
-    end
-
-    def audio_dir
-      Cfg.config["audio_dir"]
+      @play_filename ||= File.join(audio_dir, audio_filename)
+      puts "@play_filename = #{@play_filename}"
+      @play_filename
     end
 
     def temp_filename_for_ebook2cw
@@ -55,7 +54,6 @@ module CWG
       File.rename(play_filename_for_ebook2cw + '0000.mp3', play_filename_for_ebook2cw)
     end
 
-    #FIXME dry_run
     def convert_words_with_ebook2cw words
       words = words.delete("\n")
       cl = Cl.new.cl_echo(words)
@@ -64,7 +62,7 @@ module CWG
     end
 
     def convert_words words
-      tone.generate words unless Cfg.config["use_ebook2cw"]
+      tone.generate words if Cfg.config["use_ebook2cw"].nil?
       convert_words_with_ebook2cw words if Cfg.config["use_ebook2cw"]
     end
 
@@ -73,7 +71,6 @@ module CWG
       tone.play_filename
     end
 
-    #FIXME dry_run
     def play
       cmd = play_command + ' ' + play_filename
       @pid = ! @dry_run ? Process.spawn(cmd) : cmd

data/lib/cw/book.rb

@@ -43,10 +43,6 @@ module CWG
       sentence.check_sentence_navigation chr
     end
 
-    def progress_file
-      File.expand_path(@progress_file, @text_folder)
-    end
-
     def get_book_progress
       sentence.read_progress progress_file
       @current_sentence_index = sentence.index

data/lib/cw/book_details.rb

@@ -8,21 +8,32 @@ module CWG
 
     include FileDetails
 
-    def initialize
-      book_directory
-      book_name
-    end
+    BOOK_NAME = "book.txt"
+    BOOK_DIR = TEXT
+    USER_BOOK_DEFAULT_DIR = "books"
 
     def book_name
-      Cfg.config["book_name"]
+      @book_name ||=
+        Cfg.config["book_name"] ?
+          Cfg.config["book_name"] :
+          BOOK_NAME
+    end
+
+    def is_user_book_default_dir?
+      File.exists? USER_BOOK_DEFAULT_DIR
     end
 
-    def book_directory
-      File.join ROOT, Cfg.config["book_dir"]
+    def book_dir
+      @book_dir ||=
+        Cfg.config["book_dir"] ?
+          File.join(WORK_DIR, Cfg.config["book_dir"]) :
+          is_user_book_default_dir? ?
+            USER_BOOK_DEFAULT_DIR :
+            BOOK_DIR
     end
 
     def book_location
-      File.expand_path(book_name, book_directory)
+      File.expand_path(book_name, book_dir)
     end
 
     def arguments args

data/lib/cw/callsign.rb

@@ -0,0 +1,59 @@
+module CWG
+
+  class Callsign
+
+    include FileDetails
+
+    def callsigns
+      if @callsigns.nil?
+        @callsigns = load_callsigns
+      end
+      @callsigns
+    end
+
+    def load_callsigns
+      File.open(CALLS_FILENAME, "r") do |calls|
+        YAML::load(calls)
+      end
+    end
+
+
+    def rand_val
+      rand(100)
+    end
+
+    def select_part country = :uk, partial
+      pc = rand_val
+      weight = callsigns[country][partial][:weight]
+      tot_wt = 0
+      weight.each_with_index do |wt, idx|
+        tot_wt += wt
+        if pc < tot_wt
+          part = callsigns[country][partial][:option][idx]
+          return part unless(part.class == Range)
+          return part.to_a.sample
+        end
+      end
+    end
+
+    def partial_name count
+      "partial_#{count}".to_sym
+    end
+
+    def construct
+      call = ''
+      0.upto(4) do |count|
+        call << select_part(partial_name(count))
+      end
+      call.strip
+    end
+
+    def * number
+      calls = []
+      number.times do
+        calls << construct
+      end
+      calls
+    end
+  end
+end

data/lib/cw/cl.rb

@@ -6,6 +6,8 @@ module CWG
 
   class Cl
 
+    include FileDetails
+
     def initialize
       @tone = {
         sinewave: 0,
@@ -34,22 +36,21 @@ module CWG
       freq ? "-f #{freq} " : ''
     end
 
+    def wave type
+      return '' unless(Cfg.config["tone"].to_s == type)
+      "-T #{@tone[type.to_sym]} "
+    end
+
     def cl_squarewave
-      "Cfg.config[\"tone\"] = #{Cfg.config["tone"]}"
-      return '' unless Cfg.config["tone"].to_s == "squarewave"
-      "-T #{@tone[:squarewave]} "
+      wave 'squarewave'
     end
 
     def cl_sawtooth
-      "Cfg.config[\"tone\"] = #{Cfg.config["tone"]}"
-      return '' unless Cfg.config["tone"].to_s == "sawtooth"
-      "-T #{@tone[:sawtooth]} "
+      wave "sawtooth"
     end
 
     def cl_sinewave
-      "Cfg.config[\"tone\"] = #{Cfg.config["tone"]}"
-      return '' unless Cfg.config["tone"].to_s == "sinewave"
-      "-T #{@tone[:sinewave]} "
+      wave "sinewave"
     end
 
     def cl_author
@@ -64,11 +65,11 @@ module CWG
 
     def cl_noise
       Cfg.config["noise"] ?
-        "-N 5 -B 1000 " : ''
+        "-N 10 -B 800 " : ''
     end
 
     def cl_audio_filename
-      "-o \"#{File.expand_path(Cfg.config["audio_filename"], Cfg.config["audio_dir"])}\" "
+      "-o \"#{File.join(audio_dir, audio_filename)}\" "
     end
 
     def coarse_quality(quality)

data/lib/cw/common_words.rb

@@ -8,8 +8,31 @@ module CWG
       @words = []
     end
 
+    def custom_dict_dir
+      File.join(WORK_DIR, Cfg.config["dictionary_dir"])
+    end
+
+    def dictionary_dir
+      @dictionary_dir ||=
+        Cfg.config["dictionary_dir"] ?
+          custom_dict_dir :
+          DICT_DIR
+    end
+
+    def dict_filename
+      @dict_filename ||=
+        Cfg.config["dictionary_name"] ?
+          Cfg.config["dictionary_name"] :
+          DICT_FILENAME
+    end
+
+    def dictionary
+      @dictionary ||=
+        File.join(dictionary_dir, dict_filename)
+    end
+
     def all
-      File.foreach(ENGLISH_DICT).collect do |line|
+      File.foreach(dictionary).collect do |line|
       line.chomp
       end
     end
@@ -17,7 +40,7 @@ module CWG
     def low last
       results = []
       count = 0
-      File.foreach(ENGLISH_DICT).collect do |line|
+      File.foreach(dictionary).collect do |line|
         if count <= last
           results << line.chomp
         end
@@ -30,7 +53,7 @@ module CWG
     def mid first, last
       results = []
       count = 0
-      File.foreach(ENGLISH_DICT).collect do |line|
+      File.foreach(dictionary).collect do |line|
         if (count >= first) && (count <= last)
           results << line.chomp
         end

data/lib/cw/config.rb

@@ -18,18 +18,29 @@ module CWG
 
     def self.config
       unless @config
-        @config = ParseConfig.new(CONFIG_FILENAME)
+        @config = ParseConfig.new(CONFIG_PATH)
         CONFIG_METHODS.each do |method|
           unless @config[method.to_s]
             @config.add method.to_s, nil
           end
         end
+        self.user_config
+        @config.params["wpm"] = 50 if(ENV["CW_ENV"] == "test")
+        @config.params["effective_wpm"] = 50 if(ENV["CW_ENV"] == "test")
+#        puts " @config[wpm] = #{@config['wpm']}"
       end
-      @config.params["wpm"] = 50 if(ENV["CW_ENV"] == "test")
-      @config.params["effective_wpm"] = 50 if(ENV["CW_ENV"] == "test")
+#      puts "@config = #{@config.params}"
       @config
     end
 
+    def self.user_config
+      user_cfg = File.join(WORK_DIR, CONFIG_FILENAME)
+      if File.exist? user_cfg
+        temp = ParseConfig.new(user_cfg);
+        @config.params = @config.params.merge(temp.params)
+      end
+    end
+
     def self.reset
       @config = nil
     end

data/lib/cw/cw_dsl.rb

@@ -148,6 +148,7 @@ module CWG
     def word_count(wordcount)
       Cfg.config.params["word_count"] = wordcount
       @words.count wordcount
+      Cfg.config.params["words_counted"] = true
     end
 
     def beginning_with(* letters)
@@ -247,6 +248,7 @@ module CWG
 
     def run
       return if Cfg.config["no_run"]
+      word_count(Cfg.config["word_count"])unless Cfg.config.params["words_counted"]
       self.send run_default
     end
 
@@ -270,6 +272,15 @@ module CWG
       Cfg.config.params["use_ebook2cw"] = nil
     end
 
+    def callsign count = 1
+      callsign = Callsign.new
+      @words.assign callsign.* count
+    end
+
+    def read filename = :default
+      Read.new(filename)
+    end
+
     def words                  ; @words.all                     ; end
     def load_common_words      ; @words.load 1000               ; end
     def load_most_common_words ; @words.load 500                ; end

data/lib/cw/cw_encoding.rb

@@ -4,71 +4,67 @@ module CWG
 
   class CwEncoding
 
-    ENCODINGS = {
-      'a' => [:dot, :dash],
-      'b' => [:dash, :dot, :dot, :dot],
-      'c' => [:dash, :dot, :dash, :dot],
-      'd' => [:dash, :dot, :dot],
-      'e' => [:dot],
-      'f' => [:dot, :dot, :dash, :dot],
-      'g' => [:dash, :dash, :dot],
-      'h' => [:dot, :dot, :dot, :dot],
-      'i' => [:dot, :dot],
-      'j' => [:dot, :dash, :dash, :dash],
-      'k' => [:dash, :dot, :dash],
-      'l' => [:dot, :dash, :dot, :dot],
-      'm' => [:dash, :dash],
-      'n' => [:dash, :dot],
-      'o' => [:dash, :dash, :dash],
-      'p' => [:dot, :dash, :dash, :dot],
-      'q' => [:dash, :dash, :dot, :dash],
-      'r' => [:dot, :dash, :dot],
-      's' => [:dot, :dot, :dot],
-      't' => [:dash],
-      'u' => [:dot, :dot, :dash],
-      'v' => [:dot, :dot, :dot, :dash],
-      'w' => [:dot, :dash, :dash],
-      'x' => [:dash, :dot, :dot, :dash],
-      'y' => [:dash, :dot, :dash, :dash],
-      'z' => [:dash, :dash, :dot, :dot],
-      '1' => [:dot, :dash, :dash, :dash, :dash],
-      '2' => [:dot, :dot, :dash, :dash, :dash],
-      '3' => [:dot, :dot, :dot, :dash, :dash],
-      '4' => [:dot, :dot, :dot, :dot, :dash],
-      '5' => [:dot, :dot, :dot, :dot, :dot],
-      '6' => [:dash, :dot, :dot, :dot, :dot],
-      '7' => [:dash, :dash, :dot, :dot, :dot],
-      '8' => [:dash, :dash, :dash, :dot, :dot],
-      '9' => [:dash, :dash, :dash, :dash, :dot],
-      '0' => [:dash, :dash, :dash, :dash, :dash],
-      '.' => [:dot, :dash, :dot, :dash, :dot, :dash],
-      ',' => [:dash, :dash, :dot, :dot, :dash, :dash],
-      '=' => [:dash, :dot, :dot,:dot, :dash],
-      '!' => [:dot, :dot, :dash, :dash, :dot],
-      '/' => [:dash, :dot, :dot, :dash, :dot],
-      '?' => [:dot, :dot, :dash, :dash, :dot, :dot],
-      ' ' => []
-    }
+    include FileDetails
 
-    def fetch char
-      ENCODINGS[char]
+    def initialize
+      @char_lookup = "*eish54v*3uf***!2arl***+*wp**j*1tndb6=x/*kc**y**mgz7*q**o*8**90*".split('').map(&:to_sym)
     end
 
     def encodings
-      ENCODINGS
+      if @encodings.nil?
+        @encodings = load_code
+      end
+      @encodings
+    end
+
+    def load_code
+      File.open(CODE_FILENAME, "r") do |code|
+        YAML::load(code)
+      end
+    end
+
+    def fetch char
+      encodings[char]
     end
 
     def match_elements arg
       chars = []
-      ENCODINGS.each_pair do |key, value|
-        chars << key unless value.include?(:dot) if arg[0]  == :dashes
+      encodings.each_pair do |key, value|
+        chars << key unless value.include?(:dot)  if arg[0] == :dashes
         chars << key unless value.include?(:dash) if arg[0] == :dots
-        chars << key if (value.size < arg[1] )if arg[0]     == :less_than
-        chars << key if (value.size > arg[1] )if arg[0]     == :greater_than
-        chars << key if (value.size == arg[1] )if arg[0]    == :size
+        chars << key if ( value.size < arg[1] )   if arg[0] == :less_than
+        chars << key if ( value.size > arg[1] )   if arg[0] == :greater_than
+        chars << key if ( value.size == arg[1] )  if arg[0] == :size
         chars.delete(' ')
       end
       chars
     end
+
+    def fast_match code
+      index = 0
+      dash_jump = 64
+      code.each do |ele|
+        #          puts "ele: #{ele}"
+        dash_jump = dash_jump / 2
+        index = index + ((ele == :dot) ? 1 : dash_jump)
+      end
+      return @char_lookup[index].to_s
+    end
+
+    def fetch_char code
+      length = code.length
+      case length
+      when 1..5
+        return ' ' if code == [:space]
+      #        return fast_match code
+        return encodings.key(code)
+      when 0
+        return '*'
+      else
+        temp = encodings.key(code)
+        return temp if temp
+        return '*' unless temp
+      end
+    end
   end
 end