howdy 0.1.0 → 0.1.5

data/README.rdoc

@@ -18,16 +18,27 @@ Howdy enables "how" binary in your system. If for example you want to know what
     2.showing or characterized by awe.
     3.Slang. very impressive: That new white convertible is totally awesome. 
 
-    $ how -c dict.pl awesome
+    $ how -c 
+    
+    1. dictionary.com - English dictionary
+    2. urbandictionary.com - Slang dictionary
+    3. dict.pl - Polish-English dictionary
+    4. ling.pl - Polish-English dictionary
+    Choose [1..4]: 3
+    Seach in dict.pl: awesome
     
     fantastyczny; zachwycający; niesamowity
 
 = Available Dictionaries
 
- * http://urbandictionary.com
- * http://dictionary.com
- * http://dict.pl
- * http://ling.pl
+* http://urbandictionary.com
+* http://dictionary.com
+* http://dict.pl
+* http://ling.pl
+
+= Documentation
+
+http://howdy.lomnicki.com.pl
 
 = Contributors:
  * Paweł Pacana http://github.com/pawelpacana

data/TODO

@@ -0,0 +1,4 @@
+* dict.org support
+* wordreference.com support
+* play pronunciation mp3 files (http://howjsay.com)
+* support for coloring output

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.5

data/bin/how

@@ -6,40 +6,55 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'howdy')
 
 opts = OptionParser.new do |opts|
 
-  opts.banner = "Usage: #{$0} [options]"
-
-  opts.on("-c", "--choose DICTIONARY", "Interactively choose dictionary or pass one of: dict.pl, ling.pl") do |c|
-    dict = case c
-      when 'dict.pl': Howdy::Dictionary::DictPl
-      when 'ling.pl': Howdy::Dictionary::LingPl
-      when 'dictionary.com': Howdy::Dictionary::DictionaryCom
-      when 'urbandictionary.com': Howdy::Dictionary::UrbanDictionaryCom
-      else raise Howdy::HowdyError, 'Choose one of available dictionaries'
+  opts.banner = "Usage: #{File.basename($0)} [-c|--choose] [-d|--dict INDEX_OR_LABEL] [-l|--list] [-h|--help] WORDS"
+
+  opts.on("-c", "--choose", "Interactively choose a dictionary") do |c|
+    if dict_klass = Howdy::UI.choose_dictionary
+      Howdy::Dictionary.set(dict_klass)
+    else
+      Howdy::UI.error "Dictionary: '#{c}' not found. Choose one of available dictionaries"
+      exit 1
+    end
+  end
+  
+  opts.on("-d", "--dict INDEX_OR_LABEL", "Choose dictionary by index or label (-l lists available) dictionaries") do |d|
+    if d.integer?
+      index = d.to_i
+      unless Howdy::Dictionary.range_available.include?(index)
+        Howdy::UI.error "Index must be on of #{Howdy::Dictionary.range_available}"
+        exit 1
+      end
+      Howdy::Dictionary.set( Howdy::Dictionary.available[index-1] )
+    else
+      if dict_klass = Howdy::Dictionary.find_by_label(c)
+        Howdy::Dictionary.set(dict_klass)
+      else
+        Howdy::UI.error "Dictionary: '#{c}' not found. Choose one of available dictionaries"
+        exit 1
+      end
     end
-    Howdy::Dictionary.set(dict)
   end
 
   opts.on("-l", "--list", "List available dictionaries") do |l|
-    Howdy::Dictionary.available.each do |dict|
-      puts "  #{dict.dict_label} - #{dict.dict_description}"
-    end
-    exit
+    Howdy::UI.list_dictionaries
+    exit 1
   end
 
   opts.on_tail("-h", "--help", "Show this message") do |h|
-    puts opts
-    exit
+    Howdy::UI.error opts
+    exit 1
   end
 
 end
 opts.parse!
 
 if ARGV.empty?
-  puts opts
-  exit
+  query = Howdy::UI.prompt("Search in #{Howdy::Dictionary.current.dict_label}")
+else
+  query = ARGV.join(' ')
 end
 
-dict = Howdy::Dictionary.current.new(ARGV.join(' '))
+dict = Howdy::Dictionary.current.new(query.strip)
 dict.parse
 dict.print
 

