memegen 1.0.0 → 1.0.1

data/bin/memegen

@@ -13,7 +13,6 @@ campfire = ARGV.include?("--campfire") || ARGV.include?("-c")
 
 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 = "1.0.0"
+  VERSION = "1.0.1"
 
   class << self
     def generate(path, top, bottom)

data/lib/meme_generator/campfire.rb

@@ -1,6 +1,7 @@
 class MemeGenerator
   class Campfire
-    CONFIG_PATH = File.join(File.expand_path("~/.memegen"), ".campfire")
+    MEMEGEN_PATH = File.expand_path("~/.memegen")
+    CONFIG_PATH = File.join(MEMEGEN_PATH, ".campfire")
 
     class << self
       def config
@@ -9,13 +10,12 @@ class MemeGenerator
       end
 
       def prompt_config
-        puts "Set your Campfire credentials..."
-        print "Subdomain : "
-        subdomain = gets.strip
-        print "Token     : "
-        token = gets.strip
-        print "Room      : "
-        room = gets.strip
+        require "readline"
+        puts "Set your Campfire credentials..." unless config
+
+        subdomain = Readline.readline("Subdomain : ").strip
+        token     = Readline.readline("Token     : ").strip
+        room      = Readline.readline("Room      : ").strip
 
         write_config([subdomain, token, room])
 
@@ -23,15 +23,24 @@ class MemeGenerator
       end
 
       def upload(path)
-        require 'tinder'
-        require 'open-uri'
+        prompt_config unless config
+
+        require "tinder"
+        require "open-uri"
 
         puts "Uploading... "
         silence_stream(STDERR) do
-          campfire = Tinder::Campfire.new config[:subdomain], :token => config[:token]
-          room = campfire.rooms.detect { |room| room.name == config[:room] }
-          room.upload(path)
+          begin
+            campfire = Tinder::Campfire.new config[:subdomain], :token => config[:token]
+            room = campfire.rooms.detect { |room| room.name == config[:room] }
+            room.upload(path)
+          rescue Tinder::AuthenticationFailed
+            puts "Your campfire credentials are incorrect. Please enter them again."
+            prompt_config
+            upload(path)
+          end
         end
+        puts "Done!"
       end
 
       private
@@ -57,6 +66,8 @@ class MemeGenerator
       end
 
       def write_config(config)
+        require "fileutils"
+        FileUtils.mkdir_p(MEMEGEN_PATH)
         File.open(CONFIG_PATH, "w") do |file|
           file.write(config.join("|"))
         end

data/lib/meme_generator/cli.rb

@@ -18,18 +18,12 @@ def list_generators
   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}\./ }
+  elsif path = images.find { |p| p =~ /#{string}\./ }
+
   else
     puts "Error: Image not found. Use --list to view installed images."
     exit 1
@@ -40,6 +34,8 @@ end
 def generate(path, top, bottom, campfire)
   if top || bottom
     require "meme_generator"
+    require "meme_generator/campfire"
+
     output_path = MemeGenerator.generate(path, top, bottom)
 
     if campfire

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memegen
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Brandon Keene