ayadn 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ffee89e4c905c6802578918af74257eac1e70a6
-  data.tar.gz: 5d476acb782fee7cb9af92f954ebba153ef5a96a
+  metadata.gz: e60ae311797897e5786fc096a4698195b64e5226
+  data.tar.gz: 9ebf742cf8da514c4499e5af9cfa3a4260ec04c2
 SHA512:
-  metadata.gz: e5902612af2fe1c7350b2fec511cbfea37bba7d80a4536aaa6363a6d0e4b33b4182132abe2a7028e634d03ff435cb00f2a788e73a2166f024ffc16b70f63e703
-  data.tar.gz: 2a6aa433fd32cfeacc14c4ae5b0337fbd3aea83dacf3fb1f94b37078a0e28c700cf7a8ee0947f69d1c3ee57799a3076dae3334747e49325a7632fb86acebaa44
+  metadata.gz: d30d8e6304d77899de33fa7653090985ed7786217004c6d7cbddf82994c84bdccb87d811501c5d20b817057a95d5fdaf47c16b7e26466b63e4728db8dbd57a8e
+  data.tar.gz: 743647412a7ad23681c2ec03ce8ad7debb694195ea210dc200b959681248766b3970a63e2b4ba1be32c8fb90745645443be7f624a22887287801d21952e3e421

data/CHANGELOG.md

@@ -1,13 +1,22 @@
 AYADN
 ===== 
 
+## 0.6.4
+- fixed 'random'
+- fixed a few edge case bugs
+- reorganized the gem files
+- updated explanations in Readme
+- show client name is now true by default
+- show reply symbols is now true by default
+- show repost symbols is now true by default
+
 ## 0.6.3
-- better platform detection in nowplaying
-- fixed error if arg is nil in alias-channel
-- better help screen
-- autostart browser only in OSX
-- fixed channels folder
-- fixed save to pinboard without tag
+- better 'help screen'
+- better platform detection in 'nowplaying'
+- fixed 'channels' folder
+- fixed 'autostart browser' (only in OSX)
+- fixed 'alias-channel' when arg is nil
+- fixed 'save to pinboard' when saving without tag
 
 ## 2014-02-15 v0.6.2
 - fixed config

data/README.md

