facy 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa78d1e8d5b208cd05a28af845e724bd864b563e
-  data.tar.gz: a0d3026f17d4bc092fe12a59c215eb3428c8a0de
+  metadata.gz: 6b4d2057ef1767d82df6907524af90ec1d3c2365
+  data.tar.gz: 103d0cf722d6365025654487e71cc1ed41e75324
 SHA512:
-  metadata.gz: 0e482c8cc46a4a86123fcee6965364a4dd6182201a59f403feefaa6c38ac75c7cb5e0cfa1a270a4df978597f2fece1defb3bde6230ddea7338d7724145bc40f9
-  data.tar.gz: d8fd9590296282755d060e9a9a72e0776e53c043319676baabb56c87debe7f58dddb18629e60cf93d5325c3a4d9f6386ece1081d97e5823d209e68a442049985
+  metadata.gz: bed82a630b4baf68c1139763424dbb1ddb6af794ffac0bcbf2e8a96dc9f18cefc726da26903078cd7020271e96c841c20dad296dd4bc638f23bda211fce44be0
+  data.tar.gz: 1d58a815b7b90e83ef17b7033d034630123942e3a79fd022121a1b53986e950bb80bf50399d8c5f87325dd2e63b138e9641419a76a584e6cd9977845be2772d2

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    facy (1.2.11)
+      activesupport (~> 4.0)
+      bundler (~> 1.5)
+      eventmachine (~> 1.0)
+      koala (~> 1.10)
+      launchy (~> 2.4)
+      rmagick (~> 2.13)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    eventmachine (1.0.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    i18n (0.6.11)
+    json (1.8.1)
+    koala (1.10.0)
+      addressable
+      faraday
+      multi_json
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
+    rmagick (2.13.3)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  facy!

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 dxhuy1988
+Copyright (c) 2014 dxhuy1988 (doxuanhuy@gmail.com)
 
 MIT License
 

data/README.md

@@ -1,4 +1,9 @@
 # Facy
+
+![](https://badge.fury.io/rb/facy.svg)
+
+![](http://i.gyazo.com/797434ffbf29ab5dc2b4aac542a75330.png)
+
 Facy is a terminal client for facebook, which support streaming-like feature.
 Only supports Ruby 1.9 and later.
 To install facy, we need ruby pre-installed, please refer to https://www.ruby-lang.org/en/installation/ to know how to install ruby.

data/lib/facy/command.rb

@@ -1,5 +1,13 @@
 module Facy
   module Command
+    def aliasing(origin, with)
+      alias_commands[with] = origin
+    end
+
+    def alias_commands
+      @alias_commands ||= {}
+    end
+
     def commands
       @commands ||= []
     end
@@ -11,6 +19,9 @@ module Facy
     def execute(text)
       text.strip!
       rule, target = match_single_command(text) || match_target_command(text)
+      origin = alias_commands[rule.to_sym]
+      rule = origin.nil? ? rule : origin
+
       commands.each do |c|
         if rule.to_s == c[:pattern].to_s.split(":").first
           c[:block].call(target)
@@ -78,6 +89,7 @@ module Facy
       end
     end
     help :open, 'open a post in browser', ':open [code]'
+    aliasing :open, :op
 
     command :comment do |content|
       content = content.split(" ")
@@ -93,6 +105,7 @@ module Facy
       }
     end
     help :comment, 'comment to a post,', ':comment [code] [content]'
+    aliasing :comment, :cm
 
     command :seen do |notif_code|
       notif_code = "$#{notif_code}"
@@ -112,6 +125,7 @@ module Facy
       puts "" 
     end
     help :view_raw, "view raw json output of a post", ":view_raw [post_code]"
+    aliasing :view_raw, :vr
 
     command :view_img do |post_code|
       if config[:enable_img_view]
@@ -128,6 +142,7 @@ module Facy
       end
     end
     help :view_img, "view an image as ascii art", ":view_img [code]"
+    aliasing :view_img, :vi
 
     command :view_comments do |post_code|
       post_code = "$#{post_code}"
@@ -141,6 +156,7 @@ module Facy
       end
     end
     help :view_comments, "view comments from a post", ":view_comments [code]"
+    aliasing :view_comments, :vc
 
     command :view_likes do |post_code|
       post_code = "$#{post_code}"
@@ -153,6 +169,7 @@ module Facy
       end
     end
     help :view_likes, "view likes detail from a post", ":view_likes [code]"
+    aliasing :view_likes, :vl
     
     command :dump_log do
       if config[:debug_log]
@@ -166,6 +183,7 @@ module Facy
       end
     end
     help :dump_log, "dump debug log to file", ":dump_log"
+    aliasing :dump_log, :dmp
 
     command :reconfig do
       begin
@@ -193,10 +211,13 @@ module Facy
       }
     end
     help :clear_cache, "clear posts and notification cache and fetch again", ":clear_cache"
+    aliasing :clear_cache, :cc
 
     command :mailbox do |target|
       if target 
-        threadnum, messagenum = target.split(" ").map(&:to_i)
+        targets = target.split(" ").map(&:to_i)
+        raise Exception.new("need two parameters") if targets.size != 2
+        threadnum, messagenum = targets
         mail = mailbox_cache[threadnum]
         instant_output(Item.new(info: :mail, content: {mail: mail, messagenum: messagenum}))
       else
@@ -208,6 +229,7 @@ module Facy
       end
     end
     help :mailbox, "read mailbox", ":mailbox [mail number]"
+    aliasing :mailbox, :m
 
     completion_proc = proc {|s| 
       commands

data/lib/facy/core.rb

@@ -1,5 +1,9 @@
 module Facy
   module Core
+    def me
+      @me
+    end
+
     def config
       @config ||= {}
     end
@@ -22,9 +26,14 @@ module Facy
       load_config
       login_flow
       inits.each { |block| class_eval(&block) }
+      set_me
       log(:info, "core module init success")
     end
 
+    def set_me
+      @me = facebook_me
+    end
+
     def load_config
       config.reverse_update(default_config)
       log(:info, "config loaded #{config.to_s}")

data/lib/facy/facebook.rb

@@ -7,6 +7,16 @@ module Facy
       ERROR     = 1
       SUSPENDED = 2
     end
+    
+    def facebook_me
+      @graph.api("/me?fields=id,name")
+    rescue Koala::Facebook::ServerError
+      retry_wait
+    rescue Koala::Facebook::APIError
+      expired_session
+    rescue Exception => e
+      error e
+    end
 
     def facebook_status
       @status ||= ConnectionStatus::NORMAL

data/lib/facy/help.rb

@@ -15,10 +15,12 @@ module Facy
       target = target.tap{|t|t.strip!}.gsub(':','').to_sym
       @helps.each do |h|
         if h[:target] == target
+          alias_cmds = alias_commands.select {|origin, with| with == target}.map{|k,v| k}
           instant_output(Item.new(
             info: :help,
             content: h[:usage],
-            extra: h[:example]
+            extra: h[:example],
+            alias_cmds: alias_cmds
           ))
         end
       end

data/lib/facy/output.rb

@@ -169,6 +169,7 @@ module Facy
     print_register :help do |item|
       puts item.content
       puts "example: #{item.extra}" if item.extra
+      puts "aliasing: #{item.alias_cmds}" if item.alias_cmds
     end
 
     print_register :comment do |item|
@@ -184,10 +185,12 @@ module Facy
       mails = mailbox_cache
       count = 0
       mails.each do |m|
-        from = m["to"]["data"].first["name"].colorize(33)
-        to = m["to"]["data"].last["name"].colorize(34)
+        from = m["to"]["data"].first["name"]
+        to = m["to"]["data"].last["name"]
+        actor = [from, to].keep_if{|m| m != me["name"]}.first.colorize(33)
         first_message = m["comments"]["data"].last["message"].short.colorize(37)
-        puts "  {#{count}} from: #{from} to: #{to} [#{first_message}]"
+        
+        puts "  {#{count}} from: #{actor} [#{first_message}]"
         count += 1
       end
       clear_line

data/lib/facy/version.rb

@@ -1,3 +1,3 @@
 module Facy
-  VERSION = "1.2.11"
+  VERSION = "1.2.12"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: facy
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - dxhuy1988
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: koala
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
 description: 'facy: first colorful terminal client for facebook'
@@ -102,8 +102,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -135,17 +136,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.4.1
 signing_key: 
 specification_version: 4
 summary: 'facy: terminal client for facebook'