facebook-cli 1.3.16 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3859d8e0b0e3a0defe8390292b70dd40fc9f298
-  data.tar.gz: 3903b59c2894edd571f6e384356c4b9f1c3c7170
+  metadata.gz: 4e825bc8b6a218bd1cb559e8e4061b733d0ce3eb
+  data.tar.gz: 45cc917afd6dc9dcc6ec529a267c665760374bcd
 SHA512:
-  metadata.gz: 3114a77b78c19c5381d64e8d5faf1538dd9a1975106f45fc8ae74ea624daa612ac59bb96ca28c1a28b6e9b57ada0cabceba8ddf4de855e7a8f835982f4326a90
-  data.tar.gz: 7415d2da7ef29bb80aa49b72c7b97e7ae8e3f741621d5b8fdd1f8b48b1f9c77950d425611f2caa8a54e6d63090f1866901deb37cadff5ac8e1298b493c28b129
+  metadata.gz: 1971e9c34e24970570284fbcb6303388e53699f54ca7f8292fdaf650ae13399138e901db8b0e249524d957faaf41a53b45ab788c14739a4a0fe4bfdad435e204
+  data.tar.gz: b372d6298015575340ac147c374a02fc912c1383c2be24c220f6a437c488e9b58d100155c57fc69f469089ee268a2680e4f7c86a743c5cf93c1b14ec7048d2d2

data/lib/fbcli.rb

@@ -10,16 +10,17 @@ include GLI::App
 
 program_desc "Facebook command line interface"
 
-version '1.3.16'
+version '1.4.0'
 
 flag [:token], :desc => 'Provide Facebook access token', :required => false
-flag [:pages, :p], :desc => 'Max pages', :required => false, :default_value => -1
+flag [:pages, :p], :desc => 'Max pages', :required => false, :type => Integer, :default_value => -1
 
 def link(path)
   "https://www.facebook.com/#{path}"
 end
 
-def link_to_post(profile_id, post_id)
+def link_to_post(full_post_id)
+  profile_id, post_id = full_post_id.split '_', 2
   link "#{profile_id}/posts/#{post_id}"
 end
 
@@ -34,7 +35,9 @@ def save_config
   end
 end
 
-pre do |global_options,command|
+pre do |global_options, command|
+  $global_options = global_options # They're supposed to be global, right?
+
   if command.name == :config
     $config = {}
   else
@@ -61,6 +64,11 @@ pre do |global_options,command|
     end
   end
 
+  # Let access token passed from the command line take precedence
+  if not global_options[:token].nil?
+    $config['access_token'] = global_options[:token]
+  end
+
   # Success
   true
 end
@@ -76,7 +84,7 @@ desc "Save Facebook application ID and secret"
 command :config do |c|
   c.flag [:appid], :desc => 'Facebook application ID', :required => true
   c.flag [:appsecret], :desc => 'Facebook application secret', :required => true
-  c.action do |global_options,options,args|
+  c.action do |global_options, options|
     $config['app_id'] = options['appid'].to_i
     $config['app_secret'] = options['appsecret']
 
@@ -91,7 +99,7 @@ end
 desc "Log into Facebook and receive an access token"
 command :login do |c|
   c.flag [:port], :desc => 'Local TCP port to serve Facebook login redirect page', :default_value => '3333'
-  c.action do |global_options,options,args|
+  c.action do |global_options, options|
     token, expiration = FBCLI::listen_for_auth_code(options['port'], $config['app_id'], $config['app_secret'])
 
     if not token.nil?
@@ -110,16 +118,16 @@ end
 
 desc "Deauthorize your access token"
 command :logout do |c|
-  c.action do |global_options,options,args|
-    FBCLI::logout global_options
+  c.action do
+    FBCLI::logout
     puts "You are now logged out."
   end
 end
 
 desc "Show your name and profile ID"
 command :me do |c|
-  c.action do |global_options,options,args|
-    FBCLI::request_object global_options, "me" do |data|
+  c.action do
+    FBCLI::request_object "me" do |data|
       puts "Name: #{data["name"]}"
       puts "ID: #{data["id"]}"
     end
@@ -130,14 +138,14 @@ desc "Post a message or image to your timeline"
 arg_name "message"
 command :post do |c|
   c.flag [:i, :image], :desc => 'File or URL of image to post'
-  c.action do |global_options,options,args|
+  c.action do |global_options, options, args|
     if options['image'].nil?
