facebook-cli 1.3.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913ff712708e17df232c742939c4cc18cea5c778
-  data.tar.gz: c64f49dcae20930df01d415358ffc68fd6d1d184
+  metadata.gz: 680c68383186dc7064cdfe6947e825a4d91803ec
+  data.tar.gz: 121ab05a54b57245edd58cae227ef84ecdee9a4e
 SHA512:
-  metadata.gz: ba53901c3d6b794d415c0204b51549da1a6dce324c0318d4a739def77eec36bdf644416888d330737a94bb7778988152094c5baf1fd5489bb747313ce7258dff
-  data.tar.gz: 487076f9c7d7cd4093ca288723ab544dfcaf6f8ddcd9ba70c413f16ed7cf65976c472baf6cee9360c7edc525f867c769cc160b25151a5e89a2fe10db86430bc8
+  metadata.gz: d9d9855b3a79ae2bb72f2476536a038b16bfdd26c959c08c8c7e28e25ba070491673ceb1c78123fdb74e23980fd039c32072d1be16e447a626c393e5611927ba
+  data.tar.gz: f3929fde6a2f3889d1ff5c5ce10cdd4de975a319ef9eac75faeac8af65730a8d49f94825a29482a95431e9ee2f1b5d1d06815e35eb288e1bce5c7b893bf30248

data/lib/fbcli.rb

@@ -10,7 +10,7 @@ include GLI::App
 
 program_desc "Facebook command line interface"
 
-version '1.3.0'
+version '1.3.3'
 
 flag [:token], :desc => 'Provide Facebook access token', :required => false
 
@@ -172,26 +172,27 @@ end
 def list_events(global_options, past = false)
   now = Time.new
 
-  FBCLI::page_items global_options, "events", "\n- - -\n\n" do |item|
+  filter = lambda { |item|
     starts = Time.parse(item['start_time'])
+    not ((past and starts < now) ^ (not past and starts > now))
+  }
 
-    if (past and starts < now) ^ (not past and starts > now)
-      unless item['end_time'].nil?
-        ends = Time.parse(item['end_time'])
-        duration = ends - starts
-      end
+  FBCLI::page_items global_options, "events", '- - -', filter do |item|
+    starts = Time.parse(item['start_time'])
 
-      puts "#{item['name']} (#{item['id']})"
-      puts
-      puts "Location: #{item['place']['name']}" unless item['place'].nil?
-      puts "Date: #{date_str(item['start_time'])}"
-      puts "Duration: #{duration / 3600} hours" if defined?(duration) and not duration.nil?
-      puts "RSVP: #{item['rsvp_status'].sub(/unsure/, 'maybe')}"
-      puts
-      puts link "events/#{item['id']}"
-      puts
-      puts item['description']
+    unless item['end_time'].nil?
+      ends = Time.parse(item['end_time'])
+      duration = ends - starts
     end
+
+    puts "#{item['name']} (#{item['id']})"
+    puts
+    puts "Location: #{item['place']['name']}" unless item['place'].nil?
+    puts "Date: #{date_str(item['start_time'])}"
+    puts "Duration: #{duration / 3600} hours" if defined?(duration) and not duration.nil?
+    puts "RSVP: #{item['rsvp_status'].sub(/unsure/, 'maybe')}"
+    puts
+    puts link "events/#{item['id']}"
   end
 end
 
@@ -209,4 +210,52 @@ command :pastevents do |c|
   end
 end
 
+desc "Show event details"
+arg_name "[ids...]"
+command :event do |c|
+  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,interested_count,declined_count,maybe_count,is_canceled'
+      ) do |item|
+        starts = Time.parse(item['start_time'])
+
+        unless item['end_time'].nil?
+          ends = Time.parse(item['end_time'])
+          duration = ends - starts
+        end
+
+        puts "#{item['name']} (#{item['id']})"
+
+        if item['is_canceled']
+          puts "CANCELED"
+          puts
+        end
+
+        puts
+        puts "Location: #{item['place']['name']}" unless item['place'].nil?
+        puts "Date: #{date_str(item['start_time'])}"
+        puts "Duration: #{duration / 3600} hours" if defined?(duration) and not duration.nil?
+        puts "Created by: #{item['owner']['name']}"
+        puts
+        puts "Attending: #{item['attending_count']}"
+        puts "Interested: #{item['interested_count']}"
+        puts "Maybe: #{item['maybe_count']}"
+        puts "Declined: #{item['declined_count']}"
+        puts
+        puts link "events/#{item['id']}"
+
+        if not item['description'].empty?
+          puts
+          puts item['description']
+        end
+
+        puts "- - -" unless index == args.size - 1
+      end
+    end
+  end
+end
+
 exit run(ARGV)

data/lib/fbcli/facebook.rb

@@ -1,6 +1,8 @@
 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?
@@ -14,11 +16,23 @@ module FBCLI
     Koala::Facebook::API.new($config['access_token'])
   end
 
-  def self.request_data(global_options, cmd)
-    api = init_api(global_options)
+  def self.request_object(global_options, id, options = {})
+    if @@api.nil?
+      @@api = init_api(global_options)
+    end
+
+    @@api.get_object(id, options) do |data|
+      yield data
+    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)
+      data = @@api.get_connections("me", cmd)
     rescue Koala::Facebook::APIError => e
       exit_now! \
         "Koala #{e.fb_error_type} (code #{e.fb_error_code})" +
@@ -29,15 +43,21 @@ module FBCLI
     data
   end
 
-  def self.page_items(global_options, cmd, separator = nil)
-    items = request_data(global_options, cmd)
+  def self.page_items(global_options, cmd, separator = nil, filter = nil)
+    items = request_personal_connections(global_options, cmd)
+
+    virgin = true
 
     while not items.nil? do
       items.each_with_index { |item, idx|
-        yield item
+        if filter.nil? or not filter.call(item)
+          unless separator.nil? or virgin
+            puts separator
+          end
+
+          yield item
 
-        unless separator.nil? or idx == items.size - 1
-          puts separator
+          virgin = false
         end
       }
 

metadata

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