lingvo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e28bdde10ad7b90d0f0b1305ac90ea8ed55884
-  data.tar.gz: 720354fa2d7383439f58ee5895b964f3f8507bb8
+  metadata.gz: 94666dae623540164d10b616ca09ce8528572359
+  data.tar.gz: f9daaf5c70dbc7a2403d012e3abca2da28f8d270
 SHA512:
-  metadata.gz: de5dc24fce0c5059c0977bb191ef48926a2f56b325faf43eb95bc0effed959aa612abbb88aab65dfefeeb434867b1f7b7a8bd544c393ce438d857395edf29be4
-  data.tar.gz: 23704a26eada3b3925950eb8361c5fa82ce285f07bf891e504897e7fe4a2a4408986aa05436d3d33c4caba79dd4a5f4da3f9a81babbdf09156a88dae6be6b2b6
+  metadata.gz: 6e4ae83a1dd7df38f7fb603c4c4d2b5d55374f50a2052b1d5f82f5e5cc2697f8e58604a701402884989846df1378782cba64bd3c95180d05886d67e87bdd3ddf
+  data.tar.gz: e3ac5b214006e3cf5418e870290e2ea51355261976236ae5e67f378996464896dd576dfb83e90a8ecdd6e394d151bcacc13a4cde37aee34cd31df0718df20a91

data/bin/lingvo

@@ -12,7 +12,7 @@ module Lingvo
     when '--notify'then  Command.notify
     when '--gui'then  Command.gui
     when '-h' then Command.help
-    when '-v' then puts VERSION
+    when '-v' then Command.version
 
     else
       Command.help

data/lib/lingvo/config/config.rb

@@ -17,8 +17,6 @@ module Lingvo
     DB_FILE = File.join BASE_DIR, 'english_words.sqlite3'
     CUSTOM_CONFIG = File.join BASE_DIR, 'config.yaml'
 
-    $stderr = File.open File.join(BASE_DIR + 'app.log'), 'w'
-
     unless File.exists? BASE_DIR
       FileUtils.mkdir BASE_DIR, mode: 0755
     end
@@ -33,6 +31,8 @@ module Lingvo
       FileUtils.chmod 0755, CUSTOM_CONFIG
     end
 
+    $stderr = File.open File.join(BASE_DIR, 'app.log'), 'w'
+
     default_config = YAML.load_file DEFAULT_CONFIG
     custom_config = YAML.load_file CUSTOM_CONFIG
 

data/lib/lingvo/console/command.rb

@@ -11,12 +11,32 @@ Options:
                   key:  n - show next word
                         q - close window
 
-  --wc f1 [f2]   - parse text file(f1), and write statistic to file(f2) or show if file(f2) isn't specify
+  --wc f1 [f2]  - parse text file(f1), and write statistic to file(f2)
+                  or show in console if file(f2) isn't specify
 
   --size        - show words count
   -v            - show version
   -h            - show this help
 
+Description:
+
+  ○ Load words from lingualeo.ru and train with lingvo
+    · go to lingualeo site
+    · select words which you want
+    · go to print page and save it (like: print.html)
+
+    · $ lingvo --parse print.html
+    · Well Done!!! Now You have all words in lingvo ;)
+
+  ○ Parse document and build statistics
+    · save your text like english.txt file
+
+    · $ lingvo --wc english.txt
+    · show your statistic immediatly in console
+
+    · $ lingvo --wc english.txt statistics.txt
+    · open statistics.txt and see your words amount
+
 """
 
     class << self
@@ -32,7 +52,7 @@ Options:
       end
 
       def no_word
-        puts "You don't have any words"
+        Command.words_not_found
         exit
       end
     end
@@ -46,19 +66,19 @@ Options:
         end
 
         def words_counter(from, to)
-          return file_not_found if !File.exists?(from) || (to && !File.exist?(to))
+          return file_not_found unless File.exists? from
           Parsers::WordsCounter.new from, to
         end
 
         def rand(count)
-          count = (count || 1).to_i
-          Models::English.rand(count).each do |word|
+          return words_not_found unless Models::English.any?
+          Models::English.rand((count || 1).to_i).each do |word|
             printf "%-20s  %-20s  %s\n", word.eng, word.transcr, word.ru
           end
         end
 
         def size
-          puts "\nYou have #{Models::English.count} words\n"
+          puts "\nYou have #{Models::English.count} words"
         end
 
         def notify
@@ -73,10 +93,16 @@ Options:
           puts HELP
         end
 
-        private
+        def version
+          puts "\n#{VERSION}"
+        end
 
         def file_not_found
-          puts "\nFile not found!\n"
+          puts "\nFile not found!"
+        end
+
+        def words_not_found
+          puts "\nYou don't have any words"
         end
       end
     end

data/lib/lingvo/parsers/words_counter_parser.rb

@@ -18,7 +18,7 @@ module Lingvo
       end
 
       def show
-        count.each { |data| puts "#{data[1]} : #{data[0]}" }
+        count.each { |data| printf "%-4s - %-20s\n", data[1], data[0] }
       end
 
       def read from

data/lib/lingvo/version.rb

@@ -1,3 +1,3 @@
 module Lingvo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lingvo.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "qtbindings"
+  spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "qtbindings", "~> 4.8"
 
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "activerecord-jdbcsqlite3-adapter"
-  spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "activerecord", "~> 3.0"
+  spec.add_development_dependency "sqlite3", "~> 1.3"
+  spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", "~> 1.2"
+  spec.add_development_dependency "nokogiri", "~> 1.6"
 end

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: lingvo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Igor G
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: qtbindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: Will help don't forget english words
 email:
 - igor.s04@mail.ru
@@ -130,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -160,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Lingvo - easy helper in learning english words