-      profile_id, post_id = FBCLI::publish_post global_options, args[0]
+      full_post_id = FBCLI::publish_post args[0]
     else
-      profile_id, post_id = FBCLI::publish_photo global_options, args[0], options['image']
+      full_post_id = FBCLI::publish_image args[0], options['image']
     end
 
-    puts "Your post: #{link_to_post profile_id, post_id}"
+    puts "Your post: #{link_to_post full_post_id}"
   end
 end
 
@@ -149,7 +157,7 @@ command :postlink do |c|
   c.flag [:d, :description], :desc => 'Link description'
   c.flag [:c, :caption], :desc => 'Link caption'
   c.flag [:i, :image], :desc => 'Link image URL'
-  c.action do |global_options,options,args|
+  c.action do |global_options, options, args|
     link_metadata = {
       "name" => options['name'],
       "link" => args[0],
@@ -158,16 +166,16 @@ command :postlink do |c|
       "picture" => options['image']
     }
 
-    profile_id, post_id = FBCLI::publish_link global_options, options['message'], link_metadata
+    full_post_id = FBCLI::publish_post options['message'], link_metadata
 
-    puts "Your post: #{link_to_post profile_id, post_id}"
+    puts "Your post: #{link_to_post full_post_id}"
   end
 end
 
 desc "List the pages you have 'Liked'"
 command :likes do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, 'likes', '' do |item|
+  c.action do
+    FBCLI::page_items 'likes', '' do |item|
       puts item["name"]
       puts link item["id"]
     end
@@ -183,8 +191,8 @@ long_desc %(
   See: https://developers.facebook.com/docs/apps/faq#faq_1694316010830088
 )
 command :friends do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, 'taggable_friends' do |item|
+  c.action do
+    FBCLI::page_items 'taggable_friends' do |item|
       puts item['name']
     end
   end
@@ -192,12 +200,10 @@ end
 
 desc "List the posts on your profile"
 command :feed do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, "feed", '- - -' do |item|
-      profile_id, post_id = item["id"].split '_', 2
-
+  c.action do
+    FBCLI::page_items "feed", '- - -' do |item|
       puts item["message"] if item.has_key?("message")
-      puts link_to_post profile_id, post_id
+      puts link_to_post item["id"]
       puts "Created: #{date_str(item["created_time"])}"
     end
   end
@@ -211,15 +217,15 @@ end
 
 desc "List photos you have uploaded"
 command :photos do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, "photos?type=uploaded", '- - -', &handlePhoto
+  c.action do
+    FBCLI::page_items "photos?type=uploaded", '- - -', &handlePhoto
   end
 end
 
 desc "List photos you are tagged in"
 command :photosof do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, "photos", '- - -', &handlePhoto
+  c.action do
+    FBCLI::page_items "photos", '- - -', &handlePhoto
   end
 end
 
@@ -231,19 +237,19 @@ end
 
 desc "List videos you have uploaded"
 command :videos do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, "videos?type=uploaded", '- - -', &handleVideo
+  c.action do
+    FBCLI::page_items "videos?type=uploaded", '- - -', &handleVideo
   end
 end
 
 desc "List videos you are tagged in"
 command :videosof do |c|
-  c.action do |global_options,options,args|
-    FBCLI::page_items global_options, "videos", '- - -', &handleVideo
+  c.action do
+    FBCLI::page_items "videos", '- - -', &handleVideo
   end
 end
 
-def list_events(global_options, past = false)
+def list_events(past = false)
   now = Time.new
 
   filter = lambda { |item|
@@ -251,7 +257,7 @@ def list_events(global_options, past = false)
     not ((past and starts < now) ^ (not past and starts > now))
   }
 
-  FBCLI::page_items global_options, "events", '- - -', filter do |item|
+  FBCLI::page_items "events", '- - -', filter do |item|
     starts = Time.parse(item['start_time'])
 
     unless item['end_time'].nil?
@@ -272,25 +278,24 @@ end
 
 desc "List your upcoming events"
 command :events do |c|
-  c.action do |global_options,options,args|
-    list_events global_options
+  c.action do
+    list_events
   end
 end
 
 desc "List your past events"
 command :pastevents do |c|
-  c.action do |global_options,options,args|
-    list_events global_options, true
+  c.action do
+    list_events true
   end
 end
 
 desc "Show event details"
 arg_name "[ids...]"
 command :event do |c|
