surely 0.0.1 → 0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWUwOGJiZGM3YzZlMTUwZDdiMzZkOTk5ZDA5ZTQ5YjQ2YzY5MGE4NA==
+    NjA3MTFkMDliOGQxMTEyYTY5MmU3MTZmZmY5NWExMDY3MTgyZTdiNw==
   data.tar.gz: !binary |-
-    ODY2YTJhYWYyODY3ZGM5ZmQ0YjhiZDA2ZTg5MTY1MWQ5MmU5NjY5NQ==
+    ZWRjM2EzM2M2YTdiYjViMjI1YWQ5OWJkYjc0NWI0MmQ3MzJmZDQ0OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDc3OTFjNzIyZjEyOGI5MzJiZTc2NDU5NzEyMjUyZjgzNWEwZWI2OGY4ZDgz
-    MWMwNjg0MWUzYjhiOTY1Njg4Yjk3NzEzNTNmZWM1YzJiN2I1ZTY3NGQ4OWYx
-    NGUzYTNjMDllMTI4YTc2N2UxMGQyMGNhODM5NTU3NTg0ZTdmN2I=
+    N2YwYmM0NzYzNmRiNWI1ZjFiMGIyOTQ5MDZkOWVkZmRhY2FjNzg5YWMyOGY2
+    YTM4ODVjM2ZiOWNmOGVhNWQ1Y2E5OGU5ZTMzMmQ4NDE4ODRlYzlkM2I1MWQ0
+    ODNmNWVkOWQ5NWJlMjYyNTYyZmQ5OWU0NzE0ZDM5NThlMzI1NmY=
   data.tar.gz: !binary |-
-    YmZhM2RhODllMmY4MjQ4NmQ3NzZhZGJiNmRhZjQ4YThlNmMxOTMyNTYyOTM3
-    ZTk3M2Q3ZTIxNTdhYWQyMTM3MTdmYzVlYTlhNTYwZTg0YzExNDg4NGM2OTQz
-    NmI2ZGQ0ODBiOGMyODM5YmI1NjAwZjhkMzliY2NhZGM3MjRkZGQ=
+    Mzg5MTNkMTUxZDMwNmI3N2M3MDU5YWQwNWU1MjFhM2RlYjBiNzE5ZGUzZGU5
+    ODczZTk0OGU2ZmU5ZDE0MDhhMjhiZGYwNmMyN2Y4OGNiYzI4YjlmMjgwMTRk
+    NTIxYTNiNzhkMjU2MGY3NDFkZmU1NWI4MDgyNTg1MDcxMmFmNTI=

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2013 Rémi Prévost
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,24 +1,18 @@
 # Surely
 
-# Usage
+Surely watches your screenshots directory and upload new files to your [imgur](http://imgur.com/) account.
 
-Get the gem:
+## Usage
 
-```shell
+```bash
+# Install the gem
 $ gem install surely
-$ cd surely
-```
-
-Configure it:
 
-```
-export DIRECTORY=/path/to/screenshots
+# Configure it (this sucks but that’ll do for now)
+# Create an imgur application here: https://api.imgur.com/oauth2/addclient
 export IMGUR_CLIENT_ID=…
 export IMGUR_CLIENT_SECRET=…
-```
-
-Start the daemon:
 
-```
-$ surely
+# Start the watcher
+$ DIRECTORY=/path/to/screenshots surely
 ```

data/lib/surely/daemon.rb

@@ -4,25 +4,12 @@ module Surely
       @uploader = Uploader.new(env)
       @uploader.authorize!
 
-      callback = Proc.new do |modified, added, removed|
-        if added.any?
-          puts "Uploading..."
-          @uploader.refresh_token!
-
-          if uploaded_file = @uploader.upload_file(File.join(env['DIRECTORY'], added.first))
-            puts "Done uploading #{uploaded_file['link']}"
-            system "say -v 'Fred' 'Uploaded'"
-            system "echo #{uploaded_file['link']} | pbcopy"
-          end
-        end
-      end
-
-      listener = Listen.to(env["DIRECTORY"])
-      listener.filter(/\.png$/)
-      listener.change(&callback)
-
       begin
-        puts "Listening to changes on #{env["DIRECTORY"]}..."
+        puts "Listening to changes on #{env['DIRECTORY']}..."
+
+        listener = Listen.to(env['DIRECTORY'])
+        listener.filter(/\.png$/)
+        listener.change(&@uploader.callback)
         listener.start!
       ensure
         exit

data/lib/surely/uploader.rb

@@ -1,10 +1,10 @@
 module Surely
   class Uploader
     def initialize(env)
-      @access_token  = File.read("#{env['HOME']}/.surely_access_token") rescue nil
-      @refresh_token = File.read("#{env['HOME']}/.surely_refresh_token") rescue nil
+      @access_token  = File.read("#{env['HOME']}/.surely_access_token").chomp rescue nil
+      @refresh_token = File.read("#{env['HOME']}/.surely_refresh_token").chomp rescue nil
 
-      @imgur = Faraday.new(:url => 'https://api.imgur.com/3/') do |c|
+      @imgur = Faraday.new(url: 'https://api.imgur.com') do |c|
         c.request :multipart
         c.request :url_encoded
         c.adapter :net_http
@@ -16,21 +16,21 @@ module Surely
     def upload_file(file)
       file = Faraday::UploadIO.new(file, 'image/png')
 
-      response = @imgur.post 'image' do |r|
+      response = @imgur.post '/3/image' do |r|
         r.headers['Authorization'] = "Bearer #{@access_token}"
         r.body = { image: file }
       end
 
       if response.success?
-        MultiJson.load(response.body)["data"]
+        MultiJson.load(response.body)['data']
       else
         nil
       end
     end
 
     def update_tokens(token_data)
-      @access_token = token_data["access_token"]
-      @refresh_token = token_data["refresh_token"]
+      @access_token = token_data['access_token']
+      @refresh_token = token_data['refresh_token']
       File.open("#{@env['HOME']}/.surely_access_token", 'w') { |f| f << @access_token }
       File.open("#{@env['HOME']}/.surely_refresh_token", 'w') { |f| f << @refresh_token }
     end
@@ -38,15 +38,15 @@ module Surely
     def authorize!
       return true if @access_token && @refresh_token
       system "open 'https://api.imgur.com/oauth2/authorize?client_id=#{@env['IMGUR_CLIENT_ID']}&response_type=token'"
-      print "Enter your access_token: "
+      print 'Enter your access_token: '
       access_token = gets.chomp
-      print "Enter your refresh_token: "
+      print 'Enter your refresh_token: '
       refresh_token = gets.chomp
-      update_tokens({ "access_token" => access_token, "refresh_token" => refresh_token })
+      update_tokens('access_token' => access_token, 'refresh_token' => refresh_token)
     end
 
     def refresh_token!
-      response = @imgur.post 'oauth2/token' do |r|
+      response = @imgur.post '/oauth2/token' do |r|
         r.body = {
           refresh_token: @refresh_token,
           client_id: @env['IMGUR_CLIENT_ID'],
@@ -62,5 +62,20 @@ module Surely
 
       response
     end
+
+    def callback
+      @callback ||= lambda do |modified, added, removed|
+        if added.any?
+          puts 'Uploading...'
+          refresh_token!
+
+          if uploaded_file = upload_file(File.join(@env['DIRECTORY'], added.first))
+            puts "Done uploading #{uploaded_file['link']}"
+            system "say -v 'Fred' 'Uploaded'"
+            system "echo #{uploaded_file['link']} | pbcopy"
+          end
+        end
+      end
+    end
   end
 end

data/lib/surely/version.rb

@@ -1,3 +1,3 @@
 module Surely
-  VERSION = '0.0.1'
+  VERSION = '0.1'
 end

data/lib/surely.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
 require 'faraday'
 require 'listen'
 require 'multi_json'
 require 'yajl'
 
+require 'surely/version'
 require 'surely/daemon'
 require 'surely/uploader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surely
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - Rémi Prévost
@@ -91,6 +91,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/surely