le_meme 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bcc7f74f26c2187c45681071a58826936f99eb0
-  data.tar.gz: dccfc1dfe06b788abe1aee13ed938b44aff09677
+  metadata.gz: d259d15403afedfcf9afff3d29004ea4d778f180
+  data.tar.gz: 509820a6f6e562852d82e0494ad3e4e2f81be81e
 SHA512:
-  metadata.gz: 17335ec81d74e308ce8ae8f7cbd016361194509576c039bf04f309f3074a0d9b5ef01e6ec0e06e20949ae08e320785df0658c4c872e6d3282e5a55a1b44c0744
-  data.tar.gz: dbcc9831a22cbab608f00282453ff10f0a83222a97a4bd26c7a5496a7297ab3fe1394586c3e86e4debd7cef8f3506fbe750355415d7cc8f1b57f59ae782b5243
+  metadata.gz: a432b9ba98e2390e5409a1dd327a4d6ee3b9d059c3b76b2b0185e71e4833e16841a394e175efc9b8509d668abd9a1473d0ed2176b7b84be3b562e0b2a3c202a6
+  data.tar.gz: 82c70074224e66c354f074d1786747c1d820756371c7dd403337136a994ddaede68f2a83094f64d2821614eb185a7bf4bff806099530e01684968e66449e017c

data/bin/meme

@@ -4,8 +4,7 @@ require 'le_meme'
 require 'slop'
 
 memegen = LeMeme.new
-
-opts = Slop.parse!(strict: true, help: true) do
+opts = Slop.new(strict: true, help: true) do
   banner <<-HEREDOC
 Usage: meme [options] [top-text] [bottom-text]
 
@@ -20,6 +19,7 @@ HEREDOC
   on 'p', 'path=', 'path to an image to use for the meme'
   on 'w', 'watermark=', 'text to watermark the image'
   on 'o', 'outpath=', 'path to save the final meme to'
+  on 'O', 'open', "Open the file in your system's default image viewer"
 
   on 'templates', 'list all the meme templates' do
     puts memegen.memes.keys.join("\n")
@@ -30,15 +30,36 @@ HEREDOC
     exit
   end
 end
+if ARGV.empty?
+  $stdout.puts opts if $stdout.tty?
+  exit(0)
+end
 
+opts.parse!
 
 top = opts[:top] || ARGV[0]
 bottom = opts[:bottom] || ARGV[1]
 
+
 if opts[:path]
-  $stdout.puts memegen.meme(path: opts[:path], top: top, bottom: bottom, watermark: opts[:watermark], outpath: opts[:outpath])
+  output =  memegen.meme(path: opts[:path], top: top, bottom: bottom, watermark: opts[:watermark], outpath: opts[:outpath])
+else
+  name = opts[:meme].strip if opts[:meme]
+  output =  memegen.fast_meme(name: name, top: top, bottom: bottom, watermark: opts[:watermark], outpath: opts[:outpath])
+end
+
+if opts[:open]
+  case RbConfig::CONFIG['host_os']
+  when /mswin|mingw|cygwin/
+    `start #{output}`
+  when /darwin/
+    `open -F #{output}`
+  when /linux|bsd/
+    `xdg-open #{output}`
+  else
+    $stderr.puts "Sorry, don't know how to open on your system! (#{RbConfig::Config['host_os']})"
+  end
 else
-  name = opts[:meme] || ''
-  $stdout.puts memegen.fast_meme(name: name.strip, top: top, bottom: bottom, watermark: opts[:watermark], outpath: opts[:outpath])
+  $stdout.puts output
 end
 exit

data/lib/le_meme.rb

@@ -29,9 +29,10 @@ class LeMeme
   # @param top [String] The text you want to appear on the top of the meme.
   # @param bottom [String] The text you want to appear on the bottom of the meme.
   # @param watermark [String] The watermark text. If nil it is omitted
