ayadn 1.8.2 → 2.0

data/lib/ayadn/scroll.rb

@@ -6,7 +6,7 @@ module Ayadn
       @api = api
       @view = view
       @view.hide_cursor
-      @chars = %w{ | / - \\ }
+      @chars = %w{ - \\ | / }
       at_exit { @view.show_cursor }
     end
 
@@ -20,6 +20,7 @@ module Ayadn
     end
 
     def scroll_it(target, options)
+      Settings.global[:scrolling] = true
       options = check_raw(options)
       orig_target = target
       @nr = NiceRank.new
@@ -29,10 +30,12 @@ module Ayadn
           stream['data'].empty? ? niceranks = {} : niceranks = @nr.get_ranks(stream)
           Debug.stream stream, options, target
           target = "explore:#{target}" if explore?(target) # explore but not global
+          clear() if Settings.options[:scroll][:spinner] == true
           show_if_new(stream, options, target, niceranks)
           target = orig_target if target =~ /explore/
           options = save_then_return(stream, options, target)
           countdown
+          print "..." if Settings.options[:scroll][:spinner] == true
         rescue Interrupt
           canceled
         end
@@ -40,15 +43,18 @@ module Ayadn
     end
 
     def mentions(username, options)
+      Settings.global[:scrolling] = true
       options = check_raw(options)
       id = @api.get_user(username)['data']['id']
       loop do
         begin
           stream = @api.get_mentions(username, options)
           Debug.stream stream, options, username
+          clear() if Settings.options[:scroll][:spinner] == true
           show_if_new(stream, options, "mentions:#{id}")
           options = save_then_return(stream, options, "mentions:#{id}")
           countdown
+          print "..." if Settings.options[:scroll][:spinner] == true
         rescue Interrupt
           canceled
         end
@@ -56,15 +62,18 @@ module Ayadn
     end
 
     def posts(username, options)
+      Settings.global[:scrolling] = true
       options = check_raw(options)
       id = @api.get_user(username)['data']['id']
       loop do
         begin
           stream = @api.get_posts(username, options)
           Debug.stream stream, options, username
+          clear() if Settings.options[:scroll][:spinner] == true
           show_if_new(stream, options, "posts:#{id}")
           options = save_then_return(stream, options, "posts:#{id}")
           countdown
+          print "..." if Settings.options[:scroll][:spinner] == true
         rescue Interrupt
           canceled
         end
@@ -72,14 +81,17 @@ module Ayadn
     end
 
     def convo(post_id, options)
+      Settings.global[:scrolling] = true
       options = check_raw(options)
       loop do
         begin
           stream = @api.get_convo(post_id, options)
           Debug.stream stream, options, post_id
+          clear() if Settings.options[:scroll][:spinner] == true
           show_if_new(stream, options, "replies:#{post_id}")
           options = save_then_return(stream, options, "replies:#{post_id}")
           countdown
+          print "..." if Settings.options[:scroll][:spinner] == true
         rescue Interrupt
           canceled
         end
@@ -87,13 +99,15 @@ module Ayadn
     end
 
     def messages(channel_id, options)
+      Settings.global[:scrolling] = true
       options = check_raw(options)
       loop do
         begin
           stream = @api.get_messages(channel_id, options)
           Debug.stream stream, options, channel_id
+          clear() if Settings.options[:scroll][:spinner] == true
           show_if_new(stream, options, "channel:#{channel_id}")
-          if Settings.options[:marker][:update_messages] == true
+          if Settings.options[:marker][:messages] == true
             unless resp['meta']['max_id'].nil?
               marked = @api.update_marker("channel:#{channel_id}", stream['meta']['max_id'])
               updated = JSON.parse(marked)
@@ -104,6 +118,7 @@ module Ayadn
           end
           options = save_then_return(stream, options, "channel:#{channel_id}")
           countdown
+          print "..." if Settings.options[:scroll][:spinner] == true
         rescue Interrupt
           canceled
         end
@@ -113,12 +128,12 @@ module Ayadn
     private
 
     def countdown
-      Settings.options[:timeline][:show_spinner] == true ? waiting : pause
+      Settings.options[:scroll][:spinner] == true ? waiting : pause
     end
 
     def clear
       print("\r")
-      print(" ".ljust(5))
+      print(" ".ljust(40))
       print("\r")
     end
 
@@ -208,7 +223,7 @@ module Ayadn
     end
 
     def canceled
-      puts Status.canceled
+      Status.new.canceled
       exit
     end
   end

data/lib/ayadn/search.rb

@@ -7,25 +7,29 @@ module Ayadn
       @api = api
       @view = view
       @workers = workers
+      @check = Check.new
     end
 
     def hashtag(hashtag, options)
-      Settings.options[:force] = true if options[:force]
+      Settings.global[:force] = true if options[:force]
       @view.downloading(options)
       stream = @api.get_hashtag(hashtag)
-      Check.no_data(stream, 'hashtag')
+      @check.no_data(stream, 'hashtag')
       if options[:extract]
         @view.all_hashtag_links(stream, hashtag)
       else
         @view.render(stream, options)
+        if Settings.options[:timeline][:compact] == true && !options[:raw]
+          puts "\n" 
+        end
       end
     end
 
     def find(words, options)
-      Settings.options[:force] = true if options[:force]
+      Settings.global[:force] = true if options[:force]
       @view.downloading(options)
       stream = get_stream(words, options)
-      Check.no_data(stream, 'search')
+      @check.no_data(stream, 'search')
       if options[:users]
         get_users(stream, options)
       elsif options[:channels]
@@ -33,10 +37,30 @@ module Ayadn
       else
         get_generic(stream, words, options)
       end
+      if Settings.options[:timeline][:compact] == true && !options[:raw]
+        puts "\n" 
+      end
     end
 
     private
 
+    def get_stream words, options
+      if options[:users]
+        @api.search_users words, options
+      elsif options[:annotations]
+        @api.search_annotations words, options
+      elsif options[:channels]
+        @api.search_channels words, options
+      elsif options[:messages]
+        words = words.split(',')
+        channel_id = @workers.get_channel_id_from_alias(words[0])
+        words.shift
+        @api.search_messages channel_id, words.join(','), options
+      else
+        @api.get_search words, options
+      end
+    end
+
     def get_generic stream, words, options
       if options[:extract]
         @view.all_search_links(stream, words)
@@ -52,26 +76,10 @@ module Ayadn
     def get_users stream, options
       sorted = stream['data'].sort_by {|obj| obj['counts']['followers']}
       sorted.each do |obj|
-        puts @view.big_separator
+        puts @view.big_separator unless Settings.options[:timeline][:compact] == true
         @view.show_userinfos(obj, nil, false)
       end
-    end
-
-    def get_stream words, options
-      if options[:users]
-        @api.search_users words, options
-      elsif options[:annotations]
-        @api.search_annotations words, options
-      elsif options[:channels]
-        @api.search_channels words, options
-      elsif options[:messages]
-        words = words.split(',')
-        channel_id = @workers.get_channel_id_from_alias(words[0])
-        words.shift
-        @api.search_messages channel_id, words.join(','), options
-      else
-        @api.get_search words, options
-      end
+      puts "\n" if Settings.options[:timeline][:compact] == true
     end
 
   end

data/lib/ayadn/set.rb

@@ -8,7 +8,8 @@ module Ayadn
       if args[0]
         scroll_config.send(args[0], args[1])
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       scroll_config.save
     end
@@ -20,7 +21,8 @@ module Ayadn
       unless args.length != 2
         movie_config.send(args[0], args[1])
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       movie_config.save
     end
@@ -32,7 +34,8 @@ module Ayadn
       unless args.length != 2
         tvshow_config.send(args[0], args[1])
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       tvshow_config.save
     end
@@ -44,11 +47,37 @@ module Ayadn
       unless args.length != 2
         marker_config.send(args[0], args[1])
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       marker_config.save
     end
 
+    desc "channels ITEM TRUE/FALSE", "Set values for stream markers"
+    map "channel" => :channels
+    def channels(*args)
+      channels_config = SetChannels.new
+      unless args.length != 2
+        channels_config.send(args[0], args[1])
+      else
+        Status.new.error_missing_parameters
+        exit
+      end
+      channels_config.save
+    end
+
+    desc "blacklist ITEM TRUE/FALSE", "Set values for the blacklist"
+    def blacklist(*args)
+      blacklist_config = SetBlacklist.new
+      unless args.length != 2
+        blacklist_config.send(args[0], args[1])
+      else
+        Status.new.error_missing_parameters
+        exit
+      end
+      blacklist_config.save
+    end
+
     desc "nicerank ITEM VALUE", "Set NiceRank filter values"
     long_desc Descriptions.set_nicerank
     def nicerank *args
@@ -56,7 +85,8 @@ module Ayadn
       if args[0]
         nicerank_config.send(args[0], args[1])
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       nicerank_config.save
     end
