ayadn 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d61fe173d14e26de92c795038dd27fea3772413
-  data.tar.gz: 54f031328188efe4a55774916f0f0a719456741e
+  metadata.gz: be6bf71c51621964932bfa952f50e7622cf90d1f
+  data.tar.gz: 772b97b6a9f4257ef2e9bc56f67690c238e49ff4
 SHA512:
-  metadata.gz: 1dd6b47722459df1fd84c27abb1a690563b57f9b662078cf64b413da52e00738fa94b3f2daf28d0193dae6553d815a2a5a9b0c40082524bd908ee8e5f9897f46
-  data.tar.gz: 69bc850c7b96aec17dd0619c4bcca4eb9ed00a4a094f3ca8214c4f72effe5096d1d315a77daff61309bcd32fbb8bbf6bd27f3765a5e99a64acc0237e34bbfc3f
+  metadata.gz: 88b558768373966f568626ddbbfb9c2bc6cec3d96f45f48a0786d374e0d0bb44aef7eefe488cff17badf4f6eff0912e5532d019eab9e741ce1372f7cede6ad6f
+  data.tar.gz: 75e1ff70e91f48e29340256f2e0db255dfd3555c5fecdbf7271b66281d5133ace8d3f13a275548e51c784f878534dbfd7b68efd1e982ccbe66d57b5d162b2826

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.7.7 - 2014-10-26 - 'The Twins'
+
+- Fix: max characters information when sending to a channel
+- Fix: line break at the end of stream if compact view
+- Fix: save posts/messages if backup enabled
+- New: embed an image in a message to a channel
+- New: embed a Youtube video in a message
+- New: embed a Vimeo video in a message
+- New: embed a movie poster in a message
+- New: option to show OEmbed links from channels/messages
+- New: extracted links are exported to a json file
+
 # 1.7.6 - 2014-10-25 - 'Barrie'
 
 - Fix: channels parser (response != 200, working status)

data/doc/02-install.md

@@ -20,5 +20,4 @@ You can of course use the Ruby shipped with your system but it will require root
 
 ## WINDOWS
 
-Ayadn 1.0.x isn't compatible with Windows: there's too many issues due to external Gems and POSIX-dependant tools.  
-
+Ayadn 1.x isn't compatible with Windows: there's too many issues due to external Gems and POSIX-dependant tools.  

data/doc/05-streams.md

@@ -19,13 +19,11 @@ Scroll your timeline with:
 
 `ayadn -tl -s`
 
-#### SCROLL
+#### SCROLL REFRESH
 
-A note about `--scroll`. 
+*Read this if you want to launch several scroll streams at once*
 
-**Ayadn pulls the stream every 3 seconds by default.**
-
-It means you can launch up to 3 scroll streams at a time _per account_ if you want. 
+Ayadn pulls the stream every 3 seconds by default. It means you can launch up to 3 scroll streams at a time _per account_ if you want. 
 
 To launch even more streams at the same time, increment the timer by one second for each stream. 
 
@@ -221,6 +219,8 @@ You can replace the channel id with its alias if you previously defined one:
 
 `ayadn -ms mychannelalias`  
 
+Since version 1.7.7, Ayadn shows the full oembed links in messages if any. As these links can be quite long and complex, you can remove them from the view if you want with `ayadn set timeline show_channel_oembed false`.  
+
 # WHATSTARRED
 
 Show posts starred by a specific user.

data/lib/ayadn/action.rb

@@ -583,6 +583,7 @@ module Ayadn
           options = NowWatching.new.get_poster(settings[:poster], settings)
         end
         resp = writer.reply({options: options, text: text, id: post_id, reply_to: replied_to})
+        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
         # ----
         options = options.dup
         unless resp['data']['reply_to'].nil?
@@ -595,18 +596,25 @@ module Ayadn
       end
     end
 
-    def send_to_channel(channel_id)
+    def send_to_channel(channel_id, options = {})
       begin
         channel_id = @workers.get_channel_id_from_alias(channel_id)
         writer = Post.new
         puts Status.writing
-        puts Status.post
+        puts Status.message
         lines_array = writer.compose
         writer.check_message_length(lines_array)
         @view.clear_screen
         puts Status.posting
-        resp = writer.message({id: channel_id, text: lines_array.join("\n")})
-        save_and_view(resp)
+        if options[:poster]
+          settings = options.dup
+          options = NowWatching.new.get_poster(settings[:poster], settings)
+        end
+        resp = writer.message({options: options, id: channel_id, text: lines_array.join("\n")})
+        FileOps.save_message(resp) if Settings.options[:backup][:auto_save_sent_messages]
+        @view.clear_screen
+        puts Status.yourpost
+        @view.show_posted(resp)
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [channel_id]})
       end

data/lib/ayadn/app.rb

@@ -401,10 +401,10 @@ module Ayadn
 
     desc "pm @USERNAME", "Send a private message to @username"
     long_desc Descriptions.pmess
-    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new post"
-    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
-    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
-    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
+    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new message"
+    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new message"
+    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new message"
+    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new message"
     def pm(*username)
       Action.new.pmess(username, options)
     end
@@ -412,8 +412,12 @@ module Ayadn
     desc "send CHANNEL", "Send a message to a CHANNEL (-C)"
     map "-C" => :send_to_channel
     long_desc Descriptions.send_to_channel
+    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new message"
+    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new message"
+    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new message"
+    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new message"
     def send_to_channel(channel_id)
-      Action.new.send_to_channel(channel_id)
+      Action.new.send_to_channel(channel_id, options)
     end
 
     desc "reply POST", "Reply to post n°POST (-R)"
@@ -461,8 +465,9 @@ module Ayadn
     long_desc Descriptions.blacklist
     subcommand "blacklist", Blacklist
 
-    desc "nowplaying", "Post the current playing track from iTunes or Last.fm (-np)"
+    desc "nowplaying", "Post the current playing track from iTunes or Last.fm (-NP)"
     map "-np" => :nowplaying
+    map "-NP" => :nowplaying
     long_desc Descriptions.nowplaying
     option :no_url, aliases: "-n", type: :boolean, desc: "Don't append preview or album art at the end of the post"
     option :lastfm, aliases: "-l", type: :boolean, desc: "Get current track from Last.fm instead of iTunes"

data/lib/ayadn/fileops.rb

@@ -2,6 +2,10 @@
 module Ayadn
   class FileOps
 
+    def self.save_links(obj, name)
+      File.write(Settings.config[:paths][:lists] + "/#{name}", obj.to_json)
+    end
+
     def self.save_post(resp)
       File.write(Settings.config[:paths][:posts] + "/#{resp['data']['id']}.json", resp['data'].to_json)
     end

data/lib/ayadn/nowplaying.rb

@@ -92,7 +92,9 @@ module Ayadn
           source: source,
           visible: visible
         }
-        @view.show_posted(Post.new.post(dic))
+        resp = Post.new.post(dic)
+        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
+        @view.show_posted(resp)
       rescue => e
         puts Status.wtf
         Errors.global_error({error: e, caller: caller, data: [dic, store, options]})

data/lib/ayadn/post.rb

@@ -83,7 +83,8 @@ module Ayadn
         begin
           #while buffer = Readline.readline("#{Settings.config[:identity][:handle]} >> ".color(:red))
           while buffer = Readline.readline(">> ".color(:red))
-            post({text: buffer})
+            resp = post({text: buffer})
+            FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
             puts Status.done
           end
         rescue Interrupt

data/lib/ayadn/set.rb

@@ -431,7 +431,7 @@ 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'
+      when 'directed', 'html', 'show_source', 'show_symbols', 'show_real_name', 'show_date', 'show_spinner', 'show_debug', 'compact', 'show_channel_oembed'
         Settings.options[:timeline][meth.to_sym] = @output
       when 'deleted', 'annotations'
         abort(Status.not_mutable)

data/lib/ayadn/settings.rb

@@ -100,6 +100,7 @@ module Ayadn
           conf[:tvshow] = {hashtag: 'nowwatching'} if conf[:tvshow].nil?
           conf[:formats][:list] = {reverse: true} if conf[:formats][:list].nil?
           conf[:timeline][:compact] = false if conf[:timeline][:compact].nil?
+          conf[:timeline][:show_channel_oembed] = true if conf[:timeline][:show_channel_oembed].nil?
 
           @options = conf
           self.write_config_file(config_file, @options)
@@ -176,6 +177,7 @@ module Ayadn
           show_date: true,
           show_spinner: true,
           show_debug: false,
