memegen 0.0.10 → 1.0.0

data/bin/memegen

@@ -4,62 +4,16 @@ $LOAD_PATH.unshift File.expand_path("lib")
 $LOAD_PATH.unshift File.expand_path("../lib")
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
-URL_REGEX = /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+require "meme_generator/cli"
 
-def images
-  local_image_path = File.expand_path("~/.memegen")
-  Dir.glob(["generators/*", "#{local_image_path}/*."])
-end
-
-def usage
-  puts 'usage: memegen <image> <top> <bottom> [--list|-l] [--campfire|-c]'
-  exit 1
-end
-
-# Process command
 image, top, bottom = ARGV[0..2]
+help = ARGV.include?("--help") || ARGV.include?("-h")
+list = ARGV.include?("--list") || ARGV.include?("-l")
+campfire = ARGV.include?("--campfire") || ARGV.include?("-c")
 
-# List
-if ARGV.delete("--list")
-  names = images.map { |path|
-    File.basename(path).gsub(/\..*/, '')
-  }.sort
-  
-  names.each { |name| puts name }
-  exit 0
-end
-
-# Campfire setup
-require "meme_generator/campfire"
-campfire = ARGV.delete("--campfire") || ARGV.delete("-c")
-if campfire && !MemeGenerator::Campfire.config
-  MemeGenerator::Campfire.prompt_config
-end
-
-# 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
-
-# Require at least one text argument
-if top || bottom
-  require "meme_generator"
-  output_path = MemeGenerator.generate(path, top, bottom)
-  
-  if campfire
-    MemeGenerator::Campfire.upload(output_path)
-  else
-    puts output_path
-  end
-  exit 0
-else
-  puts "Error: You must provide at least one piece of text"
-  usage
-end
+usage if help || ARGV.empty?
+list_generators if list
+setup_campfire if campfire
 
+path = parse_path(image)
+generate(path, top, bottom, campfire)

data/lib/meme_generator.rb

@@ -2,7 +2,7 @@ require "rubygems"
 require "bundler/setup"
 
 class MemeGenerator
-  VERSION = "0.0.10"
+  VERSION = "1.0.0"
 
   class << self
     def generate(path, top, bottom)

data/lib/meme_generator/cli.rb

@@ -0,0 +1,55 @@
+def images
+  local_image_path = File.expand_path("~/.memegen")
+  base = File.join(File.dirname(__FILE__), "..", "..", "generators")
+  Dir.glob(["#{base}/*", "#{local_image_path}/*.*"])
+end
+
+def usage
+  puts 'usage: memegen <image> <top> <bottom> [--list|-l] [--campfire|-c] [--help|-h]'
+  exit 1
+end
+
+def list_generators
+  names = images.map { |path|
+    File.basename(path).gsub(/\..*/, '')
+  }.sort
+
+  names.each { |name| puts name }
+  exit 0
+end
+
+def setup_campfire
+  require "meme_generator/campfire"
+  if !MemeGenerator::Campfire.config
+    MemeGenerator::Campfire.prompt_config
+  end
+end
+
+def parse_path(string)
+  if string =~ /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+    path = "/tmp/memegen-download-#{Time.now.to_i}"
+    `curl "#{image}" -o #{path} --silent`
+  elsif path = images.find { |p| p =~ /#{path}\./ }
+  else
+    puts "Error: Image not found. Use --list to view installed images."
+    exit 1
+  end
+  path
+end
+
+def generate(path, top, bottom, campfire)
+  if top || bottom
+    require "meme_generator"
+    output_path = MemeGenerator.generate(path, top, bottom)
+
+    if campfire
+      MemeGenerator::Campfire.upload(output_path)
+    else
+      puts output_path
+    end
+    exit 0
+  else
+    puts "Error: You must provide at least one piece of text"
+    usage
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memegen
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  version: 1.0.0
 platform: ruby
 authors: 
 - Brandon Keene
@@ -57,6 +57,7 @@ extra_rdoc_files: []
 files: 
 - bin/memegen
 - lib/meme_generator/campfire.rb
+- lib/meme_generator/cli.rb
 - lib/meme_generator.rb
 - generators/a_dog.jpg
 - generators/angry_arnold.jpg