-  # @param outpath [String] Where do you want to put the generated meme. Defaults to /tmp/
-  # @return [String] Path to the generated meme
-  def generate(path:, top: nil, bottom: nil, watermark: nil, outpath: nil)
+  # @param outpath [String] Where do you want to put the generated meme. Defaults to /tmp/meme-<timestamp>.<extension>
+  # @param nowrite [Boolean] Returns the meme as a blob (string) instead of writing to disk.
+  # @return [String] Either the generated meme object (if nowrite) or a path to the meme
+  def generate(path:, top: nil, bottom: nil, watermark: nil, outpath: nil, nowrite: false)
     top = (top || '').upcase
     bottom = (bottom || '').upcase
 
@@ -57,8 +58,12 @@ class LeMeme
     end
 
     output_path = outpath || "/tmp/meme-#{Time.now.to_i}#{path.extname}"
-    canvas.write(output_path)
-    output_path
+    if nowrite
+      canvas.to_blob
+    else
+      canvas.write(output_path)
+      output_path
+    end
   end
   alias_method :meme, :generate
 
@@ -69,9 +74,10 @@ class LeMeme
   # @param top [String] The text you want to appear on the top of the meme.
   # @param bottom [String] The text you want to appear on the bottom of the meme.
   # @param watermark [String] The watermark text. If nil it is omitted
-  # @param outpath [String] Where do you want to put the generated meme. Defaults to /tmp/
-  # @return [String] Path to the generated meme
-  def fast_meme(name: nil, top: nil, bottom: nil, watermark: nil, outpath: nil)
+  # @param outpath [String] Where do you want to put the generated meme. Defaults to /tmp/meme-<timestamp>.<extension>
+  # @param nowrite [Boolean] Returns the meme as a blob (string) instead of writing to disk.
+  # @return [String] Either the generated meme object (if nowrite) or a path to the meme
+  def fast_meme(name: nil, top: nil, bottom: nil, watermark: nil, outpath: nil, nowrite: false)
     if name.nil?
       path = @memes[@memes.keys.sample]
     elsif @memes[name].nil?
@@ -79,7 +85,7 @@ class LeMeme
     else
       path = @memes[name]
     end
-    generate(path: path, top: top, bottom: bottom, watermark: watermark, outpath: outpath)
+    generate(path: path, top: top, bottom: bottom, watermark: watermark, outpath: outpath, nowrite: nowrite)
   end
   alias_method :m, :fast_meme
 

data/lib/le_meme/version.rb

@@ -1,3 +1,3 @@
 class LeMeme
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/le_meme_spec.rb

@@ -14,6 +14,7 @@ describe LeMeme do
       x = ['text', nil] * 3
       x.permutation(3).to_a.uniq.each do |top, bottom, watermark|
         it "should generate a meme with top: '#{top}', bottom: '#{bottom}', and watermark: '#{watermark}'" do
+          expect_any_instance_of(Magick::ImageList).to receive(:write).and_return("/tmp/meme-#{Time.now.to_i}.jpg")
           expect(meme.generate(path: image, top: top, bottom: bottom, watermark: watermark)).to match(%r{/tmp/meme-\d+.jpg})
         end
       end
@@ -24,6 +25,12 @@ describe LeMeme do
         expect(meme.generate(path: image, top: 'top', bottom: 'bottom', outpath: 'test.jpg')).to eq('test.jpg')
       end
     end
+    context 'with nowrite set to true' do
+      it 'should output the meme as a blob string' do
+        mymeme = meme.generate(path: image, nowrite: true)
+        expect(mymeme.size).to eq(43618)
+      end
+    end
   end
 
   describe '#meme' do
@@ -47,6 +54,7 @@ describe LeMeme do
 
     context 'without a specified template' do
       it 'should generate a meme' do
+        expect_any_instance_of(Magick::ImageList).to receive(:write).and_return("/tmp/meme-#{Time.now.to_i}.jpg")
         expect(meme.fast_meme).to match(%r{/tmp/meme-\d+.jpg})
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: le_meme
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jeff Sandberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,7 +208,6 @@ files:
 - memes/wonka.jpg
 - memes/yee.jpg
 - memes/yuno.jpg
-- open
 - spec/le_meme_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/paradox460/le_meme

data/open

@@ -1 +0,0 @@
-/tmp/meme-1421208560.jpg