jumping_words 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82844693cb24864743765197552c1edf7ca646bb
-  data.tar.gz: 923a5737bff48c0d898d5bdb6e117d322e605405
+  metadata.gz: d199af8b2036ffcecbf92972854db0c3416ffc49
+  data.tar.gz: e5dff6a63542450915ab3ee205d97c2b3b2f92e0
 SHA512:
-  metadata.gz: b3938b732a19e8ca5d74852ee232bda850f456d94f0f99dcaab77fe7ea3faf9851ece4b14228106d3d9a030baa4964695981e3d4f3a6ced75f945f278d46e1ae
-  data.tar.gz: cbca22ed0a45c3ffdbee5fd435a0603f0238c2f430be995e3a7f6f91ce41f1edb8578e099c9fadd8b1c1f57045a86392e0df1e6f68da947ebc3c843961df6cde
+  metadata.gz: 92edfbc425f21b5321ebec92976aa0527f93307fb1b0903ae033b11d04a948402050d2d333d5c4b30cf2882196d18ee8bc9d1ae6d0749bcb77283ab8626ba4cd
+  data.tar.gz: 02943d04bfa6ca7bf864b22167b507d5fd902a99883352427e66a38a32345a3ed7dfebb16ee7d5868f3cd03a5ed05506b3bb9a018ab5d107c06eac0065e88b29

data/README.rdoc

@@ -1,35 +1,55 @@
 = Jumping Words
-The program for Ubuntu or MAC OS X(!!! Only 10.8 or higher version MAC OS X).
-Does this: speaks and displays in the pop-up window the word (phrase) and then translated word (phrase).
-After end of list back to start.
+The program speaks and displays in the pop-up window the word or phrase and the word's translation or phrase.
+After end of list back to the start.
+
+Supports OS MAC OS X 10.8 or higher or Ubuntu
 
 == Dependencies
 For linux
 sudo apt-get install libnotify-bin
 
-For MAC OS X for the Russian users you must change the voice of system to Milena
+On MAC OS X before you start, you should add to your system the voices for words and translates.
+To enable the speech recognition ability and use speech commands on your Mac, the first thing you have to do is open the Speech menu from System Preferences.
+
+For example for Russian you should install the Milena voice.
+
+== Config
+Default:
+  Show message: true
+  Timeout between a word and translate: 3 sec.
+  Timeout to start list: 10 sec.
+  MAC OS X word voice: Vicki.
+  MAC OS X translate voice: Milena.
 
+More:
+  jwords -h
 
 == Actions
 Starting
-  jwords -s
+  jwords start
+or
+  jwords -v Fiona -t Milena -i5 start
 
 Stoping
   ctrl+c
 
 View a list of words
-  jwords -l
+  jwords list
 
-  1 to write: писать
-  2 root: корень
-  3 list: список
+  1 convenient: удобный | 7
+  2 If I were you: на твоем месте | 6
+  3 in turns: по очереди | 5
+  4 endurance: выносливость | 2
+  5 spoil, spoilt, spoilt: портиться, испортилось | 2
+  6 to lead, led, led: приводить, привели | 2
+  7 to achieve: достигать | 2
   ...
 
 Adding words to the database
   jwords -a root: корень
   jwords -a to play: играть
 
-Delete a word from the database (indicated by the index of the word)
+Delete a word from the database (indicated by the index of the word in the list)
   jwords -d 1
 
 If you want to change words in directly in CSV find .jwords directory in your home directory, then open jumping_words_db.csv. After saving the file restart the script.

data/bin/jwords

@@ -1,13 +1,47 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 require 'optparse'
+require 'ostruct'
 require 'pp'
 
 $:.push File.expand_path("../../lib", __FILE__)
 require 'jumping_words'
 
-options = {}
-optparse = OptionParser.new do|opts|
+include OS
+
+options = OpenStruct.new
+options.message = SHOW_MESSAGE
+options.space_words = SPACE_WORDS
+options.space_interation = SPACE_INTERATION
+options.mac_word_voice = MAC_WORD_VOICE
+options.mac_translate_voice = MAC_TRANSLATE_VOICE
+options.repeat = REPEAT
+
+optparse = OptionParser.new do |opts|
+
+  opts.on( '-n', '--no-message', 'No display message' ) do
+    options.message = false
+  end
+
+  opts.on( '-r', '--repeat [TIMES]', Integer, "How many times repeat each word in the cycle. Default: #{REPEAT}" ) do |times|
+    options.repeat = times
+  end
+
+  opts.on( '-w', '--timeout-words [SPACE]', Integer, "Timeout between the word and translate. Default: #{SPACE_WORDS}" ) do |space_words|
+    options.space_words = space_words
+  end
+
+  opts.on( '-i', '--timeout-interation [SPACE]', Integer, "Timeout an each interation. Default: #{SPACE_INTERATION}" ) do |space_interation|
+    options.space_interation = space_interation
+  end
+
+  opts.on( '-v', '--mac-word-voice [VOICE]', String, "MAC OS X word voice" ) do |voice|
+    options.mac_word_voice = voice
+  end
+
+  opts.on( '-t', '--mac-translate-voice [VOICE]', String, "MAC OS X translate voice" ) do |voice|
+    options.mac_translate_voice = voice
+  end
 
   #The command addes a word
   opts.on( '-a', '--add', 'Add the word' ) do
@@ -33,25 +67,40 @@ optparse = OptionParser.new do|opts|
     end
   end
 
-  #The list of words
-  opts.on( '-l', '--list', 'List of words' ) do
-    db = DbWords.new
-    db.list
-    exit
-  end
-
-  #run the application
-  opts.on( '-s', '--start', 'Start of app' ) do
-    db = DbWords.new
-    app = SayWords.new(:show_message => SHOW_MESSAGE,  :space_words => SPACE_WORDS, :space_interation => SPACE_INTERATION)
 
-    begin
-      app.run
-    rescue Interrupt
-      puts "Exiting..."
-    end
-  end
 
 end
 
 optparse.parse!
+
+puts "Show message: #{options.message}"
+puts "Timeout between a word and translate: #{options.space_words} sec."
+puts "Timeout to start list: #{options.space_interation} sec."
+if mac?
+  puts "MAC OS X word voice: #{options.mac_word_voice}."
+  puts "MAC OS X translate voice: #{options.mac_translate_voice}."
+end
+
+puts "How many times repeat each word in the cycle: #{options.repeat}"
+
+#run the application
+if ARGV.first == 'start'
+  db = DbWords.new
+  app = SayWords.new(:show_message => options.message,  :space_words => options.space_words,
+                     :space_interation => options.space_interation, :mac_word_voice => options.mac_word_voice,
+                     :mac_translate_voice => options.mac_translate_voice, :repeat => options.repeat )
+
+  begin
+    app.run
+  rescue Interrupt
+    puts "Exiting..."
+  end
+end
+
+
+#The list of words
+if ARGV.first == 'list'
+  db = DbWords.new
+  db.list
+  exit
+end

data/config.rb

@@ -3,8 +3,14 @@ DATABASE = "jumping_words_db"
 # Database directory
 DATABASE_DIR = ".jwords"
 # space between word and translate
-SPACE_WORDS = 3
+SPACE_WORDS = 2
 # space iteration
 SPACE_INTERATION = 10
 #show message box true or false
 SHOW_MESSAGE = true
+#MAC OS X word voice
+MAC_WORD_VOICE = 'Vicki'
+#MAC OS X translate voice
+MAC_TRANSLATE_VOICE = 'Milena'
+#how many times repeat each word in the cycle
+REPEAT = 1

data/lib/jwords/db_words.rb

@@ -60,14 +60,12 @@ class DbWords
         end
       end
     end
-
-    GC.start
   end
 
   #Print the list of words
   def list
     list_of_words do |word, idx|
-      puts "#{idx + 1} #{word[0]} | #{word[1]} | #{word[2]}"
+      puts "#{idx + 1} #{word[0]}: #{word[1]} | #{word[2]}"
     end
   end
 

