RubyGems - facebook-cli - Versions diffs - 1.2.0 → 1.3.0 - Mend

facebook-cli 1.2.0 → 1.3.0

Files changed (5) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43e88b0462f22b153e6b31aa3f14ab6e3129aab
-  data.tar.gz: 3b39f775a897e4e5c9ab3cb7bb0310ddbcd28092
+  metadata.gz: 913ff712708e17df232c742939c4cc18cea5c778
+  data.tar.gz: c64f49dcae20930df01d415358ffc68fd6d1d184
 SHA512:
-  metadata.gz: 8730da7429b2dcb7c57677bb450083430fbac028962cc042ff0be74031dd9eaf7f6d075918d231be046ad6f7368a8cd77313f35cf3c4d6fb87deb726a30c9570
-  data.tar.gz: 4149d6345806ee902dfb37947f485a80bd7d1c50a548d02fc0d1e542de14b93f93b75c58e568d2836a2e829868b1f3d183b3f178269dcac21b9d1802e4739cbe
+  metadata.gz: ba53901c3d6b794d415c0204b51549da1a6dce324c0318d4a739def77eec36bdf644416888d330737a94bb7778988152094c5baf1fd5489bb747313ce7258dff
+  data.tar.gz: 487076f9c7d7cd4093ca288723ab544dfcaf6f8ddcd9ba70c413f16ed7cf65976c472baf6cee9360c7edc525f867c769cc160b25151a5e89a2fe10db86430bc8

data/lib/fbcli.rb CHANGED Viewed

@@ -1,7 +1,6 @@
 require 'gli'
 require 'yaml'
 require 'fbcli/auth'
-require 'fbcli/format'
 require 'fbcli/facebook'
 APP_NAME = File.split($0)[1]
@@ -11,43 +10,18 @@ include GLI::App
 program_desc "Facebook command line interface"
-version '1.2.0'
+version '1.3.0'
 flag [:token], :desc => 'Provide Facebook access token', :required => false
-flag [:format], :desc => 'Output format (values: text, html)', :default_value => "text"
-def print_header
-  if $format == 'html'
-    puts <<~EOM
-      <!doctype html>
-      <html lang=en>
-      <head>
-        <meta charset=utf-8>
-      </head>
-      <body>
-    EOM
-  end
-end
-def print_footer
-  if $format == 'html'
-    puts <<~EOM
-      </body>
-      </html>
-    EOM
-  end
+def link(path)
+  "https://www.facebook.com/#{path}"
 end
-formattable_commands = [
-  :me,
-  :likes,
-  :feed,
-  :friends,
-  :photos,
-  :photosof,
-  :events,
-  :pastevents
-]
+# Facebook returns dates in ISO 8601 format
+def date_str(fb_date)
+  Time.parse(fb_date).localtime.rfc2822
+end
 def save_config
   File.open(CONFIG_FILE, 'w') do |f|
@@ -80,22 +54,10 @@ pre do |global_options,command|
     end
   end
-  $format = global_options[:format]
-  if formattable_commands.include?(command.name)
-    print_header
-  end
   # Success
   true
 end
-post do |global_options,command|
-  if formattable_commands.include?(command.name)
-    print_footer
-  end
-end
 on_error do |exception|
   puts exception.message
@@ -105,8 +67,8 @@ end
 desc "Save Facebook application ID and secret"
 command :config do |c|
-  c.flag [:appid], :desc => 'Facebook application ID'
-  c.flag [:appsecret], :desc => 'Facebook application secret'
+  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|
     $config['app_id'] = options['appid'].to_i
     $config['app_secret'] = options['appsecret']
@@ -143,18 +105,17 @@ desc "Show your name and profile ID"
 command :me do |c|
   c.action do |global_options,options,args|
     data = FBCLI::request_data global_options, ""
-    FBCLI::write "Name: #{data["name"]}"
-    FBCLI::write "Your profile ID: #{data["id"]}"
+    puts "Name: #{data["name"]}"
+    puts "Your profile ID: #{data["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|
-      FBCLI::write item["name"]
-      FBCLI::write FBCLI::link item["id"]
-      FBCLI::write
+    FBCLI::page_items global_options, 'likes', '' do |item|
+      puts item["name"]
+      puts link item["id"]
     end
   end
 end
@@ -169,8 +130,8 @@ long_desc <<~EOM
 EOM
 command :friends do |c|
   c.action do |global_options,options,args|
