whatsa 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9790a127723affb42f57cc98c69b02c3bad30751989b5aff659ea5487a1c3f8
-  data.tar.gz: 9419777a390a934533a4e42edbfec071a492d1735444165103592cb6b71c4351
+  metadata.gz: ec58e158b0487b561776deefa4ef188d098db2217c741c6334d71813b1a9b3ee
+  data.tar.gz: 2f98558b531ec16394e48c79cb897c11c7d0b3e626c4dfd216f3dd3481fc6155
 SHA512:
-  metadata.gz: 528671031a44ecdbf374497c1197e179dab514ab18b306690a605ba84a7aec8d7f367a300a7274d174c12b72c701374d946358ee1e00a1183d39dcb1d3fbb7a1
-  data.tar.gz: 5beb1d7b909b91a13b52ab11af80ae3606f73eb9d55932149cb67d61c3e200ee5edbef5295e1b8d9bcccc386799dce0c090e0edbfafcc3dacd831dd5b943ee0b
+  metadata.gz: 306736c3618ffc71245101a6203e0b13ce55dc4aeb1e3ec3f0a55e6fa9a2b3639ec5f5cf9758f07d9dd838a02a39a622d99147cc4e9cf2e7ec4e5cc5eb299743
+  data.tar.gz: fcc8ef9a5852c591a2252209e2f7bf67afed6080cfb329b4b82a0b90c112f8cebd34a05581d941f1e164e8fa520e008db4065e3068168005d183e06d1bafb952

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+whatsa*.gem

data/lib/whatsa/cli.rb

@@ -23,30 +23,49 @@ class Whatsa::CLI
     puts "regarding that subject, which you can choose by number or name."
     puts "You can type 'exit' to close the program (or 'help' to receive"
     puts "these instructions again) at any time!"
+    puts ""
   end
 
   def ask
     puts "What would you like to know about?"
-    gets_command
+    gets_command(true)
   end
 
-  def gets_command
-    input = nil
+  def gets_command(treat_as_query = false)
+    command_type = {
+      "exit" => "exit",
+      "quit" => "exit",
+      "q"    => "exit",
+
+      "help"         => "help",
+      "h"            => "help",
+      "instructions": ("help" unless treat_as_query),
+
+      "new"            => "new",
+      "different"      => ("new" unless treat_as_query),
+      "something else" => ("new" unless treat_as_query),
+      "again"          => ("new" unless treat_as_query),
+
+      "other"      => ("other" unless treat_as_query),
+      "categories" => ("other" unless treat_as_query),
+      "category"   => ("other" unless treat_as_query),
+      "dig"        => ("other" unless treat_as_query),
+
+      "" => "blank"
+    }
+
     loop do
       print "> "
       input = gets.strip.downcase
-      case input
-      when "exit"
-        exit
-      when "help"
-        instructions
-      when "new"
-        run
-      else
-        break
+      case command_type[input]
+      when "exit"  then exit
+      when "help"  then instructions
+      when "new"   then return run
+      when "other" then return "other"
+      when ""      then next
+      else return input
       end
     end
-    input
   end
 
   def display_dmb(dmb)

data/lib/whatsa/version.rb

@@ -1,3 +1,3 @@
 module Whatsa
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/whatsa.gemspec

@@ -10,9 +10,14 @@ Gem::Specification.new do |spec|
   spec.email         = ["kjleitz@gmail.com"]
 
   spec.summary       = %q{What is that? Okay, okay, I don't need a lecture... just gimme the short 'n sweet!}
-  spec.description   = %q{Whatsa is a CLI app that allows you to search a word or phrase and receive a quick summary about that subject. It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (often a surprisingly decent summary).
+  spec.description   = <<~SPECDESC
+    Whatsa harnesses the POWER OF WIKIPEDIA, allowing you to quickly search a
+    word or phrase and receive a short (one paragraph) summary about that subject,
+    right from the command line! Type 'more' to get a longer summary, 'other' to
+    pick a specific category about that subject, and more. If you're too vague,
+    Whatsa allows you to select from a disambiguation of topics.
+  SPECDESC
 
-If you're not super satisfied with that bit of information (and you need to know a little more) you can type `more` to get a better picture of that subject. If you're _still_ not satisfied, and you want to know something _specific_ about the thing you've searched, type `other`, and it will list the categories of information Wikipedia knows about the subject (its "History", "Early Life", "Uses", etc.). You can select one of those sections, if you'd like, and it will give you the first paragraph of that section, too (which you can extend similarly with another `more` command). You can make a new query with `new`, ask for help at any time with `help`, or exit the application with `exit`.}
   spec.homepage      = "https://github.com/kjleitz/whatsa"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatsa
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Keegan Leitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,10 +66,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  Whatsa is a CLI app that allows you to search a word or phrase and receive a quick summary about that subject. It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (often a surprisingly decent summary).
-
-  If you're not super satisfied with that bit of information (and you need to know a little more) you can type `more` to get a better picture of that subject. If you're _still_ not satisfied, and you want to know something _specific_ about the thing you've searched, type `other`, and it will list the categories of information Wikipedia knows about the subject (its "History", "Early Life", "Uses", etc.). You can select one of those sections, if you'd like, and it will give you the first paragraph of that section, too (which you can extend similarly with another `more` command). You can make a new query with `new`, ask for help at any time with `help`, or exit the application with `exit`.
+description: |
+  Whatsa harnesses the POWER OF WIKIPEDIA, allowing you to quickly search a
+  word or phrase and receive a short (one paragraph) summary about that subject,
+  right from the command line! Type 'more' to get a longer summary, 'other' to
+  pick a specific category about that subject, and more. If you're too vague,
+  Whatsa allows you to select from a disambiguation of topics.
 email:
 - kjleitz@gmail.com
 executables: