imgurr 0.0.4 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imgurr (0.0.4)
+    imgurr (0.1.0)
       json (~> 1.7.0)
 
 GEM

data/README.md

@@ -13,6 +13,9 @@ Imgurr lets you quickly upload images, get info about an image and delete your o
     imgurr upload image.jpg
     Copied http://i.imgur.com/PLWGJlc.gif to clipboard
 
+    imgurr upload image.jpg --markdown
+    Copied ![Screenshot](http://i.imgur.com/PLWGJlc.gif) to clipboard
+
     imgurr info 2KxrTAK
         Image ID   : 2KxrTAK
         Views      : 14717
@@ -24,8 +27,10 @@ Imgurr lets you quickly upload images, get info about an image and delete your o
         Height     : 540 px
         Link       : http://i.imgur.com/2KxrTAK.jpg
 
-    imgurr delete 2KxrTAK
+    imgurr delete http://i.imgur.com/2KxrTAK.jpg
     Successfully deleted image from Imgur
 
+    ./imgurr --help for more.
+
 ## How it works
 Imgurr stores the delete hash generated by Imgur locally when uploading an image using imgurr. Most of the time the delete hash gets lost if you don't have an account and you want to takedown an image you have to contact Imgur support which can take a while. With imgurr all your delete hashes are saved so you can delete your images later if needed.

data/Rakefile

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+#############################################################################
+#
+# Tests
+#
+#############################################################################
+
+task :default => :test
+
+desc "Run tests for #{name}"
+task :test do
+  exec "test/run"
+end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end

data/imgurr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'imgurr'
-  s.version     = '0.0.4'
-  s.date        = '2013-04-11'
+  s.version     = '0.1.0'
+  s.date        = '2013-04-17'
   s.summary     = "Imgurr lets you upload images to imgur from the command line"
   s.description = "Imgurr is a ruby gem that lets you upload images to Imgur and manage your account"
   s.authors     = ["Christophe Naud-Dulude"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.files             = %w( README.md LICENSE.md Gemfile Gemfile.lock imgurr.gemspec )
+  s.files             = %w( README.md LICENSE.md Gemfile Gemfile.lock imgurr.gemspec Rakefile)
   s.files            += Dir.glob("lib/**/*")
   s.files            += Dir.glob("bin/**/*")
   s.files            += Dir.glob("test/**/*")

data/lib/imgurr.rb

@@ -10,6 +10,7 @@ require 'net/http'
 require 'net/https'
 require 'open-uri'
 require 'json'
+require 'optparse'
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
@@ -23,10 +24,14 @@ require 'imgurr/imgurErrors'
 require 'imgurr/command'
 
 module Imgurr
-	VERSION = '0.0.4'
+	VERSION = '0.1.0'
   DEBUG   = false
 
   def self.storage
     @storage ||= Storage.new
   end
+
+  def self.options
+    @options ||= {}
+  end
 end

data/lib/imgurr/command.rb

@@ -10,6 +10,7 @@
 module Imgurr
   class Command
     class << self
+
       #include Imgurr::Color
 
       # Public: executes a command.
@@ -22,9 +23,45 @@ module Imgurr
         minor   = args.empty? ? nil : args.join(' ')
 
         return help unless command
+        parse_options
         delegate(command, major, minor)
       end
 
+      # Public: Parse extra options
+      #
+      # returns nothing
+      def parse_options
+        options[:markdown] = false
+        o = OptionParser.new do |opts|
+          opts.on('-m', '--markdown', 'Use Markdown Syntax') do
+            options[:markdown] = true
+          end
+          opts.on('-t', '--title TITLE', 'Image Title') do |value|
+            options[:title] = value
+          end
+          opts.on('-d', '--desc DESC', 'Image Title') do |value|
+            options[:desc] = value
+          end
+          opts.on('-v', '--version', 'Print Version') do
+            version
+            quit
+          end
+          opts.on('-h', '--help', 'Print Help') do
+            help
+            quit
+          end
+        end
+        begin
+          o.parse!
+        rescue OptionParser::MissingArgument => e
+          puts "Error: #{e.message}"
+          quit
+        rescue OptionParser::InvalidOption => e
+          puts "Error: #{e.message}"
+          quit
+        end
+      end
+
       # Public: gets $stdin.
       #
       # Returns the $stdin object. This method exists to help with easy mocking
@@ -40,6 +77,13 @@ module Imgurr
         Imgurr.storage
       end
 
+      # Public: accesses the global options
+      #
+      # Returns Options dictionary
+      def options
+        Imgurr.options
+      end
+
       # Public: allows main access to most commands.
       #
       # Returns output based on method calls.
@@ -47,13 +91,22 @@ module Imgurr
         return help unless command
         return no_internet       unless self.internet_connection?
 
-        return version             if command == '--version' || command == '-v' || command == 'version'
-        return help                if command == 'help'
-        return help                if command[0] == 45 || command[0] == '-' # any - dash options are pleas for help
-        return upload(major)       if command == 'upload' || command == 'up' || command == 'u'
-        return info(major)         if command == 'info' || command == 'i'
-        return delete(major,minor) if command == 'delete' || command == 'd'
+        # Get image ID from URL
+        if major
+          return upload(major)       if command == 'upload' || command == 'up' || command == 'u'
 
+          if major =~ /.*imgur\.com\/[a-zA-Z0-9]*\.[a-zA-Z]*/
+            major = /com\/[a-zA-Z0-9]*/.match(major).to_s.gsub('com/','')
+          end
+
+          return unless valid_id major
+          return info(major)         if command == 'info' || command == 'i'
+          return delete(major,minor) if command == 'delete' || command == 'd'
+        else
+          puts "Argument required for commmand #{command}."
+          puts "imgurr --help for more information."
+          return
+        end
       end
 
       # Public: Upload an image to Imgur
@@ -66,7 +119,10 @@ module Imgurr
         end
         response = ImgurAPI.upload(major)
         puts response if response.start_with?('Imgur Error')
-        puts "Copied #{Platform.copy(response)} to clipboard" if response.start_with?('http')
+        if response.start_with?('http')
+          response = "![#{options[:title].nil? ? 'Screenshot' : options[:title]}](#{response})" if options[:markdown]
+          puts "Copied #{Platform.copy(response)} to clipboard"
+        end
         storage.save
       end
 
@@ -122,7 +178,25 @@ module Imgurr
       #
       # Returns nothing
       def no_internet
-        puts "An Internet connection is required to use this command."
+        puts 'An Internet connection is required to use this command.'
+      end
+
+      # Public: Quit / Exit program
+      #
+      # Returns nothing
+      def quit
+        exit(1)
+      end
+
+      # Public: Validate id (major)
+      #
+      # Returns true if valid id
+      def valid_id(major)
+        unless major =~ /^[a-zA-Z0-9]*$/
+          puts "#{major} is not a valid imgur ID or URL"
+          return false
+        end
+        return true
       end
 
       # Public: prints all the commands of boom.
@@ -132,10 +206,13 @@ module Imgurr
         text = '
           - imgurr: help ---------------------------------------------------
 
-          imgurr help                              This help text
-          imgurr version                           Print current version
+          imgurr --help                            This help text
+          imgurr --version                         Print current version
 
           imgurr upload <image>                    Upload image and copy link to clipboard
+          imgurr upload <image> [-m|--markdown ]   Upload image and copy link to clipboard with markdown syntax
+                                [--tile="Title"]   Set image title
+                                [--desc="Desc" ]   Set image description
           imgurr info   <id>                       Print image information
           imgurr delete <id>                       Deletes an image from imgur if the deletehash is found locally
           imgurr delete <id> <deletehash>          Deletes an image from imgur with the provided deletehash

data/lib/imgurr/imgurAPI.rb

@@ -22,6 +22,13 @@ module Imgurr
         Imgurr.storage
       end
 
+      # Public: accesses the global options
+      #
+      # Returns Options dictionary
+      def options
+        Imgurr.options
+      end
+
       # HTTP Client used for API requests
       # TODO: Confirm SSL Certificate
       def web_client
@@ -37,6 +44,8 @@ module Imgurr
       # 
       def upload(image_path)
         params   = {:image => File.read(image_path)}
+        params[:title] = options[:title] unless options[:title].nil?
+        params[:description] = options[:desc] unless options[:desc].nil?
         request  = Net::HTTP::Post.new(API_URI.request_uri + ENDPOINTS[:image])
         request.set_form_data(params)
         request.add_field('Authorization', API_PUBLIC_KEY)
@@ -95,8 +104,8 @@ module Imgurr
             Image ID   : #{data['data']['id']}
             Views      : #{data['data']['views']}
             Bandwidth  : #{Numbers.to_human(data['data']['bandwidth'])}
-            Title      : #{'None' unless data['data']['title']}
-            Desc       : #{'None' unless data['data']['description']}
+            Title      : #{data['data']['title'].nil? ? 'None' : data['data']['title']}
+            Desc       : #{data['data']['description'].nil? ? 'None' : data['data']['description']}
             Animated   : #{data['data']['animated']}
             Width      : #{data['data']['width']} px
             Height     : #{data['data']['height']} px

data/test/1-upload.sh

@@ -12,3 +12,11 @@ it_uploads_image() {
   chmod 777 ${id_file}
   rm test/temp
 }
+
+it_uploads_image_with_markdown() {
+  ${imgurr} upload ${image} --markdown | grep "Copied !\[Screenshot\](http://i.imgur.com"
+}
+
+it_uploads_image_with_title_desc() {
+  ${imgurr} upload ${image} --title "Test" --desc "Test" | grep "Copied http://i.imgur.com"
+}

data/test/2-info.sh

@@ -8,3 +8,15 @@ describe "info"
 it_gets_image_info() {
   ${imgurr} info `cat ${id_file}` | grep "Width      : 96 px"
 }
+
+it_gets_image_info_from_url() {
+  ${imgurr} info http://i.imgur.com/2KxrTAK.jpg | grep "Width      : 960 px"
+}
+
+it_gets_image_info_from_url_with_title() {
+  ${imgurr} info http://i.imgur.com/Wk1iPej.jpg | grep "Title      : Imgurr Test"
+}
+
+it_gets_image_info_from_url_with_description() {
+  ${imgurr} info http://i.imgur.com/Wk1iPej.jpg | grep "Desc       : Imgurr Test"
+}

data/test/cli.sh

@@ -5,7 +5,7 @@ imgurr="./bin/imgurr"
 describe "cli"
 
 it_shows_help() {
-  ${imgurr} help | grep "imgurr: help"
+  ${imgurr} --help | grep "imgurr: help"
 }
 
 it_shows_a_version() {

data/test/error.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env roundup
+export IMGURRFILE=test/files/imgurr.json
+imgurr="./bin/imgurr"
+image="test/files/habs.gif"
+
+describe "errors"
+
+it_shows_missing_arg_error() {
+  ${imgurr} upload ${image} --title | grep "Error: missing argument"
+}
+
+it_shows_invalid_option_error() {
+  ${imgurr} upload ${image} --unknown | grep "Error: invalid option"
+}

data/test/run

@@ -5,4 +5,6 @@
 ./test/roundup test/*.sh
 rm test/id
 
-git checkout test/files/imgurr.json
+git checkout test/files/imgurr.json
+
+export IMGURRFILE=~/.imgurr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgurr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,6 +58,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - imgurr.gemspec
+- Rakefile
 - bin/imgurr
 - lib/imgurr/color.rb
 - lib/imgurr/command.rb
@@ -71,6 +72,7 @@ files:
 - test/2-info.sh
 - test/3-delete.sh
 - test/cli.sh
+- test/error.sh
 - test/files/github-logo.png
 - test/files/habs.gif
 - test/files/imgurr.json