meem 0.0.2 → 1.0.0

data/README.md

@@ -1,6 +1,6 @@
 # Meem
 
-Meem is a command-line tool to create memes.
+Meem is a command-line tool to create memes. It's pretty awesome.
 
 ### Usage
 

data/lib/meem/templates.rb

@@ -0,0 +1,40 @@
+require "pathname"
+require "open-uri"
+
+module Meem::Templates
+  PATHS = [
+    Pathname.new("#{ENV['HOME']}/.meem/"),
+    Pathname.new("#{DIRECTORY}/../templates/")
+  ]
+
+  # List templates.
+  #
+  # Returns an Array of Pathname instances.
+  def self.list
+    PATHS.map do |path|
+      path.children.select { |child| child.extname == ".jpg" }
+    end.flatten
+  end
+
+  # Find a given template.
+  #
+  # template - A String describing a template.
+  #
+  # Return a Pathname instance.
+  def self.find template
+    list.find { |file| file.basename.to_s =~ /#{template}/ }
+  end
+
+  # Load a template from file or the internet.
+  #
+  # template - A String describing a template.
+  #
+  # Returns a File.
+  def self.load template
+    if template[/^http:\/\//]
+      return open template
+    else
+      find template
+    end
+  end
+end

data/lib/meem/version.rb

@@ -1,3 +1,3 @@
 module Meem
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/lib/meem.rb

@@ -1,31 +1,30 @@
+DIRECTORY = File.expand_path File.dirname __FILE__
+
 require "meem/version"
+require "meem/templates"
 require "optparse"
 require "ostruct"
 require "meme_captain"
-require "open-uri"
-require "pathname"
-
-DIRECTORY = File.expand_path File.dirname __FILE__
 
 module Meem
-  PATHS = [
-    "#{ENV['HOME']}/.meem/",
-    "#{DIRECTORY}/../templates/"
-  ]
-
   def self.run arguments
     options = parse arguments
 
-    image = MemeCaptain.meme_top_bottom fetch(options.meme), options.top, options.bottom,
-      font: "#{DIRECTORY}/../fonts/impact.ttf"
+    template = Templates.load options.meme
+
+    if template
+      image = generate template, options.top, options.bottom
 
-    if STDOUT.tty?
-      path = "/tmp/meme.jpg"
+      if STDOUT.tty?
+        path = "/tmp/meme.jpg"
 
-      image.write path
-      puts path
+        image.write path
+        puts path
+      else
+        puts image.to_blob
+      end
     else
-      puts image.to_blob
+      error "meme not found"
     end
   end
 
@@ -41,11 +40,14 @@ module Meem
 
     OptionParser.new do |opts|
       opts.program_name = "meem"
-      opts.banner = "usage: meem <meme> <top text> <bottom text>"
+      opts.banner = "usage: meem <meme> [options]"
       opts.version = Meem::VERSION
 
       opts.on "-l", "--list", "List memes" do
-        list
+        Templates.list.each do |file|
+          puts file.basename.to_s[/(.*)\.jpg/, 1]
+        end
+
         exit
       end
 
@@ -71,19 +73,17 @@ module Meem
     options
   end
 
-  # List memes.
-  def self.list
-    PATHS.each do |path|
-      Dir.glob "#{path}/*.jpg" do |file|
-        file = Pathname.new file
+  private
 
-        puts "* " + file.basename.to_s[/(.*)\.jpg/, 1]
-      end
-    end
+  # Generate a meme.
+  # 
+  # template - A File describing a template.
+  # top      - A String describing the top caption.
+  # bottom   - A String describing the bottom caption.
+  def self.generate template, top, bottom
+    MemeCaptain.meme_top_bottom template, top, bottom, font: "#{DIRECTORY}/../fonts/impact.ttf"
   end
 
-  private
-
   # Print a message and exit.
   #
   # message - A String describing the message.
@@ -92,25 +92,4 @@ module Meem
     puts "meem: #{message}"
     exit code
   end
-
-  # Load a meme.
-  #
-  # meme - A String describing a meme.
-  #
-  # Returns a File.
-  def self.fetch meme
-    if meme[/^http:\/\//]
-      return open meme
-    else
-      PATHS.each do |path|
-        image = path + "#{meme}.jpg"
-
-        if File.exists? image
-          return open image
-        end
-      end
-
-      error "meme not found"
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meem
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,7 @@ files:
 - bin/meem
 - fonts/impact.ttf
 - lib/meem.rb
+- lib/meem/templates.rb
 - lib/meem/version.rb
 - meem.gemspec
 - spec/meem_spec.rb
@@ -123,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2090817232039969754
+      hash: -3622821011475249863
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2090817232039969754
+      hash: -3622821011475249863
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23