memer 0.0.1 → 0.0.2

data/lib/memer.rb

@@ -26,18 +26,22 @@ class Memer
 
   # fuzzy matching
   def IDS.[](meme)
-    return super(meme.to_sym) if super(meme.to_sym) # if you just use it like normal
+    return super(meme.to_sym) if super(meme.to_sym)
 
-    regex = Regexp.new(meme.to_s, Regexp::IGNORECASE)
-    super(keys.find {|k, _| k.to_s =~ regex})
+    regex = %r{#{meme}}i
+    if (result = keys.select {|k, _| k.to_s =~ regex}).size > 1
+      Memer.whine(:message => "Ambiguous name: #{meme}", :list_memes => true)
+    else
+      super(result.first)
+    end
   end
 
   class << self
     def generate!(meme, line1, line2="")
-      meme_ids = IDS[meme] || usage("No meme matches '#{meme}'")
-      generator_id   = meme_ids[:generator]
-      image_id       = meme_ids[:image]
-      response_body  = api_response(generator_id, image_id, line1, line2).body
+      meme_ids = IDS[meme] || whine({:message => "No meme matches '#{meme}'", :list_memes => true})
+      generator_id  = meme_ids[:generator]
+      image_id      = meme_ids[:image]
+      response_body = api_response(generator_id, image_id, line1, line2).body
 
       extract_instance_url(response_body)
     end
@@ -45,6 +49,8 @@ class Memer
     def api_response(generator_id, image_id, line1, line2)
       require 'net/http'
       Net::HTTP.get_response(uri_for(generator_id, image_id, line1, line2))
+    rescue => e
+      whine({:message => "Could not access API... No connection?\n  Error: #{e.message}"})
     end
 
     def uri_for(generator_id, image_id, line1, line2)
@@ -75,8 +81,10 @@ class Memer
 
       if hash['success']
         @@instance_url = hash['result']['instanceUrl']
-      else hash['errorMessage']
-        usage("API returned an error: #{hash['errorMessage']}")
+      elsif hash['errorMessage']
+        whine({:message => "API returned an error: #{hash['errorMessage']}"})
+      else
+        raise("Unexpected API response: #{json_string}")
       end
     end
 
@@ -86,30 +94,44 @@ class Memer
       puts "#{string} copied to clipboard!".color(:yellow)
     end
 
-    def usage(*messages)
-      if messages.empty?
-        puts "Usage:".color(:green)
-        puts "  canhaz <meme> <first-line> [second-line]".color(:yellow)
-      else
-        messages.each { |msg| puts msg.color(:red) }
-      end
+    def pretty_memes_list
+      "Available memes:\n#{list = IDS.keys.map { |meme| "  #{meme.to_s}" }.join("\n")}"
+    end
+
+    def pretty_usage
+      "Usage:\n  canhaz <meme> <first-line> [second-line]\n  canhaz [list | memes]"
+    end
+
+    def whine(options={})
+      msg = "#{options[:message]}".color(:red) if options[:message]
+      lst = pretty_memes_list.color(:cyan) if options[:list_memes]
+      usg = pretty_usage.color(:green) if options[:usage]
+
+      puts [msg, usg, lst].compact.join("\n\n")
 
       exit(1)
     end
 
+    def assert_username_password
+      if [MEME_USER, MEME_PASS].any?(&:nil?)
+        whine(:message => "Sign up on memegenerator.org and export $MEME_USERNAME and $MEME_PASSWORD shell variables")
+      end
+    end
+
     def run(args)
       require 'rainbow'
 
-      if [MEME_USER, MEME_PASS].any?(&:nil?)
-        usage("Sign up on memegenerator.org and export $MEME_USERNAME and $MEME_PASSWORD shell variables")
-      end
+      assert_username_password
+
+      whine(:list_memes => true) if [/^meme/i, /^list/i].any? {|reg| args[0] =~ reg}
+      whine(:usage => true) unless args.size == 3
 
       meme, line1, line2 = *args
 
       generate!(*[meme, line1, line2].compact)
       copy_to_clipboard(@@instance_url)
-    rescue
-      usage
+    rescue => e
+      whine({:message => "Uncaught exception: #{e.message}"})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2152400240 !ruby/object:Gem::Requirement
+  requirement: &2152540260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152400240
+  version_requirements: *2152540260
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &2152399480 !ruby/object:Gem::Requirement
+  requirement: &2152539500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152399480
+  version_requirements: *2152539500
 description: A command line tool to easily create and share your own memes!
 email: alexgenco@gmail.com
 executables: