imgurr 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6777d3dbff2111a8da2b309dfbd7d6770b35858
-  data.tar.gz: 8235aa8f016c17665b6fb882372d839852588538
+  metadata.gz: 896266ace91ad81bebc3bd35bd2b76c92ee94535
+  data.tar.gz: 87c9c88f338ee26aafe7370ba72b2fa458866850
 SHA512:
-  metadata.gz: 7808e86a9294e2e3310081dbbe6d77ce0a20b8eeb2ba7f6cc7ece4acc86597134b86cab93bb0a333d4e95bdeb24ca653cd4d2f9bf8fc9366c959fcf60bf2b195
-  data.tar.gz: 326758a27bb0a30130cbb11c106956456abea1c6da9daf1788f347a0e9285f1afa78fe2b55e06982500052ecd40cd306d596f30d5f8a9713a630ae7197f5f9b2
+  metadata.gz: 86b3107f8c45e27e4df59bf1927198a7368b6f17c6068ca43c3f37c42cdce88688e7449e2bf0456868110376e7dd7b11017f8725dd2d3c6d2d551577d9ac56ff
+  data.tar.gz: 75f5a0287e0d01ae06655c07b887aa5998960b3b3c4b2d7778d9208be3e1346d778d4a3153644402c792cc05da97ddedc84d5c61f639ba04ffef824c31a2524c

data/README.md

@@ -13,13 +13,13 @@ Command line utility for Imgur in Ruby. Imgurr lets you quickly upload images, g
     Uploading screenshot...
     Copied http://i.imgur.com/rGoGCNb.png to clipboard
 
-    $ imgurr upload image.jpg
+    $ imgurr upload image.gif
     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
+    $ imgurr info 2KxrTAK
         Image ID   : 2KxrTAK
         Views      : 14717
         Bandwidth  : 2.296 GiB

data/imgurr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'imgurr'
-  s.version     = '0.2.0'
+  s.version     = '1.0.0'
   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"]
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.files             = %w( README.md LICENSE.md Gemfile Gemfile.lock imgurr.gemspec Rakefile)
+  s.files             = %w( README.md LICENSE.md Gemfile imgurr.gemspec Rakefile)
   s.files            += Dir.glob("lib/**/*")
   s.files            += Dir.glob("bin/**/*")
   s.files            += Dir.glob("test/**/*")

data/lib/imgurr.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 begin
-	require 'rubygems'
+  require 'rubygems'
 rescue LoadError
 end
 
@@ -24,7 +24,7 @@ require 'imgurr/imgurErrors'
 require 'imgurr/command'
 
 module Imgurr
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
   DEBUG   = false
 
   def self.storage

data/lib/imgurr/command.rb

@@ -110,6 +110,8 @@ module Imgurr
           return info(major)         if command == 'info' || command == 'i'
           return delete(major,minor) if command == 'delete' || command == 'd'
         else
+          return list                if command == 'list' || command == 'l'
+
           puts "Argument required for commmand #{command}."
           puts "imgurr --help for more information."
           return
@@ -124,6 +126,7 @@ module Imgurr
           puts "File #{major} not found."
           return
         end
+        major = File.absolute_path(major)
         response, success = ImgurAPI.upload(major)
         puts response unless success
         if success
@@ -160,6 +163,21 @@ module Imgurr
         end
       end
 
+      # Public: List uploaded images
+      #
+      # Returns nothing
+      def list
+        items = storage.items
+        if items.empty?
+          puts 'No items in the list.'
+          return
+        end
+
+        storage.items.each do |(id, data)|
+          puts "#{id}  #{data[:stamp]}  #{data[:source].ljust(48)}"
+        end
+      end
+
       # Public: build HTML image tag response
       #
       # Returns a properly formatted HTML <img> tag
@@ -181,6 +199,7 @@ module Imgurr
       #
       # Returns nothing
       def delete(major,minor)
+        major = major.to_sym
         if minor
           delete_hash = minor
         else
@@ -194,6 +213,8 @@ module Imgurr
         end
         if ImgurAPI.delete(delete_hash)
           puts 'Successfully deleted image from Imgur'
+          storage.delete(major)
+          storage.save
         else
           puts 'Unauthorized Access. Wrong delete hash?'
         end
@@ -259,6 +280,7 @@ module Imgurr
                                 [--tile="Title"]   Set image title
                                 [--desc="Desc" ]   Set image description
           imgurr capture                           Capture a screenshot and upload it (OS X only)
+          imgurr list                              List uploaded images
           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

@@ -51,7 +51,7 @@ module Imgurr
         request.add_field('Authorization', API_PUBLIC_KEY)
 
         response = web_client.request(request)
-        handle_upload_response(response.body)
+        handle_upload_response(response.body, image_path)
       end
 
       # Public: Get info about an image
