presbeus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e38a877a37867af0dd1d00565d83fe39f9d10c
-  data.tar.gz: 3a04c8b377b080b31b834df2ecbe8209b633a194
+  metadata.gz: ded533ad46ea98b79efaf8d074aca6d41832f235
+  data.tar.gz: 70111cecb71ae253d4fcb99581669ef5262da956
 SHA512:
-  metadata.gz: 0f19f785f912a72764dcd5ae1846a5e8c85cb0282f11e2dc482516f777cafb9917f145863da65d236959b1b4491d63d72149a8faa30bc86f245d2e33ff41c19a
-  data.tar.gz: 2cb5224e27ba02cf1e380bf8e2a170a6f74a0a0a950db9c277931c31144184007680895ede863e16862d2fe7045b60040b2708ae9891bf37d49b35237f2c6ddd
+  metadata.gz: 5701ba7f4dbd79757d6c4691e48986cca6a77eddb66a371f449cad98eef4fe9ba13bfe9add8d5c5e1568fba3c84fb407ff0462021a657a3483888a511264f096
+  data.tar.gz: 6b1db7b5b9a909f360ce3ef7c5292cd170dbec75f7a43db9f312f469628a8ce2fe9a3a784b87a8ed9ea1e79777c46d0ebfdb7d78bf01267cf46e979df17739d3

data/bin/presbeus

@@ -3,6 +3,9 @@ require 'rest-client'
 require 'json'
 require 'yaml'
 require 'time_ago_in_words'
+require 'terminal-table'
+require 'highline'
+require 'colorize'
 
 class Presbeus
 
@@ -20,17 +23,16 @@ class Presbeus
   end
 
   def devices
-    Hash[get_v2("devices")["devices"].select do |device|
-      device["icon"] == "phone"
-    end.map do |device|
+    get_v2("devices")["devices"].map do |device|
       [device["iden"], device["model"]]
-    end]
+    end
   end
 
   def threads iden
-    Hash[get_v2("permanents/#{iden}_threads")["threads"].reverse.map do |thread|
-      [thread["id"], thread["recipients"].map { |r| r["name"] }]
-    end]
+    get_v2("permanents/#{iden}_threads")["threads"].reverse.map do |thread|
+      require 'awesome_print'
+      [thread["id"]] + thread["recipients"].map { |r| [r["address"], r["name"]] }.flatten
+    end
   end
 
   def thread device, id
@@ -58,22 +60,48 @@ class Presbeus
       @headers)
   end
 
+  def table rows, config = {}
+    t = Terminal::Table.new config.merge({:rows => rows})
+    t.style = { border_top: false, border_bottom: false, border_y: '' }
+    puts t
+  end
+
+  def wrap s, width
+    s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+  end
+
+  def with_color string, width, background
+    lines = string.split("\n")
+    lines.map { |line| line.ljust(width).colorize(color: :black, background: background)}.join "\n"
+  end
+
+  def thread_with_two_columns_wrap device, id
+    width = HighLine::SystemExtensions.terminal_size[0] / 2 - 4
+    res = []
+    thread(device, id).reverse.each do |message|
+        text = [wrap(message["body"], width), ""]
+        date = ["\n#{Time.at(message["timestamp"]).ago_in_words}", ""]
+        if message["direction"] != "incoming"
+          text[0] = with_color text[0], width, :white
+          text.reverse!
+          date.reverse!
+        else
+          text[0] = with_color text[0], width, :green
+        end
+        res << date
+        res << text
+    end
+    res 
+  end
+
   def run command
     case command[0]
     when "devices"
-      devices.each do |iden, name|
-        puts "#{iden}  #{name}"
-      end
+      puts table devices
     when "threads"
-      threads(command[1]).each do |id, recipients|
-        puts "#{id}  #{recipients.join(",")}"
-      end
+      puts table threads command[1]
     when "thread"
-      thread(command[1], command[2]).reverse.each do |message|
-        puts message["direction"] == "incoming" ? ">" : "<"
-        puts "  #{message["body"]}"
-        puts "  #{Time.at(message["timestamp"]).ago_in_words}"
-      end
+      puts table thread_with_two_columns_wrap command[1], command[2]
     when "sms"
       send_sms command[1], command[2], command[3..-1].join(" ")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presbeus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Olivier Abdesselam
@@ -14,28 +14,70 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: time_ago_in_words
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows to view/send pushbullet SMS