data/howdy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{howdy}
-  s.version = "0.1.0"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mlomnicki"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-02-16}
   s.default_executable = %q{how}
   s.description = %q{Howdy is a tool that allows querying web dictionaries from a command line.}
   s.email = %q{michal.lomnicki@gmail.com}
@@ -24,16 +24,19 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
+     "TODO",
      "VERSION",
      "bin/how",
      "howdy.gemspec",
      "lib/howdy.rb",
      "lib/howdy/base.rb",
+     "lib/howdy/core_ext/ruby/string/integer.rb",
      "lib/howdy/core_ext/ruby/string/underscore.rb",
      "lib/howdy/dictionaries/dict_pl.rb",
      "lib/howdy/dictionaries/dictionary_com.rb",
      "lib/howdy/dictionaries/ling_pl.rb",
      "lib/howdy/dictionaries/urban_dictionary_com.rb",
+     "lib/howdy/ui.rb",
      "spec/howdy_spec.rb",
      "spec/spec_helper.rb"
   ]

data/lib/howdy/base.rb

@@ -31,6 +31,16 @@ module Howdy # :nodoc
       @@available_dictionaries ||= []
     end
 
+    # Returns range from 1 to total dictionaries count (1..Dictionary.available.size)
+    def self.range_available
+      (1..available.size)
+    end
+
+    # Find dictionary class by label
+    def self.find_by_label(label)
+      available.detect { |dict| dict.dict_label == label.to_s }
+    end
+
     # Base class for all dictionaries. Inherit from it if you want to implement
     # your own dictionary.
     #   Example:

data/lib/howdy/core_ext/ruby/string/integer.rb

@@ -0,0 +1,8 @@
+class String
+
+  # Returns true if string include digits only
+  def integer?
+    !!(self =~ /[0-9]+/)
+  end
+
+end unless String.method_defined?(:integer?) 

data/lib/howdy/ui.rb

@@ -0,0 +1,45 @@
+module Howdy
+  # Layer for user interface. In the simplest case it's just standard output.
+  class UI
+
+    class << self
+
+      # Displays message on defined output (stdout by default)
+      def display(message)
+        puts message
+      end
+
+      # Displays message on defined output (stderr by default)
+      def error(message)
+        $stderr.puts message
+      end
+      
+      # prints list of available dictionaries 
+      def list_dictionaries
+        Dictionary.available.each_with_index do |dict, idx|
+          display " #{idx+1}. #{dict.dict_label} - #{dict.dict_description}"
+        end
+      end
+
+      # Display message and wait for user input.
+      # Returns captured data
+      def prompt(message)
+        print "#{message}: "
+        gets
+      end
+
+      def choose_dictionary
+        list_dictionaries
+        range = Dictionary.range_available
+        index = prompt("Choose [#{range}]").to_i
+        unless range.include?(index)
+          error "No such dictionary. Choose one number of [#{range}]"
+          exit 1
+        end
+        Dictionary.available[index-1]
+      end
+
+    end
+
+  end
+end

data/lib/howdy.rb

@@ -1,6 +1,8 @@
 $: << File.join(File.dirname(__FILE__), 'howdy')
 
 require 'core_ext/ruby/string/underscore'
+require 'core_ext/ruby/string/integer'
 require 'base'
+require 'ui'
 Dir[File.join(File.dirname(__FILE__), 'howdy', 'dictionaries', '*.rb')].each { |dict| require dict }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: howdy
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors: 
 - mlomnicki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-02-16 00:00:00 +01:00
 default_executable: how
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,16 +47,19 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - bin/how
 - howdy.gemspec
 - lib/howdy.rb
 - lib/howdy/base.rb
+- lib/howdy/core_ext/ruby/string/integer.rb
 - lib/howdy/core_ext/ruby/string/underscore.rb
 - lib/howdy/dictionaries/dict_pl.rb
 - lib/howdy/dictionaries/dictionary_com.rb
 - lib/howdy/dictionaries/ling_pl.rb
 - lib/howdy/dictionaries/urban_dictionary_com.rb
+- lib/howdy/ui.rb
 - spec/howdy_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true