@@ -82,11 +82,11 @@ module Imgurr
       #
       # args    - Response data
       # 
-      def handle_upload_response(response)
+      def handle_upload_response(response, source_path)
         data = JSON.parse(response)
         puts JSON.pretty_unparse(data) if Imgurr::DEBUG
         if data['success']
-          storage.add_hash(data['data']['id'], data['data']['deletehash'])
+          storage.add_hash(data['data']['id'], data['data']['deletehash'], source_path)
           return [data['data']['link'], true]
         end
         [ImgurErrors.handle_error(response), false]
@@ -127,4 +127,4 @@ module Imgurr
 
     end
   end
-end
+end

data/lib/imgurr/storage.rb

@@ -19,7 +19,7 @@ module Imgurr
     #
     # Returns the Storage instance.
     def initialize
-      @hashes = []
+      @hashes = Hash.new
       bootstrap
       populate
     end
@@ -38,9 +38,8 @@ module Imgurr
     # hash - Delete hash
     #
     # Returns nothing
-    def add_hash(id, hash)
-      hash_item = {:id => id, :deletehash => hash}
-      @hashes.push(hash_item)
+    def add_hash(id, hash, source)
+      @hashes[id] = {:deletehash => hash, :source => source, :stamp => Time.now}
     end
 
     # Public: test whether out storage contains the delete hash for given id
@@ -49,7 +48,7 @@ module Imgurr
     #
     # Returns true if found, false if not.
     def hash_exists?(id)
-      @hashes.detect { |hash| hash[:id] == id }
+      @hashes.has_key? id
     end
 
     # Public: finds any given delete_hash by id.
@@ -58,15 +57,22 @@ module Imgurr
     #
     # Returns the first instance of delete_hash that it finds.
     def find(id)
-      hash = @hashes.find { |hash| hash[:id] == id }
-      hash[:deletehash]
+      hash = @hashes[id]
+      hash ? hash[:deletehash] : nil
     end
 
-    # Public: all Items in storage.
+    # Public: all Items in storage sorted in chronological order.
     #
     # Returns an Array of all Items.
     def items
-      @hashes.collect(&:items).flatten
+      @hashes.to_a.sort {|(_, a), (_, b)| a[:stamp] <=> b[:stamp] }
+    end
+
+    # Public: delete an Item entry from storage.
+    #
+    # Returns the deleted Item or nil.
+    def delete(id)
+      @hashes.delete(id)
     end
 
     # Public: creates a Hash of the representation of the in-memory data
@@ -75,7 +81,7 @@ module Imgurr
     #
     # Returns a Hash of the entire data set.
     def to_hash
-      { :hashes => @hashes.collect(&:to_hash) }
+      {:hashes => @hashes}
     end
 
     # Takes care of bootstrapping the Json file, both in terms of creating the
@@ -92,14 +98,15 @@ module Imgurr
     # Take a JSON representation of data and explode it out into the constituent
     # Lists and Items for the given Storage instance.
     #
-    # Returns nothing.
+    # Returns all hashes.
     def populate
       file = File.read(json_file)
-      storage = JSON.parse(file)
+      storage = JSON.parse(file, :symbolize_names => true)
+
+      @hashes = storage[:hashes]
+      convert if @hashes.is_a? Array
 
-      storage['hashes'].each do |hashes|
-        add_hash(hashes['id'], hashes['deletehash'])
-      end
+      @hashes
     end
 
     # Public: persists your in-memory objects to disk in Json format.
@@ -118,5 +125,19 @@ module Imgurr
     def to_json
       JSON.pretty_generate(to_hash)
     end
+
+    private
+    # Private: convert from old Json representation, filling in the missing data.
+    # Also print a warning message for the user.
+    #
+    # Returns nothing.
+    def convert
+      old = @hashes
+      @hashes = Hash.new
+
+      puts 'Warning: old JSON format detected, converting.'
+      old.each {|i| add_hash(i[:id], i[:deletehash], 'unknown') }
+      save
+    end
   end
-end
+end

data/test/1-upload.sh

@@ -1,30 +1,30 @@
 #!/usr/bin/env roundup
 export IMGURRFILE=test/files/imgurr.json
 imgurr="./bin/imgurr"