+          show_channel_oembed: true,
           compact: false
         },
         counts: {

data/lib/ayadn/status.rb

@@ -7,6 +7,9 @@ module Ayadn
     def self.downloaded(name)
       "\nFile downloaded in #{Settings.config[:paths][:downloads]}/#{name}\n".color(:green)
     end
+    def self.links_saved(name)
+      "\nLinks exported to file #{Settings.config[:paths][:lists]}/#{name}\n".color(:green)
+    end
     def self.downloading
       "Downloading from ADN...\n\n".inverse
     end
@@ -156,7 +159,7 @@ module Ayadn
       "\nPosting as ".color(:cyan) + "#{Settings.config[:identity][:handle]}".color(:green) + ".".color(:cyan)
     end
     def self.yourpost
-      "Your post:\n\n".color(:cyan)
+      "Your post:\n".color(:cyan)
     end
     def self.yourmessage username = nil
       if username.nil?

data/lib/ayadn/stream.rb

@@ -25,6 +25,7 @@ module Ayadn
         @view.clear_screen()
       end
       Scroll.new(@api, @view).global(options) if options[:scroll]
+      puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
 
@@ -54,6 +55,7 @@ module Ayadn
         @view.clear_screen()
       end
       Scroll.new(@api, @view).send(meth, options) if options[:scroll]
+      puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
 
@@ -75,6 +77,7 @@ module Ayadn
         @view.clear_screen()
       end
       Scroll.new(@api, @view).mentions(username, options) if options[:scroll]
+      puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
     def posts username, options
@@ -91,6 +94,7 @@ module Ayadn
       end
       @view.render(stream, options)
       Scroll.new(@api, @view).posts(username, options) if options[:scroll]
+      puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
     def whatstarred(username, options)
@@ -193,6 +197,7 @@ module Ayadn
       options[:post_id] = post_id.to_i
       @view.render(stream, options)
       Scroll.new(@api, @view).convo(id, options) if options[:scroll]
+      puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
     def messages(channel_id, options)
@@ -205,6 +210,7 @@ module Ayadn
       Check.no_data(resp, 'messages')
       @view.render(resp, options)
       Scroll.new(@api, @view).messages(channel_id, options) if options[:scroll]
+      puts "\n" if Settings.options[:timeline][:compact] && options[:raw].nil?
     end
 
     def random_posts(options)

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -43,6 +43,7 @@ module Ayadn
 
     def show_posted(resp)
       show_simple_post([resp['data']], {})
+      puts "\n" if Settings.options[:timeline][:compact]
     end
 
     def show_list_reposted(list, target)
@@ -325,19 +326,28 @@ module Ayadn
     def all_hashtag_links(stream, hashtag)
       clear_screen()
       puts "Links from posts containing hashtag '##{hashtag}': \n".color(:cyan)
-      show_links(@workers.links_from_posts(stream))
+      links = @workers.links_from_posts(stream)
+      links.uniq!
+      show_links(links)
+      @workers.save_links(links, "hashtag", hashtag)
     end
 
     def all_search_links(stream, words)
       clear_screen()
       puts "Links from posts containing word(s) '#{words}': \n".color(:cyan)
-      show_links(@workers.links_from_posts(stream))
+      links = @workers.links_from_posts(stream)
+      links.uniq!
+      show_links(links)
+      @workers.save_links(links, "search", words)
     end
 
     def all_stars_links(stream)
       clear_screen()
       puts "Links from your starred posts: \n".color(:cyan)
-      show_links(@workers.links_from_posts(stream))
+      links = @workers.links_from_posts(stream)
+      links.uniq!
+      show_links(links)
+      @workers.save_links(links, 'starred')
     end
 
     def infos(stream, token)

data/lib/ayadn/workers.rb

@@ -262,13 +262,34 @@ module Ayadn
       unless post['annotations'].nil? || post['annotations'].empty?
         post['annotations'].each do |ann|
           if ann['type'] == "net.app.core.oembed"
-            links << ann['value']['embeddable_url'] if ann['value']['embeddable_url']
+            if ann['value']['embeddable_url']
+              links << ann['value']['embeddable_url']
+            elsif ann['value']['url'] && Settings.options[:timeline][:show_channel_oembed] == true
+              links << ann['value']['url']
+            end
           end
         end
       end
       links.uniq
     end
 
+    def save_links(links, origin, args = "")
+      links.sort!
+      obj = {
+        'meta' => {
+          'type' => 'links',
+          'origin' => origin,
+          'args' => args,
+          'created_at' => Time.now,
+          'username' => Settings.config[:identity][:handle]
+        },
+        'data' => links
+      }
+      filename = "#{Settings.config[:identity][:handle]}_#{origin}_links.json"
+      FileOps.save_links(obj, filename)
+      puts Status.links_saved(filename)
+    end
+
     def extract_hashtags(post)
       post['entities']['hashtags'].map { |h| h['name'] }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor