dict 0.1.8 → 0.1.9

data/lib/module_main.rb

@@ -10,42 +10,32 @@ module Main
   end
 
   def self.parse_parameters
-    opts = Slop.parse do 
-      banner "Usage: $translate -w word [Options]"
-      on '-w', :word=, 'after this option is a word to translate'
-      on '-h', :help=, 'help', :argument => :optional
-      on '-t', :time=, 'time in seconds, default: 300', :as => :int
-      on '-d', :dict=, 'wiktionary, dictpl', :argument => :optional
+    opts = Slop.parse! do 
+      banner <<-END
+Usage: dict WORD [OPTIONS]
+Search WORD in dict, an open source dictionary aggregator.
+      END
+  
+      on '-h', :help, 'display this help message', :argument => :optional
+      on '-t', :time=, 'timeout in seconds, default: 300', :as => :int
+      on '-d', :dict=, 'wiktionary|dictpl', :argument => :optional
     end
     opts
   end
   
-  def self.get_translations(opts)
-
-      if opts.word?
-        begin
-          Timeout::timeout(opts[:time].to_i || 300) do
-            if opts.dict? && opts[:dict] != nil
-              Dict.get_single_dictionary_translations(opts[:word],opts[:dict])
-            else
-              Dict.get_all_dictionaries_translations(opts[:word])
-            end
-          end
-          
-        rescue 
-          "Timeout for the query."
-        end
+  def self.get_translations(opts, word)
+    Timeout::timeout(opts[:time].to_i || 300) do
+      if opts.dict? && opts[:dict] != nil
+        Dict.get_single_dictionary_translations(word, opts[:dict])
+      else
+        Dict.get_all_dictionaries_translations(word)
       end
-
+    end
+  rescue 
+    "Timeout for the query."
   end
   
   def self.main(opts)
-    
-    if check_parameters? == true
-      puts "Please enter the word. (-h for help)"
-      exit
-    end
-    
     begin
       opts = parse_parameters
     rescue Slop::MissingArgumentError
@@ -53,13 +43,16 @@ module Main
       exit
     end
 
-    puts get_translations(opts)
-    
-    begin
-      puts opts if opts.help?
-      puts Dict.available_services if opts.dict?
-    rescue
-      nil
+    if opts.help?
+      puts opts
+    elsif opts.dict? && !opts[:dict]
+      puts Dict.available_services
+    else
+      if check_parameters? == true
+        puts "Please enter a word. (-h for help)"
+        exit
+      end
+      puts get_translations(opts, ARGV[0])
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors: