ayadn 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f500f323caa3910e67daf9a38647f61c0a8b571a
-  data.tar.gz: 11f5b44c9a6fcda4d13bf56f5f99b0ff21985bb0
+  metadata.gz: 178f8d0b90c3d05a395d913d20b5ceeb8e9e4889
+  data.tar.gz: f8905a19ce739307c6dd510a8776e2ea58c1e11e
 SHA512:
-  metadata.gz: 38d76af0d377cabdc0ec2caece47b1c625c0013dea9a91345fa66e8f50b9fdaa8406dd0bc09565af9c47e52c10b8d865c962e2e16138a9f3288fd590ef0f2ed9
-  data.tar.gz: a7c83646b121f2b642827fe144ce8fc77e844484ff1cd906f6f3af04f22ffbd3aebd74a29e075c5ca56fa56285d7e9b4656d0154c008306ecc0566878a506505
+  metadata.gz: 7dc47ef7305ce368c37200bac11320620ed2fdd25733bba82df29e6449e750420de501b7f2d43239267d324ea4c551d90024db2d616f997bf30d7a221e97b9bd
+  data.tar.gz: 491d12154549d299528217d8561edfbf4eb6e2d44b8bac4baac906b9480d0dde2413ec8821844590bc8eb1a2ef7f349464a24d53a854a5bf238d5b5e4d015eee

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.13
+
+- New layout for '#nowplaying'
+- Compact index.db and pagination.db if necessary
+- New api urls
+- Fix 'download file'
+
 # 1.0.12
 
 - Fixed an error in: authorizing an account if its folders already exists

data/README.md

@@ -6,19 +6,19 @@ AYADN
 
 [App.net](http://app.net) command-line client.
 
-The purpose of Ayadn is to give you access to all the features of App.net from the command line.
+The purpose of Ayadn is to give you access to all the features of App.net from the console.
 
-View or scroll all streams, view or scroll conversations and posts from specific users or mentioning a user, follow/unfollow users, star/unstar/repost/etc, get information about users and their followers/followings, search for words or hashtags, list and download your files, view all your channels including Broadcasts and Patter rooms, write single-line or multi-line posts, send private messages, view geolocation data, etc.
+View or scroll all streams in your Terminal, view or scroll conversations and posts from specific users or mentioning a user, follow/unfollow users, star/unstar/repost/etc, get information about users and their followers/followings, search for words or hashtags, list and download your files, view all your channels including Broadcasts and Patter rooms, write single-line or multi-line posts, send private messages, view geolocation data, etc.
 
-More than 50 features await for your Geekiness to command them.
+This CLI has more than 50 features awaiting for your Geekiness to command them.
 
 Ayadn is configurable: colors, timelines, durations, aliases, etc. 
 
-You can also specify many options from the commande line, like show the raw JSON instead of the formatted response, show only a number of most recents posts, show only new posts, etc.
+You can also specify many options, like show the raw JSON instead of the formatted response, show only a number of most recents posts, show only new posts, etc.
 
 There's also exclusive features, like the Blacklist: feed this mini database with usernames, client names or hashtags and Ayadn will never show you any post containing any of these elements.
 
-Last but not least: Ayadn supports multi-accounting! Authorize as many accounts as you wish and simply switch between them with a keystroke.  
+Last but not least: Ayadn supports multiple ADN accounts! Authorize as many accounts as you wish and simply switch between them with a keystroke.  
 
 
 ## INSTALL

data/lib/ayadn/action.rb

@@ -800,7 +800,8 @@ module Ayadn
           abort(Status.empty_fields) if el.length == 0
         end
         @view.clear_screen
-        text_to_post = "#nowplaying '#{itunes.track}' from '#{itunes.album}' by #{itunes.artist}"
+        #text_to_post = "#nowplaying '#{itunes.track}' from '#{itunes.album}' by #{itunes.artist}"
+        text_to_post = "#nowplaying\nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
         show_nowplaying(text_to_post)
         unless STDIN.getch == ("y" || "Y")
           puts "\nCanceled.\n\n".color(:red)
@@ -1133,7 +1134,7 @@ module Ayadn
     end
 
     def show_nowplaying(text)
-      puts "\nThis is what will be posted:\n".color(:cyan)
+      puts "\nYour post:\n".color(:cyan)
       puts text + "\n\n"
       puts "Do you confirm? (y/N) ".color(:yellow)
     end

data/lib/ayadn/authorize.rb

@@ -74,7 +74,7 @@ module Ayadn
     end
 
     def get_user(token)
-      JSON.parse(RestClient.get("https://alpha-api.app.net/stream/0/users/me?access_token=#{token}", :verify_ssl => OpenSSL::SSL::VERIFY_NONE) {|response, request, result| response })
+      JSON.parse(RestClient.get("https://api.app.net/users/me?access_token=#{token}", :verify_ssl => OpenSSL::SSL::VERIFY_NONE) {|response, request, result| response })
     end
 
     def get_token

data/lib/ayadn/cnx.rb

@@ -19,7 +19,7 @@ module Ayadn
     end
 
     def self.check(response)
-      message = JSON.parse(response)['meta']['error_message']
+      message = JSON.parse(response)['meta']['error_message'] if response.code != 200
       case response.code
       when 200
         response

data/lib/ayadn/databases.rb

@@ -16,6 +16,8 @@ module Ayadn
     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

data/lib/ayadn/endpoints.rb

@@ -6,13 +6,13 @@ module Ayadn
 
     def initialize
       @ayadn_callback_url = "http://aya.io/ayadn/auth.html"
-      @base_url = "https://alpha-api.app.net/"
-      @config_api_url = @base_url + "stream/0/config"
-      @posts_url = @base_url + "stream/0/posts/"
-      @users_url = @base_url + "stream/0/users/"
-      @files_url = @base_url + "stream/0/files/"
-      @token_url = @base_url + "stream/0/token/"
-      @channels_url = @base_url + "stream/0/channels/"
+      @base_url = "https://api.app.net/"
+      @config_api_url = @base_url + "config"
+      @posts_url = @base_url + "posts/"
+      @users_url = @base_url + "users/"
+      @files_url = @base_url + "files/"
+      @token_url = @base_url + "token/"
+      @channels_url = @base_url + "channels/"
       @pm_url = @channels_url + "pm/messages"
     end
 

data/lib/ayadn/errors.rb

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

data/lib/ayadn/version.rb

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

data/spec/unit/endpoints_spec.rb

@@ -18,18 +18,18 @@ describe Ayadn::Endpoints do
   end
   describe '#token_info' do
     it "returns the Token url" do
-      expect(Ayadn::Endpoints.new.token_info).to eq 'https://alpha-api.app.net/stream/0/token/?access_token=XXX'
+      expect(Ayadn::Endpoints.new.token_info).to eq 'https://api.app.net/token/?access_token=XXX'
     end
   end
   describe '#unified' do
     it "returns the Unified url" do
-      expect(Ayadn::Endpoints.new.unified({})).to eq 'https://alpha-api.app.net/stream/0/posts/stream/unified?access_token=XXX&count=33&include_html=0&include_directed=1&include_deleted=0&include_annotations=1'
+      expect(Ayadn::Endpoints.new.unified({})).to eq 'https://api.app.net/posts/stream/unified?access_token=XXX&count=33&include_html=0&include_directed=1&include_deleted=0&include_annotations=1'
     end
     it "returns the Unified url" do
-      expect(Ayadn::Endpoints.new.unified({count: 66, html: 1})).to eq 'https://alpha-api.app.net/stream/0/posts/stream/unified?access_token=XXX&count=66&include_html=1&include_directed=1&include_deleted=0&include_annotations=1'
+      expect(Ayadn::Endpoints.new.unified({count: 66, html: 1})).to eq 'https://api.app.net/posts/stream/unified?access_token=XXX&count=66&include_html=1&include_directed=1&include_deleted=0&include_annotations=1'
     end
     it "returns the Unified url" do
-      expect(Ayadn::Endpoints.new.unified({since_id: 336699})).to eq 'https://alpha-api.app.net/stream/0/posts/stream/unified?access_token=XXX&count=100&include_html=0&include_directed=1&include_deleted=0&include_annotations=1&since_id=336699'
+      expect(Ayadn::Endpoints.new.unified({since_id: 336699})).to eq 'https://api.app.net/posts/stream/unified?access_token=XXX&count=100&include_html=0&include_directed=1&include_deleted=0&include_annotations=1&since_id=336699'
     end
   end
 end

data/spec/unit/post_spec.rb

@@ -58,7 +58,7 @@ describe Ayadn::Post do
       expect(printed).to include "You should provide some text."
     end
     it "posts a post" do
-      expect(rest).to receive(:post).with("https://alpha-api.app.net/stream/0/posts/?include_annotations=1&access_token=XYZ", {"text"=>"YOLO", "entities"=>{"parse_markdown_links"=>true, "parse_links"=>true}, "annotations"=>[{"type"=>"com.ayadn.user", "value"=>{"+net.app.core.user"=>{"user_id"=>"@test", "format"=>"basic"}}}, {"type"=>"com.ayadn.client", "value"=>{"url"=>"http://ayadn-app.net", "author"=>{"name"=>"Eric Dejonckheere", "username"=>"ericd", "id"=>"69904", "email"=>"eric@aya.io"}, "version"=>"wee"}}]})
+      expect(rest).to receive(:post).with("https://api.app.net/posts/?include_annotations=1&access_token=XYZ", {"text"=>"YOLO", "entities"=>{"parse_markdown_links"=>true, "parse_links"=>true}, "annotations"=>[{"type"=>"com.ayadn.user", "value"=>{"+net.app.core.user"=>{"user_id"=>"@test", "format"=>"basic"}}}, {"type"=>"com.ayadn.client", "value"=>{"url"=>"http://ayadn-app.net", "author"=>{"name"=>"Eric Dejonckheere", "username"=>"ericd", "id"=>"69904", "email"=>"eric@aya.io"}, "version"=>"wee"}}]})
       x = post.post(['YOLO'])
     end
     it "returns the posted post" do

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: daybreak
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pinboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 'App.net command-line client: toolbox to access and manage your ADN data,
@@ -187,10 +187,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -259,17 +259,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: App.net command-line client.