cw 0.2.4 → 0.3.0

data/lib/cw/book_details.rb

@@ -1,69 +1,58 @@
 # encoding: utf-8
 
-class BookDetails
+module CWG
 
-  attr_reader :args
+  class BookDetails
 
-  HERE = File.dirname(__FILE__) + '/'
-  GEM_BOOK_DIRECTORY     = HERE + '../../data/text/'
-  GEM_BOOK_NAME          = 'book.txt'
-  DEFAULT_BOOK_DIRECTORY = 'books'
+    attr_reader :args
 
-  def initialize
-    book_directory
-    book_name
-  end
+    include FileDetails
 
-  def is_default_book_dir?
-    if File.exist? DEFAULT_BOOK_DIRECTORY
-      if File.directory? DEFAULT_BOOK_DIRECTORY
-        return true
-      end
+    def initialize
+      book_directory
+      book_name
     end
-    false
-  end
 
-  def book_name
-    Params.book_name ||= GEM_BOOK_NAME
-  end
+    def book_name
+      Cfg.config["book_name"]
+    end
 
-  def book_directory
-    book_dir = GEM_BOOK_DIRECTORY
-    if is_default_book_dir?
-      book_dir = DEFAULT_BOOK_DIRECTORY
+    def book_directory
+      File.join ROOT, Cfg.config["book_dir"]
     end
-    Params.book_dir ||= book_dir
-  end
 
-  def book_location
-    File.expand_path(Params.book_name, Params.book_dir)
-  end
+    def book_location
+      File.expand_path(book_name, book_directory)
+    end
 
-  def arguments args
-    @args = args
-    @args[:output] = :letter unless @args[:output]
-    if @args[:duration]
-      @timeout = Time.now + @args[:duration] * 60.0
+    def arguments args
+      @args = args
+      @args[:output] = :letter unless @args[:output]
+      if @args[:duration]
+        @timeout = Time.now + @args[:duration] * 60.0
+      end
     end
-  end
 
-  def session_finished?
-    sentences_complete? || book_timeout?
-  end
+    def session_finished?
+      sentences_complete? || book_timeout?
+    end
 
-  def sentences_complete?
-    if @args.has_key?(:sentences) &&  @args[:sentences].is_a?(Fixnum)
-      if @sentence_count_source
-        @sentence_count_source = nil
-      else
-        @args[:sentences] -= 1
-        @sentence_count_source = true
+    def sentences_complete?
+      if @args.has_key?(:sentences) &&  @args[:sentences].is_a?(Fixnum)
+        if @sentence_count_source
+          @sentence_count_source = nil
+        else
+          @args[:sentences] -= 1
+          @sentence_count_source = true
+        end
+        true if(@args[:sentences] < 0)
       end
-      true if(@args[:sentences] < 0)
     end
-  end
 
-  def book_timeout?
-    @timeout && (Time.now > @timeout)
+    def book_timeout?
+      @timeout && (Time.now > @timeout)
+    end
+
   end
+
 end

data/lib/cw/cl.rb

@@ -1,121 +1,127 @@
 # encoding: utf-8
 
-#class Cl performs command-line processing
+module CWG
 
-class Cl
+  #class Cl performs command-line processing
 
-  def initialize
-    @tone = {
-      sinewave: 0,
-      sawtooth: 1,
-      squarewave: 2
-    }
-  end
+  class Cl
 
-  def cl_wpm
-    wpm = Params.wpm
-    wpm ? "-w #{wpm} " : ''
-  end
+    def initialize
+      @tone = {
+        sinewave: 0,
+        sawtooth: 1,
+        squarewave: 2
+      }
+    end
 
-  def cl_effective_wpm
-    ewpm = Params.effective_wpm
-    ewpm ? "-e #{ewpm} " : ''
-  end
+    def cl_wpm
+      wpm = Cfg.config["wpm"]
+      wpm ? "-w #{wpm} " : ''
+    end
 
-  def cl_word_spacing
-    ws = Params.word_spacing
-    ws ? "-W #{ws} " : ''
-  end
+    def cl_effective_wpm
+      ewpm = Cfg.config["effective_wpm"]
+      ewpm ? "-e #{ewpm} " : ''
+    end
 
-  def cl_frequency
-    freq = Params.frequency
-    freq ? "-f #{freq} " : ''
-  end
+    def cl_word_spacing
+      ws = Cfg.config["word_spacing"]
+      ws ? "-W #{ws} " : ''
+    end
 
-  def cl_squarewave
-    sqr = Params.tone == :squarewave
-    sqr ? "-T #{@tone[:squarewave]} " : ''
-  end
+    def cl_frequency
+      freq = Cfg.config["frequency"]
+      freq ? "-f #{freq} " : ''
+    end
 
-  def cl_sawtooth
-    st = Params.tone == :sawtooth
-    st ? "-T #{@tone[:sawtooth]} " : ''
-  end
+    def cl_squarewave
+      "Cfg.config[\"tone\"] = #{Cfg.config["tone"]}"
+      return '' unless Cfg.config["tone"].to_s == "squarewave"
+      "-T #{@tone[:squarewave]} "
+    end
 
-  def cl_sinewave
-    sin = Params.tone == :sinewave
-    sin ? "-T #{@tone[:sinewave]} " : ''
-  end
+    def cl_sawtooth
+      "Cfg.config[\"tone\"] = #{Cfg.config["tone"]}"
+      return '' unless Cfg.config["tone"].to_s == "sawtooth"
+      "-T #{@tone[:sawtooth]} "
+    end
 
-  def cl_author
-    author = Params.author
-    author ? "-a \"#{author}\" " : ''
-  end
+    def cl_sinewave
+      "Cfg.config[\"tone\"] = #{Cfg.config["tone"]}"
+      return '' unless Cfg.config["tone"].to_s == "sinewave"
+      "-T #{@tone[:sinewave]} "
+    end
 
-  def cl_title
-    title = Params.title
-    title ? "-t \"#{title}\" " : ''
-  end
+    def cl_author
+      author = Cfg.config["author"]
+      author ? "-a \"#{author}\" " : ''
+    end
 
-  def cl_noise
-    noise = Params.noise
-    noise ? "-N 5 -B 1000 " : ''
-  end
+    def cl_title
+      title = Cfg.config["title"]
+      title ? "-t \"#{title}\" " : ''
+    end
 
-  def cl_audio_filename
-    "-o \"#{File.expand_path(Params.audio_filename, Params.audio_dir)}\" "
-  end
+    def cl_noise
+      Cfg.config["noise"] ?
+        "-N 5 -B 1000 " : ''
+    end
 
-  def coarse_quality(quality)
-    {
-      :high =>   "-q 1 ",
-      :medium => "-q 5 ",
-      :low =>    "-q 9 "
-    }[quality]
-  end
+    def cl_audio_filename
+      "-o \"#{File.expand_path(Cfg.config["audio_filename"], Cfg.config["audio_dir"])}\" "
+    end
 
-  def cl_quality
-    quality = Params.quality
-    if quality && quality.class == Fixnum
-      "-q #{quality} "
-    else
-      coarse_quality quality
+    def coarse_quality(quality)
+      {
+        :high =>   "-q 1 ",
+        :medium => "-q 5 ",
+        :low =>    "-q 9 "
+      }[quality]
     end
-  end
 
-  def cl_command_line
-    cl = Params.command_line
-    cl ? "#{cl}" : ''
-  end
+    def cl_quality
+      quality = Cfg.config["quality"]
+      if quality && quality.class == Fixnum
+        "-q #{quality} "
+      else
+        coarse_quality quality
+      end
+    end
 
-  def build_command_line
-    [ cl_wpm,
-      cl_effective_wpm,
-      cl_word_spacing,
-      cl_frequency,
-      cl_squarewave,
-      cl_sawtooth,
-      cl_sinewave,
-      cl_author,
-      cl_title,
-      cl_noise,
-      cl_audio_filename,
-      cl_quality,
-      cl_command_line
-    ].collect{|param| param}.join
-  end
+    def cl_command_line
+      cl = Cfg.config["command_line"]
+      cl ? "#{cl}" : ''
+    end
 
-  def ebook2cw_path
-    Params.ebook2cw_path ||= 'ebook2cw'
-    Params.ebook2cw_path
-  end
+    def build_command_line
+      [ cl_wpm,
+        cl_effective_wpm,
+        cl_word_spacing,
+        cl_frequency,
+        cl_squarewave,
+        cl_sawtooth,
+        cl_sinewave,
+        cl_author,
+        cl_title,
+        cl_noise,
+        cl_audio_filename,
+        cl_quality,
+        cl_command_line
+      ].collect{|param| param}.join
+    end
 
-  def cl_echo words
-    "echo #{words} | #{ebook2cw_path} #{build_command_line}"
-  end
+    def ebook2cw_path
+      Cfg.config["ebook2cw_path"] || 'ebook2cw'
+    end
+
+    def cl_echo words
+      "echo #{words} | #{ebook2cw_path} #{build_command_line}"
+    end
+
+    def cl_full input
+      "#{ebook2cw_path} #{build_command_line} #{input}"
+    end
 
-  def cl_full input
-    "#{ebook2cw_path} #{build_command_line} #{input}"
   end
 
 end

data/lib/cw/common_words.rb

@@ -0,0 +1,76 @@
+module CWG
+
+  class CommonWords
+
+    include FileDetails
+
+    def initialize
+      @words = []
+    end
+
+    def all
+      File.foreach(ENGLISH_DICT).collect do |line|
+      line.chomp
+      end
+    end
+
+    def low last
+      results = []
+      count = 0
+      File.foreach(ENGLISH_DICT).collect do |line|
+        if count <= last
+          results << line.chomp
+        end
+        count += 1
+        break if count > last
+      end
+      results
+    end
+
+    def mid first, last
+      results = []
+      count = 0
+      File.foreach(ENGLISH_DICT).collect do |line|
+        if (count >= first) && (count <= last)
+          results << line.chomp
+        end
+        count += 1
+        break if count > last
+      end
+      results
+    end
+
+    def parse_quantity(quantity = :default)
+      if quantity == :default
+        return [0, 999]
+      elsif quantity.class == Fixnum
+        [0, quantity - 1]
+        (0...quantity).collect {|q| q}
+      elsif quantity.class == Range
+        ary = quantity.to_a
+        return ary[0] - 1, ary[-1] -1
+#        ary.pop
+#        ary.unshift ary[0] - 1
+#        ary
+      end
+    end
+
+    def read(quantity = :default)
+      if quantity == :all
+        @words = all
+      else
+        qty = parse_quantity(quantity)
+        if qty[0] == 0
+          @words = low qty[-1]
+        else
+          @words = mid qty[0], qty[1]
+        end
+      end
+      @words
+    end
+
+    def to_a
+      @words
+    end
+  end
+end

data/lib/cw/config.rb

@@ -0,0 +1,50 @@
+require 'parseconfig.rb'
+
+module CWG
+
+  module Cfg
+
+    include CWG::FileDetails
+
+    CONFIG_METHODS = [
+      :name,:wpm,:effective_wpm,:frequency,:audio_filename,:audio_dir,
+      :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
+    ]
+
+    def self.config
+      unless @config
+        @config = ParseConfig.new(CONFIG_FILENAME)
+        CONFIG_METHODS.each do |method|
+          unless @config[method.to_s]
+            @config.add method.to_s, nil
+          end
+        end
+      end
+      @config.params["wpm"] = 50 if(ENV["CW_ENV"] == "test")
+      @config.params["effective_wpm"] = 50 if(ENV["CW_ENV"] == "test")
+      @config
+    end
+
+    def self.reset
+      @config = nil
+    end
+
+    def self.reset_param param
+      @config.params[param] = false
+    end
+
+    def self.reset_if_nil param
+      self.reset_param param if @config[param].nil?
+    end
+
+    def self.get_param param
+      self.reset_if_nil param
+      @config[param]
+    end
+  end
+end