@@ -6,7 +6,7 @@ AYADN
 [![Gem Version](https://badge.fury.io/rb/ayadn.png)](http://badge.fury.io/rb/ayadn)
 
 - [FEATURES](#features)
-- [TL;DR](#tl;dr)
+- [TL;DR](#tldr)
 - [IMPORTANT NOTE](#important-note)
 - [INSTALL](#install)
 - [HOW TO USE](#how-to-use)
@@ -91,7 +91,7 @@ AYADN
 
 - change file attribute: public/private
 
-- upload files to your ADN account *(no Windows support)*
+- upload files to your ADN account *(only OS X and Linux)*
 
 - list your subscribed channels
 
@@ -99,7 +99,7 @@ AYADN
 
 - save a post link to your Pinboard account
 
-- post the current iTunes song with #nowplaying hashtag *(OS X only)*
+- post the current iTunes song with #nowplaying hashtag *(only OS X)*
 
 - [and more!](https://github.com/ericdke/ayadn#list-of-commands)
 
@@ -117,17 +117,11 @@ ayadn write 'Posting to App.net with Ruby!'
 
 Ayadn is currently in a transition process from beta to v1.
 
-This beta version is now a Gem. It's identical to the previous Ayadn, except it lacks multi accounting.
-
-The current [na](https://github.com/ericdke/na) repository will become Ayadn v1 when ready and complete (multi account, configuration with ayadn commands, fresh clean code, OSS rules compliant, new layout, new features, new options, etc).
+The current [na](https://github.com/ericdke/na) repository will become Ayadn v1 when ready and complete (multi account, automatic initial configuration, configuration with ayadn commands, modular code, OSS rules compliant, new layout, new features, new options, etc).
 
 ## INSTALL
 
-**Mac OS X, Linux = it just works.**
-
-Ayadn is also compatible with Windows (install Ruby with Rubygems at [http://rubyinstaller.org](http://rubyinstaller.org)).
-
-Run gem install:
+In your console/terminal:
 
 ```
 gem install ayadn
@@ -143,15 +137,15 @@ You have to authorize Ayadn to use your App.net credentials.
 
 If you don't provide any option to Ayadn, your personnalized stream is displayed.
 
-If you provide the `write` command without text, you will enter the compose message feature. *(recommended)*  
-
 By default, Ayadn displays only the new posts in the stream since your last visit.  
 
 **I strongly recommend you run this command after install:**
 
 `ayadn install config`
 
-**so that you can customize the `~/ayadn/data/config.yml` file this command will create.**
+**so that you can then customize the `~/ayadn/data/config.yml` file this command will create.**
+
+*Note: Ayadn will try and use your existing authorization if you had a previous version installed. If it fails, just run `ayadn authorize` again.*
 
 ## LIST OF COMMANDS
 
@@ -253,6 +247,31 @@ ayadn webhelp
 ayadn random
 ```  
 
+## HELP
+
+### Writing in the console/terminal
+
+Be aware of the way the console/terminal treats what you type if you're using ayadn inline, like this: `ayadn write "Hello"`
+
+When posting with `"double quotes"`, any special character will be interpreted by the command line! 
+
+So you have to post with `'simple quotes'` instead, this way the console don't mess with your content.
+
+But it creates other problems...
+
+**My advice: post with the compose feature, that is to say without providing your text inline:**  
+  
+`ayadn write`  
+
+Then just write your text, nothing else is needed, no single or double quotes.
+
+### Database
+
+Ayadn keeps a database of the ids of all the users it sees (it reduces the number of API calls and speeds up the app.)
+
+If you think that this file is causing problems to Ayadn or if it's simply getting too big, just trash it.
+
+The file is: `%USERNAME%/ayadn/data/username/db/users.db`  
 
 ## TIPS    
 
@@ -404,61 +423,18 @@ then read its messages with `ayadn messages mychannel`.
 
 List your existing aliases with `ayadn list alias`.
 
-Aliases are cumulable. If something goes awfully wrong, just trash the file: `%USERNAME%/ayadn/data/username/db/channels_alias.db`   
+Aliases are cumulable. If something goes wrong, just trash the file: `%USERNAME%/ayadn/data/username/db/channels_alias.db`   
 
 ### Just for fun
 
 `ayadn random`  
 
-## HELP
-
-### Console
-
-Be aware of the way the console/terminal treats what you type.
-
-When posting with `"double quotes"`, any special character will be interpreted! 
-
-So `"echo !"` becomes `"echo last command"`. You may not want to do that...
-
-So you have to post with `'simple quotes'`, this way the console don't mess with your content.
-
-The thing is, how do you then post a text *containing one ore more exclamation marks AND/OR one or more simple quotes?*
-
-The answer is to post with *"double quotes"* but use `\`, the *antislash* character, before any exclamation mark:
-
-```
-ayadn write "Here's an escaped exclamation mark \! and a normal simple quote in the same text"
-```  
-
-**My advice: to avoid any problems, post with the compose feature, that is to say without providing arguments:**  
-  
-`ayadn write`  
-
-### Database
-
-Ayadn keeps a database of the ids of all the users it sees (it reduces the number of API calls and speeds up the app.)
-
-If you think that this file is causing problems to Ayadn or if it's simply getting too big, just trash it.
-
-The file is: `%USERNAME%/ayadn/data/username/db/users.db`  
-
 ## CONTACT
 
 Contact me on ADN [(@ericd)](http://alpha.app.net/ericd) if you have questions, ideas, or... if you know Ruby and you want to help a newbie to code better. ;)
 
-The handle for the app itself is [@ayadn](http://alpha.app.net/ayadn) and will be used for support, bug report, etc.
+The app's account is [@ayadn](http://alpha.app.net/ayadn) and will be used for support, bug report, etc.
 
-Don't bother with @ayaio or @aya_tests, they're bots. 
+There's also a [Broadcast channel](https://app.net/c/2zqf) for important announcements.
 
-## CREDITS
-
-### Beta-testers
-
-- Windows: [@ksniod](http://alpha.app.net/ksniod)
-
-- Linux: 
-
-    - [@martner_mala](http://alpha.app.net/martner_mala)
-    - [@nguarracino](http://alpha.app.net/nguarracino)
-
-- OpenBSD: *(soon)*
+Don't bother with @ayaio or @aya_tests, they're bots. 

data/bin/ayadn

@@ -5,356 +5,5 @@
 # http://alpha.app.net/ericd
 # © 2013
 
-require 'ayadn'
-puts "\n\nAYADN".red + " - " + "App.net command-line client\n".brown
+require_relative '../lib/ayadn'
 
-$status = AyaDN::ClientStatus.new
-$tools = AyaDN::Tools.new
-$files = AyaDN::Files.new
-$files.makedir($tools.ayadn_configuration[:db_path])
-
-token = $files.auth_read
-if token != nil
-	client = AyaDN.new(token)
-	client.configAPI
-else
-	puts $status.errorNotAuthorized
-	AyaDN.new(nil).ayadnAuthorize(nil)
-	exit
-end
-
-arg1, arg2, arg3, arg4 = ARGV[0], ARGV[1], ARGV[2], ARGV[3]
-
-case arg1
-
-when "scroll"
-	client.ayadnScroll(arg2, arg3)
-
-when nil
-	client.ayadnUnified(nil)
-
-when "unified", "uni"
-	client.ayadnUnified(arg2)
-
-when "write", "w"
-	arg2 != nil ? client.ayadnSendPost(arg2, nil) : client.ayadn_compose_post
-
-when "reply", "r"
-	if arg2 != nil
-		arg2.is_integer? ? client.ayadn_reply(arg2) : (puts $status.errorPostID(arg2))
-	else
-		puts $status.errorNoID
-	end
-
-when "global", "g"
-	client.ayadnGlobal(arg2)
-
-when "mentions", "m"
-	(arg2 =~ /^@/ || arg2 == "me") ? client.ayadnUserMentions(arg2, arg3) : (puts $status.errorUserID(arg2))
-
-when "posts", "p"
-	(arg2 =~ /^@/ || arg2 == "me") ? client.ayadnUserPosts(arg2, arg3) : (puts $status.errorUserID(arg2))
-
-when "trending", "conversations", "checkins", "photos"
-	client.ayadnExplore(arg1, arg2)
-
-when "infos", "i", "info"
-	if arg2 =~ /^@/ || arg2 == "me"
-		client.ayadnUserInfos(arg2)
-	elsif arg2.is_integer?
-		client.ayadnPostInfos(arg2)
-	else
-		puts $status.errorInfos(arg2)
-	end
-
-when "convo", "c", "thread"
-	arg2.is_integer? ? client.ayadnConversation(arg2) : (puts $status.errorPostID(arg2))
-
-when "tag", "t", "hashtag"
-	theTag = arg2.dup
-	theTag[0] = "" if theTag =~ /^#/
-	client.ayadnHashtags(theTag)
-
-when "delete"
-	if arg2.is_integer?
-		puts "\nAre you sure you want to delete post ".green + "#{arg2}? ".brown + "(n/y) ".green 
-		input = STDIN.getch
-		(input == "y" || input == "Y") ? client.ayadnDeletePost(arg2) : (puts "\nCanceled.\n\n".red)
-	else
-		puts $status.errorPostID(arg2)
-	end
-
-when "list"
-	case arg2
-	when "followings", "fwings"
-		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnShowList("followings", arg3) : (puts $status.errorSyntax)
-	when "followers", "fwers"
-		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnShowList("followers", arg3) : (puts $status.errorSyntax)
-	when "muted"
-		client.ayadnShowList("muted", "me")
-	when "blocked"
-		client.ayadnShowList("blocked", "me")
-	when "files"
-		client.ayadn_list_files(arg3)
-	when "options","config"
-		client.ayadn_show_options
-	when "channels", "ch"
-		client.get_loaded_channels
-		client.ayadn_get_channels
-	when "aliases", "alias", "channel-alias", "alias-channel"
-		client.ayadn_list_aliases
-	else
-		puts $status.errorSyntax
-	end
-
-when "star"
-	arg2.is_integer? ? client.ayadnStarringPost("star", arg2) : (puts $status.errorPostID(arg2))
-
-when "unstar"
-	arg2.is_integer? ? client.ayadnStarringPost("unstar", arg2) : (puts $status.errorPostID(arg2))
-
-when "repost"
-	arg2.is_integer? ? client.ayadnReposting("repost", arg2) : (puts $status.errorPostID(arg2))
-
-when "unrepost"
-	arg2.is_integer? ? client.ayadnReposting("unrepost", arg2) : (puts $status.errorPostID(arg2))
-
-when "follow"
-	arg2 =~ /^@/ ? client.ayadnFollowing("follow", arg2) : (puts $status.errorUserID(arg2))
-
-when "unfollow"
-	arg2 =~ /^@/ ? client.ayadnFollowing("unfollow", arg2) : (puts $status.errorUserID(arg2))
-
-when "pm"
-	if arg2 =~ /^@/
-		if arg3 != nil
-			# ayadn pm @ericd "hello!"
-			client.ayadnSendMessage(arg2, arg3)
-		else
-			client.ayadnComposeMessage(arg2)
-		end
-	else
-		puts $status.errorSyntax
-	end
-
-when "send"
-	if arg3 != nil
-		# ayadn send 12345 "hello, channel!"
-		client.ayadnSendMessageToChannel(arg2, arg3)
-	else
-		client.ayadnComposeMessageToChannel(arg2)
-	end
-
-when "channels", "ch"
-	client.get_loaded_channels
-	client.ayadn_get_channels
-
-when "messages", "msg"
-	# arg2 is integer -> display channel stream
-	# arg3 == nil = with pagination, arg3 == "all" = no pagination
-	client.ayadnGetMessages(arg2, arg3)
-
-when "quote", "comment", "q"
-	if arg2.is_integer?
-		client.ayadn_quote(arg2)
-	else
-		puts $status.errorSyntax
-	end
-
-when "nowplaying", "itunes", "np"
-	client.ayadn_nowplaying
-
-when "search", "s"
-	arg2 != nil ? client.ayadnSearch(arg2) : (puts $status.errorSyntax)
-
-when "starred"
-	if arg2 =~ /^@/ || arg2 == "me"
-		client.ayadnStarredPosts(arg2, arg3)
-	elsif arg2.is_integer?
-		client.ayadnWhoStarred(arg2)
-	else
-		puts $status.errorUserID(arg2)
-	end
-
-when "reposted"
-	arg2.is_integer? ? client.ayadnWhoReposted(arg2) : (puts $status.errorPostID(arg2))
-
-when "inter", "interactions", "events"
-	client.ayadnInteractions
-
-when "save"
-	arg2.is_integer? ? client.ayadnSavePost(arg2) : (puts $status.errorPostID(arg2))
-
-when "load"
-	arg2.is_integer? ? client.ayadnLoadPost(arg2) : (puts $status.errorPostID(arg2))
-
-when "backup"
-	if arg2 == "followings"
-		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnSaveList("followings", arg3) : (puts $status.errorSyntax)
-	elsif arg2 == "followers"
-		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnSaveList("followers", arg3) : (puts $status.errorSyntax)
-	elsif arg2 == "muted"
-		client.ayadnSaveList("muted", "me")
-	end
-
-when "help", "h"
-	puts $tools.helpScreen
-
-when "commands", "usage"
-	puts $tools.list_of_commands
-
-when "webhelp"
-	puts $tools.helpScreen
-	begin
-		if $tools.ayadn_configuration[:platform] =~ /darwin/
-			$tools.startBrowser("https://github.com/ericdke/ayadn#ayadn")
-		else
-			puts "\nCan't start a browser automatically. Please visit ".cyan + "https://github.com/ericdke/ayadn#ayadn".magenta	
-		end
-	end
-
-when "options"
-	client.ayadn_show_options
-
-when "debug"
-	if arg2 == nil
-		client.ayadnDebugStream
-	elsif arg2 =~ /^@/
-		client.ayadnDebugUser(arg2)
-	elsif arg3.is_integer?
-		if arg2 == "post"
-			client.ayadnDebugPost(arg3)
-		elsif arg2 == "message"
-			# channel_id, message_id
-			client.ayadnDebugMessage(arg3, arg4)
-		elsif arg2 == "channel"
-			client.ayadnDebugChannel(arg3)
-		end
-	end
-
-when "skip-source", "skip-client"
-	case arg2
-	when "add"
-		client.ayadn_skip_add("sources", arg3)
-	when "remove"
-		client.ayadn_skip_remove("sources", arg3)
-	when "show"
-		client.ayadn_show_options
-	else
-		puts $status.errorSyntax
-	end
-
-when "skip-tag", "skip-hashtag"
-	case arg2
-	when "add"
-		client.ayadn_skip_add("hashtags", arg3)
-	when "remove"
-		client.ayadn_skip_remove("hashtags", arg3)
-	when "show"
-		client.ayadn_show_options
-	else
-		puts $status.errorSyntax
-	end
-
-when "skip-mention", "skip-name", "skip-username"
-	case arg2
-	when "add"
-		client.ayadn_skip_add("mentions", arg3)
-	when "remove"
-		client.ayadn_skip_remove("mentions", arg3)
-	when "show"
-		client.ayadn_show_options
-	else
-		puts $status.errorSyntax
-	end
-
-when "mute"
-	arg2 =~ /^@/ ? client.ayadnMuting("mute", arg2) : (puts $status.errorUserID(arg2))
-
-when "unmute"
-	arg2 =~ /^@/ ? client.ayadnMuting("unmute", arg2) : (puts $status.errorUserID(arg2))
-
-when "block"
-	arg2 =~ /^@/ ? client.ayadnBlocking("block", arg2) : (puts $status.errorUserID(arg2))
-
-when "unblock"
-	arg2 =~ /^@/ ? client.ayadnBlocking("unblock", arg2) : (puts $status.errorUserID(arg2))
-
-when "reset"
-	if arg2 == "pagination"
-		client.ayadnReset(arg3, arg4)
-	elsif arg2 == nil
-		client.ayadnReset(nil, nil)
-	end
-
-# when "deactivate"
-# 	# deactivate a user channel
-# 	client.ayadnDeactivateChannel(arg2)
-
-when "random"
-	# just for fun :)
-	api = AyaDN::API.new(token)
-	puts "Fetching random posts, wait a second... (quit with CTRL+C)\n\n".green
-	$tools.config['counts']['global'] = 20
-	hash = api.getGlobal(nil)
-	last_post = hash['data'][0]['id'].to_i
-	loop do
-		begin
-			rnd_post_num = rand(last_post + 1)
-			hash = api.getPostInfos("call", rnd_post_num)
-			hash = hash['data']
-			if hash['text'] == nil
-				sleep 0.2
-				next
-			end
-			puts AyaDN::View.new(nil).buildSimplePost(hash)
-			sleep 2
-		rescue Exception
-			abort($status.stopped)
-		end
-	end
-
-when "delete-message"
-	client.ayadn_delete_message(arg2, arg3) #channel, message
-
-when "download"
-	client.ayadn_download_files(arg2)
-
-when "delete-file"
-	client.ayadn_delete_file(arg2)
-
-when "upload"
-	client.ayadn_upload_files(arg2)
-
-when "private", "public"
-	client.ayadn_attribute_file(arg1, arg2)
-
-when "pin"
-	client.ayadnBookmark(ARGV)
-
-when "alias-channel"
-	client.ayadn_alias_channel(arg2, arg3)
-
-when "stream_global"
-	client.ayadn_userstream
-
-when "does", "do", "is", "has"
-	client.ayadn_does(ARGV)
-
-when "authorize", "login"
-	AyaDN.new(nil).ayadnAuthorize("reset")
-
-when "install"
-	if arg2 == "config"
-		$tools.installConfig
-	else
-		puts $status.errorSyntax
-	end
-
-else
-	# if not any known argument
-	puts $status.errorSyntax
-	puts "#{ARGV.join(" ")} ".brown + "is not a valid option.\n\n".red
-	puts $tools.helpScreen
-
-end

data/lib/ayadn.rb

@@ -1,24 +1,25 @@
-require 'ayadn/requires.rb'
-require 'ayadn/adn_files.rb'
-require 'ayadn/api.rb'
-require 'ayadn/authorize.rb'
-require 'ayadn/client-http.rb'
-require 'ayadn/colors.rb'
-require 'ayadn/debug.rb'
-require 'ayadn/endpoints.rb'
-require 'ayadn/extend.rb'
-require 'ayadn/files.rb'
-require 'ayadn/get-api.rb'
-require 'ayadn/help.rb'
-require 'ayadn/list.rb'
-require 'ayadn/main.rb'
-require 'ayadn/pinboard.rb'
-require 'ayadn/post.rb'
-require 'ayadn/skip.rb'
-require 'ayadn/status.rb'
-require 'ayadn/tools.rb'
-require 'ayadn/user-stream.rb'
-require 'ayadn/view-channels.rb'
-require 'ayadn/view-interactions.rb'
-require 'ayadn/view-object.rb'
-require 'ayadn/view.rb'
+require_relative 'ayadn/requires.rb'
+require_relative 'ayadn/adn_files.rb'
+require_relative 'ayadn/api.rb'
+require_relative 'ayadn/authorize.rb'
+require_relative 'ayadn/client-http.rb'
+require_relative 'ayadn/colors.rb'
+require_relative 'ayadn/debug.rb'
+require_relative 'ayadn/endpoints.rb'
+require_relative 'ayadn/extend.rb'
+require_relative 'ayadn/files.rb'
+require_relative 'ayadn/get-api.rb'
+require_relative 'ayadn/help.rb'
+require_relative 'ayadn/list.rb'
+require_relative 'ayadn/main.rb'
+require_relative 'ayadn/pinboard.rb'
+require_relative 'ayadn/post.rb'
+require_relative 'ayadn/skip.rb'
+require_relative 'ayadn/status.rb'
+require_relative 'ayadn/tools.rb'
+require_relative 'ayadn/user-stream.rb'
+require_relative 'ayadn/view-channels.rb'
+require_relative 'ayadn/view-interactions.rb'
+require_relative 'ayadn/view-object.rb'
+require_relative 'ayadn/view.rb'
+require_relative 'ayadn/app.rb'

data/lib/ayadn/api.rb

@@ -25,7 +25,7 @@ class AyaDN
 
 		def getGlobal(last_page_id)
 			@url = @endpoints.global
-			@url += @endpoints.light_params
+			@url += @endpoints.base_params
 			@url += @endpoints.include_directed if $tools.config['timeline']['directed']
 			checkLastPageID(last_page_id)
 			getHash
@@ -92,7 +92,7 @@ class AyaDN
 		end
 		def getSinglePost(post_id)
 			@url = @endpoints.single_post(post_id)
-			@url += @endpoints.base_params
+			@url += @endpoints.light_params
 			getHash
 		end
 		def getStarredPosts(username)

data/lib/ayadn/app.rb

@@ -0,0 +1,367 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+puts "\n\nAYADN".red + " - " + "App.net command-line client\n".brown
+
+$status = AyaDN::ClientStatus.new
+$tools = AyaDN::Tools.new
+$files = AyaDN::Files.new
+$files.makedir($tools.ayadn_configuration[:db_path])
+
+token = $files.auth_read
+if token != nil
+	client = AyaDN.new(token)
+	client.configAPI
+else
+	puts $status.errorNotAuthorized
+	AyaDN.new(nil).ayadnAuthorize(nil)
+	exit
+end
+
+arg1, arg2, arg3, arg4 = ARGV[0], ARGV[1], ARGV[2], ARGV[3]
+
+case arg1
+
+when "scroll"
+	client.ayadnScroll(arg2, arg3)
+
+when nil
+	client.ayadnUnified(nil)
+
+when "unified", "uni"
+	client.ayadnUnified(arg2)
+
+when "write", "w"
+	arg2 != nil ? client.ayadnSendPost(arg2, nil) : client.ayadn_compose_post
+
+when "reply", "r"
+	if arg2 != nil
+		arg2.is_integer? ? client.ayadn_reply(arg2) : (puts $status.errorPostID(arg2))
+	else
+		puts $status.errorNoID
+	end
+
+when "global", "g"
+	client.ayadnGlobal(arg2)
+
+when "mentions", "m"
+	(arg2 =~ /^@/ || arg2 == "me") ? client.ayadnUserMentions(arg2, arg3) : (puts $status.errorUserID(arg2))
+
+when "posts", "p"
+	(arg2 =~ /^@/ || arg2 == "me") ? client.ayadnUserPosts(arg2, arg3) : (puts $status.errorUserID(arg2))
+
+when "trending", "conversations", "checkins", "photos"
+	client.ayadnExplore(arg1, arg2)
+
+when "infos", "i", "info"
+	if arg2 =~ /^@/ || arg2 == "me"
+		client.ayadnUserInfos(arg2)
+	elsif arg2.is_integer?
+		client.ayadnPostInfos(arg2)
+	else
+		puts $status.errorInfos(arg2)
+	end
+
+when "convo", "c", "thread"
+	arg2.is_integer? ? client.ayadnConversation(arg2) : (puts $status.errorPostID(arg2))
+
+when "tag", "t", "hashtag"
+	theTag = arg2.dup
+	theTag[0] = "" if theTag =~ /^#/
+	client.ayadnHashtags(theTag)
+
+when "delete"
+	if arg2.is_integer?
+		puts "\nAre you sure you want to delete post ".green + "#{arg2}? ".brown + "(n/y) ".green 
+		input = STDIN.getch
+		(input == "y" || input == "Y") ? client.ayadnDeletePost(arg2) : (puts "\nCanceled.\n\n".red)
+	else
+		puts $status.errorPostID(arg2)
+	end
+
+when "list"
+	case arg2
+	when "followings", "fwings"
+		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnShowList("followings", arg3) : (puts $status.errorSyntax)
+	when "followers", "fwers"
+		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnShowList("followers", arg3) : (puts $status.errorSyntax)
+	when "muted"
+		client.ayadnShowList("muted", "me")
+	when "blocked"
+		client.ayadnShowList("blocked", "me")
+	when "files"
+		client.ayadn_list_files(arg3)
+	when "options","config"
+		client.ayadn_show_options
+	when "channels", "ch"
+		client.get_loaded_channels
+		client.ayadn_get_channels
+	when "aliases", "alias", "channel-alias", "alias-channel"
+		client.ayadn_list_aliases
+	else
+		puts $status.errorSyntax
+	end
+
+when "star"
+	arg2.is_integer? ? client.ayadnStarringPost("star", arg2) : (puts $status.errorPostID(arg2))
+
+when "unstar"
+	arg2.is_integer? ? client.ayadnStarringPost("unstar", arg2) : (puts $status.errorPostID(arg2))
+
+when "repost"
+	arg2.is_integer? ? client.ayadnReposting("repost", arg2) : (puts $status.errorPostID(arg2))
+
+when "unrepost"
+	arg2.is_integer? ? client.ayadnReposting("unrepost", arg2) : (puts $status.errorPostID(arg2))
+
+when "follow"
+	arg2 =~ /^@/ ? client.ayadnFollowing("follow", arg2) : (puts $status.errorUserID(arg2))
+
+when "unfollow"
+	arg2 =~ /^@/ ? client.ayadnFollowing("unfollow", arg2) : (puts $status.errorUserID(arg2))
+
+when "pm"
+	if arg2 =~ /^@/
+		if arg3 != nil
+			# ayadn pm @ericd "hello!"
+			client.ayadnSendMessage(arg2, arg3)
+		else
+			client.ayadnComposeMessage(arg2)
+		end
+	else
+		puts $status.errorSyntax
+	end
+
+when "send"
+	if arg3 != nil
+		# ayadn send 12345 "hello, channel!"
+		client.ayadnSendMessageToChannel(arg2, arg3)
+	else
+		client.ayadnComposeMessageToChannel(arg2)
+	end
+
+when "channels", "ch"
+	client.get_loaded_channels
+	client.ayadn_get_channels
+
+when "messages", "msg"
+	# arg2 is integer -> display channel stream
+	# arg3 == nil = with pagination, arg3 == "all" = no pagination
+	client.ayadnGetMessages(arg2, arg3)
+
+when "quote", "comment", "q"
+	if arg2.is_integer?
+		client.ayadn_quote(arg2)
+	else
+		puts $status.errorSyntax
+	end
+
+when "nowplaying", "itunes", "np"
+	client.ayadn_nowplaying
+
+when "search", "s"
+	arg2 != nil ? client.ayadnSearch(arg2) : (puts $status.errorSyntax)
+
+when "starred"
+	if arg2 =~ /^@/ || arg2 == "me"
+		client.ayadnStarredPosts(arg2, arg3)
+	elsif arg2.is_integer?
+		client.ayadnWhoStarred(arg2)
+	else
+		puts $status.errorUserID(arg2)
+	end
+
+when "reposted"
+	arg2.is_integer? ? client.ayadnWhoReposted(arg2) : (puts $status.errorPostID(arg2))
+
+when "inter", "interactions", "events"
+	client.ayadnInteractions
+
+when "save"
+	arg2.is_integer? ? client.ayadnSavePost(arg2) : (puts $status.errorPostID(arg2))
+
+when "load"
+	arg2.is_integer? ? client.ayadnLoadPost(arg2) : (puts $status.errorPostID(arg2))
+
+when "backup"
+	if arg2 == "followings"
+		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnSaveList("followings", arg3) : (puts $status.errorSyntax)
+	elsif arg2 == "followers"
+		(arg3 =~ /^@/ || arg3 == "me") ? client.ayadnSaveList("followers", arg3) : (puts $status.errorSyntax)
+	elsif arg2 == "muted"
+		client.ayadnSaveList("muted", "me")
+	end
+
+when "help", "h"
+	puts $tools.helpScreen
+
+when "commands", "usage"
+	puts $tools.list_of_commands
+
+when "webhelp"
+	puts $tools.helpScreen
+	begin
+		if $tools.ayadn_configuration[:platform] =~ /darwin/
+			$tools.startBrowser("https://github.com/ericdke/ayadn#ayadn")
+		else
+			puts "\nCan't start a browser automatically. Please visit ".cyan + "https://github.com/ericdke/ayadn#ayadn".magenta	
+		end
+	end
+
+when "options"
+	client.ayadn_show_options
+
+when "debug"
+	if arg2 == nil
+		client.ayadnDebugStream
+	elsif arg2 =~ /^@/
+		client.ayadnDebugUser(arg2)
+	elsif arg3.is_integer?
+		if arg2 == "post"
+			client.ayadnDebugPost(arg3)
+		elsif arg2 == "message"
+			# channel_id, message_id
+			client.ayadnDebugMessage(arg3, arg4)
+		elsif arg2 == "channel"
+			client.ayadnDebugChannel(arg3)
+		end
+	end
+
+when "skip-source", "skip-client"
+	case arg2
+	when "add"
+		client.ayadn_skip_add("sources", arg3)
+	when "remove"
+		client.ayadn_skip_remove("sources", arg3)
+	when "show"
+		client.ayadn_show_options
+	else
+		puts $status.errorSyntax
+	end
+
+when "skip-tag", "skip-hashtag"
+	case arg2
+	when "add"
+		client.ayadn_skip_add("hashtags", arg3)
+	when "remove"
+		client.ayadn_skip_remove("hashtags", arg3)
+	when "show"
+		client.ayadn_show_options
+	else
+		puts $status.errorSyntax
+	end
+
+when "skip-mention", "skip-name", "skip-username"
+	case arg2
+	when "add"
+		client.ayadn_skip_add("mentions", arg3)
+	when "remove"
+		client.ayadn_skip_remove("mentions", arg3)
+	when "show"
+		client.ayadn_show_options
+	else
+		puts $status.errorSyntax
+	end
+
+when "mute"
+	arg2 =~ /^@/ ? client.ayadnMuting("mute", arg2) : (puts $status.errorUserID(arg2))
+
+when "unmute"
+	arg2 =~ /^@/ ? client.ayadnMuting("unmute", arg2) : (puts $status.errorUserID(arg2))
+
+when "block"
+	arg2 =~ /^@/ ? client.ayadnBlocking("block", arg2) : (puts $status.errorUserID(arg2))
+
+when "unblock"
+	arg2 =~ /^@/ ? client.ayadnBlocking("unblock", arg2) : (puts $status.errorUserID(arg2))
+
+when "reset"
+	if arg2 == "pagination"
+		client.ayadnReset(arg3, arg4)
+	elsif arg2 == nil
+		client.ayadnReset(nil, nil)
+	end
+
+# when "deactivate"
+# 	# deactivate a user channel
+# 	client.ayadnDeactivateChannel(arg2)
+
+when "random"
+	# just for fun, a quick & dirty hack :)
+	api = AyaDN::API.new(token)
+	puts "Fetching random posts, wait a second... (quit with CTRL+C)\n\n".green
+	$tools.config['counts']['global'] = 20
+	hash = api.getGlobal(2)
+	puts "\e[H\e[2J"
+	last_post = hash['data'][0]['id'].to_i
+	rnd_post_num = rand(last_post + 1)
+	hash = api.getSinglePost(rnd_post_num)
+	hash = hash['data']
+	puts AyaDN::View.new(nil).buildSimplePost(hash)
+	if hash['text'] == nil
+		puts "\n-- SKIPPED POST (NO TEXT) --\n\n"
+		sleep 0.2
+	end
+	loop do
+		begin
+			sleep 0.7
+			rnd_post_num = rand(last_post + 1)
+			hash = api.getSinglePost(rnd_post_num)
+			hash = hash['data']
+			if hash['text'] == nil
+				puts "\n-- SKIPPED POST (NO TEXT) --\n\n"
+				sleep 0.2
+				next
+			end
+			#jj hash['annotations'] if hash['annotations']
+			puts AyaDN::View.new(nil).buildSimplePost(hash)
+		rescue Exception => e
+			#puts e.inspect
+			abort($status.stopped)
+		end
+	end
+
+when "delete-message"
+	client.ayadn_delete_message(arg2, arg3) #channel, message
+
+when "download"
+	client.ayadn_download_files(arg2)
+
+when "delete-file"
+	client.ayadn_delete_file(arg2)
+
+when "upload"
+	client.ayadn_upload_files(arg2)
+
+when "private", "public"
+	client.ayadn_attribute_file(arg1, arg2)
+
+when "pin"
+	client.ayadnBookmark(ARGV)
+
+when "alias-channel"
+	client.ayadn_alias_channel(arg2, arg3)
+
+when "stream_global"
+	client.ayadn_userstream
+
+when "does", "do", "is", "has"
+	client.ayadn_does(ARGV)
+
+when "authorize", "login"
+	AyaDN.new(nil).ayadnAuthorize("reset")
+
+when "install"
+	if arg2 == "config"
+		$tools.installConfig
+	else
+		puts $status.errorSyntax
+	end
+
+else
+	# if not any known argument
+	puts $status.errorSyntax
+	puts "#{ARGV.join(" ")} ".brown + "is not a valid option.\n\n".red
+	puts $tools.helpScreen
+
+end

data/lib/ayadn/client-http.rb

@@ -26,7 +26,7 @@ class AyaDN
 				puts "\nForbidden.\n\n".red
 				exit
 			when 404
-				puts "\nDoes not exist (or has been deleted).\n\n".red
+				puts "\nDoes not exist (or has been deleted) => \n\n#{code}\n\n".red
 				exit
 			when 429
 				puts "\nToo many requests.\n\n".red
@@ -54,17 +54,17 @@ class AyaDN
 				#print "\rConnecting to #{uri.host}#{uri.path}".cyan
 				body = ''
 				https.request(request) do |res| 
-					fileSize = res['Content-Length'].to_i
-					bytesTransferred = 0
+					#fileSize = res['Content-Length'].to_i
+					#bytesTransferred = 0
 					res.read_body do |part|
-						bytesTransferred += part.length
-						rounded = bytesTransferred.percent_of(fileSize).round(2)
-						print "\rFetching data: ".cyan + "#{rounded}      ".brown
+						#bytesTransferred += part.length
+						#rounded = bytesTransferred.percent_of(fileSize).round(2)
+						#print "\rFetching data: ".cyan + "#{rounded}      ".brown
 						# print "\rDownloading response from App.net\t#{bytesTransferred.to_filesize}"
 						body << part
 					end
 				end
-				print "\r                           "
+				#print "\r                           "
 				#puts ""
 				check_http_error_code(body)
 				return body

data/lib/ayadn/config.yml

@@ -1,13 +1,13 @@
 ---
 counts: # number of elements retrieved by a stream on the first access, 200 max
-    global: 100
-    unified: 100
-    checkins: 100
-    explore: 100
-    mentions: 100
-    posts: 100
-    starred: 100
-    search: 200
+    global: 50
+    unified: 50
+    checkins: 50
+    explore: 50
+    mentions: 50
+    posts: 50
+    starred: 50
+    search: 50
 timeline:
     # if true, the timeline is displayed from old to recent
     downside: true 
@@ -17,7 +17,7 @@ timeline:
     streamback: 30
     countdown_1: 5
     countdown_2: 15
-    show_client: false
+    show_client: true
     show_symbols: true
     show_reposters: true
 files:

data/lib/ayadn/get-api.rb

@@ -33,7 +33,7 @@ class AyaDN
 		end
 		hash_timer = {
 			checked: @time_now,
-			deadline: @time_now + 1
+			deadline: @time_now + 7
 		}
 		f = File.new(file_timer, "w")
 		    f.puts(hash_timer.to_json)

data/lib/ayadn/main.rb

@@ -333,9 +333,7 @@ class AyaDN
 				case STDIN.getch
 				when "y", "Y"
 					@api.blockUser(name)
-					puts "debug"
 					puts "\nYou just blocked user ".green + "#{name}".brown + "\n\n"
-					exit
 				end
 				puts $status.canceled
 			end

data/lib/ayadn/tools.rb

@@ -49,9 +49,9 @@ class AyaDN
                         "streamback" => 30,
                         "countdown_1" => 5,
                         "countdown_2" => 15,
-                        "show_client" => false,
+                        "show_client" => true,
                         "show_symbols" => true,
-                        "show_reposters" => false
+                        "show_reposters" => true
                     },
                     "files" => { 
                         "ayadnfiles" => "/ayadn/data",
@@ -182,7 +182,7 @@ class AyaDN
                 puts "\nRedirected.\n\n".red
                 puts "#{meta.inspect}\n".red
             when 404
-                puts "Does not exist (or has been deleted).\n\n".red
+                puts "Does not exist (or has been deleted) => #{meta['code']}\n".red
                 exit
             else
                 abort("\nERROR: #{meta.to_s}\n".red)

data/lib/ayadn/view-object.rb

@@ -17,6 +17,7 @@ class AyaDN
 				user_handle: user_handle,
 				user_real_name: user_real_name,
 				text: coloredText(item),
+				source: item['source']['name'],
 				links: objectLinks(item),
 				annotations: annotations,
 				me_mentioned: me_mentioned,
@@ -134,7 +135,7 @@ class AyaDN
 			obj_view << ' '
 			obj_view << params[:created_day].cyan + ' ' + params[:created_hour].cyan 
 			obj_view << ' '
-			obj_view << "[#{@source_name_and_link[:name]}]".cyan if $tools.config['timeline']['show_client']
+			obj_view << "[#{params[:source]}]".cyan if $tools.config['timeline']['show_client']
 			if params[:repost_of] && $tools.config['timeline']['show_reposters']
 				obj_view << " [x#{params[:num_reposts]}]".blue
 			end
@@ -144,6 +145,7 @@ class AyaDN
 			end
 			obj_view << "\n"
 			obj_view << params[:text]
+			obj_view << "\n" if params[:links]
 			obj_view << (params[:annotations] + "\n") if params[:annotations] != nil
 			obj_view << params[:links] + "\n"
 			obj_view

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -54,6 +54,7 @@ files:
 - lib/ayadn.rb
 - lib/ayadn/adn_files.rb
 - lib/ayadn/api.rb
+- lib/ayadn/app.rb
 - lib/ayadn/authorize.rb
 - lib/ayadn/client-http.rb
 - lib/ayadn/colors.rb