@@ -69,13 +99,14 @@ module Ayadn
         begin
           timeline_config.send(args[0], args[1])
         rescue NoMethodError, ArgumentError
-          puts Status.error_missing_parameters
+          Status.new.error_missing_parameters
           exit
         rescue => e
           raise e
         end
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       timeline_config.save
     end
@@ -89,13 +120,14 @@ module Ayadn
         begin
           counts_config.send(args[0], args[1])
         rescue NoMethodError, ArgumentError
-          puts Status.error_missing_parameters
+          Status.new.error_missing_parameters
           exit
         rescue => e
           raise e
         end
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       counts_config.save
     end
@@ -111,13 +143,14 @@ module Ayadn
         begin
           color_config.send(args[0], args[1])
         rescue NoMethodError, ArgumentError
-          puts Status.error_missing_parameters
+          Status.new.error_missing_parameters
           exit
         rescue => e
           raise e
         end
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       color_config.save
     end
@@ -130,13 +163,14 @@ module Ayadn
         begin
           backup_config.send(args[0], args[1])
         rescue NoMethodError, ArgumentError
-          puts Status.error_missing_parameters
+          Status.new.error_missing_parameters
           exit
         rescue => e
           raise e
         end
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       backup_config.save
     end
@@ -145,7 +179,7 @@ module Ayadn
     long_desc Descriptions.set_defaults
     def defaults
       Settings.restore_defaults
-      puts Status.done
+      Status.new.done
     end
 
     desc "formats ITEM VALUE", "Set values for formatting fields"
@@ -156,13 +190,14 @@ module Ayadn
           command = args.shift
           formats_config.send(command, args)
         rescue NoMethodError, ArgumentError
-          puts Status.error_missing_parameters
+          Status.new.error_missing_parameters
           exit
         rescue => e
           raise e
         end
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
       formats_config.save
     end
@@ -178,7 +213,8 @@ module Ayadn
       when "false", "0", "no"
         false
       else
-        abort(Status.error_missing_parameters)
+        Status.new.error_missing_parameters
+        exit
       end
     end
 
@@ -187,15 +223,7 @@ module Ayadn
       if x >= min && x <= max
         x
       else
-        abort(Status.must_be_integer)
-      end
-    end
-
-    def self.cache_range value
-      if value >= 1 && value <= 168
-        value.round
-      else
-        abort(Status.cache_range)
+        Status.new.must_be_integer
       end
     end
 
@@ -212,7 +240,7 @@ module Ayadn
       if value > 0 and value < 5
         value
       else
-        abort(Status.threshold)
+        Status.new.threshold
       end
     end
 
@@ -224,8 +252,9 @@ module Ayadn
     def self.color(color)
       colors_list = %w{red green magenta cyan yellow blue white black}
       unless colors_list.include?(color.to_s)
-        puts Status.error_missing_parameters
-        abort(Status.valid_colors(colors_list))
+        Status.new.error_missing_parameters
+        Status.new.valid_colors(colors_list)
+        exit
       else
         return color.to_sym
       end
@@ -242,6 +271,8 @@ module Ayadn
       Settings.get_token()
       Settings.init_config()
       Logs.create_logger()
+      @thor = Thor::Shell::Color.new
+      @status = Status.new
     end
 
     def save
@@ -250,9 +281,11 @@ module Ayadn
     end
 
     def log
-      x = "New value for '#{@input}' in '#{@category}' => #{@output}"
-      puts "\n#{x}\n".color(:cyan)
-      Logs.rec.info x
+      @status.say do
+        @thor.say_status(:updated, "'#{@input}' in '#{@category}'", :cyan)
+        @thor.say_status(:content, "'#{@output}'", :green)
+      end
+      Logs.rec.info "new value for '#{@input}' in '#{@category}' => '#{@output}'"
     end
 
   end
@@ -266,13 +299,19 @@ module Ayadn
 
     def table(args)
       type = args.shift.downcase
-      value = args[0].to_i
       if type == 'width'
+        value = args[0].to_i
         @input = 'table width'
         @output = Validators.width_range(value)
         Settings.options[:formats][:table][:width] = @output
+      elsif type == 'borders' || type == 'border'
+        value = args[0]
+        @input = 'table borders'
+        @output = Validators.boolean(value)
+        Settings.options[:formats][:table][:borders] = @output
       else
-        abort(Status.error_missing_parameters)
+        @status.error_missing_parameters
+        exit
       end
     end
 
