lyracyst 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fa76f61ab215f161aaef40ab5726c44fd692ec9
-  data.tar.gz: 71ca2a1f5adf2654c274a76d7459cd687aa5876b
+  metadata.gz: 52dc9e24fd2289f6afd97edaa876f8b0c3cc418a
+  data.tar.gz: 00e086cdbf93d6763e57f88e695e6861428681f7
 SHA512:
-  metadata.gz: b8e42f4cd00aa09d5f365c6e658ea209226f519339da6b61282786dd2baa13ec3f85f870f01bf62e999a25bfc5c04c3e3dabdf28eb3eacb22f6e534a6424eb1e
-  data.tar.gz: 0b6d2b35be80197a39117348ad94dbe94426db3267348249898021c8c5240cfa1e4d31187974f4b2a020da54068d67637030a90981af5a7ef54e3a1f92cf4ffb
+  metadata.gz: c2b5e8a37901f2f74819ae12eb5273e6b462cbe2db7f8da8b5bcaaf5a7c200c9fd9ce20eb486392f348c8576c009797bb7cfd37fa9ff9de1dd69aa1c435793b4
+  data.tar.gz: 8f18730e1c9ba61d752cd4474cf5a25ce7ae752b79f33f27ffd2c95f98cc5cd6618b32c26857d5830752b38971c4baac728fbc621cbd8ea731cda60d98dbe52b

data/LICENSE.md

@@ -1,22 +1,22 @@
-The MIT License (MIT)
-========
-
-**Copyright (c) 2014 Drew Prentice**
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.**
+The MIT License (MIT)
+========
+
+**Copyright (c) 2014 Drew Prentice**
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.**

data/bin/lyracyst

@@ -1,92 +1,304 @@
 #!/usr/bin/env ruby
 # coding: utf-8
+require 'gli'
+require './lib/lyracyst/rhymebrain.rb'
+require './lib/lyracyst/version.rb'
+require './lib/lyracyst/wordnik.rb'
 
