lyracyst 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04aa0f88e802ebfc29567e7bd4c869217ecccc0b
-  data.tar.gz: ca44ce70517f1d47ba7a42ebdcc5c0b213362d04
+  metadata.gz: c062c9d3baca7f781229f0dcb79fc73af3031a40
+  data.tar.gz: f9ee4efb9855d0023d7e4f800d33de0d0b926618
 SHA512:
-  metadata.gz: 955927f012089dea86c66eceb908d42913955622a463ddef9b6d3e58741ec3eec287bf840ed13d4447decf93173f6c4e9b9b9764aa686263a9b640c07d0fb915
-  data.tar.gz: 9db35817730ca71a25601bee00fa94a731c19707bba84db06132ab6bc012dd56e9b303680e7b1228b1613c838af07ef712ce8db60b0c22a9c4fe7b424d3b19bb
+  metadata.gz: 5d89ab3574e4cc2cb33d7a3d9db4ecb847dbbb15b0ccf7183a7edf04d905257d06d19b006d26ed45c4c7ba9f0fbd149e71f6b9a394f9d9239c6e9a0aceb137b7
+  data.tar.gz: bb69b57eff63a2f02252d6d844ec488dad7314e229bf183292f774656f2d3beb34c7e3d63ebbf2c1ccecd2c7ffe35ca914904985ed285e252f692fec0ee77f25

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 ===
 
+Version 1.1.0 - Major cleanup
+- Dropped redundant format flag, autodetects format based on file extension.
+- Split up the command blocks into separate files
+- Fixed rhyme outfile
+
 Version 1.0.2 - Code climate & defaults
 - Methodized more code blocks to improve climate
 - Now using smart defaults for httpi, multi_json & multi_xml

data/bin/lyracyst

@@ -10,9 +10,7 @@ require 'lyracyst/rhymebrain'
 require 'lyracyst/urban'
 require 'lyracyst/version'
 require 'lyracyst/wordnik'
-require "rexml/document"
 require 'xml-fu'
-include REXML
 
 # The Lyracyst module handles base functionality.
 module Lyracyst
@@ -67,7 +65,6 @@ program_desc 'A powerful word search tool that fetches definitions, related word
 config_file '.lyracyst.yml'
 version Lyracyst::VERSION
 
-flag [:f, :format], :default_value => nil, :arg_name => 'string', :desc => 'File format', :long_desc => 'json or xml'
 flag [:h, :http], :default_value => nil, :arg_name => 'string', :desc => 'HTTP adapter', :long_desc => 'httpclient, curb, em_http, net_http_persistent, excon, rack'
 flag [:j, :json], :default_value => nil, :arg_name => 'string', :desc => 'JSON adapter', :long_desc => 'oj, yajl, json_gem, json_pure'
 flag [:o, :out], :default_value => nil, :arg_name => 'filename', :desc => 'Output file', :long_desc => 'filename.json or filename.xml'
@@ -75,150 +72,10 @@ flag [:x, :xml], :default_value => nil, :arg_name => 'string', :desc => 'XML ada
 switch [:fo, :force], :default_value => false, :desc => 'Force overwrite', :long_desc => 'Overwrites existing JSON & XML files'
 switch [:v, :verbose], :default_value => false, :desc => 'Prints parameters and options'
 
-desc 'Wordnik operations'
-command :wn do |nik|
-  nik.switch :canon, :default_value => false, :desc => 'Use canonical', :long_desc => "If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested."
-  nik.flag :limit, :default_value => 5, :arg_name => 'integer', :desc => 'Maximum number of results to return'
-  nik.desc 'Fetch definitions from Wordnik'
-  nik.arg_name 'word'
-  nik.command :def do |define|
-    define.flag :defdict, :default_value => 'all', :arg_name => 'string', :desc => "CSV list. Source dictionaries 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"
-    define.flag [:p, :part], :default_value => nil, :arg_name => 'csv', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
-    define.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], defdict: options[:defdict], increl: false, inctags: false, limit: options[:limit] }
-      df = Lyracyst::Wordnik::Define.new
-      df.get_def(search, options[:p], params)
-    end
-  end
-  nik.desc 'Fetch examples from Wordnik'
-  nik.arg_name 'word'
-  nik.command :ex do |example|
-    example.flag [:s, :skip], :default_value => 0, :arg_name => 'integer', :desc => 'Results to skip'
-    example.switch :incdups, :default_value => false, :desc => 'Show duplicate examples from different sources'
-    example.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], incdups: options[:incdups], limit: options[:limit], skip: options[:s] }
-      ex = Lyracyst::Wordnik::Example.new
-      ex.get_ex(search, params)
-    end
-  end
-  nik.desc 'Fetches related words from Wordnik'
-  nik.arg_name 'word'
-  nik.command :rel do |relate|
-    relate.flag :relt, :default_value => nil, :arg_name => 'integer', :desc => 'Limits the total results per type of relationship type'
-    relate.flag :rell, :default_value => 10, :arg_name => 'integer', :desc => 'Restrict to the supplied relationship types'
-    relate.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], rellimit: options[:rell] }
-      ex = Lyracyst::Wordnik::Relate.new
-      ex.get_rel(search, params, options[:relt])
-    end
-  end
-  nik.desc 'Fetches pronunciations from Wordnik'
-  nik.arg_name 'word'
-  nik.command :pro do |pronounce|
-    pronounce.flag :src, :default_value => nil, :arg_name => 'string', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
-    pronounce.flag :pt, :default_value => nil, :arg_name => 'string', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
-    pronounce.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], limit: options[:limit], source: options[:src] }
-      pr = Lyracyst::Wordnik::Pronounce.new
-      pr.get_pro(search, params, options[:pt])
-    end
-  end
-  nik.desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
-  nik.arg_name 'word'
-  nik.command :hyph do |hyphen|
-    hyphen.flag :source, :default_value => nil, :arg_name => 'string', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
-    hyphen.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], limit: options[:limit] }
-      if options[:source] != nil then params[:source] = options[:source]; end
-      hyph = Lyracyst::Wordnik::Hyphen.new
-      hyph.get_hyph(search, params)
-    end
-  end
-  nik.desc 'Fetches bi-gram phrases from Wordnik'
-  nik.arg_name 'word'
-  nik.command :phr do |phrase|
-    phrase.flag :wlmi, :default_value => 13, :arg_name => 'integer', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
-    phrase.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], limit: options[:limit], wlmi: options[:wlmi] }
-      phra = Lyracyst::Wordnik::Phrase.new
-      phra.get_phr(search, params)
-    end
-  end
-  nik.desc 'Fetches etymologies from Wordnik'
-  nik.arg_name 'word'
-  nik.command :ori do |origin|
-    origin.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon] }
-      orig = Lyracyst::Wordnik::Origin.new
-      orig.get_et(search, params)
-    end
-  end
-end
-
-desc 'Rhymebrain operations'
-command :rb do |rb|
-  rb.flag :lang, :default_value => 'en', :arg_name => 'string', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
-  rb.flag :max, :default_value => nil, :arg_name => 'integer', :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.'
-  rb.desc 'Fetches rhymes from Rhymebrain.com'
-  rb.arg_name 'word'
-  rb.command :rhy do |rhyme|
-    rhyme.action do |global_options, options, args|
-      search = args[0]
-      params = { lang: options[:lang], max: options[:max] }
-      rhym = Lyracyst::Rhymebrain::Rhyme.new
-      rhym.get_rhyme(search, params)
-    end
-  end
-  rb.desc 'Fetches word info from Rhymebrain.com'
-  rb.arg_name 'word'
-  rb.command :inf do |info|
-    info.action do |global_options, options, args|
-      search = args[0]
-      params = { lang: options[:lang], max: options[:max] }
-      info = Lyracyst::Rhymebrain::Info.new
-      info.get_info(search, params)
-    end
-  end
-  rb.desc 'Fetches combined words (portmanteaus) from Rhymebrain.com'
-  rb.arg_name 'word'
-  rb.command :comb do |combine|
-    combine.action do |global_options, options, args|
-      search = args[0]
-      params = { lang: options[:lang], max: options[:max] }
-      port = Lyracyst::Rhymebrain::Combine.new
-      port.get_port(search, params)
-    end
-  end
-end
-
-desc 'Fetches definitions from Urban Dictionary'
-arg_name 'word'
-command :urb do |c|
-  c.action do |global_options, options, args|
-    search = args[0]
-    ur = Lyracyst::Urban::Define.new
-    ur.get_def(search)
-  end
-end
-
-desc 'Fetches word info from Onelook'
-arg_name 'word'
-command :look do |c|
-  c.switch :source, :default_value => false, :desc => 'Fetches resource links (verbose)'
-  c.action do |global_options, options, args|
-    search = args[0]
-    source = options[:source]
-    fe = Lyracyst::Onelook::Fetch.new
-    fe.fetch(search, source)
-  end
-end
+require 'lyracyst/cli/onelook'
+require 'lyracyst/cli/rhymebrain'
+require 'lyracyst/cli/urban'
+require 'lyracyst/cli/wordnik'
 
 pre do |global, command, options, args|
   # Pre logic here
@@ -273,7 +130,7 @@ post do |global, command, options, args|
   # block on that command only
   if $fmt != nil
     outfile = global[:o]
-    if File.exist?(outfile) && global[:f] == true
+    if File.exist?(outfile) && global[:fo] == true
       if $fmt == :json
         fo = File.open(outfile, 'w+')
         fo.print MultiJson.dump($tofile, :pretty => true)
@@ -289,7 +146,7 @@ post do |global, command, options, args|
         puts 'Invalid file extension.'
       end
     end
-    if File.exist?(outfile) && global[:f] == false
+    if File.exist?(outfile) && global[:fo] == false
       puts Rainbow("#{outfile} exists. Overwrite? y/n ").bright
       ans = gets
       if ans =~ /y/

data/lib/lyracyst.rb

@@ -10,9 +10,7 @@ require 'lyracyst/rhymebrain'
 require 'lyracyst/urban'
 require 'lyracyst/version'
 require 'lyracyst/wordnik'
-require "rexml/document"
 require 'xml-fu'
-include REXML
 
 # The Lyracyst module handles base functionality.
 module Lyracyst
@@ -67,7 +65,6 @@ program_desc 'A powerful word search tool that fetches definitions, related word
 config_file '.lyracyst.yml'
 version Lyracyst::VERSION
 
-flag [:f, :format], :default_value => nil, :arg_name => 'string', :desc => 'File format', :long_desc => 'json or xml'
 flag [:h, :http], :default_value => nil, :arg_name => 'string', :desc => 'HTTP adapter', :long_desc => 'httpclient, curb, em_http, net_http_persistent, excon, rack'
 flag [:j, :json], :default_value => nil, :arg_name => 'string', :desc => 'JSON adapter', :long_desc => 'oj, yajl, json_gem, json_pure'
 flag [:o, :out], :default_value => nil, :arg_name => 'filename', :desc => 'Output file', :long_desc => 'filename.json or filename.xml'
@@ -75,150 +72,10 @@ flag [:x, :xml], :default_value => nil, :arg_name => 'string', :desc => 'XML ada
 switch [:fo, :force], :default_value => false, :desc => 'Force overwrite', :long_desc => 'Overwrites existing JSON & XML files'
 switch [:v, :verbose], :default_value => false, :desc => 'Prints parameters and options'
 