@@ -288,7 +327,8 @@ module Ayadn
         @output = Validators.boolean(value)
         Settings.options[:formats][:list][:reverse] = @output
       else
-        abort(Status.error_missing_parameters)
+        @status.error_missing_parameters
+        exit
       end
     end
 
@@ -315,6 +355,18 @@ module Ayadn
       Settings.options[:scroll][:timer] = @output
     end
 
+    def date(value)
+      @input = 'date'
+      @output = Validators.boolean(value)
+      Settings.options[:scroll][:date] = @output
+    end
+
+    def spinner(value)
+      @input = 'spinner'
+      @output = Validators.boolean(value)
+      Settings.options[:scroll][:spinner] = @output
+    end
+
   end
 
   class SetMovie < SetBase
@@ -360,10 +412,14 @@ module Ayadn
       Settings.options[:nicerank][:filter] = @output
     end
 
-    def filter_unranked value
-      @input = 'filter_unranked'
+    def active value
+      filter(value)
+    end
+
+    def unranked value
+      @input = 'unranked'
       @output = Validators.boolean(value)
-      Settings.options[:nicerank][:filter_unranked] = @output
+      Settings.options[:nicerank][:unranked] = @output
     end
 
     def threshold value
@@ -372,12 +428,6 @@ module Ayadn
       Settings.options[:nicerank][:threshold] = @output
     end
 
-    def cache value
-      @input = 'cache'
-      @output = Validators.cache_range(value.to_i)
-      Settings.options[:nicerank][:cache] = @output
-    end
-
   end
 
   class SetBackup < SetBase
@@ -395,7 +445,7 @@ module Ayadn
       @input = meth.to_s
       @output = validate(options)
       case @input
-      when 'auto_save_sent_posts', 'auto_save_sent_messages', 'auto_save_lists'
+      when 'posts', 'messages', 'lists'
         Settings.options[:backup][meth.to_sym] = @output
       else
         super
@@ -419,7 +469,7 @@ module Ayadn
       @input = meth.to_s
       @output = validate(options)
       case @input
-      when 'update_messages'
+      when 'messages'
         Settings.options[:marker][meth.to_sym] = @output
       else
         super
@@ -428,6 +478,54 @@ module Ayadn
 
   end
 
+  class SetChannels < SetBase
+
+    def initialize
+      super
+      @category = 'channels'
+    end
+
+    def validate(value)
+      Validators.boolean(value)
+    end
+
+    def method_missing(meth, options)
+      @input = meth.to_s
+      @output = validate(options)
+      case @input
+      when 'links'
+        Settings.options[:channels][meth.to_sym] = @output
+      else
+        super
+      end
+    end
+
+  end
+
+  class SetBlacklist < SetBase
+
+    def initialize
+      super
+      @category = 'blacklist'
+    end
+
+    def validate(value)
+      Validators.boolean(value)
+    end
+
+    def method_missing(meth, options)
+      @input = meth.to_s
+      @output = validate(options)
+      case @input
+      when 'active', 'activated'
+        Settings.options[:blacklist][meth.to_sym] = @output
+      else
+        super
+      end
+    end
+
+  end
+
   class SetCounts < SetBase
 
     def initialize
@@ -467,10 +565,8 @@ module Ayadn
       @input = meth.to_s
       @output = validate(options)
       case @input
-      when 'directed', 'html', 'show_source', 'show_symbols', 'show_real_name', 'show_date', 'show_spinner', 'show_debug', 'compact', 'show_channel_oembed'
+      when 'directed', 'source', 'symbols', 'name', 'date', 'debug', 'compact'
         Settings.options[:timeline][meth.to_sym] = @output
-      when 'deleted', 'annotations'
-        abort(Status.not_mutable)
       else
         super
       end
@@ -493,7 +589,7 @@ module Ayadn
       @input = meth.to_s.capitalize
       @output = validate(options)
       case meth.to_s
-      when 'id', 'index', 'username', 'name', 'date', 'link', 'dots', 'hashtags', 'mentions', 'source', 'symbols', 'unread', 'debug'
+      when 'id', 'index', 'username', 'name', 'date', 'link', 'dots', 'hashtags', 'mentions', 'source', 'symbols', 'unread', 'debug', 'excerpt'
         Settings.options[:colors][meth.to_sym] = @output
       when 'hashtag', 'mention', 'symbol'
         Settings.options[:colors]["#{meth}s".to_sym] = @output