data/lib/jwords/say_words.rb

@@ -4,9 +4,12 @@ class SayWords
   def initialize(options={})
     @db = DbWords.new
     @collection = @db.collection
-    @show_message = options[:show_message] || SHOW_MESSAGE
+    @show_message = options[:show_message].nil? ? SHOW_MESSAGE : options[:show_message]
     @space_words = options[:space_words] || SPACE_WORDS
     @space_interation = options[:space_interation] || SPACE_INTERATION
+    @mac_word_voice = options[:mac_word_voice] || MAC_WORD_VOICE
+    @mac_translate_voice = options[:mac_translate_voice] || MAC_TRANSLATE_VOICE
+    @repeat = options[:repeat] || REPEAT
   end
 
   def run
@@ -21,39 +24,60 @@ class SayWords
   def do_ubuntu
     loop do
       @collection.each_with_index do |word, idx|
-        puts "#{word[0]}: #{word[1]} | #{word[2]}"
-        system 'notify-send -i /usr/share/pixmaps/gnome-irc.png "'+ word[0] +'" "'+ word[1] +'"  -t 1' if @show_message
-        system 'espeak -v en -s120 "'+ word[0] +'"'
-        sleep @space_words
-        #puts "I say #{word[1]}"
-        system 'espeak -v ru -s120 "'+ word[1] +'"'
+        rep_times = !word[2].nil? ? word[2].to_i : 1
+        @repeat.times do
 
-        #set number of showing
-        @db.update(idx, [word[0], word[1], !word[2].nil? ? word[2].to_i + 1 : 1])
+          rep_times += 1
 
+          puts "#{word[0]}: #{word[1]} | #{rep_times}"
+          system 'notify-send -i /usr/share/pixmaps/gnome-irc.png "'+ word[0] +'" "'+ word[1] +'"  -t 1' if @show_message
+          system 'espeak -v en -s120 "'+ word[0] +'"'
+          sleep @space_words
+
+          system 'espeak -v ru -s120 "'+ word[1] +'"'
+
+          #set number of showing
+          @db.update(idx, [word[0], word[1], rep_times])
+
+          sleep @space_words
+        end
         sleep @space_interation
       end
       sleep 4 # for notification hiding
+
+      #cleaning
+      GC.start
     end
   end
 
   def do_mac
     loop do
       @collection.each_with_index do |word, idx|
-        puts "#{word[0]}: #{word[1]} | #{!word[2].nil? ? word[2].to_i + 1 : 1}"
-        #puts 'terminal-notifier -message "'+ word[0] +': '+ word[1] +'" -title "JWords"' if @show_message
-        system 'terminal-notifier -message "'+ word[0] +': '+ word[1] +'" -title ""' if @show_message
-        system 'say -v Vicki "'+ word[0] +'"'
-        sleep @space_words
-        #puts "I say #{word[1]}"
-        system 'say -v Milena "'+ word[1] +'"'
+        rep_times = !word[2].nil? ? word[2].to_i : 1
+        @repeat.times do
+
+          rep_times += 1
 
-        #set number of showing
-        @db.update(idx, [word[0], word[1], !word[2].nil? ? word[2].to_i + 1 : 1])
+          puts "#{word[0]}: #{word[1]} | #{rep_times}"
 
+          system 'terminal-notifier -message "'+ word[0] +': '+ word[1] +'" -title ""' if @show_message
+          system 'say -v ' + @mac_word_voice + ' "'+ word[0] +'"'
+
+          sleep @space_words
+
+          system 'say -v '+ @mac_translate_voice +' "'+ word[1] +'"'
+
+          #set number of showing
+          @db.update(idx, [word[0], word[1], rep_times])
+
+          sleep @space_words
+        end
         sleep @space_interation
       end
       sleep 4 # for notification hiding
+
+      #cleaning
+      GC.start
     end
 
   end

data/lib/jwords/version.rb

@@ -1,3 +1,3 @@
 module Jwords
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jumping_words
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Dmitriev