imgurr 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4544fad3819e0f8c9d81e8a59e1be7435a78296
-  data.tar.gz: 890d54d33ea441afd7970d73ea1d937d0df4dde9
+  metadata.gz: dc5e24675f0306b5d0f9c1068599acc4ffd6de29
+  data.tar.gz: 62ffec32123b2d2d9e306f98bcc5d0c2440e5780
 SHA512:
-  metadata.gz: 99eb2135ac23a07d1a23333aaf0db10564a4e347c70cb54b12acf8e8f51538236a2685372ad93ed2eb0eea4317536315785ef6ab34d5753578258b4ba153131f
-  data.tar.gz: 1b807e4cb0ab03b55b0582376dd23c307edba8d3c919f176f3f3cf7caafdcb4beceb0bb3a7f94f73753b31ebece59c9468f3ca01311a7f49a7ae6e20047fb86c
+  metadata.gz: 5af7a7c4f701d72132e6aed3e8577420de2e7508d4efe3eec9b83573da91b07d325c843e9fad8f0023c3516626fb492ac64cae2dd0e4fbc2afa8c99b97b946b1
+  data.tar.gz: ef8c4dd81a8bb18f6d259b966963235d4298a7b1377202bba889b59d44db9a8a06588d754476da6a261fac476e6559cc85e57eeb65e75618750bb029d38fa3c3

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    imgurr (0.0.1)
+    imgurr (0.0.2)
       json (~> 1.7.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     json (1.7.7)
+    rake (0.9.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   imgurr!
+  rake (~> 0.9.2)

data/README.md

@@ -5,9 +5,22 @@ Command line utility for Imgur in ruby
 
 
 ## Install
+**Warning:** This gem is still in early development and might not work on your system. Please report any bugs. 
+
     gem install imgurr
     
 ## Usage
     imgurr upload image.jpg
     Copied http://i.imgur.com/PLWGJlc.gif to clipboard
+
+    imgurr info 2KxrTAK
+        Image ID   : 2KxrTAK
+        Views      : 14717
+        Bandwidth  : 2.296 GiB
+        Title      :
+        Desc       :
+        Animated   : false
+        Width      : 960 px
+        Height     : 540 px
+        Link       : http://i.imgur.com/2KxrTAK.jpg
     

data/imgurr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'imgurr'
-  s.version     = '0.0.1'
-  s.date        = '2013-04-06'
+  s.version     = '0.0.3'
+  s.date        = '2013-04-07'
   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"]

data/lib/imgurr/command.rb

@@ -10,7 +10,7 @@
 module Imgurr
   class Command
     class << self
-      #include Imgurup::Color
+      #include Imgurr::Color
 
       # Public: executes a command.
       #
@@ -25,16 +25,6 @@ module Imgurr
         delegate(command, major, minor)
       end
 
-      # Public: prints any given string.
-      #
-      # s = String output
-      #
-      # Prints to STDOUT and returns. This method exists to standardize output
-      # and for easy mocking or overriding.
-      def output(s)
-        puts(s)
-      end
-
       # Public: gets $stdin.
       #
       # Returns the $stdin object. This method exists to help with easy mocking
@@ -47,12 +37,14 @@ module Imgurr
       #
       # Returns output based on method calls.
       def delegate(command, major, minor)
-        return version           if command == '-v'
+        return help unless command
+        return no_internet       unless self.internet_connection?
+
         return version           if command == '--version'
         return help              if command == 'help'
         return help              if command[0] == 45 || command[0] == '-' # any - dash options are pleas for help
-        return echo(major,minor) if command == 'echo' || command == 'e'
         return upload(major)     if command == 'upload' || command == 'up' || command == 'u'
+        return info(major)       if command == 'info' || command == 'i'
 
       end
 
@@ -60,23 +52,53 @@ module Imgurr
       # 
       # Returns nothing
       def upload(major)
+        unless File.exist?(major)
+          puts "File #{major} not found."
+          return
+        end
         response = ImgurAPI.upload(major)
-        puts response if response.start_with?('Error')
+        puts response if response.start_with?('Imgur Error')
         puts "Copied #{Platform.copy(response)} to clipboard" if response.start_with?('http')
       end
 
+      # Public: Get image info
+      #
+      # Returns nothing
+      def info(major)
+        response = ImgurAPI.get_info(major)
+        puts response
+      end
+
       # Public: the version of boom that you're currently running.
       #
       # Returns a String identifying the version number.
       def version
-        output "You're running imgurup #{Imgurup::VERSION}."
+        puts "You're running imgurr #{Imgurr::VERSION}."
       end
 
       # Public: launches preferences JSON file in an editor for you to edit manually.
       #
       # Returns nothing.
       def edit
-        Platform.edit(account.json_file)
+        #Platform.edit(account.json_file)
+      end
+
+      # Public: Checks is there's an active internet connection
+      #
+      # Returns true or false
+      def internet_connection?
+        begin
+          true if open("http://www.google.com/")
+        rescue
+          false
+        end
+      end
+
+      # Public: No internet error
+      #
+      # Returns nothing
+      def no_internet
+        puts "An Internet connection is required to use this command."
       end
 
       # Public: prints all the commands of boom.
@@ -84,16 +106,19 @@ module Imgurr
       # Returns nothing.
       def help
         text = '
-          - imgurup: help ---------------------------------------------------
+          - imgurr: help ---------------------------------------------------
 
-          imgurup upload <image>                    Upload image and copy link to clipboard
+          imgurr help                              This help text
+          imgurr version                           Print current version
 
+          imgurr upload <image>                    Upload image and copy link to clipboard
+          imgurr info   <id>                       Print image information
 
           all other documentation is located at:
-          https://github.com/Chris911/imgurup
+          https://github.com/Chris911/imgurr
         '.gsub(/^ {8}/, '') # strip the first eight spaces of every line
 
-        output text
+        puts text
       end
 
     end

data/lib/imgurr/imgurAPI.rb

@@ -11,8 +11,8 @@ module Imgurr
       API_PUBLIC_KEY = 'Client-ID 70ff50b8dfc3a53'
 
       ENDPOINTS = {
-        :image   => '/3/image',
-        :gallery => '/3/gallery'
+        :image   => '/3/image/',
+        :gallery => '/3/gallery/'
       }
 
       # HTTP Client used for API requests
@@ -35,17 +35,55 @@ module Imgurr
         request.add_field('Authorization', API_PUBLIC_KEY)
 
         response = web_client.request(request)
-        handle_response(response.body)
+        handle_upload_response(response.body)
+      end
+
+      # Public: Get info about an image
+      #
+      # args    - The image imgur id
+      #
+      def get_info(image_id)
+        request  = Net::HTTP::Get.new(API_URI.request_uri + ENDPOINTS[:image] + image_id)
+        request.add_field('Authorization', API_PUBLIC_KEY)
+
+        response = web_client.request(request)
+        handle_info_response(response.body)
       end
 
       # Public: Handle API Response
       #
       # args    - Response data
       # 
-      def handle_response(response)
+      def handle_upload_response(response)
+        data = JSON.parse(response)
+        puts JSON.pretty_unparse(data) if Imgurr::DEBUG
+        if data['success']
+          return data['data']['link']
+        end
+        ImgurErrors.handle_error(response)
+      end
+
+      # Public: Handle API Response
+      #
+      # args    - Response data
+      #
+      def handle_info_response(response)
         data = JSON.parse(response)
-        #puts JSON.pretty_unparse(data)
-        data['data']['link'] if(data['success'])
+        puts JSON.pretty_unparse(data) if Imgurr::DEBUG
+        if data['success']
+          return "
+            Image ID   : #{data['data']['id']}
+            Views      : #{data['data']['views']}
+            Bandwidth  : #{Numbers.to_human(data['data']['bandwidth'])}
+            Title      : #{data['data']['title']}
+            Desc       : #{data['data']['description']}
+            Animated   : #{data['data']['animated']}
+            Width      : #{data['data']['width']} px
+            Height     : #{data['data']['height']} px
+            Link       : #{data['data']['link']}
+          ".gsub(/^ {8}/, '')
+        end
+        ImgurErrors.handle_error(response)
       end
 
     end

data/lib/imgurr/imgurErrors.rb

@@ -8,17 +8,9 @@ module Imgurr
 	class ImgurErrors
 		class << self
 
-			ERROR_CODES = {
-				400 => 'Missing Parameters',
-				401 => 'Auth Required',
-				403 => 'Forbidden',
-				404 => 'Resource does not exist',
-				429 => 'Rate Limiting',
-				500 => 'Internal Error'
-			}
-
 			def handle_error(response)
-				
+        data = JSON.parse(response)
+        "Imgur Error: #{data['data']['error']} (#{data['status']})"
 			end
 			
 		end

data/lib/imgurr/numbers.rb

@@ -0,0 +1,14 @@
+module Imgurr
+  class Numbers
+    class << self
+      def to_human(number)
+        units = %W(B KiB MiB GiB TiB)
+
+        size, unit = units.reduce(number.to_f) do |(fsize, _), utype|
+          fsize > 512 ? [fsize / 1024, utype] : (break [fsize, utype])
+        end
+        return "#{"%.3f" % size} #{unit}"
+      end
+    end
+  end
+end

data/lib/imgurr.rb

@@ -8,18 +8,20 @@ end
 # External require
 require 'net/http'
 require 'net/https'
+require 'open-uri'
 require 'json'
-require 'openssl'
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 # Internal require
-require 'imgurr/command'
 require 'imgurr/color'
+require 'imgurr/numbers'
 require 'imgurr/imgurAPI'
 require 'imgurr/platform'
 require 'imgurr/imgurErrors'
+require 'imgurr/command'
 
 module Imgurr
-	VERSION = '0.0.1'
+	VERSION = '0.0.2'
+  DEBUG   = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgurr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Christophe Naud-Dulude
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,6 +58,7 @@ files:
 - lib/imgurr/command.rb
 - lib/imgurr/imgurAPI.rb
 - lib/imgurr/imgurErrors.rb
+- lib/imgurr/numbers.rb
 - lib/imgurr/platform.rb
 - lib/imgurr.rb
 - test/run