-desc 'Wordnik operations'
-command :wn do |nik|
-  nik.switch :canon, :default_value => false, :desc => 'Use canonical', :long_desc => "If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested."
-  nik.flag :limit, :default_value => 5, :arg_name => 'integer', :desc => 'Maximum number of results to return'
-  nik.desc 'Fetch definitions from Wordnik'
-  nik.arg_name 'word'
-  nik.command :def do |define|
-    define.flag :defdict, :default_value => 'all', :arg_name => 'string', :desc => "CSV list. Source dictionaries 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"
-    define.flag [:p, :part], :default_value => nil, :arg_name => 'csv', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
-    define.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], defdict: options[:defdict], increl: false, inctags: false, limit: options[:limit] }
-      df = Lyracyst::Wordnik::Define.new
-      df.get_def(search, options[:p], params)
-    end
-  end
-  nik.desc 'Fetch examples from Wordnik'
-  nik.arg_name 'word'
-  nik.command :ex do |example|
-    example.flag [:s, :skip], :default_value => 0, :arg_name => 'integer', :desc => 'Results to skip'
-    example.switch :incdups, :default_value => false, :desc => 'Show duplicate examples from different sources'
-    example.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], incdups: options[:incdups], limit: options[:limit], skip: options[:s] }
-      ex = Lyracyst::Wordnik::Example.new
-      ex.get_ex(search, params)
-    end
-  end
-  nik.desc 'Fetches related words from Wordnik'
-  nik.arg_name 'word'
-  nik.command :rel do |relate|
-    relate.flag :relt, :default_value => nil, :arg_name => 'integer', :desc => 'Limits the total results per type of relationship type'
-    relate.flag :rell, :default_value => 10, :arg_name => 'integer', :desc => 'Restrict to the supplied relationship types'
-    relate.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], rellimit: options[:rell] }
-      ex = Lyracyst::Wordnik::Relate.new
-      ex.get_rel(search, params, options[:relt])
-    end
-  end
-  nik.desc 'Fetches pronunciations from Wordnik'
-  nik.arg_name 'word'
-  nik.command :pro do |pronounce|
-    pronounce.flag :src, :default_value => nil, :arg_name => 'string', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
-    pronounce.flag :pt, :default_value => nil, :arg_name => 'string', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
-    pronounce.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], limit: options[:limit], source: options[:src] }
-      pr = Lyracyst::Wordnik::Pronounce.new
-      pr.get_pro(search, params, options[:pt])
-    end
-  end
-  nik.desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
-  nik.arg_name 'word'
-  nik.command :hyph do |hyphen|
-    hyphen.flag :source, :default_value => nil, :arg_name => 'string', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
-    hyphen.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], limit: options[:limit] }
-      if options[:source] != nil then params[:source] = options[:source]; end
-      hyph = Lyracyst::Wordnik::Hyphen.new
-      hyph.get_hyph(search, params)
-    end
-  end
-  nik.desc 'Fetches bi-gram phrases from Wordnik'
-  nik.arg_name 'word'
-  nik.command :phr do |phrase|
-    phrase.flag :wlmi, :default_value => 13, :arg_name => 'integer', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
-    phrase.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon], limit: options[:limit], wlmi: options[:wlmi] }
-      phra = Lyracyst::Wordnik::Phrase.new
-      phra.get_phr(search, params)
-    end
-  end
-  nik.desc 'Fetches etymologies from Wordnik'
-  nik.arg_name 'word'
-  nik.command :ori do |origin|
-    origin.action do |global_options, options, args|
-      search = args[0]
-      params = { canon: options[:canon] }
-      orig = Lyracyst::Wordnik::Origin.new
-      orig.get_et(search, params)
-    end
-  end
-end
-
-desc 'Rhymebrain operations'
-command :rb do |rb|
-  rb.flag :lang, :default_value => 'en', :arg_name => 'string', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
-  rb.flag :max, :default_value => nil, :arg_name => 'integer', :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.'
-  rb.desc 'Fetches rhymes from Rhymebrain.com'
-  rb.arg_name 'word'
-  rb.command :rhy do |rhyme|
-    rhyme.action do |global_options, options, args|
-      search = args[0]
-      params = { lang: options[:lang], max: options[:max] }
-      rhym = Lyracyst::Rhymebrain::Rhyme.new
-      rhym.get_rhyme(search, params)
-    end
-  end
-  rb.desc 'Fetches word info from Rhymebrain.com'
-  rb.arg_name 'word'
-  rb.command :inf do |info|
-    info.action do |global_options, options, args|
-      search = args[0]
-      params = { lang: options[:lang], max: options[:max] }
-      info = Lyracyst::Rhymebrain::Info.new
-      info.get_info(search, params)
-    end
-  end
-  rb.desc 'Fetches combined words (portmanteaus) from Rhymebrain.com'
-  rb.arg_name 'word'
-  rb.command :comb do |combine|
-    combine.action do |global_options, options, args|
-      search = args[0]
-      params = { lang: options[:lang], max: options[:max] }
-      port = Lyracyst::Rhymebrain::Combine.new
-      port.get_port(search, params)
-    end
-  end
-end
-
-desc 'Fetches definitions from Urban Dictionary'
-arg_name 'word'
-command :urb do |c|
-  c.action do |global_options, options, args|
-    search = args[0]
-    ur = Lyracyst::Urban::Define.new
-    ur.get_def(search)
-  end
-end
-
-desc 'Fetches word info from Onelook'
-arg_name 'word'
-command :look do |c|
-  c.switch :source, :default_value => false, :desc => 'Fetches resource links (verbose)'
-  c.action do |global_options, options, args|
-    search = args[0]
-    source = options[:source]
-    fe = Lyracyst::Onelook::Fetch.new
-    fe.fetch(search, source)
-  end
-end
+require 'lyracyst/cli/onelook'
+require 'lyracyst/cli/rhymebrain'
+require 'lyracyst/cli/urban'
+require 'lyracyst/cli/wordnik'
 
 pre do |global, command, options, args|
   # Pre logic here