-  c.action do |global_options,options,args|
+  c.action do |global_options, options, args|
     args.each_with_index do |id, index|
       FBCLI::request_object(
-        global_options,
         id,
         :fields => 'name,description,place,owner,start_time,end_time,attending_count,declined_count,maybe_count,is_canceled'
       ) do |item|

data/lib/fbcli/facebook.rb

@@ -3,12 +3,7 @@ require 'koala'
 module FBCLI
   @@api = nil
 
-  def self.init_api(global_options)
-    # Access token passed from the command line takes precedence
-    if not global_options[:token].nil?
-      $config['access_token'] = global_options[:token]
-    end
-
+  def self.init_api
     if $config['access_token'].nil? or $config['access_token'].empty?
       exit_now! "You must first acquire an access token; run: #{APP_NAME} login"
     end
@@ -27,53 +22,41 @@ module FBCLI
     str
   end
 
-  def self.logout(global_options)
-    if @@api.nil?
-      @@api = init_api(global_options)
-    end
+  def self.api_call(lambda)
+    @@api = init_api if @@api.nil?
 
     begin
-      @@api.delete_object("me/permissions")
+      lambda.call(@@api)
     rescue Koala::Facebook::APIError => e
       exit_now! koala_error_str e
     end
   end
 
-  def self.request_object(global_options, id, options = {})
-    if @@api.nil?
-      @@api = init_api(global_options)
-    end
+  def self.logout
+    api_call lambda { |api| api.delete_object("me/permissions") }
+  end
 
-    begin
-      @@api.get_object(id, options) do |data|
+  def self.request_object(id, options = {})
+    api_call lambda { |api|
+      api.get_object(id, options) do |data|
         yield data
       end
-    rescue Koala::Facebook::APIError => e
-      exit_now! koala_error_str e
-    end
+    }
   end
 
-  def self.request_personal_connections(global_options, cmd)
-    if @@api.nil?
-      @@api = init_api(global_options)
-    end
-
-    begin
-      data = @@api.get_connections("me", cmd)
-    rescue Koala::Facebook::APIError => e
-      exit_now! koala_error_str e
-    end
-
-    data
+  def self.request_personal_connections(cmd)
+    api_call lambda { |api|
+      api.get_connections("me", cmd)
+    }
   end
 
-  def self.page_items(global_options, cmd, separator = nil, filter = nil)
-    items = request_personal_connections(global_options, cmd)
+  def self.page_items(cmd, separator = nil, filter = nil)
+    items = request_personal_connections(cmd)
 
     virgin = true
     count = 0
 
-    while not (items.nil? or count == global_options['pages'].to_i) do
+    while not (items.nil? or count == $global_options['pages']) do
       items.each_with_index { |item, idx|
         if filter.nil? or not filter.call(item)
           unless separator.nil? or virgin
@@ -91,46 +74,13 @@ module FBCLI
     end
   end
 
-  def self.publish_post(global_options, msg)
-    if @@api.nil?
-      @@api = init_api(global_options)
-    end
-
-    begin
-      profile_id, post_id = @@api.put_wall_post(msg)['id'].split '_', 2
-    rescue Koala::Facebook::APIError => e
-      exit_now! koala_error_str e
-    end
-
-    [profile_id, post_id]
+  def self.publish_post(msg, link_metadata = {})
+    result = api_call lambda { |api| api.put_wall_post(msg, link_metadata) }
+    result['id']
   end
 
-  def self.publish_link(global_options, msg, link_metadata)
-    if @@api.nil?
-      @@api = init_api(global_options)
-    end
-
-    begin
-      profile_id, post_id = @@api.put_wall_post(msg, link_metadata)['id'].split '_', 2
-    rescue Koala::Facebook::APIError => e
-      exit_now! koala_error_str e
-    end
-
-    [profile_id, post_id]
-  end
-
-  def self.publish_photo(global_options, msg, image_file_or_url)
-    if @@api.nil?
-      @@api = init_api(global_options)
-    end
-
-    begin
-      result = @@api.put_picture(image_file_or_url, {:message => msg})
-      profile_id, post_id = result['post_id'].split '_', 2
-    rescue Koala::Facebook::APIError => e
-      exit_now! koala_error_str e
-    end
-
-    [profile_id, post_id]
+  def self.publish_image(msg, image_file_or_url)
+    result = api_call lambda { |api| api.put_picture(image_file_or_url, {:message => msg}) }
+    result['post_id']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facebook-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.4.0
 platform: ruby
 authors:
 - Ildar Sagdejev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies: []
 description: A limited command line interface to Facebook
 email: specious@gmail.com