-    FBCLI::page_items global_options, "invitable_friends" do |item|
-      FBCLI::write item["name"]
+    FBCLI::page_items global_options, 'invitable_friends' do |item|
+      puts item['name']
     end
   end
 end
@@ -178,42 +139,40 @@ 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|
+    FBCLI::page_items global_options, "feed", '- - -' do |item|
       profile_id, post_id = item["id"].split '_', 2
-      FBCLI::write item["message"] if item.has_key?("message")
-      FBCLI::write FBCLI::link "#{profile_id}/posts/#{post_id}"
-      FBCLI::write "Created: #{FBCLI::date(item["created_time"])}"
-      FBCLI::write "--"
+      puts item["message"] if item.has_key?("message")
+      puts link "#{profile_id}/posts/#{post_id}"
+      puts "Created: #{date_str(item["created_time"])}"
     end
   end
 end
 consumePhoto = Proc.new do |item|
-  FBCLI::write item["name"] unless not item.key?("name")
-  FBCLI::write FBCLI::link "#{item["id"]}"
-  FBCLI::write "Created: #{FBCLI::date(item["created_time"])}"
-  FBCLI::write "--"
+  puts item["name"] unless not item.key?("name")
+  puts link "#{item["id"]}"
+  puts "Created: #{date_str(item["created_time"])}"
 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", &consumePhoto
+    FBCLI::page_items global_options, "photos?type=uploaded", '- - -', &consumePhoto
   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", &consumePhoto
+    FBCLI::page_items global_options, "photos", '- - -', &consumePhoto
   end
 end
 def list_events(global_options, past = false)
   now = Time.new
-  FBCLI::page_items global_options, "events" do |item|
+  FBCLI::page_items global_options, "events", "\n- - -\n\n" do |item|
     starts = Time.parse(item['start_time'])
     if (past and starts < now) ^ (not past and starts > now)
@@ -222,17 +181,16 @@ def list_events(global_options, past = false)
         duration = ends - starts
       end
-      FBCLI::write "#{item['name']} (#{item['id']})"
-      FBCLI::write
-      FBCLI::write "Location: #{item['place']['name']}" unless item['place'].nil?
-      FBCLI::write "Date: #{FBCLI::date(item['start_time'])}"
-      FBCLI::write "Duration: #{duration / 3600} hours" if defined?(duration) and not duration.nil?
-      FBCLI::write "RSVP: #{item['rsvp_status'].sub(/unsure/, "maybe")}"
-      FBCLI::write
-      FBCLI::write FBCLI::link "events/#{item['id']}"
-      FBCLI::write
-      FBCLI::write item['description']
-      FBCLI::write "---------------------------------"
+      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']
     end
   end
 end

data/lib/fbcli/facebook.rb CHANGED Viewed

@@ -29,12 +29,16 @@ module FBCLI
     data
   end
-  def self.page_items(global_options, cmd)
+  def self.page_items(global_options, cmd, separator = nil)
     items = request_data(global_options, cmd)
     while not items.nil? do
-      items.each { |item|
+      items.each_with_index { |item, idx|
         yield item
+        unless separator.nil? or idx == items.size - 1
+          puts separator
+        end
       }
       items = items.next_page

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facebook-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ildar Sagdejev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies: []
 description: A limited command line interface to the Facebook Graph API
 email: specious@gmail.com
@@ -21,7 +21,6 @@ files:
 - lib/fbcli.rb
 - lib/fbcli/auth.rb
 - lib/fbcli/facebook.rb
-- lib/fbcli/format.rb
 homepage: https://github.com/specious/facebook-cli
 licenses:
 - MIT

data/lib/fbcli/format.rb DELETED Viewed

@@ -1,27 +0,0 @@
-module FBCLI
-  # Facebook returns dates in ISO 8601 format
-  def self.date(fb_date)
-    Time.parse(fb_date).localtime.rfc2822
-  end
-  def self.link(path, format = $format)
-    url = "https://www.facebook.com/#{path}"
-    case format
-    when "html"
-      "<a href=\"#{url}\">#{url}</a>"
-    else
-      url
-    end
-  end
-  def self.write(str = "", format = $format)
-    str = "" if str.nil?
-    if format == "html"
-      str = "  " + str + "<br>"
-    end
-    puts str.encode('utf-8')
-  end
-end