memegen 0.0.5 → 0.0.6

data/bin/memegen

@@ -4,9 +4,11 @@ $LOAD_PATH.unshift File.expand_path("lib")
 $LOAD_PATH.unshift File.expand_path("../lib")
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
-def generators
+URL_REGEX = /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+
+def images
   local_generator_dir = File.expand_path("~/.memegen")
-  Dir.glob(["generators/*", "#{local_generator_dir}/*"]).sort
+  Dir.glob(["generators/*", "#{local_generator_dir}/*"])
 end
 
 def usage
@@ -15,25 +17,36 @@ def usage
 end
 
 # Process command
-generator, top, bottom = ARGV[0..2]
+image, top, bottom = ARGV[0..2]
 
 # List
-if generator == "--list"
-  generators.each do |path|
-    puts File.basename(path).gsub(/\..*/, '')
-  end
+if image == "--list"
+  names = images.map { |path|
+    File.basename(path).gsub(/\..*/, '')
+  }.sort
+  
+  names.each { |name| puts name }
   exit 0
 end
 
-# Require arguments
-usage unless generator && (top || bottom)
+# URL
+if image =~ URL_REGEX
+  path = "/tmp/memegen-download-#{Time.now.to_i}"
+  `curl "#{image}" -o #{path} --silent`
+elsif path = images.find { |p| p =~ /#{image}\./ }
+  # Success!
+else
+  puts "Error: Image not found. Use --list to view installed images."
+  exit 1
+end
 
-# Generate
-if path = generators.find { |p| p =~ /#{generator}\./ }
+# Require at least one text argument
+if top || bottom
   require "meme_generator"
   MemeGenerator.generate(path, top, bottom)
   exit 0
 else
-  puts "Meme not found"
-  exit 1
+  puts "Error: You must provide at least one piece of text"
+  usage
 end
+

data/lib/meme_generator.rb

@@ -3,7 +3,7 @@ require "bundler/setup"
 require "RMagick"
 
 class MemeGenerator
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   IMPACT_PATH = "fonts/Impact.ttf" # If you don't have OS X, fork me :)
 
   class << self

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memegen
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Brandon Keene
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 -04:00
-default_executable: 
+date: 2011-05-08 00:00:00 Z
 dependencies: []
 
 description: Locally generate two-caption 'Advice Dog'-style meme images
@@ -33,7 +32,6 @@ files:
 - lib/meme_generator.rb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: http://github.com/cmdrkeene/memegen
 licenses: []
 
@@ -65,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Two-caption meme generator CLI