ayadn 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e18bb04ce138e330fd86117c3421493d601f071
-  data.tar.gz: 791e8592572655c87fe2dc325485258941a685c1
+  metadata.gz: 06f225381b151b3aff0052e1a18a51ca69c7d56c
+  data.tar.gz: 95679ba480b2a43a510ea02d1e0c4782aaa899b9
 SHA512:
-  metadata.gz: 4b26d049c720a75eda60b63476043158f881d80228d761a6795865ee21d8da93e15fcd20498da728712b624a54a42fb3ca3cedd0fc5ca0c1d9e3a3fe5409f4d1
-  data.tar.gz: 48838c2c978e31f86db3124e4f533a8255cafd731945a932f845b542a0c184b9157c4b10b4172d113ec6ab9dfdf758e7bc50efaaf2594156d12bd10b0077a19d
+  metadata.gz: 6bbf0b6b7a279928cd39de44514475919335a1467428bbbc96035de702e54c3b2f3285a5c823936c69c370498168d2858cc27bd298a49271fad6ab677270dddf
+  data.tar.gz: 751f7ea8bb9e6c0b3f02f1768b3a3908b5c3cb44b51f5c92fdceec2621cfc3a52bb81347f23879820344294b6198c6327d733543428b40a26bfe4758db605f2f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.8
+
+- Better error messages/logs (specifically when HTTP errors)
+- Token is anonymized if in error logs
+- No more database error when canceling a 'nowplaying' post
+- Better mentions colorization
+
 # 1.0.7
 
 - Machine-only messages in channels are now viewable

data/lib/ayadn/action.rb

@@ -791,7 +791,7 @@ module Ayadn
 
     def nowplaying
       begin
-        #abort(Status.error_only_osx) unless Settings.config[:platform] =~ /darwin/
+        abort(Status.error_only_osx) unless Settings.config[:platform] =~ /darwin/
         itunes = get_track_infos
         itunes.each do |el|
           abort(Status.empty_fields) if el.length == 0
@@ -805,6 +805,8 @@ module Ayadn
       rescue => e
         puts Status.wtf
         Errors.global_error("action/nowplaying", itunes, e)
+      ensure
+        Databases.close_all
       end
     end
 

data/lib/ayadn/cnx.rb

@@ -19,34 +19,35 @@ module Ayadn
     end
 
     def self.check(response)
+      message = JSON.parse(response)['meta']['error_message']
       case response.code
       when 200
         response
       when 204
-        puts "\n'No content'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "NO CONTENT")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "NO CONTENT")
       when 400
-        puts "\n'Bad request'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "BAD REQUEST")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "BAD REQUEST")
       when 401
-        puts "\n'Unauthorized'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "UNAUTHORIZED")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "UNAUTHORIZED")
       when 403
-        puts "\n'Forbidden'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "FORBIDDEN")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "FORBIDDEN")
       when 405
-        puts "\n'Method not allowed'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "METHOD NOT ALLOWED")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "METHOD NOT ALLOWED")
       when 429
-        puts "\n'Too many requests'".color(:red)
+        puts "\n#{message}".color(:red)
         puts "\n\nAyadn made too many requests to the App.net API. You should wait at least ".color(:cyan) + "#{response.headers[:retry_after]} ".color(:red) + "seconds before trying again. Maybe you launched a lot of Ayadn instances at the same time? That's no problem, but in this case you should increase the value of the scroll timer (with `ayadn set scroll timer 5` for example). App.net allows 5000 requests per hour per account maximum.".color(:cyan)
-        Errors.global_error("cnx.rb", response.headers, "TOO MANY REQUESTS")
+        Errors.global_error("cnx.rb", [message, response.headers], "TOO MANY REQUESTS")
       when 500
-        puts "\n'App.net server error'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "APP.NET SERVER ERROR")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "APP.NET SERVER ERROR")
       when 507
-        puts "\n'Insufficient storage'".color(:red)
-        Errors.global_error("cnx.rb", response.headers, "INSUFFICIENT STORAGE")
+        puts "\n#{message}".color(:red)
+        Errors.global_error("cnx.rb", [message, response.headers], "INSUFFICIENT STORAGE")
       else
         response
       end

data/lib/ayadn/errors.rb

@@ -2,13 +2,12 @@
 module Ayadn
   class Errors
     def self.global_error(where, args, error)
-      [where, args, error].each do |el|
-        self.detokenize(el)
-      end
+      elems = []
+      args.each {|arg| elems << self.detokenize(arg)}
       Logs.rec.error "--BEGIN--"
       Logs.rec.error "#{error}"
       Logs.rec.debug "LOCATION: #{where}"
-      Logs.rec.debug "DATA: #{args}" unless args.nil?
+      Logs.rec.debug "DATA: #{elems}" unless elems.nil?
       Logs.rec.debug "STACK: #{caller}"
       Logs.rec.error "--END--"
       puts "\n(error logged in #{Settings.config[:paths][:log]}/ayadn.log)\n".color(:blue)

data/lib/ayadn/post.rb

@@ -15,7 +15,7 @@ module Ayadn
         # post = classic
       # else
         require "readline"
-        post = readline
+        readline
       # end
       # post
     end

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/lib/ayadn/workers.rb

@@ -277,18 +277,22 @@ module Ayadn
     end
 
     def colorize_text(text, mentions)
+      reg_split = '[:\-;,?!\'&`^=+<>*%()\/"“”’°£$€.]'
+      reg_tag = '#([A-Za-z0-9_]{1,255})(?![\w+])'
+      reg_mention = '@([A-Za-z0-9_]{1,20})(?![\w+])'
+      reg_sentence = '^.+[\r\n]*'
       handles = Array.new
       mentions.each {|username| handles << "@#{username}"}
       words = Array.new
       sentences = Array.new
       hashtag_color = Settings.options[:colors][:hashtags]
       mention_color = Settings.options[:colors][:mentions]
-      text.scan(/^.+[\r\n]*/) do |sentence|
+      text.scan(/#{reg_sentence}/) do |sentence|
         sentence.split(' ').each do |word|
           if word =~ /#\w+/
-            words << word.gsub(/#([A-Za-z0-9_]{1,255})(?![\w+])/, '#\1'.color(hashtag_color))
+            words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
           elsif word =~ /@\w+/
-            splitted = word.split(/[:\-;,?!'&`^=+<>*%()]/) if word =~ /[:\-;,?!'&`^=+<>*%()]/
+            splitted = word.split(/#{reg_split}/) if word =~ /#{reg_split}/
             if splitted
               splitted.each {|d| @str = d if d =~ /@\w+/}
               @str = word if @str.nil?
@@ -296,7 +300,7 @@ module Ayadn
               @str = word
             end
             if handles.include?(@str.downcase)
-              words << word.gsub(/@([A-Za-z0-9_]{1,20})(?![\w+])/, '@\1'.color(mention_color))
+              words << word.gsub(/#{reg_mention}/, '@\1'.color(mention_color))
             else
               words << word
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor