ayadn 2.1 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f91b217c6c170cfcc4cb0bfb47be2b881463054
-  data.tar.gz: cdc82c5ddcda7512c6195be5abc219e28935c17b
+  metadata.gz: 669aa931c86f3c1503fcb018d9ae061c4807f821
+  data.tar.gz: 9e0b95916d303a4f163a751db01533a6cc95ba5f
 SHA512:
-  metadata.gz: 1e59fafb75249a6a9bc64be41c434ef0a4311ab7f0181011c5c4283dcb2abcb27d36bab6d985bb00a7d0d219d1172287186f0e4c5d317eea577c029d58591352
-  data.tar.gz: d6919bab279e3b739ac73a6c2259859eb9bc774b8fa4329debaf04eb209119645864c27fb51ff23bae0ca6976b64e7643a802b07de9a99639bbf3a33ef555ff6
+  metadata.gz: 94b1ffcc7e1ef7c8350b02da3e56f28e0164a2b13ef63ecf2ece988c36fd70ebec9edf690b6aef921707da2ef385e9fbebe7bad0667ababde8656d9d1dd6297c
+  data.tar.gz: 4ce0e8e000c1306678ebaddcc5d2a6dcae772e8cb3bdc3c866d9679d93920b8f5dbf48896899022e5c38a5c6d821509095c5f684a6964b78a23dde3a37e77a1a

data/.gitignore

