surely 0.1.2 → 0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGNiNjlkY2UzZmE3NDNlNGI0YzNjMDU2YTY4ZDVhMTY1MDc1ZWE1Yw==
+    ZjEwNmU3MmQ5NjBkNDFiMWYxZjg1NGNjZjYwZDE2MTUxZDY3OWVmMA==
   data.tar.gz: !binary |-
-    NzdkM2MzNmZlZDAwMjhjZWY5MWRhNDc1Yzc5NjA4MWRiNWU4ZDRlMg==
+    NGZlZWZkM2JhMzlkMjU3N2NmNjNmZDYyNDRkODk0MjRjNmI4YWE3Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTI1ODI3NGRiZTAzZjNkZWI4OGRjODk1YjZhZDZjNWY3NDFlNzI4N2MzOTg0
-    MTk1NmY0OTk3MzQwYjZmNGE1NWM2NzAyOTQwNzY0N2M0NGEzYjhiN2RlMzdi
-    NGVkMDgwOWYwNTdlNGE2Zjk3YjFkY2Y1OWI3OGE0YzU5MzE3NjE=
+    ZTQyYTM0M2U2M2NiMWMyZGZiNjRiMzlmZjYyNTIwMmRlNzRmY2EzNmQ4YWZm
+    NjlhYjI2ZmZiYjQxMmZlNTUwMmE2YWMyY2I4MDMyYTIzZjlhZjBmNTQ0ODQz
+    MTIxZjFiNTdkMWZkMjBiYzViNTQxMWQzMGMyNDYyYTYwYjMwNjE=
   data.tar.gz: !binary |-
-    ZWE2ZTk0NjJiN2ZmOWQ4NTg2OTg0OTJkNzlkMDUyYWJjZjc1YmY2ZTQ4YTJh
-    MGMyMDc5ZjNiMGY5YTkzNTIwM2MxY2NmNmExYzA3ZjdhNTg1MTY0ZmYzMTA2
-    NTY0OTVjYzc2MTVjYzQxNGQxMTQwOWEwNGEyYjJmYjMyYjQ5OTE=
+    NjRkNzAxZDQxOGM2NmZjZjk4YTc5NzBhOGRkYmFkYWYzMmE1ZTYzMjE1NmZj
+    ZmIxNGU1YjQ3MWIxMzA2ZGNlMjZjZDdhYzU3NTBiMGRjZjFhNDU2MWFkYzFl
+    OWEyNThjYTlkNGVmNTliZGJiNzg2YmYwODNiOWUyZGY0MmVlZWY=

data/.gitignore

@@ -1,3 +1,5 @@
 /Gemfile.lock
 /pkg
 /tmp
+*.log
+*.pid

data/README.md

@@ -1,6 +1,6 @@
 # Surely
 
-Surely watches your screenshots directory and upload new files to your [imgur](http://imgur.com/) account.
+Surely is a daemon that watches your screenshots directory and upload new files to your [imgur](http://imgur.com/) account.
 
 ## Usage
 
@@ -13,6 +13,6 @@ $ gem install surely
 export IMGUR_CLIENT_ID=…
 export IMGUR_CLIENT_SECRET=…
 
-# Start the watcher (OS X screenshots directory by default)
-$ surely
+# Start the daemon (OS X screenshots directory by default)
+$ surely start -d
 ```

data/bin/surely

@@ -4,4 +4,8 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'surely'
 
-Surely::Daemon.new(ARGV, ENV)
+module Surely
+  def self.new(*args)
+    Daemon.new(ENV)
+  end
+end

data/lib/surely/daemon.rb

@@ -1,20 +1,22 @@
 module Surely
   class Daemon
-    def initialize(argv, env)
-      directory = env['SURELY_DIRECTORY'] || `defaults read com.apple.screencapture location`.chomp
-      @uploader = Uploader.new(env, directory)
+    def initialize(env)
+      @env = env
+    end
+
+    def start
+      directory = @env['SURELY_DIRECTORY'] || `defaults read com.apple.screencapture location`.chomp
+      @uploader = Uploader.new(@env, directory)
       @uploader.authorize!
 
-      begin
-        puts "Listening to changes on #{directory}..."
+      Raad::Logger.info "Listening to changes on #{directory}..."
+
+      listener = Listen.to(directory)
+      listener.filter(/\.(png|jpg|jpeg|gif)$/)
+      listener.change(&@uploader.callback)
+      listener.start
 
-        listener = Listen.to(directory)
-        listener.filter(/\.(png|jpg|jpeg|gif)$/)
-        listener.change(&@uploader.callback)
-        listener.start!
-      ensure
-        exit
-      end
+      sleep(1) while !Raad.stopped?
     end
   end
 end

data/lib/surely/uploader.rb

@@ -67,11 +67,11 @@ module Surely
     def callback
       @callback ||= lambda do |modified, added, removed|
         if added.any?
-          print 'Uploading... '
+          Raad::Logger.info 'Uploading... '
           refresh_token!
 
           if uploaded_file = upload_file(File.join(@directory, added.first))
-            puts "done! #{uploaded_file['link']}"
+            Raad::Logger.info "Done! Uploaded #{uploaded_file['link']}"
             system "say -v 'Fred' 'Uploaded'"
             system "echo #{uploaded_file['link']} | pbcopy"
           end

data/lib/surely/version.rb

@@ -1,3 +1,3 @@
 module Surely
-  VERSION = '0.1.2'
+  VERSION = '0.2'
 end

data/lib/surely.rb

@@ -1,3 +1,4 @@
+require 'raad'
 require 'faraday'
 require 'listen'
 require 'multi_json'

data/surely.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "faraday"
-  s.add_runtime_dependency "listen"
-  s.add_runtime_dependency "multi_json"
-  s.add_runtime_dependency "yajl-ruby"
+  s.add_runtime_dependency "faraday", '~> 0.8'
+  s.add_runtime_dependency "listen", '~> 1.0'
+  s.add_runtime_dependency "multi_json", '~> 1.7'
+  s.add_runtime_dependency "yajl-ruby", '~> 1.1'
+  s.add_runtime_dependency "raad", '~> 0.5'
 
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", '~> 10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surely
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
 platform: ruby
 authors:
 - Rémi Prévost
@@ -14,72 +14,86 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: raad
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: Surely watches your screenshots directory and upload new files to your
   imgur account.
 email: