surely 0.2.1 → 0.3

data/README.md

@@ -8,17 +8,12 @@ Surely is a daemon that watches your screenshots directory and upload new files
 # Install the gem
 $ gem install surely
 
-# Configure it (environment variables 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 it
 # The first time you run it, it will open a browser window and ask you to
 # enter the OAuth credentials that you will obtain after allowing your imgur app
 $ surely start
 
-# After that, you can kill it (^C) and start it as a real daemon
+# After that, you can kill it (^C) (or `ps -ef | grep surely` and `kill` its PID) and start it as a real daemon
 $ surely start -d
 ```
 

data/lib/surely/daemon.rb

@@ -2,14 +2,17 @@ module Surely
   class Daemon
     def initialize(env)
       @env = env
+      settings_file = File.join(@env['HOME'], '.surely.yml')
+      @settings = File.exists?(settings_file) ? YAML.load_file(settings_file) : {}
     end
 
     def start
-      directory = @env['SURELY_DIRECTORY']
+      directory = @settings['directory']
       directory ||= `defaults read com.apple.screencapture location 2> /dev/null`.chomp
       directory = "#{@env['HOME']}/Desktop" if directory.empty?
 
-      @uploader = Uploader.new(@env, directory)
+      @uploader = Uploader.new(@env, @settings, directory)
+      @uploader.add_client!
       @uploader.authorize!
 
       Raad::Logger.info "Listening to changes on #{directory}..."

data/lib/surely/uploader.rb

@@ -1,8 +1,10 @@
 module Surely
   class Uploader
-    def initialize(env, directory)
-      @access_token  = File.read("#{env['HOME']}/.surely_access_token").chomp rescue nil
-      @refresh_token = File.read("#{env['HOME']}/.surely_refresh_token").chomp rescue nil
+    def initialize(env, settings, directory)
+      @access_token  = settings['access_token']
+      @refresh_token = settings['refresh_token']
+      @imgur_client_id  = settings['imgur_client_id']
+      @imgur_client_secret = settings['imgur_client_secret']
 
       @imgur = Faraday.new(url: 'https://api.imgur.com') do |c|
         c.request :multipart
@@ -11,6 +13,7 @@ module Surely
       end
 
       @env = env
+      @settings = settings
       @directory = directory
     end
 
@@ -32,17 +35,40 @@ module Surely
     def update_tokens(token_data)
       @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 }
+      save_settings
+    end
+
+    def save_settings
+      @settings = @settings.merge({
+        'imgur_client_id' => @imgur_client_id,
+        'imgur_client_secret' => @imgur_client_secret,
+        'access_token' => @access_token,
+        'refresh_token' => @refresh_token,
+      })
+
+      File.open("#{@env['HOME']}/.surely.yml", 'w') { |f| f << @settings.to_yaml }
+    end
+
+    def add_client!
+      return true if @imgur_client_id && @imgur_client_secret
+
+      puts 'Create an imgur application here: https://api.imgur.com/oauth2/addclient'
+      print 'Enter your application client_id: '
+      @imgur_client_id = STDIN.gets.chomp
+      print 'Enter your application client_secret: '
+      @imgur_client_secret = STDIN.gets.chomp
+
+      save_settings
     end
 
     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'"
+
+      system "open 'https://api.imgur.com/oauth2/authorize?client_id=#{@imgur_client_id}&response_type=token'"
       print 'Enter your access_token: '
-      access_token = gets.chomp
+      access_token = STDIN.gets.chomp
       print 'Enter your refresh_token: '
-      refresh_token = gets.chomp
+      refresh_token = STDIN.gets.chomp
       update_tokens('access_token' => access_token, 'refresh_token' => refresh_token)
     end
 
@@ -50,8 +76,8 @@ module Surely
       response = @imgur.post '/oauth2/token' do |r|
         r.body = {
           refresh_token: @refresh_token,
-          client_id: @env['IMGUR_CLIENT_ID'],
-          client_secret: @env['IMGUR_CLIENT_SECRET'],
+          client_id: @imgur_client_id,
+          client_secret: @imgur_client_secret,
           grant_type: 'refresh_token'
         }
       end

data/lib/surely/version.rb

@@ -1,3 +1,3 @@
 module Surely
-  VERSION = '0.2.1'
+  VERSION = '0.3'
 end

data/lib/surely.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surely
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -13490925257366599
+      hash: -478749530698552417
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -13490925257366599
+      hash: -478749530698552417
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23