-require 'commander/import'
-require 'lyracyst/define'
-require 'lyracyst/get'
-require 'lyracyst/relate'
-require 'lyracyst/rhyme'
-require 'lyracyst/version'
-
-# The program takes a search term and returns a list.
-# The list can be either definitions, related words,
-# rhymes, or all three at once.
-#
-# Author::    Drew Prentice  (mailto:weirdpercent@gmail.com)
-# Copyright:: Copyright (c) 2014 Drew Prentice
-# License::   MIT
-module Lyracyst
-  # The platform this app is running on. For now only Ruby, plans for node.js version in the future.
-  ENVIRONMENT = 'ruby'
-  program :name, 'lyracyst'
-  program :version, VERSION
-  program :description, 'A powerful word search tool that fetches definitions, related words, and rhymes.'
-
-  command :get do |c|
-    c.syntax = 'lyracyst get word'
-    c.summary = 'Fetches all sources'
-    c.description = 'Searches definitions, related words, and rhymes for a given query'
-    c.example 'Fetches info about the word test', 'lyracyst get test'
-    c.option '--lang en_US', String, 'Sets search language'
-    c.option '--fmt json', String, 'Sets XML or JSON format'
-    c.action do |args, options|
-      options.default :lang => 'en_US', :fmt => 'json'
-      lang = options.lang
-      fmt = options.fmt
-      search = args[0]
-      result = []
-      g = Lyracyst::Get.new
-      puts "Getting all for [#{search}]"
-      g.get(search, result, lang, fmt)
-    end
+include GLI::App
+program_desc 'A powerful word search tool that fetches definitions, related words, rhymes, and much more.'
+config_file '.lyracyst.yml'
+version Lyracyst::VERSION
+
+desc 'HTTP adapter'
+long_desc 'httpclient, curb, em_http, net_http_persistent, excon, rack'
+default_value :excon
+arg_name 'http'
+flag [:h,:http]
+
+desc 'JSON adapter'
+long_desc 'oj, yajl, json_gem, json_pure'
+default_value :json_pure
+arg_name 'json'
+flag [:j,:json]
+
+desc 'XML adapter'
+long_desc 'ox, libxml, nokogiri, rexml'
+default_value :rexml
+arg_name 'xml'
+flag [:x,:xml]
+
+desc 'Fetches definitions from Wordnik'
+arg_name 'word'
+command :define do |c|
+  c.desc 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
+  c.default_value nil
+  c.arg_name 'part'
+  c.flag [:p,:part]
+  c.desc "Source dictionary to return definitions from. If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet"
+  c.default_value 'all'
+  c.arg_name 'defdict'
+  c.flag [:defdict]
+  c.action do |global_options,options,args|
+    # If you have any errors, just raise them
+    # raise "that command made no sense"
+    search = args[0]
+    part = options[:p]
+    params = {limit: 10, increl: false, canon: false, inctags: false}
+    params[:defdict] = options[:defdict]
+    df = Lyracyst::Wordnik.new
+    df.get_def(search, part, params)
+  end
+end
+
+desc 'Fetches examples from Wordnik'
+arg_name 'word'
+command :example do |c|
+  c.desc 'Results to skip'
+  c.default_value 0
+  c.arg_name 'skip'
+  c.flag [:s,:skip]
+  c.desc 'Maximum number of results to return'
+  c.default_value 5
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.action do |global_options,options,args|
+    search = args[0]
+    skip = options[:s]
+    limit = options[:limit]
+    params = {incdups: false, canon: false}
+    params[:skip] = skip
+    params[:limit] = limit
+    ex = Lyracyst::Wordnik.new
+    ex.get_ex(search, params)
+  end
+end
+
+desc 'Fetches related words from Wordnik'
+arg_name 'word'
+command :relate do |c|
+  c.desc 'Limits the total results per type of relationship type'
+  c.default_value nil
+  c.arg_name 'reltypes'
+  c.flag [:relt]
+  c.desc 'Restrict to the supplied relationship types'
+  c.default_value 10
+  c.arg_name 'rell'
+  c.flag [:rell]
+  c.action do |global_options,options,args|
+    search = args[0]
+    reltypes = options[:relt]
+    rellimit = options[:rell]
+    params = {canon: false}
+    params[:rellimit] = rellimit
+    ex = Lyracyst::Wordnik.new
+    ex.get_rel(search, params, reltypes)
+  end
+end
+
+desc 'Fetches pronunciations from Wordnik'
+arg_name 'word'
+command :pronounce do |c|
+  c.desc 'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
+  c.default_value nil
+  c.arg_name 'source'
+  c.flag [:src]
+  c.desc 'Text pronunciation type'
+  c.long_desc 'ahd, arpabet, gcide-diacritical, IPA'
+  c.default_value nil
+  c.arg_name 'ptype'
+  c.flag [:pt]
+  c.desc 'Maximum number of results to return'
+  c.default_value 5
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.action do |global_options,options,args|
+    search = args[0]
+    source = options[:src]
+    ptype = options[:pt]
+    limit = options[:limit]
+    params = {canon: false}
+    params[:source] = source
+    params[:limit] = limit
+    pr = Lyracyst::Wordnik.new
+    pr.get_pro(search, params, ptype)
+  end
+end
+
+desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
+arg_name 'word'
+command :hyphen do |c|
+  c.desc "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
+  c.default_value nil
+  c.arg_name 'source'
+  c.flag [:src]
+  c.desc 'Maximum number of results to return'
+  c.default_value 5
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.action do |global_options,options,args|
+    search = args[0]
+    source = options[:src]
+    limit = options[:limit]
+    params = {canon: false}
+    if source != nil then params[:source] = source; end
+    params[:limit] = limit
+    hyph = Lyracyst::Wordnik.new
+    hyph.get_hyph(search, params)
   end
+end
+
+desc 'Fetches bi-gram phrases from Wordnik'
+arg_name 'word'
+command :phrase do |c|
+  c.desc 'Maximum number of results to return'
+  c.default_value 10
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.desc 'Minimum WLMI(weighted mutual info) for the phrase.'
+  c.default_value 13
+  c.arg_name 'wlmi'
+  c.flag [:wlmi]
+  c.action do |global_options,options,args|
+    search = args[0]
+    limit = options[:limit]
+    wlmi = options[:wlmi]
+    params = {canon: false}
+    params[:limit] = limit
+    params[:wlmi] = wlmi
+    phra = Lyracyst::Wordnik.new
+    phra.get_phr(search, params)
+  end
+end
 
-  command :define do |c|
-    c.syntax = 'lyracyst define word'
-    c.summary = 'Fetches definitions'
-    c.description = 'Uses the Wordnik API to get definitions'
-    c.example 'Uses the Wordnik API to get definitions of the word test', 'lyracyst define test'
-    c.option '--fmt json', String, 'Sets XML or JSON format'
-    c.action do |args, options|
-      options.default :fmt => 'json'
-      fmt = options.fmt
-      search = args[0]
-      de = Lyracyst::Define.new
-      puts "Getting definitions for [#{search}]"
-      de.define(search, fmt)
-    end
+desc 'Fetches etymologies from Wordnik'
+arg_name 'word'
+command :origin do |c|
+  c.action do |global_options,options,args|
+    search = args[0]
+    params = {canon: false}
+    orig = Lyracyst::Wordnik.new
+    orig.get_et(search, params)
   end
+end
+
+desc 'Fetches rhymes from Rhymebrain'
+arg_name 'word'
+command :rhyme do |c|
+  c.desc 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  c.default_value 'en'
+  c.arg_name 'lang'
+  c.flag [:lang]
+  c.desc '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  c.default_value nil
+  c.arg_name 'max'
+  c.flag [:max]
+  c.action do |global_options,options,args|
+    search = args[0]
+    lang = options[:lang]
+    max = options[:max]
+    params = {}
+    params[:lang] = lang
+    params[:max] = max
+    rhym = Lyracyst::Rhymebrain.new
+    rhym.get_rhyme(search, params)
+  end
+end
 
-  command :relate do |c|
-    c.syntax = 'lyracyst relate word'
-    c.summary = 'Fetches relate words'
-    c.description = 'Uses the Altervista API to get related words'
-    c.example 'Uses the Altervista API to get words related to test', 'lyracyst relate test'
-    c.option '--lang en_US', String, 'Sets search language'
-    c.option '--fmt json', String, 'Sets XML or JSON format'
-    c.action do |args, options|
-      options.default :lang => 'en_US', :fmt => 'json'
-      lang = options.lang
-      fmt = options.fmt
-      search = args[0]
-      result = []
-      re = Lyracyst::Relate.new
-      puts "Getting related words for [#{search}]"
-      re.relate(search, result, lang, fmt)
-    end
+desc 'Fetches word info from Rhymebrain'
+arg_name 'word'
+command :info do |c|
+  c.desc 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  c.default_value 'en'
+  c.arg_name 'lang'
+  c.flag [:lang]
+  c.desc '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  c.default_value nil
+  c.arg_name 'max'
+  c.flag [:max]
+  c.action do |global_options,options,args|
+    search = args[0]
+    lang = options[:lang]
+    max = options[:max]
+    params = {}
+    params[:lang] = lang
+    params[:max] = max
+    info = Lyracyst::Rhymebrain.new
+    info.get_info(search, params)
   end
+end
 
-  command :rhyme do |c|
-    c.syntax = 'lyracyst rhyme word'
-    c.summary = 'Fetches rhymes'
-    c.description = 'Uses the ARPABET system to get rhymes'
-    c.example 'Uses the ARPABET system to get rhymes with test', 'lyracyst rhyme test'
-    c.action do |args|
-      result = []
-      search = args[0]
-      rh = Lyracyst::Rhyme.new
-      puts "Getting rhymes for [#{search}]"
-      rh.rhyme(search, result)
-    end
+desc 'Fetches combined words (portmanteaus) from Rhymebrain'
+arg_name 'word'
+  command :combine do |c|
+  c.desc 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  c.default_value 'en'
+  c.arg_name 'lang'
+  c.flag [:lang]
+  c.desc '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  c.default_value nil
+  c.arg_name 'max'
+  c.flag [:max]
+  c.action do |global_options,options,args|
+    search = args[0]
+    lang = options[:lang]
+    max = options[:max]
+    params = {}
+    params[:lang] = lang
+    params[:max] = max
+    port = Lyracyst::Rhymebrain.new
+    port.get_port(search, params)
   end
 end
