memegen 1.0.8 → 1.0.9

data/README.md

@@ -6,11 +6,12 @@ An RMagick-based two-caption meme generator.
 
 ## Install
 
-You'll need [ImageMagick](http://www.imagemagick.org/script/index.php) installed.
+You'll need [ImageMagick](http://www.imagemagick.org/script/index.php) and [ghostscript](http://www.ghostscript.com/) installed.
 The easiest way is to use [Homebrew](https://github.com/mxcl/homebrew).
 
-    brew install imagemagick
-    
+    brew install ghostscript
+    brew install --build-from-source imagemagick
+
 Then install the gem!
 
     gem install memegen
@@ -23,13 +24,13 @@ To see a list of available images:
     a_dog
     p_obama
     ...
-    
+
 To generate an image:
 
     $ memegen a_dog "Eat Crayons" "Poop Rainbows"
     /tmp/meme-1234567890.jpg
-    $ 
-    
+    $
+
 You only have to supply one piece of text:
 
     $ memegen a_dog "" "AWESOME"
@@ -41,20 +42,20 @@ You can also use URLs for one time use memes:
     $ memegen http://example.com/stupid.jpg "Generated" "From a URL"
     /tmp/meme-1234567890.jpg
     $
-    
+
 ## Adding your own images
 
 You can add images to your local `~/.memegen` folder:
 
     $ ls ~/.memegen
     my_custom_image.png
-    
+
 ## Upload to Campfire
 
 If you have a [Campfire](http://campfirenow.com/) account and token, you can automatically upload your image:
 
     $ memegen a_dog "Hello" "Campfire world" --campfire
-    
+
 It will prompt you for your subdomain, token, and room name the first time.
 
 ## Upload to GroupMe
@@ -62,9 +63,9 @@ It will prompt you for your subdomain, token, and room name the first time.
 If you have a [GroupMe](http://groupme.com/) account and token, you can automatically upload your image:
 
     $ memegen a_dog "Hello" "GroupMe world" --groupme
-    
+
 It will prompt you for your phone number, password, and group id the first time. (your password will NOT be stored in plain text).
-    
+
 ## Bash completion
 
 Source or copy `script/autocomplete.sh` inside `~/.bashrc` to get image name autocompletion.

data/lib/meme_generator.rb

@@ -2,12 +2,32 @@ require "RMagick"
 require "fileutils"
 
 class MemeGenerator
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 
   class << self
+
+    # @return [Array<String>] Returns a list of short names for memes
+    #   available locally on disk.
+    def memes
+      meme_paths.keys
+    end
+
+    # @return [Hash] Returns a hash of of available memes.  Hash keys are
+    #   the short names for the memes and the values are paths to the meme
+    #   image on disk.
+    def meme_paths
+      local_image_path = File.expand_path("~/.memegen")
+      base = File.join(File.dirname(__FILE__), "..", "generators")
+      files = Dir.glob(["#{base}/*", "#{local_image_path}/*.*"])
+      files.inject({}) do |images,path|
+        name = path.split('/').last.sub(/\.jpg$/, '')
+        images.merge(name => path)
+      end
+    end
+
     def generate(path, top, bottom)
-      top = top.upcase
-      bottom = bottom.upcase
+      top = (top || '').upcase
+      bottom = (bottom || '').upcase
 
       canvas = Magick::ImageList.new(path)
       image = canvas.first

data/lib/meme_generator/cli.rb

@@ -1,7 +1,5 @@
 def images
-  local_image_path = File.expand_path("~/.memegen")
-  base = File.join(File.dirname(__FILE__), "..", "..", "generators")
-  Dir.glob(["#{base}/*", "#{local_image_path}/*.*"])
+  MemeGenerator.meme_paths.values
 end
 
 def usage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memegen
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70143249364640 !ruby/object:Gem::Requirement
+  requirement: &70180072379800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143249364640
+  version_requirements: *70180072379800
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70143249364100 !ruby/object:Gem::Requirement
+  requirement: &70180072379260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70143249364100
+  version_requirements: *70180072379260
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70143249363680 !ruby/object:Gem::Requirement
+  requirement: &70180072378840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143249363680
+  version_requirements: *70180072378840
 - !ruby/object:Gem::Dependency
   name: highlight
-  requirement: &70143249363220 !ruby/object:Gem::Requirement
+  requirement: &70180072378380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143249363220
+  version_requirements: *70180072378380
 description: Locally generate two-caption 'Advice Dog'-style meme images
 email:
 - bkeene@gmail.com