@@ -273,7 +130,7 @@ post do |global, command, options, args|
   # block on that command only
   if $fmt != nil
     outfile = global[:o]
-    if File.exist?(outfile) && global[:f] == true
+    if File.exist?(outfile) && global[:fo] == true
       if $fmt == :json
         fo = File.open(outfile, 'w+')
         fo.print MultiJson.dump($tofile, :pretty => true)
@@ -289,7 +146,7 @@ post do |global, command, options, args|
         puts 'Invalid file extension.'
       end
     end
-    if File.exist?(outfile) && global[:f] == false
+    if File.exist?(outfile) && global[:fo] == false
       puts Rainbow("#{outfile} exists. Overwrite? y/n ").bright
       ans = gets
       if ans =~ /y/

data/lib/lyracyst/cli/onelook.rb

@@ -0,0 +1,11 @@
+desc 'Fetches word info from Onelook'
+arg_name 'word'
+command :look do |c|
+  c.switch :source, :default_value => false, :desc => 'Fetches resource links (verbose)'
+  c.action do |global_options, options, args|
+    search = args[0]
+    source = options[:source]
+    fe = Lyracyst::Onelook::Fetch.new
+    fe.fetch(search, source)
+  end
+end

data/lib/lyracyst/cli/rhymebrain.rb

@@ -0,0 +1,35 @@
+desc 'Rhymebrain operations'
+command :rb do |rb|
+  rb.flag :lang, :default_value => 'en', :arg_name => 'string', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  rb.flag :max, :default_value => nil, :arg_name => 'integer', :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.'
+  rb.desc 'Fetches rhymes from Rhymebrain.com'
+  rb.arg_name 'word'
+  rb.command :rhy do |rhyme|
+    rhyme.action do |global_options, options, args|
+      search = args[0]
+      params = { lang: options[:lang], max: options[:max] }
+      rhym = Lyracyst::Rhymebrain::Rhyme.new
+      rhym.get_rhyme(search, params)
+    end
+  end
+  rb.desc 'Fetches word info from Rhymebrain.com'
+  rb.arg_name 'word'
+  rb.command :inf do |info|
+    info.action do |global_options, options, args|
+      search = args[0]
+      params = { lang: options[:lang], max: options[:max] }
+      info = Lyracyst::Rhymebrain::Info.new
+      info.get_info(search, params)
+    end
+  end
+  rb.desc 'Fetches combined words (portmanteaus) from Rhymebrain.com'
+  rb.arg_name 'word'
+  rb.command :comb do |combine|
+    combine.action do |global_options, options, args|
+      search = args[0]
+      params = { lang: options[:lang], max: options[:max] }
+      port = Lyracyst::Rhymebrain::Combine.new
+      port.get_port(search, params)
+    end
+  end
+end

data/lib/lyracyst/cli/urban.rb

@@ -0,0 +1,9 @@
+desc 'Fetches definitions from Urban Dictionary'
+arg_name 'word'
+command :urb do |c|
+  c.action do |global_options, options, args|
+    search = args[0]
+    ur = Lyracyst::Urban::Define.new
+    ur.get_def(search)
+  end
+end

data/lib/lyracyst/cli/wordnik.rb

@@ -0,0 +1,86 @@
+desc 'Wordnik operations'
+command :wn do |nik|
+  nik.switch :canon, :default_value => false, :desc => 'Use canonical', :long_desc => "If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested."
+  nik.flag :limit, :default_value => 5, :arg_name => 'integer', :desc => 'Maximum number of results to return'
+  nik.desc 'Fetch definitions from Wordnik'
+  nik.arg_name 'word'
+  nik.command :def do |define|
+    define.flag :defdict, :default_value => 'all', :arg_name => 'string', :desc => "CSV list. Source dictionaries 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"
+    define.flag [:p, :part], :default_value => nil, :arg_name => 'csv', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
+    define.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon], defdict: options[:defdict], increl: false, inctags: false, limit: options[:limit] }
+      df = Lyracyst::Wordnik::Define.new
+      df.get_def(search, options[:p], params)
+    end
+  end
+  nik.desc 'Fetch examples from Wordnik'
+  nik.arg_name 'word'
+  nik.command :ex do |example|
+    example.flag [:s, :skip], :default_value => 0, :arg_name => 'integer', :desc => 'Results to skip'
+    example.switch :incdups, :default_value => false, :desc => 'Show duplicate examples from different sources'
+    example.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon], incdups: options[:incdups], limit: options[:limit], skip: options[:s] }
+      ex = Lyracyst::Wordnik::Example.new
+      ex.get_ex(search, params)
+    end
+  end
+  nik.desc 'Fetches related words from Wordnik'
+  nik.arg_name 'word'
+  nik.command :rel do |relate|
+    relate.flag :relt, :default_value => nil, :arg_name => 'integer', :desc => 'Limits the total results per type of relationship type'
+    relate.flag :rell, :default_value => 10, :arg_name => 'integer', :desc => 'Restrict to the supplied relationship types'
+    relate.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon], rellimit: options[:rell] }
+      ex = Lyracyst::Wordnik::Relate.new
+      ex.get_rel(search, params, options[:relt])
+    end
+  end
+  nik.desc 'Fetches pronunciations from Wordnik'
+  nik.arg_name 'word'
+  nik.command :pro do |pronounce|
+    pronounce.flag :src, :default_value => nil, :arg_name => 'string', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
+    pronounce.flag :pt, :default_value => nil, :arg_name => 'string', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
+    pronounce.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon], limit: options[:limit], source: options[:src] }
+      pr = Lyracyst::Wordnik::Pronounce.new
+      pr.get_pro(search, params, options[:pt])
+    end
+  end
+  nik.desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
+  nik.arg_name 'word'
+  nik.command :hyph do |hyphen|
+    hyphen.flag :source, :default_value => nil, :arg_name => 'string', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
+    hyphen.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon], limit: options[:limit] }
+      if options[:source] != nil then params[:source] = options[:source]; end
+      hyph = Lyracyst::Wordnik::Hyphen.new
+      hyph.get_hyph(search, params)
+    end
+  end
+  nik.desc 'Fetches bi-gram phrases from Wordnik'
+  nik.arg_name 'word'
+  nik.command :phr do |phrase|
+    phrase.flag :wlmi, :default_value => 13, :arg_name => 'integer', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
+    phrase.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon], limit: options[:limit], wlmi: options[:wlmi] }
+      phra = Lyracyst::Wordnik::Phrase.new
+      phra.get_phr(search, params)
+    end
+  end
+  nik.desc 'Fetches etymologies from Wordnik'
+  nik.arg_name 'word'
+  nik.command :ori do |origin|
+    origin.action do |global_options, options, args|
+      search = args[0]
+      params = { canon: options[:canon] }
+      orig = Lyracyst::Wordnik::Origin.new
+      orig.get_et(search, params)
+    end
+  end
+end

data/lib/lyracyst/rhymebrain/rhyme.rb

@@ -32,9 +32,9 @@ module Lyracyst
           rhyme = match['word']
           rcont.push rhyme
           rhyme = { 'rhyme' => rhyme }
-          Lyracyst.tofile(rhyme)
           a += 1
         end
+        Lyracyst.tofile("#{rcont.join(',')}")
         puts rcont.join(Rainbow('|').bright)
       end
     end

data/lib/lyracyst/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 module Lyracyst
   # Semantic program version
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyracyst
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Drew Prentice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -188,6 +188,10 @@ files:
 - CHANGELOG.md
 - bin/lyracyst
 - lib/lyracyst.rb
+- lib/lyracyst/cli/onelook.rb
+- lib/lyracyst/cli/rhymebrain.rb
+- lib/lyracyst/cli/urban.rb
+- lib/lyracyst/cli/wordnik.rb
 - lib/lyracyst/onelook.rb
 - lib/lyracyst/rhymebrain.rb
 - lib/lyracyst/rhymebrain/combine.rb