@@ -14,7 +14,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
-spec/mock/ayadn.log
+spec/mock/*.log*
 test/tmp
 test/version_tmp
 tmp
@@ -22,3 +22,4 @@ token
 fake.db
 .ruby-version
 *.zip
+.gitignore

data/.travis.yml

@@ -2,9 +2,8 @@ language: ruby
 cache: bundler
 
 rvm:
+  - "2.2.3"
   - "2.2.0"
-  - "2.1.2"
-  - "2.1.1"
   - "2.1.0"
   - "2.0.0"
 

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.0 - 2015-11-07 - 'Edge Of Tomorrow'
+
+- New: option to set an alternative base URL for the API calls
+- New: run diagnostics (network, accounts, settings, gem)
+- New: --auth bypass authorization webpage by providing the token inline
+- New: edit settings with your $EDITOR
+- Fixed: commands when no user authorized
+- Fixed: --unauthorize if no valid username
+- Deprecated: Ayadn 1.x migration tools
+- Deprecated: "ayadn-app.net" domain name (use GitHub repository)
+
 ## 2.1 - 2015-08-29 - 'Electric Boogaloo'
 
 - Fix: crash when scrolling Global with NiceRank

data/README.md

@@ -62,25 +62,23 @@ Uninstall:
 
 `gem uninstall ayadn`  
 
-# DOCUMENTATION
+## DOCUMENTATION
 
 [In the /doc folder of the repo](https://github.com/ericdke/na/tree/master/doc)
 
-# CONTACT
+## FEEDBACK
+
+Feedback and/or contributions are very welcomed!
+
+## CONTACT
 
 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/)
 
-# FEEDBACK
-
-Feedback and/or contributions are very welcomed!
-
-# SCREENSHOTS
+## SCREENSHOTS
 
 Examples on Mac OS X, with iTerm2 + Solarized theme.
 

data/ayadn.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   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.homepage      = "http://ayadn-app.net"
+  spec.homepage      = "https://github.com/ericdke/na"
   spec.license       = "MIT"
   spec.metadata      = { "documentation" => "https://github.com/ericdke/na/tree/master/doc" }
 
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rest-client", "~> 1.7"
   spec.add_dependency "rainbow", "~> 2.0"
   spec.add_dependency "terminal-table", "~> 1.4"
-  spec.add_dependency "daybreak", "~> 0.3"
   spec.add_dependency "pinboard", "~> 0.1"
   spec.add_dependency "unicode_utils", "~> 1.4"
   spec.add_dependency "spotlite", "~> 0.8"

data/doc/02-install.md

@@ -26,10 +26,20 @@ Ayadn also works on Windows because it's pure Ruby, but some Gems it depends upo
 
 ## MIGRATE
 
+### From Ayadn 2.x to 3.x
+
+There's nothing to do, just update the Gem.
+
+### From Ayadn 1.x to 2.x
+
 If you have an old Ayadn 1.x install that you want to keep using with Ayadn 2.x, Ayadn 2.x will ask you to run the `migrate` command (once) for this account.
 
 Otherwise it's better to start with a fresh configuration: just delete your old 1.0 `~/ayadn` folder before authorizing the user again with Ayadn 2.x.
 
+### From Ayadn 1.x to 3.x
+
+Ayadn 3.x is not compatible at all with Ayadn 1.x. Delete your `~/ayadn` folder before authorizing the user again with Ayadn 3.x.
+
 ## DEPENDENCIES
 
 Ayadn depends upon these Gems:
@@ -46,4 +56,4 @@ Ayadn depends upon these Gems:
         unicode_utils (text utilities)
         daybreak (Ruby data store)
 
-*Note: the "daybreak" dependency is only needed for 1.x to 2.x migrations. As this migration is optional and Ayadn 1.x is deprecated, this dependency will be removed in future versions.*
+*Note: the "daybreak" dependency is only needed for 1.x to 2.x migrations. Deprecated since Ayadn 3.0.*

data/doc/18-contact.md

@@ -6,8 +6,6 @@
 
 [@ayadn](http://app.net/ayadn)
 
-[ayadn-app.net](http://ayadn-app.net)
-
 ## THANK YOU
 
 This is a list of people who helped me developing Ayadn by giving me awesome feedback and support.

data/lib/ayadn.rb

@@ -2,7 +2,7 @@
 
 begin
   require_relative 'ayadn/version'
-  %w{rest_client json thor rainbow/ext/string terminal-table yaml logger fileutils io/console unicode_utils readline amalgalite fast_cache}.each { |r| require "#{r}" }
+  %w{rest_client json thor rainbow/ext/string terminal-table yaml logger fileutils io/console unicode_utils readline amalgalite}.each { |r| require "#{r}" }
   Rainbow.enabled = true
   require_relative 'ayadn/app'
 rescue LoadError => e

data/lib/ayadn/action.rb

@@ -6,11 +6,12 @@ module Ayadn
     # This class is the main initializer + dispatcher
     # It responds to the CLI commands dispatcher, app.rb
 
+    require_relative "stream"
+
     def initialize
       @api = API.new
       @view = View.new
       @workers = Workers.new
-      @thor = Thor::Shell::Color.new
       @status = Status.new
       @check = Check.new
       Settings.load_config
@@ -466,13 +467,19 @@ module Ayadn
         response = details.call
         @check.no_post(response, post_id)
         resp = response['data']
+
+        if resp["is_deleted"] == true
+          @status.user_404(resp["id"])
+          Errors.global_error({error: "user 404", caller: caller, data: [post_id, options]})
+        end
+
         response = @api.get_user("@#{resp['user']['username']}")
         @check.no_user(response, response['data']['username'])
         stream = response['data']
         @status.post_info
         @view.show_simple_post([resp], options)
         puts "\n" if Settings.options[:timeline][:compact] == true
-        @thor.say_status "info", "author", "cyan"
+        @status.say_info "author"
         puts "\n" unless Settings.options[:timeline][:compact] == true
         if response['data']['username'] == Settings.config[:identity][:username]
           @view.show_userinfos(stream, @api.get_token_info['data'], true)
@@ -556,7 +563,7 @@ module Ayadn
           Settings.options[:marker][:messages] = false
         end
         puts "\n"
-        @thor.say_status :searching, "channels with unread PMs"
+        @status.say_nocolor :searching, "channels with unread PMs"
         response = @api.get_channels
         unread_channels = []
         response['data'].map do |ch|
@@ -570,7 +577,7 @@ module Ayadn
         end
         unread_messages = {}
         unread_channels.reverse.each do |id|
-          @thor.say_status :downloading, "messages from channel #{id}"
+          @status.say_nocolor :downloading, "messages from channel #{id}"
           since = Databases.find_last_id_from("channel:#{id}")
           unless since.nil?
             api_options = {count: 20, since_id: since}
@@ -593,9 +600,9 @@ module Ayadn
             resp = @api.update_marker(name, v[1])
             res = JSON.parse(resp)
             if res['meta']['code'] != 200
-              @thor.say_status :error, "couldn't update channel #{k} as read", :red
+              @status.say_error "couldn't update channel #{k} as read"
             else
-              @thor.say_status :updated, "channel #{k} as read", :green
+              @status.say_green :updated, "channel #{k} as read"
             end
           end
         end
@@ -895,14 +902,6 @@ module Ayadn
       end
     end
 
-    def version
-      begin
-        @status.version
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: []})
-      end
-    end
-
     private
 
     def save_and_view(resp)

data/lib/ayadn/annotations.rb

@@ -36,7 +36,7 @@ module Ayadn
         {
         "type" => "com.ayadn.client",
         "value" => {
-          "url" => "http://ayadn-app.net",
+          "url" => "https://github.com/ericdke/na",
           "author" => {
               "name" => "Eric Dejonckheere",
               "username" => "ericd",

data/lib/ayadn/api.rb

@@ -36,9 +36,14 @@ module Ayadn
     end
 
     def get_explore(explore, options)
-      url = Endpoints.new.trending(options) if explore == :trending
-      url = Endpoints.new.photos(options) if explore == :photos
-      url = Endpoints.new.conversations(options) if explore == :conversations
+      url = case explore
+      when :trending
+        Endpoints.new.trending(options)
+      when :photos
+        Endpoints.new.photos(options)
+      when :conversations
+        Endpoints.new.conversations(options)
+      end
       get_parsed_response(url)
     end
 

data/lib/ayadn/app.rb

@@ -4,7 +4,7 @@ module Ayadn
     package_name "Ayadn"
 
     begin
-      %w{action stream api search descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug check nowplaying nowwatching tvshow annotations profile migration}.each { |r| require_relative "#{r}" }
+      %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs set alias errors blacklist mark nicerank debug check diagnostics}.each { |r| require_relative "#{r}" }
     rescue Interrupt
       puts "\nExit: stopped by user while launching\n\n"
       exit
@@ -254,6 +254,7 @@ module Ayadn
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def hashtag(hashtag)
+      require_relative("search")
       Action.new.hashtag(hashtag, options)
     end
 
@@ -271,6 +272,7 @@ module Ayadn
     option :channels, type: :boolean, desc: 'Search for App.net channels by searching WORD(S) in their description.'
     option :annotations, type: :boolean, desc: 'Search for posts containing a specific App.net annotation.'
     def search(*words)
+      require_relative("search")
       Action.new.search(words.join(","), options)
     end
 
@@ -304,6 +306,7 @@ module Ayadn
     option :avatar, type: :array, desc: "Update your avatar picture"
     option :cover, type: :array, desc: "Update your cover picture"
     def userupdate
+      require_relative("profile")
       Action.new.userupdate(options)
     end
 
@@ -455,6 +458,7 @@ module Ayadn
     long_desc Descriptions.pin
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def pin(post_id, *tags)
+      require_relative("pinboard")
       Action.new.pin(post_id, tags, options)
     end
 
@@ -566,6 +570,7 @@ module Ayadn
     option :text, aliases: "-t", type: :array, desc: "Add custom text"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def nowplaying
+      require_relative("nowplaying")
       Action.new.nowplaying(options)
     end
 
@@ -577,6 +582,7 @@ module Ayadn
     option :alt, aliases: "-a", type: :boolean, desc: "Select an alternative response if the first didn't match"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def movie(*title)
+      require_relative("nowwatching")
       Action.new.nowwatching(title, options)
     end
 
@@ -587,6 +593,7 @@ module Ayadn
     option :banner, aliases: "-b", type: :boolean, desc: "Inserts the show banner instead of the show poster"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def tvshow(*title)
+      require_relative("tvshow")
       Action.new.tvshow(title, options)
     end
 
@@ -602,9 +609,13 @@ module Ayadn
     desc "authorize", "Authorize Ayadn (-AU)"
     map "-auth" => :authorize
     map "-AU" => :authorize
+    option :api, aliases: "-a", type: :array, desc: "Provide an alternative root URL for the API call."
+    option :token, aliases: "-t", type: :array, desc: "Provide the token directly (bypass the webpage)"
     long_desc Descriptions.authorize
-    def authorize
-      Authorize.new.authorize
+    def authorize()
+      require_relative("authorize")
+      require_relative("switch")
+      Authorize.new.authorize(options)
     end
 
     desc "unauthorize @USERNAME", "Unauthorize an Ayadn user account (-UA)"
@@ -613,6 +624,8 @@ module Ayadn
     option :delete, aliases: "-D", type: :boolean, desc: "Deletes user folders (default: false)"
     long_desc Descriptions.unauthorize
     def unauthorize(*user)
+      require_relative("authorize")
+      require_relative("switch")
       Authorize.new.unauthorize(user, options)
     end
 
@@ -622,6 +635,7 @@ module Ayadn
     option :list, aliases: "-l", type: :boolean, desc: "List authorized accounts"
     long_desc Descriptions.switch
     def switch(*username)
+      require_relative("switch")
       unless options[:list]
         Switch.new.switch(username)
       else
@@ -632,16 +646,14 @@ module Ayadn
     desc "version", "Show the current Ayadn version (-v)"
     map "-v" => :version
     def version
-      Action.new.version
+      Status.new.version
     end
 
-    desc "migrate", "Migrate databases (upgrade accounts)", :hide => true
-    map "upgrade" => :migrate
-    long_desc Descriptions.migrate
-    def migrate
-      mig = Migration.new
-      mig.all
-    end
+    desc "diagnostics", "Run diagnostics (-dg)"
+    map "-dg" => :diagnostics
+    map "check" => :diagnostics
+    map "test" => :diagnostics
+    subcommand "diagnostics", Diagnostics
 
   end
 end

data/lib/ayadn/authorize.rb

@@ -5,68 +5,88 @@ module Ayadn
     def initialize
       @thor = Thor::Shell::Color.new # local statuses
       @status = Status.new # global statuses + utils
+      @baseURL = "https://api.app.net" # may be overriden
     end
 
-    def authorize
+    def authorize(options)
       puts "\n"
       if File.exist?(Dir.home + "/ayadn/accounts.db")
-        @status.has_to_migrate
+        @status.deprecated_ayadn
         exit
       end
+      api_file = Dir.home + "/ayadn/.api.yml"
+      # overrides the default value
+      if File.exist?(api_file)
+        @baseURL = YAML.load(File.read(api_file))[:root]
+      end
+      # overrides the config file
+      if options["api"]
+        @baseURL = options["api"]
+      end
       puts "\e[H\e[2J"
       show_link
-      token = get_token
+      token = if options["token"]
+        options["token"][0]
+      else
+        get_token
+      end
+      # token = get_token
       check_token(token)
       puts "\e[H\e[2J"
-      @thor.say_status :connexion, "downloading user info", :yellow
+      @status.say_yellow :connexion, "downloading user info"
       user = create_user_data(token, Dir.home + "/ayadn")
       prepare(user)
-      @thor.say_status :create, "configuration", :yellow
+      @status.say_yellow :create, "configuration"
       Settings.load_config
       Logs.create_logger
       install
-      @thor.say_status :done, "user #{user.handle} is authorized", :green
+      @status.say_green :done, "user #{user.handle} is authorized"
       Errors.info "#{user.handle} authorized."
-      @status.say { @thor.say_status :end, "Thank you for using Ayadn. Enjoy!", :green }
+      @status.say { @status.say_green :end, "Thank you for using Ayadn. Enjoy!" }
       Switch.new.list
     end
 
     def unauthorize(user, options)
       begin
         @workers = Workers.new
-        if user.size > 1
+        if user.size != 1
           @status.one_username
           exit
         end
         user = @workers.remove_arobase_if_present(user)[0]
         puts "\e[H\e[2J"
         if options[:delete]
-          sure = @thor.yes?("Are you sure you want to unauthorize user @#{user} and delete its folders?\n\n> ", :red)
+          sure = @thor.yes?("Are you sure you want to unauthorize user @#{user} and delete its folders? [y/N]\n\n> ", :red)
         else
-          sure = @thor.yes?("Are you sure you want to unauthorize user @#{user} ?\n\n> ", :red)
+          sure = @thor.yes?("Are you sure you want to unauthorize user @#{user} ? [y/N]\n\n> ", :red)
         end
         unless sure == true
           Status.new.canceled
           exit
         end
         puts "\e[H\e[2J"
-        @thor.say_status :delete, "database entry for @#{user}", :yellow
+        @status.say_yellow :delete, "database entry for @#{user}"
+
         db = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
+
         Databases.remove_from_accounts(db, user)
         if options[:delete]
-          @thor.say_status :delete, "@#{user} user folders", :yellow
+          @status.say_yellow :delete, "@#{user} user folders"
           FileUtils.remove_dir(Dir.home + "/ayadn/#{user}")
         end
-        @thor.say_status :done, "user @#{user} has been unauthorized", :green
+        @status.say_green :done, "user @#{user} has been unauthorized"
         remaining = Databases.all_accounts(db)
         if remaining.flatten.empty?
-          @thor.say_status :info, "accounts database is now empty", :cyan
+          @status.say_info "accounts database is now empty"
         else
           username = remaining[0][0]
           Databases.set_active_account(db, username)
-          @thor.say_status :info, "user @#{username} is now the active user", :cyan
+          @status.say_info "user @#{username} is now the active user"
         end
         puts "\n"
+      rescue Amalgalite::SQLite3::Error => e
+          @status.not_authorized
+          exit
       rescue Interrupt
         Status.new.canceled
         exit
@@ -76,11 +96,11 @@ module Ayadn
     private
 
     def prepare(user)
-      @thor.say_status :create, "user folders", :yellow
+      @status.say_yellow :create, "user folders"
       create_config_folders(user)
-      @thor.say_status :save, "user token", :yellow
+      @status.say_yellow :save, "user token"
       create_token_file(user)
-      @thor.say_status :create, "Ayadn account", :yellow
+      @status.say_yellow :create, "Ayadn account"
       acc_db = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
       user_db = Amalgalite::Database.new("#{user.user_path}/db/ayadn.sqlite")
       if user_db.schema.tables.empty?
@@ -93,7 +113,7 @@ module Ayadn
     end
 
     def install
-      @thor.say_status :create, "api and config files", :yellow
+      @status.say_yellow :create, "api and config files"
       Errors.info "Creating api and config files..."
       Errors.info "Creating version file..."
       Settings.init_config
@@ -111,7 +131,7 @@ module Ayadn
         end
       rescue => e
         @status.say do
-          @thor.say_status :error, "can't create #{user.handle} account folders", :red
+          @status.say_error "can't create #{user.handle} account folders"
         end
         @status.say { puts "\nError: #{e}" }
         exit
@@ -120,23 +140,23 @@ module Ayadn
 
     def show_link
       @status.say do
-        @thor.say_status :please, "click or copy/paste this URL in a browser", :yellow
+        @status.say_yellow :please, "click or copy/paste this URL in a browser"
         puts "\n"
         puts "\t#{Endpoints.new.authorize_url}"
         puts "\n"
-        @thor.say_status :next, "log in to authorize Ayadn", :cyan
-        @thor.say_status nil, "you will be redirected to your 'user token'"
-        @thor.say_status :please, "copy/paste the token here:", :yellow
+        @status.say_cyan :next, "log in to authorize Ayadn"
+        @status.say_center "you will be redirected to your 'user token'"
+        @status.say_yellow :please, "copy/paste the token here:"
       end
       print "\t> "
     end
 
     def get_user(token)
       begin
-        JSON.parse(RestClient.get("https://api.app.net/users/me?access_token=#{token}", :verify_ssl => OpenSSL::SSL::VERIFY_NONE) {|response, request, result| response })
+        JSON.parse(RestClient.get("#{@baseURL}/users/me?access_token=#{token}", :verify_ssl => OpenSSL::SSL::VERIFY_NONE) {|response, request, result| response })
       rescue Exception => e
         @status.say do
-          @thor.say_status :error, "connection problem", :red
+          @status.say_error "connection problem"
         end
         puts "#{e}"
       end
@@ -154,7 +174,7 @@ module Ayadn
     def check_token(token)
       if token.empty? || token.nil?
         @status.say do
-          @thor.say_status :error, "couldn't get the token", :red
+          @status.say_error "couldn't get the token"
         end
         exit
       end