+
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abort and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  wn = Lyracyst::Wordnik.new
+  http = global[:h]
+  json = global[:j]
+  xml = global[:x]
+  if http.class != Symbol then http = http.to_sym; end
+  wn.set_http(http)
+  if json.class != Symbol then json = json.to_sym; end
+  wn.set_json(json)
+  if xml.class != Symbol then xml = xml.to_sym; end
+  wn.set_xml(xml)
+  label = 'Global options'
+  wn.label(label)
+  print "- #{global} "
+  label = 'Command'
+  wn.label(label)
+  print "- #{command.name} "
+  label = 'Command options'
+  wn.label(label)
+  print "- #{options} "
+  label = 'Args'
+  wn.label(label)
+  print "- #{args} "
+  label =  'Bootstrapped'
+  wn.label(label)
+  puts ''
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+  wn = Lyracyst::Wordnik.new
+  label =  'Shutdown'
+  wn.label(label)
+  puts ''
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)

data/lib/lyracyst.rb

@@ -1,92 +1,304 @@
 #!/usr/bin/env ruby
 # coding: utf-8
+require 'gli'
+require 'lyracyst/rhymebrain'
+require 'lyracyst/version'
+require 'lyracyst/wordnik'
 
-require 'commander/import'
-require './lib/lyracyst/define.rb'
-require './lib/lyracyst/get.rb'
-require './lib/lyracyst/relate.rb'
-require './lib/lyracyst/rhyme.rb'
-require './lib/lyracyst/version.rb'
-
-# The program takes a search term and returns a list.
-# The list can be either definitions, related words,
-# rhymes, or all three at once.
-#
-# Author::    Drew Prentice  (mailto:weirdpercent@gmail.com)
-# Copyright:: Copyright (c) 2014 Drew Prentice
-# License::   MIT
-module Lyracyst
-  # The platform this app is running on. For now only Ruby, plans for node.js version in the future.
-  ENVIRONMENT = 'ruby'
-  program :name, 'lyracyst'
-  program :version, VERSION
-  program :description, 'A powerful word search tool that fetches definitions, related words, and rhymes.'
-
-  command :get do |c|
-    c.syntax = 'lyracyst get word'
-    c.summary = 'Fetches all sources'
-    c.description = 'Searches definitions, related words, and rhymes for a given query'
-    c.example 'Fetches info about the word test', 'lyracyst get test'
-    c.option '--lang en_US', String, 'Sets search language'
-    c.option '--fmt json', String, 'Sets XML or JSON format'
-    c.action do |args, options|
-      options.default :lang => 'en_US', :fmt => 'json'
-      lang = options.lang
-      fmt = options.fmt
-      search = args[0]
-      result = []
-      g = Lyracyst::Get.new
-      puts "Getting all for [#{search}]"
-      g.get(search, result, lang, fmt)
-    end
+include GLI::App
+program_desc 'A powerful word search tool that fetches definitions, related words, rhymes, and much more.'
+config_file '.lyracyst.yml'
+version Lyracyst::VERSION
+
+desc 'HTTP adapter'
+long_desc 'httpclient, curb, em_http, net_http_persistent, excon, rack'
+default_value :excon
+arg_name 'http'
+flag [:h,:http]
+
+desc 'JSON adapter'
+long_desc 'oj, yajl, json_gem, json_pure'
+default_value :json_pure
+arg_name 'json'
+flag [:j,:json]
+
+desc 'XML adapter'
+long_desc 'ox, libxml, nokogiri, rexml'
+default_value :rexml
+arg_name 'xml'
+flag [:x,:xml]
+
+desc 'Fetches definitions from Wordnik'
+arg_name 'word'
+command :define do |c|
+  c.desc 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
+  c.default_value nil
+  c.arg_name 'part'
+  c.flag [:p,:part]
+  c.desc "Source dictionary to return definitions from. If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet"
+  c.default_value 'all'
+  c.arg_name 'defdict'
+  c.flag [:defdict]
+  c.action do |global_options,options,args|
+    # If you have any errors, just raise them
+    # raise "that command made no sense"
+    search = args[0]
+    part = options[:p]
+    params = {limit: 10, increl: false, canon: false, inctags: false}
+    params[:defdict] = options[:defdict]
+    df = Lyracyst::Wordnik.new
+    df.get_def(search, part, params)
+  end
+end
+
+desc 'Fetches examples from Wordnik'
+arg_name 'word'
+command :example do |c|
+  c.desc 'Results to skip'
+  c.default_value 0
+  c.arg_name 'skip'
+  c.flag [:s,:skip]
+  c.desc 'Maximum number of results to return'
+  c.default_value 5
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.action do |global_options,options,args|
+    search = args[0]
+    skip = options[:s]
+    limit = options[:limit]
+    params = {incdups: false, canon: false}
+    params[:skip] = skip
+    params[:limit] = limit
+    ex = Lyracyst::Wordnik.new
+    ex.get_ex(search, params)
+  end
+end
+
+desc 'Fetches related words from Wordnik'
+arg_name 'word'
+command :relate do |c|
+  c.desc 'Limits the total results per type of relationship type'
+  c.default_value nil
+  c.arg_name 'reltypes'
+  c.flag [:relt]
+  c.desc 'Restrict to the supplied relationship types'
+  c.default_value 10
+  c.arg_name 'rell'
+  c.flag [:rell]
+  c.action do |global_options,options,args|
+    search = args[0]
+    reltypes = options[:relt]
+    rellimit = options[:rell]
+    params = {canon: false}
+    params[:rellimit] = rellimit
+    ex = Lyracyst::Wordnik.new
+    ex.get_rel(search, params, reltypes)
+  end
+end
+
+desc 'Fetches pronunciations from Wordnik'
+arg_name 'word'
+command :pronounce do |c|
+  c.desc 'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
+  c.default_value nil
+  c.arg_name 'source'
+  c.flag [:src]
+  c.desc 'Text pronunciation type'
+  c.long_desc 'ahd, arpabet, gcide-diacritical, IPA'
+  c.default_value nil
+  c.arg_name 'ptype'
+  c.flag [:pt]
+  c.desc 'Maximum number of results to return'
+  c.default_value 5
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.action do |global_options,options,args|
+    search = args[0]
+    source = options[:src]
+    ptype = options[:pt]
+    limit = options[:limit]
+    params = {canon: false}
+    params[:source] = source
+    params[:limit] = limit
+    pr = Lyracyst::Wordnik.new
+    pr.get_pro(search, params, ptype)
+  end
+end
+
+desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
+arg_name 'word'
+command :hyphen do |c|
+  c.desc "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
+  c.default_value nil
+  c.arg_name 'source'
+  c.flag [:src]
+  c.desc 'Maximum number of results to return'
+  c.default_value 5
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.action do |global_options,options,args|
+    search = args[0]
+    source = options[:src]
+    limit = options[:limit]
+    params = {canon: false}
+    if source != nil then params[:source] = source; end
+    params[:limit] = limit
+    hyph = Lyracyst::Wordnik.new
+    hyph.get_hyph(search, params)
   end
+end
+
+desc 'Fetches bi-gram phrases from Wordnik'
+arg_name 'word'
+command :phrase do |c|
+  c.desc 'Maximum number of results to return'
+  c.default_value 10
+  c.arg_name 'limit'
+  c.flag [:limit]
+  c.desc 'Minimum WLMI(weighted mutual info) for the phrase.'
+  c.default_value 13
+  c.arg_name 'wlmi'
+  c.flag [:wlmi]
+  c.action do |global_options,options,args|
+    search = args[0]
+    limit = options[:limit]
+    wlmi = options[:wlmi]
+    params = {canon: false}
+    params[:limit] = limit
+    params[:wlmi] = wlmi
+    phra = Lyracyst::Wordnik.new
+    phra.get_phr(search, params)
+  end
+end
 
-  command :define do |c|
-    c.syntax = 'lyracyst define word'
-    c.summary = 'Fetches definitions'
-    c.description = 'Uses the Wordnik API to get definitions'
-    c.example 'Uses the Wordnik API to get definitions of the word test', 'lyracyst define test'
-    c.option '--fmt json', String, 'Sets XML or JSON format'
-    c.action do |args, options|
-      options.default :fmt => 'json'
-      fmt = options.fmt
-      search = args[0]
-      de = Lyracyst::Define.new
-      puts "Getting definitions for [#{search}]"
-      de.define(search, fmt)
-    end
+desc 'Fetches etymologies from Wordnik'
+arg_name 'word'
+command :origin do |c|
+  c.action do |global_options,options,args|
+    search = args[0]
+    params = {canon: false}
+    orig = Lyracyst::Wordnik.new
+    orig.get_et(search, params)
   end