-image="test/files/habs.gif"
+image="test/files/habs.png"
 id_file="test/id"
 
 describe "upload"
 
 it_uploads_image() {
-  ${imgurr} upload ${image} | grep "Copied http://i.imgur.com" >> test/temp
-  cat test/temp | sed 's/.*imgur.com\/\(.*\)\..*/\1/' >> ${id_file}
-  chmod 777 ${id_file}
+  ${imgurr} upload ${image} >> test/temp
+  sed 's/.*imgur.com\/\(.*\)\..*/\1/' test/temp > ${id_file}
   rm test/temp
+  expr `cat ${id_file} | wc -c` ">" 0
 }
 
 it_uploads_image_with_markdown() {
-  ${imgurr} upload ${image} --markdown | grep "Copied !\[Screenshot\](http://i.imgur.com"
+  ${imgurr} upload ${image} --markdown | grep -m 1 "Copied !\[Screenshot\](http://i.imgur.com"
 }
 
 it_uploads_image_with_html() {
-  ${imgurr} upload ${image} --html | grep "Copied <img src=\"http://i.imgur.com/.*\" alt=\"Screenshot\">"
+  ${imgurr} upload ${image} --html | grep -m 1 "Copied <img src=\"http://i.imgur.com/.*\" alt=\"Screenshot\">"
 }
 
 it_uploads_image_with_html_and_size() {
-  ${imgurr} upload ${image} --html --size 45 | grep "Copied <img src=\"http://i.imgur.com/.*\" alt=\"Screenshot\" width=\"45%\">"
+  ${imgurr} upload ${image} --html --size 45 | grep -m 1 "Copied <img src=\"http://i.imgur.com/.*\" alt=\"Screenshot\" width=\"45%\">"
 }
 
 it_uploads_image_with_title_desc() {
-  ${imgurr} upload ${image} --title "Test" --desc "Test" | grep "Copied http://i.imgur.com"
-}
+  ${imgurr} upload ${image} --title "Test" --desc "Test" | grep -m 1 "Copied http://i.imgur.com"
+}

data/test/2-info.sh

@@ -6,17 +6,21 @@ id_file="test/id"
 describe "info"
 
 it_gets_image_info() {
-  ${imgurr} info `cat ${id_file}` | grep "Width      : 96 px"
+  ${imgurr} info `cat ${id_file}` | grep -m 1 "Width      : 48 px"
 }
 
 it_gets_image_info_from_url() {
-  ${imgurr} info http://i.imgur.com/2KxrTAK.jpg | grep "Width      : 960 px"
+  ${imgurr} info http://i.imgur.com/2KxrTAK.jpg | grep -m 1 "Width      : 960 px"
 }
 
 it_gets_image_info_from_url_with_title() {
-  ${imgurr} info http://i.imgur.com/Wk1iPej.jpg | grep "Title      : Imgurr Test"
+  ${imgurr} info http://i.imgur.com/Wk1iPej.jpg | grep -m 1 "Title      : Imgurr Test"
 }
 
 it_gets_image_info_from_url_with_description() {
-  ${imgurr} info http://i.imgur.com/Wk1iPej.jpg | grep "Desc       : Imgurr Test"
-}
+  ${imgurr} info http://i.imgur.com/Wk1iPej.jpg | grep -m 1 "Desc       : Imgurr Test"
+}
+
+it_lists_uploaded_images() {
+  ${imgurr} list | grep -m 1 `cat ${id_file}`
+}

data/test/3-delete.sh

@@ -6,9 +6,9 @@ id_file="test/id"
 describe "delete"
 
 it_shows_error_wrong_hash() {
-  ${imgurr} delete `cat ${id_file}` random | grep "Unauthorized Access"
+  ${imgurr} delete `cat ${id_file}` random | grep -m 1 "Unauthorized Access"
 }
 
 it_deletes_from_storage() {
-  ${imgurr} delete `cat ${id_file}` | grep "Successfully deleted"
-}
+  ${imgurr} delete `cat ${id_file}` | grep -m 1 "Successfully deleted"
+}

data/test/4-misc.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env roundup
+export IMGURRFILE=test/files/imgurr-old.json
+imgurr="./bin/imgurr"
+
+describe "misc"
+
+it_converts_old_json_file() {
+  ${imgurr} list | grep -m 1 'Warning'
+}

data/test/run

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgurr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Christophe Naud-Dulude
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -49,7 +49,6 @@ extra_rdoc_files:
 - LICENSE.md
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
@@ -66,11 +65,12 @@ files:
 - test/1-upload.sh
 - test/2-info.sh
 - test/3-delete.sh
+- test/4-misc.sh
 - test/cli.sh
 - test/error.sh
 - test/files/github-logo.png
-- test/files/habs.gif
-- test/files/imgurr.json
+- test/files/habs.png
+- test/files/imgurr-old.json
 - test/roundup
 - test/run
 homepage: https://github.com/Chris911/imgurr
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Imgurr lets you upload images to imgur from the command line

data/Gemfile.lock

@@ -1,18 +0,0 @@
-PATH
-  remote: .
-  specs:
-    imgurr (0.1.2)
-      json
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    json (1.8.1)
-    rake (0.9.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  imgurr!
-  rake (~> 0.9.2)