ayadn 1.1.1 → 1.1.3

data/README.md

@@ -36,27 +36,9 @@ Uninstall:
 
 `gem uninstall ayadn`  
 
-### OS X, LINUX, BSD
-
-Please use something like RVM or RBENV to install Ruby if necessary.
-
-You can also use the Ruby shipped with your system but you shouldn't, as it would require root privileges.
-
-### OTHER PLATFORMS
-
-Ayadn 1.0.x isn't compatible with Windows: there's too many issues due to external Gems and POSIX-dependant tools.  
-
-That may change in the future...  
-
-### ALPHA-BETA-PRE
-
-This is only necessary if you installed a pre-1.0 testing version:
-
-Users of alpha, beta or pre-release versions should first uninstall the old versions with `gem uninstall ayadn` then run `ayadn set defaults` after installing version 1.0 (note that this will replace the config file contents).  
-
 # DOCUMENTATION
 
-Read the [manual](https://github.com/ericdke/na/blob/master/MANUAL.md).
+[Read the docs at ayadn-app.net/doc](http://ayadn-app.net/doc/)
 
 # CONTACT
 
@@ -65,3 +47,5 @@ Author: [@ericd](http://app.net/ericd)
 App account: [@ayadn](http://app.net/ayadn)
 
 Website: [ayadn-app.net](http://ayadn-app.net)
+
+ADN Directory: [Ayadn](https://directory.app.net/app/345/ayadn/)

data/ayadn.gemspec

@@ -6,12 +6,13 @@ require 'ayadn/version'
 Gem::Specification.new do |spec|
   spec.name          = "ayadn"
   spec.version       = Ayadn::VERSION
-  spec.author       = "Eric Dejonckheere"
+  spec.author        = "Eric Dejonckheere"
   spec.email         = "eric@aya.io"
   spec.summary       = %q{App.net command-line client.}
-  spec.description   = %q{App.net command-line client: toolbox to access and manage your ADN data, show your streams, post, manage conversations, star/follow/repost... and many, many more.}
+  spec.description   = %q{App.net command-line client: toolbox to access and manage your ADN data, show your streams, post, manage conversations, star/follow/repost... and many, many more. http://ayadn-app.net/doc/}
   spec.homepage      = "http://ayadn-app.net"
   spec.license       = "MIT"
+  spec.metadata      = { "documentation" => "http://ayadn-app.net/doc/" }
 
   spec.bindir        = 'bin'
   spec.files         = `git ls-files`.split("\n")

data/lib/ayadn/action.rb

@@ -226,8 +226,7 @@ module Ayadn
         missing_post_id unless post_id.is_integer?
         doing(options)
         id = get_original_id(post_id, @api.get_details(post_id, options))
-        stream = @api.get_convo(id, options)
-        post_404(id) if meta_404(stream)
+        stream = get_convo id, options
         Databases.pagination["replies:#{id}"] = stream['meta']['max_id']
         render_view(stream, options)
         Scroll.new(@api, @view).convo(id, options) if options[:scroll]
@@ -238,6 +237,12 @@ module Ayadn
       end
     end
 
+    def get_convo id, options
+      stream = @api.get_convo(id, options)
+      post_404(id) if meta_404(stream)
+      stream
+    end
+
     def delete(post_id)
       begin
         missing_post_id unless post_id.is_integer?

data/lib/ayadn/app.rb

@@ -3,7 +3,7 @@ module Ayadn
   class App < Thor
     package_name "Ayadn"
 
-    %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch}.each { |r| require_relative "#{r}" }
+    %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark}.each { |r| require_relative "#{r}" }
 
     desc "timeline", "Show your App.net timeline, aka the Unified Stream (-tl)"
     map "unified" => :timeline
@@ -391,6 +391,10 @@ module Ayadn
     long_desc Descriptions.alias
     subcommand "alias", Alias
 
+    desc "mark POST (TITLE)", "Bookmark a conversation / manage bookmarks"
+    long_desc Descriptions.mark
+    subcommand "mark", Mark
+
     desc "download FILE", "Download the file with id FILE (-df)"
     map "-df" => :download
     long_desc Descriptions.download

data/lib/ayadn/databases.rb

@@ -4,7 +4,7 @@ module Ayadn
   class Databases
 
     class << self
-      attr_accessor :users, :index, :pagination, :aliases, :blacklist
+      attr_accessor :users, :index, :pagination, :aliases, :blacklist, :bookmarks
     end
 
     def self.open_databases
@@ -13,14 +13,14 @@ module Ayadn
       @pagination = self.init "#{Settings.config[:paths][:pagination]}/pagination.db"
       @aliases = self.init "#{Settings.config[:paths][:db]}/aliases.db"
       @blacklist = self.init "#{Settings.config[:paths][:db]}/blacklist.db"
+      @bookmarks = self.init "#{Settings.config[:paths][:db]}/bookmarks.db"
     end
 
     def self.close_all
-      @pagination.compact if (File.size("#{Settings.config[:paths][:pagination]}/pagination.db") > (250000))
-      @index.compact if (File.size("#{Settings.config[:paths][:pagination]}/index.db") > (250000))
-      [@users, @index, @pagination, @aliases, @blacklist].each do |db|
-        db.flush
-        db.close
+      [@users, @index, @pagination, @aliases, @blacklist, @bookmarks].each do |db|
+          db.compact
+          db.flush
+          db.close
       end
     end
 
@@ -126,6 +126,18 @@ module Ayadn
       stream['meta']['max_id'].to_i > @pagination[title].to_i
     end
 
+    def self.add_bookmark bookmark
+      @bookmarks[bookmark[:id]] = bookmark
+    end
+
+    def self.delete_bookmark post_id
+      @bookmarks.delete post_id
+    end
+
+    def self.rename_bookmark post_id, new_title
+      @bookmarks[post_id][:title] = new_title
+    end
+
   end
 
 end

data/lib/ayadn/descriptions.rb

@@ -896,6 +896,68 @@ module Ayadn
       \n\n
       USAGE
     end
+    def self.mark
+      <<-USAGE
+      Bookmark a conversation and manage your bookmarks.
+
+      Usage:
+
+      ayadn mark add 30594331
+
+      ayadn mark add 30594331 convo_name
+
+      ayadn mark list
+
+      ayadn mark delete 30594331
+
+      ayadn mark rename 'convo name' 'other name'
+      \n\n
+      USAGE
+    end
+    def self.mark_add
+      <<-USAGE
+      Add a conversation to your conversations bookmarks.
+
+      Usage:
+
+      ayadn mark add 30594331
+
+      ayadn mark add 30594331 'title'
+
+      You don't have to specify the root post of the conversation, any post within the thread will work.
+      \n\n
+      USAGE
+    end
+    def self.mark_list
+      <<-USAGE
+      List your bookmarked conversations.
+
+      Usage:
+
+      ayadn mark list
+      \n\n
+      USAGE
+    end
+    def self.mark_delete
+      <<-USAGE
+      Delete entry from your bookmarked conversations.
+
+      Usage:
+
+      ayadn mark delete 30594331
+      \n\n
+      USAGE
+    end
+    def self.mark_rename
+      <<-USAGE
+      Rename a bookmarked conversation.
+
+      Usage:
+
+      ayadn mark rename 30594331 'new title'
+      \n\n
+      USAGE
+    end
     def self.blacklist
       <<-USAGE
       Manage your blacklist. Commands: add, remove, list, import.

data/lib/ayadn/mark.rb

@@ -0,0 +1,153 @@
+# encoding: utf-8
+module Ayadn
+  class Mark < Thor
+
+    desc "add POST_ID (TITLE)", "Create a bookmark for this conversation"
+    long_desc Descriptions.mark_add
+    def add(*args)
+      begin
+        unless args.empty?
+          post_id, convo_title = args[0], args[1]
+        else
+          init
+          abort Status.wrong_arguments
+        end
+        abort Status.error_missing_post_id unless post_id.is_integer?
+        convo_title = post_id if convo_title.nil?
+        action, workers, view, users, bucket = Action.new, Workers.new, View.new, [], []
+        view.clear_screen
+        puts "\nAnalyzing conversation...\n".inverse
+        stream = action.get_convo post_id, options
+        posts = workers.build_posts(stream['data'].reverse)
+        posts.each do |id, post|
+          users << "#{post[:original_poster]}"
+          post[:mentions].each {|mention| users << "#{mention}"}
+          bucket << post
+        end
+        users.uniq!
+        now = Time.now.to_s
+        bookmark = {
+          id: post_id,
+          root_id: bucket[0][:id],
+          last_id: (bucket.last)[:id],
+          title: convo_title,
+          first_date: bucket[0][:date],
+          last_date: (bucket.last)[:date],
+          mark_date: now[0..18],
+          first_poster: bucket[0][:original_poster],
+          last_poster: (bucket.last)[:username],
+          users: users,
+          size: bucket.length,
+          url: bucket[0][:canonical_url],
+          root_text: bucket[0][:raw_text],
+          root_colorized_text: bucket[0][:text]
+        }
+        view.clear_screen
+        puts "Bookmarked conversation:\n".color(:green)
+        puts make_entry bookmark
+        Databases.add_bookmark bookmark
+        Logs.rec.info "Added conversation bookmark for post #{bookmark[:id]}."
+        puts Status.done
+      rescue => e
+        Errors.global_error("mark/add", args, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
+    desc "list", "List your bookmarked conversations"
+    long_desc Descriptions.mark_list
+    option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    def list
+      begin
+        init
+        list = []
+        Databases.bookmarks.each {|i,v| list << v}
+        if options[:raw]
+          jj JSON.parse(list.to_json)
+          exit
+        end
+        puts "\n"
+        list.each {|marked| puts make_entry marked; puts "\n"}
+      rescue => e
+        Errors.global_error("mark/list", nil, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
+    desc "delete POST_ID", "Delete entry POST_ID from your bookmarked conversations"
+    long_desc Descriptions.mark_delete
+    def delete *args
+      begin
+        init
+        args.empty? ? abort(Status.wrong_arguments) : post_id = args[0]
+        abort Status.error_missing_post_id unless post_id.is_integer?
+        Databases.delete_bookmark post_id
+        puts Status.done
+      rescue => e
+        Errors.global_error("mark/delete", args, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
+    desc "rename POST_ID NEW_TITLE", "Rename bookmark POST_ID"
+    long_desc Descriptions.mark_rename
+    def rename *args
+      begin
+        init
+        unless args.empty? || args[1].nil?
+          post_id, new_title = args[0], args[1]
+        else
+          abort Status.wrong_arguments
+        end
+        abort Status.error_missing_post_id unless post_id.is_integer?
+        Databases.rename_bookmark post_id, new_title
+        puts Status.done
+      rescue => e
+        Errors.global_error("mark/rename", args, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
+    private
+
+    def make_entry content
+      entry = ""
+      entry << "Post id:".color(:cyan)
+      entry << "\t#{content[:id]}\n".color(Settings.options[:colors][:username])
+      unless content[:title].is_integer?
+        entry << "Title:".color(:cyan)
+        entry << "\t\t#{content[:title]}\n".color(Settings.options[:colors][:id])
+      end
+      entry << "Date:".color(:cyan)
+      entry << "\t\t#{content[:first_date]}\n".color(Settings.options[:colors][:date])
+      # entry << "Bookmarked:".color(:cyan)
+      # entry << "\t#{content[:mark_date]}\n".color(Settings.options[:colors][:date])
+      entry << "Posts:".color(:cyan)
+      entry << "\t\t#{content[:size]}\n".color(Settings.options[:colors][:name])
+      entry << "Posters:".color(:cyan)
+      posters = []
+      content[:users].each {|mention| posters << "@#{mention}"}
+      entry << "\t#{posters.join(', ')}\n".color(Settings.options[:colors][:mentions])
+      # entry << "First:\t\t@#{content[:first_poster]}\n"
+      # entry << "Last:\t\t@#{content[:last_poster]}\n"
+      entry << "Link:".color(:cyan)
+      entry << "\t\t#{content[:url]}\n".color(Settings.options[:colors][:link])
+      entry << "Beginning:".color(:cyan)
+      text = content[:root_colorized_text].gsub(/[\r\n]/, ' ')
+      entry << "\t#{text[0..60]} [...]\n"
+    end
+
+    def init
+      Settings.load_config
+      Settings.get_token
+      Settings.init_config
+      Logs.create_logger
+      Databases.open_databases
+    end
+
+  end
+end

data/lib/ayadn/settings.rb

@@ -25,9 +25,9 @@ module Ayadn
           auth: "#{home}/auth",
           downloads: "#{home}/downloads",
           backup: "#{home}/backup",
-          posts: "#{home}/backup/posts",
-          messages: "#{home}/backup/messages",
-          lists: "#{home}/backup/lists"
+          posts: "#{home}/posts",
+          messages: "#{home}/messages",
+          lists: "#{home}/lists"
         },
         identity: {
           id: db[active][:id],

data/lib/ayadn/status.rb

@@ -8,46 +8,46 @@ module Ayadn
       "\nFile downloaded in #{Settings.config[:paths][:downloads]}/#{name}\n".color(:green)
     end
     def self.downloading
-      "Downloading from ADN...\n".inverse
+      "Downloading from ADN...".inverse
     end
     def self.posting
-      "Posting to ADN...\n".inverse
+      "Posting to ADN...".inverse
     end
     def self.deleting_post(post_id)
-      "\nDeleting post #{post_id}\n".inverse
+      "\nDeleting post #{post_id}".inverse
     end
     def self.deleting_message(message_id)
-      "\nDeleting message #{message_id}\n".inverse
+      "\nDeleting message #{message_id}".inverse
     end
     def self.unfollowing(username)
-      "\nUnfollowing #{username}\n".inverse
+      "\nUnfollowing #{username}".inverse
     end
     def self.following(username)
-      "\nFollowing #{username}\n".inverse
+      "\nFollowing #{username}".inverse
     end
     def self.unmuting(username)
-      "\nUnmuting #{username}\n".inverse
+      "\nUnmuting #{username}".inverse
     end
     def self.muting(username)
-      "\nMuting #{username}\n".inverse
+      "\nMuting #{username}".inverse
     end
     def self.unblocking(username)
-      "\nUnblocking #{username}\n".inverse
+      "\nUnblocking #{username}".inverse
     end
     def self.blocking(username)
-      "\nBlocking #{username}\n".inverse
+      "\nBlocking #{username}".inverse
     end
     def self.unreposting(post_id)
-      "\nUnreposting #{post_id}\n".inverse
+      "\nUnreposting #{post_id}".inverse
     end
     def self.reposting(post_id)
-      "\nReposting #{post_id}\n".inverse
+      "\nReposting #{post_id}".inverse
     end
     def self.unstarring(post_id)
-      "\nUnstarring #{post_id}\n".inverse
+      "\nUnstarring #{post_id}".inverse
     end
     def self.starring(post_id)
-      "\nStarring #{post_id}\n".inverse
+      "\nStarring #{post_id}".inverse
     end
     def self.not_deleted(post_id)
       "Could not delete post #{post_id} (post isn't yours, or is already deleted)\n".color(:red)
@@ -83,22 +83,22 @@ module Ayadn
       "Could not block user #{username} (doesn't exist, or is already blocked)\n".color(:red)
     end
     def self.deleted(post_id)
-      "Post #{post_id} has been deleted.\n".color(:green)
+      "\nPost #{post_id} has been deleted.\n".color(:green)
     end
     def self.deleted_m(message_id)
       "\nMessage #{message_id} has been deleted.\n".color(:green)
     end
     def self.starred(post_id)
-      "Post #{post_id} has been starred.\n".color(:green)
+      "\nPost #{post_id} has been starred.\n".color(:green)
     end
     def self.unreposted(post_id)
-      "Post #{post_id} has been unreposted.\n".color(:green)
+      "\nPost #{post_id} has been unreposted.\n".color(:green)
     end
     def self.reposted(post_id)
-      "Post #{post_id} has been reposted.\n".color(:green)
+      "\nPost #{post_id} has been reposted.\n".color(:green)
     end
     def self.unstarred(post_id)
-      "Post #{post_id} has been unstarred.\n".color(:green)
+      "\nPost #{post_id} has been unstarred.\n".color(:green)
     end
     def self.unfollowed(username)
       "\nUser #{username} has been unfollowed.\n".color(:green)
@@ -149,10 +149,10 @@ module Ayadn
       "\nPosting as ".color(:cyan) + "#{Settings.config[:identity][:handle]}".color(:green) + ".".color(:cyan)
     end
     def self.yourpost
-      "\nYour post:\n\n".color(:cyan)
+      "Your post:\n\n".color(:cyan)
     end
     def self.yourmessage
-      "\nYour message:\n\n".color(:cyan)
+      "Your message:\n\n".color(:cyan)
     end
     def self.message_from(username)
       "\nMessage from ".color(:cyan) + "#{Settings.config[:identity][:handle]} ".color(:green) + "to ".color(:cyan) + "#{username[0]}".color(:yellow) + ".".color(:cyan)