+end
+
+desc 'Fetches rhymes from Rhymebrain'
+arg_name 'word'
+command :rhyme do |c|
+  c.desc 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  c.default_value 'en'
+  c.arg_name 'lang'
+  c.flag [:lang]
+  c.desc '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  c.default_value nil
+  c.arg_name 'max'
+  c.flag [:max]
+  c.action do |global_options,options,args|
+    search = args[0]
+    lang = options[:lang]
+    max = options[:max]
+    params = {}
+    params[:lang] = lang
+    params[:max] = max
+    rhym = Lyracyst::Rhymebrain.new
+    rhym.get_rhyme(search, params)
+  end
+end
 
-  command :relate do |c|
-    c.syntax = 'lyracyst relate word'
-    c.summary = 'Fetches relate words'
-    c.description = 'Uses the Altervista API to get related words'
-    c.example 'Uses the Altervista API to get words related to test', 'lyracyst relate test'
-    c.option '--lang en_US', String, 'Sets search language'
-    c.option '--fmt json', String, 'Sets XML or JSON format'
-    c.action do |args, options|
-      options.default :lang => 'en_US', :fmt => 'json'
-      lang = options.lang
-      fmt = options.fmt
-      search = args[0]
-      result = []
-      re = Lyracyst::Relate.new
-      puts "Getting related words for [#{search}]"
-      re.relate(search, result, lang, fmt)
-    end
+desc 'Fetches word info from Rhymebrain'
+arg_name 'word'
+command :info do |c|
+  c.desc 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  c.default_value 'en'
+  c.arg_name 'lang'
+  c.flag [:lang]
+  c.desc '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  c.default_value nil
+  c.arg_name 'max'
+  c.flag [:max]
+  c.action do |global_options,options,args|
+    search = args[0]
+    lang = options[:lang]
+    max = options[:max]
+    params = {}
+    params[:lang] = lang
+    params[:max] = max
+    info = Lyracyst::Rhymebrain.new
+    info.get_info(search, params)
   end
+end
 
-  command :rhyme do |c|
-    c.syntax = 'lyracyst rhyme word'
-    c.summary = 'Fetches rhymes'
-    c.description = 'Uses the ARPABET system to get rhymes'
-    c.example 'Uses the ARPABET system to get rhymes with test', 'lyracyst rhyme test'
-    c.action do |args|
-      result = []
-      search = args[0]
-      rh = Lyracyst::Rhyme.new
-      puts "Getting rhymes for [#{search}]"
-      rh.rhyme(search, result)
-    end
+desc 'Fetches combined words (portmanteaus) from Rhymebrain'
+arg_name 'word'
+  command :combine do |c|
+  c.desc 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  c.default_value 'en'
+  c.arg_name 'lang'
+  c.flag [:lang]
+  c.desc '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  c.default_value nil
+  c.arg_name 'max'
+  c.flag [:max]
+  c.action do |global_options,options,args|
+    search = args[0]
+    lang = options[:lang]
+    max = options[:max]
+    params = {}
+    params[:lang] = lang
+    params[:max] = max
+    port = Lyracyst::Rhymebrain.new
+    port.get_port(search, params)
   end
 end
+
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abort and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  wn = Lyracyst::Wordnik.new
+  http = global[:h]
+  json = global[:j]
+  xml = global[:x]
+  if http.class != Symbol then http = http.to_sym; end
+  wn.set_http(http)
+  if json.class != Symbol then json = json.to_sym; end
+  wn.set_json(json)
+  if xml.class != Symbol then xml = xml.to_sym; end
+  wn.set_xml(xml)
+  label = 'Global options'
+  wn.label(label)
+  print "- #{global} "
+  label = 'Command'
+  wn.label(label)
+  print "- #{command.name} "
+  label = 'Command options'
+  wn.label(label)
+  print "- #{options} "
+  label = 'Args'
+  wn.label(label)
+  print "- #{args} "
+  label =  'Bootstrapped'
+  wn.label(label)
+  puts ''
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+  wn = Lyracyst::Wordnik.new
+  label =  'Shutdown'
+  wn.label(label)
+  puts ''
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)