pry-send_tweet.rb 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537e0e6e65fc0bed50a05e83610b69f28f1cf85880aff4a9dbbab09bba3387f0
-  data.tar.gz: 2f60bc834dc6791358b98c293e24c55c0b97a81518cfaa9ad10b6e12d3f62627
+  metadata.gz: 400374f90dfa63fbc17fb9f2b2676ad12c12d080da32d2cac65bd7a2494bcc5f
+  data.tar.gz: 1a436174c9e722ecaba2fe4536bc5cd49c9438e8c257e3165f55169ac83e3a83
 SHA512:
-  metadata.gz: 10f2f3f901c2abee29dcbcb6afa4ad4ed576a8ba555b54b63eef3490b6985555106c52b379e1728e3fde52379b25987c153ad6f0f20b91225e1dacaf2596d556
-  data.tar.gz: b284f42bdbd27f5717164e868f565c7a3a8d2720a5770096d0c8475c76f7cce9fc16e6a7434d37e55123b2bb7a1361da32511df400410e2a7e7e681e1ccd610a
+  metadata.gz: 0571355b013a36706a43cb78b44ea3ae1ee328af23e0aba6697280556b522d57fd48fe51b553c07830b3d3228462842f548395d636e0393eeaec99ea16ae33ab
+  data.tar.gz: b8c588b3816953a0bdcd5a7b1de5de7165472f315e292d9c022f4a577d469a0f712130dfeb296c90c39712d977e53373cada99225584c8b1defa571f5620edaf

data/CHANGELOG.md

@@ -1,5 +1,64 @@
 # CHANGELOG
 
+## v0.13.0
+
+* Remove `Gemfile`, and the Bundler dependency.
+
+* On the FreeBSD VM, runtime dependencies are installed as FreeBSD packages.
+
+* Rethink fork + wait logic in `read-tweets`.
+
+* Configure the default timezone on the FreeBSD VM to be CET (Central European Time).
+  This can be changed by `$VMTZ`. Please see the README for an example.
+
+* `on-twitter --show-following` and `on-twitter --show-followers` accept an
+  optional regular expression that can filter through the result set.
+
+* Implement `ruby vms/freebsd.rb --fresh`, for destroying an old VM and
+  spinning up a new one.
+
+* Implement `time-ago-in-words` without patching the Time class.
+
+* Remove `spec/`.
+
+* Timestamps in the future or present are represented as '0 seconds' ago
+  in `lib/time-ago-in-words`.
+
+* Replace 'time-lord' with 'time-ago-in-words'
+
+* Print an error when unknown switches are passed to command
+
+* Switch default editor to 'ee' on FreeBSD VM
+
+* Add mitigation for RCE bug in apt-get to Dockerfile.
+
+* `--delay`, and `--self-destruct` assume that a time such as 07:00, which  
+  has past on the current day, was meant to mean 07:00, tomorrow.
+
+* Install FreeBSD-12 with Vagrant due to unresolvable issues with the
+  HardenedBSD vagrant box.  
+
+* Replace `t.co` links with the expanded URL `t.co` redirects to.  
+
+* Collect status of system pager after sending `SIGKILL`.
+
+* When translating text or a tweet, show the source and destination language.  
+
+* Add `read-tweets -sl=`, `read-tweets --source-lang=` for setting the source    
+  language of the text or tweet being translated.
+
+* Add `read-tweets -tx`, for translating a piece of text using the Yandex  
+  translation API.
+
+* Set CET (Central European Time) as the default timezone for the HardenedBSD VM.
+
+* Implement a minimum box height of 8, but scale to a larger number if a tweet  
+  or user bio is written using a lot of newlines.
+
+* Remove the `config.box_height` option.
+
+* Typo fix: rescue `Twitter::Error`, not `Timeout::Error`, when liking a tweet.
+
 ## v0.12.1
 
 * Correct multiple grammar errors found in the help output of all commands.
@@ -13,7 +72,7 @@
 
 ## v0.11.0
 
-* Apply a fix to tty-box for the `on-twitter --show-followers`, and
+* Apply a fix to tty-box for the `on-twitter --show-followers`, and  
   `on-twitter --show-following` commands.
 
 * Add unicode support by applying a fix - as a monkey patch - to the `tty-box`  

data/README.md

@@ -19,8 +19,9 @@
 * [Multi-tasking: tmux / screen](#multi-tasking)
 * [Install](#install)
   * [Rubygem](#install-rubygem)
-  * [Docker](#install-docker)
-  * [Vagrant (HardenedBSD)](#vagrant-hardenedbsd)
+  * [Virtual Machines](#vms)
+    * [FreeBSD](#vms-freebsd)
+* [Screenshots](#screenshots)
 * [License](#license)
 
 ## <a id='Introduction'>Introduction</a>
@@ -29,19 +30,16 @@ A Twitter client for the Pry REPL.
 
 ## <a id='api-access'>API Access</a>
 
-Using the Twitter API requires a developer account.  
-Follow the instructions at
-[https://developer.twitter.com](https://developer.twitter.com)
-if you haven't already   
-setup access to the Twitter API.
+Using the Twitter API requires a developer account.
+Follow the instructions at [https://developer.twitter.com](https://developer.twitter.com)
+if you haven't already setup access to the Twitter API.
 
 ## <a id='configuration'>Configuration (required)</a>
 
-The placeholder keys and tokens in the below example can be replaced  
-by those from your developer account.
-
-pry-send_tweet.rb can be configured from a `.pryrc` file using Ruby, or  
-through a YAML file located at `$HOME/.pry-send_tweet.yml`
+The placeholder keys and tokens in the below example can be replaced
+by those from your developer account. pry-send_tweet.rb can be configured from
+a `.pryrc` file using Ruby, or through a YAML file located at
+`$HOME/.pry-send_tweet.yml`
 
 __1. Ruby__
 
@@ -59,10 +57,8 @@ Pry.configure do |config|
     # Default is: 'pry-send_tweet.rb vX.Y.Z'.
     user_agent: 'Custom User-Agent',
     # Optional configuration
-    # The width & height of a box that contains a tweet or user.
-    # The default width is 100 and the default height is 8.
+    # The width of a box that contains a tweet or user. The default width is 100.
     box_width: 120,
-    box_height: 10,
     # Optional configuration
     # A Yandex API key for translating tweets when using `read-tweets -x`.
     yandex_key: 'xxx',
@@ -85,7 +81,8 @@ access_token: '<access token>'
 access_token_secret: '<access token secret>'
 # Optional
 user_agent: 'Your User-Agent string'
-line_width: 120
+# Optional
+box_width: 120
 # Optional
 yandex_key: xxx
 yandex_lang: xx
@@ -95,17 +92,22 @@ yandex_lang: xx
 
 There are four commands added to Pry by this plugin, those commands are:
 
-  * `send-tweet`  
+  * `send-tweet`
     For sending tweets.
 
-  * `read-tweets`  
+  * `read-tweets`
     For reading tweets.
 
-  * `twitter-action` (aliased as: `on-twitter`)  
+  * `twitter-action` (aliased as: `on-twitter`)
     For performing misc actions on Twitter, such as following, unfollowing, etc.
 
-  * `twitter-search`  
-    For searching Twitter.  
+  * `twitter-search`
+    For searching Twitter.
+
+Each command provides help, that can be shown by appending `--help` to the
+command. Example:
+
+    [1] pry(main)> send-tweet --help
 
 ### <a id='sending-tweets'>Sending tweets</a>
 
@@ -123,33 +125,36 @@ There are four commands added to Pry by this plugin, those commands are:
       [1] pry(main)> send-tweet --file #{File.join ENV['HOME'], 'photos', 'image.jpg'}
 
 
+* Send a tweet with multiple images attached:
+
+      [1] pry(main)> send-tweet --file #{%w[1.jpg 2.jpg 3.jpg].join(',')}
+
 * Reply to a tweet:
 
       [1] pry(main)> send-tweet --reply-to https://twitter.com/username/status/1
 
-* Send a tweet that will self-destruct after 70 seconds.  
+* Send a tweet that will self-destruct after 70 seconds.
 It's worth adding that if the Pry process exits this operation will be cancelled:
 
       [1] pry(main)> send-tweet --self-destruct=70
 
-* Send a tweet that will be published 70 seconds in the future.  
-It's worth adding that if the Pry process exits, this operation will be cancelled:  
+* Send a tweet that will be published 70 seconds in the future.
+It's worth adding that if the Pry process exits, this operation will be cancelled:
 
       [1] pry(main)> send-tweet --delay=70
 
-* Delay sending a tweet until 12AM, today. `--self-destruct` also supports this  
+* Delay sending a tweet until 12AM, today. `--self-destruct` also supports this
   syntax:
 
       [1] pry(main)> send-tweet --delay=00:00
 
 ### <a id='reading-tweets'>Reading tweets</a>
 
-By default the tweets displayed by the `read-tweets` command  are automatically  
+By default the tweets displayed by the `read-tweets` command  are automatically
 refreshed every 5 minutes.
 
-That can be changed to a custom interval by setting `Pry.config.twitter.refresh_interval`  
-to a number of seconds, or to `false` if you want to disable this
-feature.
+That can be changed to a custom interval by setting `Pry.config.twitter.refresh_interval`
+to a number of seconds, or to `false` if you want to disable this feature.
 
 * Read recent tweets from your timeline:
 
@@ -176,18 +181,31 @@ feature.
       [1] pry(main)> read-tweets --replies github
 
 * Read a translated copy of a tweet, using the
-  [Yandex translation API](https://translate.yandex.com/developers).  
+  [Yandex translation API](https://translate.yandex.com/developers).
   The configuration instructions for Yandex are included in the [configuration section](#configuration).
 
-      [1] pry(main) read-tweets -x https://twitter.com/user/status/1
+      [1] pry(main)> read-tweets -x https://twitter.com/user/status/1
 
-* Read 100 recent tweets instead of the default 200 recent tweets.    
+* Read a translated copy of a piece of text:
+
+      [1] pry(main)> read-tweets -tx='#{File.binread "persian.txt"}'
+      [2] pry(main)> read-tweets -tx='Guten Tag'
+      [3] pry(main)> read-tweets -tx='Hola'
+
+* Sometimes Yandex cannot detect the language of the text or tweet being
+  translated, or it will guess the source language incorrectly. In case
+  this happens, the source language can be set explicitly:
+
+      [1] pry(main)> read-tweets --source-lang=fa -x https://url/to/farsi/tweet
+      [1] pry(main)> read-tweets --source-lang=sw -tx='Habari yako'
+
+* Read 100 recent tweets instead of the default 200 recent tweets.
   **Tip:** `--count` can be combined with all of the options described above.
 
       [1] pry(main)> read-tweets --count 100
 
-* By default retweets are not displayed.  
-  To display retweets, pass the `--with-retweets` option.  
+* By default retweets are not displayed.
+  To display retweets, pass the `--with-retweets` option.
 
       [1] pry(main)> read-tweets --with-retweets
 
@@ -225,6 +243,15 @@ feature.
 
       [1] pry(main)> on-twitter --show-followers
 
+* Show the tweeters who you follow:
+
+      [1] pry(main)> on-twitter --show-following
+
+* Both `--show-following` and `--show-followers` accept an optional argument
+  that can be used to filter the result set.
+
+      [1] pry(main)> on-twitter --show-following=[0-9]$
+
 ### <a id='searching-twitter'>Searching Twitter</a>
 
 The `twitter-search` command can be used to search Twitter.
@@ -251,13 +278,13 @@ The `twitter-search` command can be used to search Twitter.
       # Your profiles bio will be updated after closing the editor.
       [1] pry(main)> on-twitter --set-profile-bio
 
-* Set the location visible on your profile:  
+* Set the location visible on your profile:
 
       # An editor opens (`_pry_.editor`), write your location then hit save &
       # close. Your profiles location will be updated after closing the editor.
       [1] pry(main)> on-twitter --set-profile-bio
 
-* Set the color (as a hex value) of links that appear on your profiles timeline:  
+* Set the color (as a hex value) of links that appear on your profiles timeline:
 
       [1] pry(main)> on-twitter --set-profile-link-color=#CC0000
 
@@ -280,7 +307,7 @@ The `twitter-search` command can be used to search Twitter.
 
       [1] pry(main)> on-twitter --suggested-lang=es --suggested-topics
 
-* View a list of suggested users from a given topic, optionally restricted to  
+* View a list of suggested users from a given topic, optionally restricted to
   Spanish:
 
       [1] pry(main)> on-twitter --suggested-lang=es --suggested-users=<topic>
@@ -299,11 +326,10 @@ The `twitter-search` command can be used to search Twitter.
 
 ### <a id='special-variable-_twitter_'>Sticky local variable: `_twitter_`</a>
 
-The local variable `_twitter_` is inserted into the active Binding, providing   
-a programmable API accessible to Ruby code as well as a lower level of access to  
-the Twitter API. It is meant for exploration, development, and debugging. The local  
-variable is considered reserved,  if another local variable of the same name is set  
-in the same Binding, expect unusual behaviour.  
+The local variable `_twitter_` is inserted into the active Binding, providing
+a programmable API accessible to Ruby code as well as a lower level of access to
+the Twitter API. It is meant for exploration, development, and debugging.
+The local variable is considered reserved.
 
 The local variable returns an instance of `Twitter::REST::Client`:
 
@@ -317,8 +343,8 @@ The local variable returns an instance of `Twitter::REST::Client`:
 
 ### <a id='tip'>Tip: Command Aliases</a>
 
-When there are Twitter accounts you read often, it can turn out to be faster   
-to create command aliases for reading those accounts. An example follows, a   
+When there are Twitter accounts you read often, it can turn out to be faster
+to create command aliases for reading those accounts. An example follows, a
 hyphen is included in the aliased commands to avoid collisions with Ruby code.
 
 ```ruby
@@ -329,47 +355,93 @@ Pry.commands.alias_command "prez-obama", "read-tweets -t barackobama"
 
 ## <a id='multi-tasking'>Multi-tasking: tmux / screen</a>
 
-To get the most out of `pry-send_tweet.rb` I use tmux to manage a pane for reading  
-tweets and another for writing tweets. I've found this to be the best way since  
+To get the most out of `pry-send_tweet.rb` I use tmux to manage a pane for reading
+tweets and another for writing tweets. I've found this to be the best way since
 a single shell does not allow for multi tasking but tmux and screen do.
 
-I use
-[tmuxinator](https://github.com/tmuxinator/tmuxinator)
-to manage my tmux sessions.  
-The tmuxinator configurations I use for Docker / Vagrant are checked into the  
-repo to use yourself or to act as inspiration for your own configuration:
+I use [tmuxinator](https://github.com/tmuxinator/tmuxinator) to manage my tmux
+sessions. The tmuxinator configuration I use is checked into the repo in the
+hope that it might be useful to others.
 
-* [Docker](./samples/tmuxinator-docker.yml)
-* [Vagrant (HardenedBSD)](./samples/tmuxinator-vagrant.yml)
+* [tmuxinator-vagrant.yml](./samples/tmuxinator-vagrant.yml)
 
+## <a id='vms'>Virtual Machines</a>
 
-## <a id='install'>Install</a>
+Before getting started with a Virtual Machine, download and install the
+following tools if you didn't already, they're free:
 
-### <a id='install-rubygem'>Rubygem</a>
+* VirtualBox
+* Vagrant
 
-    $ gem install pry-send_tweet.rb
+Next, configure access to the Twitter API by adding `.pryrc` file to the root of
+the repository. That's covered in the [configuration](#configuration) section.
 
-### <a id='install-docker'>Docker</a>
+### Shared space
 
-This method is how I use to install and use `pry-send_tweet.rb`, before switching  
-to Vagrant. I still recommend giving Docker a try - especially if on Windows.  
-The Docker container is configured to use Debian Linux, and `emacs` when  
-performing tasks that use an editor:  
+While exploring, developing or tweeting on one of the available VMs sometimes
+you want to bring files from the 'host' machine to the virtual machine, which
+is known as the guest machine.
 
-    $ git clone https://github.com/r-obert/pry-send_tweet.rb
-    $ cd pry-send_tweet.rb
-    $ ./dockerize.sh
+__Syncing files__
+
+`vagrant rsync-auto` can see edits made to the cloned repo on the host
+machine and sync those changes back to the guest machine. To set this up, from
+the root of the repo on the host machine run:
+
+    $ vagrant rsync-auto
 
-### <a id='vagrant-hardenedbsd'>Vagrant (HardenedBSD)</a>
+__Tweeting media__
 
-The other available option is to use Vagrant to spawn a  
-VirtualBox [HardenedBSD](https://hardenedbsd.org) VM:
+To tweet media such as an image or video from the VM, what I do is drop those
+files into `/app/shared-space` and then reference `/app/shared-space` when
+sharing them, eg `send-tweet -f /app/shared-space/photo.jpg`.
+
+### <a id='vms-freebsd'>FreeBSD</a>
+
+[FreeBSD 12](https://freebsd.org) Virtual Machine
+
+Vagrant will use Amazon to download the box image. Sometimes the download can be
+slow, sometimes the download can stall..
+
+Keep trying if this happens, a download should always resume from the point
+where it finished. FreeBSD is worth the perseverance. :)
 
     $ git clone https://github.com/r-obert/pry-send_tweet.rb
     $ cd pry-send_tweet.rb
-    $ vagrant up
-    $ vagrant ssh -c 'cd /app && bundle exec pry -e "read-tweets"'
+    $ ruby vms/freebsd.rb
+
+Screenshots __#1__, __#2__ in the [screenshots](#screenshots) section show the
+type of experience to expect when running `ruby vms/freebsd.rb`.
+
+A virtual machine can be destroyed and a new VM instance created by appending
+the `--fresh` option:
+
+    $ ruby vms/freebsd.rb --fresh
+
+The default time settings are set to CET (Central European Time). This can be
+changed with an environment variable.
+
+    $ VMTZ=Asia/Tehran ruby vms/freebsd.rb
+
+A complete list of time zones are available in the VM:
+
+    $ ls /usr/share/zoneinfo
+
+## <a id='install'>Install</a>
+
+### <a id='install-rubygem'>Rubygem</a>
+
+    $ gem install pry-send_tweet.rb
+
+## <a id='screenshots'>Screenshots</a>
+
+__#1__ Running FreeBSD 12 with Vagrant, Tmux
+
+![FreeBSD-1](/art/44-e44743a5bb.jpg)
+
+__#2__ Composing a tweet on FreeBSD 12 - with Vagrant, Tmux.
 
+![FreeBSD-2](/art/52-eec4df2edf.jpg)
 
 ## <a id='license'>License</a>
 

data/Vagrantfile

@@ -1,31 +1,46 @@
+require 'shellwords'
+insert_root_path = ->(tmux_conf) {
+  conf = YAML.load(tmux_conf)
+  conf['root'] = '/app'
+  YAML.dump(conf)
+}
+
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/hardenedbsd11"
+  config.vm.box = "generic/freebsd12"
   config.vm.synced_folder Dir.getwd, "/app", type: "rsync"
 
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "1024"
   end
 
+  # Install useful packages
   cmds = [
-    "sudo ASSUME_ALWAYS_YES=true pkg install zsh",
-    "sudo ASSUME_ALWAYS_YES=true pkg install emacs",
-    "sudo chsh -s zsh vagrant",
-    "echo '#{File.binread('./samples/hardenedbsd-zshrc')}' > /home/vagrant/.zshrc"
+    "sudo pkg install -y zsh tmux",
+    "sudo chsh -s zsh vagrant"
   ]
   config.vm.provision "shell", inline: cmds.join(' && ')
 
-  # Install Ruby
+  # Configure date & time
+  zone = ENV.key?('VMTZ') ? ENV['VMTZ'] : 'CET'
   cmds = [
-    "sudo ASSUME_ALWAYS_YES=true pkg install ruby",
-    "sudo ASSUME_ALWAYS_YES=true pkg install devel/ruby-gems",
-    "sudo ASSUME_ALWAYS_YES=true pkg install rubygem-bundler"
+    "cp /usr/share/zoneinfo/#{zone} /etc/localtime"
   ]
   config.vm.provision "shell", inline: cmds.join(' && ')
 
-  # Install app dependencies
+  # Insert files into VM
+  tmux_conf = insert_root_path.call File.binread('./samples/tmuxinator-vagrant.yml')
+  cmds = [
+    "echo '#{File.binread('./samples/freebsd-zshrc')}' > /home/vagrant/.zshrc",
+    "mkdir -p /home/vagrant/.config/tmuxinator",
+    "echo #{Shellwords.shellescape(tmux_conf)} > /home/vagrant/.config/tmuxinator/pry_send_tweet.yml"
+  ]
+  config.vm.provision "shell", inline: cmds.join(' && ')
+
+  # Install Ruby
+  # Install pry-send_tweet dependencies (..as FreeBSD packages)
   cmds = [
-    "cd /app",
-    "bundle install"
+    "sudo pkg install -y ruby rubygem-tmuxinator rubygem-pry rubygem-twitter " \
+    "rubygem-tty-box rubygem-unicode-display_width"
   ]
   config.vm.provision "shell", inline: cmds.join(' && ')
 end

data/lib/pry-send_tweet.rb

@@ -27,7 +27,8 @@ class Pry
     require 'cgi'
     require 'timeout'
     require 'yaml'
-    require 'time-lord'
+    require 'time-ago-in-words'
+    require_relative 'pry/pager/system_pager'
     require_relative 'pry/send_tweet/tty-box'
     require_relative 'pry/send_tweet/renderers/tweet_renderer'
     require_relative 'pry/send_tweet/renderers/user_renderer'
@@ -37,6 +38,7 @@ class Pry
     require_relative 'pry/send_tweet/commands/read_tweets'
     require_relative 'pry/send_tweet/commands/twitter_search'
     require_relative 'pry/send_tweet/commands/twitter_action'
+    require_relative 'pry/send_tweet/version'
 
     # @api private
     def self.merge_yaml_file!(config, path)

data/lib/pry/pager/system_pager.rb

@@ -0,0 +1,25 @@
+class Pry::Pager::SystemPager
+  def pid
+    pager.pid
+  end
+
+  def fork
+    pager
+    nil
+  end
+
+  def fast_exit!
+    Process.kill 'SIGKILL', pid
+    Process.wait pid
+  end
+
+  private
+  # Patch to avoid spawning a shell when launching the pager.
+  def pager
+    @pager ||= begin
+      ary = self.class.default_pager.split(' ')
+      io = IO.popen(ary, 'w')
+      io.tap{|io| io.sync = true}
+    end
+  end
+end

data/lib/pry/send_tweet/commands/base_command.rb

@@ -1,3 +1,7 @@
+class Pry::Slop
+  DEFAULT_OPTIONS.merge!(strict: true)
+end
+
 class Pry::SendTweet::BaseCommand < Pry::ClassCommand
   include Pry::SendTweet::TweetRenderer
   include Pry::SendTweet::UserRenderer
@@ -19,7 +23,7 @@ class Pry::SendTweet::BaseCommand < Pry::ClassCommand
   private
 
   def box_height
-    _pry_.config.twitter.box_height || Pry::SendTweet::DEFAULT_BOX_HEIGHT
+    Pry::SendTweet::DEFAULT_BOX_HEIGHT
   end
 
   def box_width

data/lib/pry/send_tweet/commands/read_tweets.rb

@@ -22,13 +22,17 @@ class Pry::SendTweet::ReadTweets < Pry::SendTweet::BaseCommand
     o.on 'r=', 'replies=', 'A username whose replies you want to read.'
     o.on 'm', 'mentions', 'Read tweets that @mention you.'
     o.on 'x=', 'translate=', 'Translate a tweet.'
+    o.on 'tx=', nil, 'Translate a string of text.'
+    o.on 'sl=', 'source-lang=', '[optional] The source language of the ' \
+                                'text or tweet being translated'
     o.on 'w', 'with-retweets', 'Include retweets.'
   end
 
   def process
     super
     case
-    when opts.present?('translate') then translate_tweet(opts['translate'])
+    when opts.present?('translate') then translate_tweet(opts['x'], opts['sl'])
+    when opts.present?('tx') then translate_text(opts['tx'], opts['sl'])
     when opts.present?('replies') then show_replies(user: opts['replies'])
     when opts.present?('likes') then show_likes(user: opts['likes'])
     when opts.present?('mentions') then show_mentions

data/lib/pry/send_tweet/commands/read_tweets/translate_actions.rb

@@ -2,14 +2,47 @@ module Pry::SendTweet::ReadTweets::TranslateActions
   YANDEX_ENDPOINT = "https://translate.yandex.net/api/v1.5/tr.json/translate?" \
                     "key=%{key}&text=%{text}&lang=%{lang}"
 
-  def translate_tweet(tweet_url)
+  LANGUAGE_STRINGS = {
+    'ar' => 'Arabic (العربية)',
+    'en' => 'English',
+    'de' => 'German (Deutsch)',
+    'pt' => 'Portuguese (Portuguesa)',
+    'fa' => 'Farsi (دریافت)',
+    'ja' => 'Japanese (日本語)',
+    'he' => 'Hebrew (עברית)',
+    'ga' => 'Irish (Gaeilge)',
+    'es' => 'Spanish (Español)',
+    'it' => 'Italinao (italiano)',
+    'nl' => 'Dutch (Nederlands)',
+    'ru' => 'Russian (русский)',
+    'uk' => 'Ukranian (країнська)',
+    'ko' => 'Korean (한국어)',
+    'fr' => 'French (Français)',
+    'da' => 'Danish (dansk)',
+    'yi' => 'Yiddish (ייִדיש)',
+    'sw' => 'Swahili'
+  }
+
+  def translate_tweet(tweet_url, source_language)
     tweet = twitter.status(tweet_url)
-    uri_endpoint = __build_yandex_endpoint(tweet)
+    uri_endpoint = __build_yandex_endpoint(tweet, source_language)
+    res = Net::HTTP.get_response(uri_endpoint)
+    case res
+    when Net::HTTPOK
+      tweet.attrs[:full_text] = __translated_text_from(res)
+      render_tweets [tweet], title: "#{__translation_map(res)}: "
+    else
+      raise Pry::CommandError, "Bad response from Yandex (#{res.class})"
+    end
+  end
+
+  def translate_text(text, source_language)
+    uri_endpoint = __build_yandex_endpoint(text, source_language)
     res = Net::HTTP.get_response(uri_endpoint)
     case res
     when Net::HTTPOK
-      tweet.attrs[:full_text] = JSON.parse(res.body)["text"][0]
-      render_tweets [tweet], title: "Translated tweet"
+      _pry_.output.puts "#{__translation_map(res)}: \n" \
+                        "#{__translated_text_from(res)}"
     else
       raise Pry::CommandError, "Bad response from Yandex (#{res.class})"
     end
@@ -18,14 +51,37 @@ module Pry::SendTweet::ReadTweets::TranslateActions
   private
 
   # @api private
-  def __build_yandex_endpoint(tweet)
+  def __translation_map(res)
+    b = JSON.parse(res.body)
+    from, to = b['lang'].split('-')
+    from = LANGUAGE_STRINGS[from] || from
+    to = LANGUAGE_STRINGS[to] || to
+    "#{from} => #{to}"
+  end
+
+  # @api private
+  def __translated_text_from(res)
+    JSON.parse(res.body)["text"][0]
+  end
+
+  # @api private
+  def __build_yandex_endpoint(tweet, source_language)
     URI.parse format(YANDEX_ENDPOINT,
-      lang: _pry_.config.twitter.yandex_lang || "en",
-      key: __yandex_key,
-      text: URI.encode_www_form_component(__read_tweet_body(tweet))
+      lang: URI.encode_www_form_component(__yandex_lang_param(source_language)),
+      key: URI.encode_www_form_component(__yandex_key),
+      text: URI.encode_www_form_component(
+        Twitter::Tweet === tweet ? __read_tweet_body(tweet) : tweet
+      )
     )
   end
 
+  # @api private
+  def __yandex_lang_param(source_language)
+    from = source_language ? "#{source_language}-" : ""
+    to = _pry_.config.twitter.yandex_lang || "en"
+    from + to
+  end
+
   # @api private
   def __yandex_key
     k = _pry_.config.twitter.yandex_key
@@ -33,6 +89,6 @@ module Pry::SendTweet::ReadTweets::TranslateActions
       raise Pry::CommandError,
             "fatal: _pry_.config.twitter.yandex_key is nil, false or empty"
     end
-    URI.encode_www_form_component(k)
+    k
   end
 end

data/lib/pry/send_tweet/commands/send_tweet.rb

@@ -127,9 +127,10 @@ class Pry::SendTweet::SendTweet < Pry::SendTweet::BaseCommand
       sleep_seconds = Integer(str)
     elsif str =~ /\A\d{2}:\d{2}\z/ || str =~ /\A\d{2}:\d{2}:\d{2}\z/
       time_obj = Time.parse(str)
+      time_obj += 3600*24 if time_obj <= Time.now
       sleep_seconds = Integer(time_obj - Time.now)
     else
-      raise Pry::CommandError, "The argument --delay='#{str}' is not " \
+      raise Pry::CommandError, "--delay='#{str}' or --self-destruct='#{str}' is not " \
                                "something I understand."
     end
     [time_obj, sleep_seconds]

data/lib/pry/send_tweet/commands/twitter_action.rb

@@ -91,8 +91,8 @@ class Pry::SendTweet::TwitterAction < Pry::SendTweet::BaseCommand
     when opts.present?('suggested-users') then suggested_users(opts['suggested-users'])
     when opts.present?('mute-user') then mute_user(opts['mute-user'])
     when opts.present?('unmute-user') then unmute_user(opts['unmute-user'])
-    when opts.present?('show-followers') then show_followers
-    when opts.present?('show-following') then show_following
+    when opts.present?('show-followers') then show_followers(opts['show-followers'])
+    when opts.present?('show-following') then show_following(opts['show-following'])
     end
   end
 

data/lib/pry/send_tweet/commands/twitter_action/follow_actions.rb

@@ -23,8 +23,9 @@ module Pry::SendTweet::TwitterAction::FollowActions
     page_error(e)
   end
 
-  def show_followers
-    followers = twitter.followers(follow_request_options)
+  def show_followers(pattern)
+    followers = Array twitter.followers(follow_request_options)
+    __follow_filter!(followers, pattern) if pattern
     page numbered_list("Followers", followers) {|follower, index|
       render_user(follower)
     }
@@ -32,8 +33,9 @@ module Pry::SendTweet::TwitterAction::FollowActions
     page_error(e)
   end
 
-  def show_following
-    followings = twitter.following(follow_request_options)
+  def show_following(pattern)
+    followings = Array twitter.following(follow_request_options)
+    __follow_filter!(followings, pattern) if pattern
     page numbered_list("Following", followings) {|following, index|
       render_user(following)
     }
@@ -43,6 +45,13 @@ module Pry::SendTweet::TwitterAction::FollowActions
 
   private
 
+  # @api private
+  def __follow_filter!(users, pattern)
+    users.select! do |u|
+      u.screen_name =~ /#{pattern}/
+    end
+  end
+
   # @api private
   def follow_request_options
     {skip_status: true, include_user_entities: true}

data/lib/pry/send_tweet/commands/twitter_action/like_actions.rb

@@ -6,7 +6,7 @@ module Pry::SendTweet::TwitterAction::LikeActions
     else
       page_error "No tweets liked, are you sure you didn't already like those tweet(s) ..?"
     end
-  rescue Timeout::Error => e
+  rescue Twitter::Error => e
     page_error(e)
   end
 

data/lib/pry/send_tweet/renderers/tweet_renderer.rb

@@ -1,35 +1,27 @@
 module Pry::SendTweet::TweetRenderer
   include Timeout
+  include TimeAgoInWords
 
   def render_tweets(tweet_fetcher, title: nil, timeout: _pry_.config.twitter.refresh_interval)
-    pid = nil
-    timeout(__choose_render_interval(timeout)) {
+    pager = Pry::Pager::SystemPager.new(_pry_.output).tap(&:fork)
+    interval = __choose_render_interval(timeout)
+    timeout(interval) do
       tweets = __fetch_tweets(tweet_fetcher)
-      pid = __fork_pager(title, tweets)
-      Process.wait(pid)
-    }
-  rescue Interrupt
-    __kill_pager!(pid)
+      tweets.empty? ? pager.write("No tweets to show.") :
+                      pager.write(__render_tweets(title || "Twitter", tweets))
+    end
+  rescue Pry::Pager::StopPaging, Interrupt
+    pager.fast_exit!
     system 'reset'
   rescue Timeout::Error
-    __kill_pager!(pid)
+    pager.fast_exit!
     system 'reset'
     retry
+  ensure
+    pager.close
   end
 
   private
-  # @api private
-  def __fork_pager(title, tweets)
-    Kernel.fork do
-      _pry_.pager.open do |pager|
-        __trap_signal_in_fork(pager)
-        tweets.empty? ? pager.write("No tweets to show.") :
-                        pager.write(__render_tweets(title || "Twitter", tweets))
-
-      end
-    end
-  end
-
   # @api private
   def __render_tweets(title, tweets)
     title = bright_blue(bold((" " * 40) + title) + "\n\n")
@@ -39,11 +31,11 @@ module Pry::SendTweet::TweetRenderer
   # @api private
   def __render_tweet(tweet)
     contents = __read_tweet_body(tweet)
-    TTY::Box.frame(height: box_height,
+    body = "#{tweet.url}\n--\n#{contents}\n"
+    height = body.lines.count > box_height ? body.lines.count : box_height
+    TTY::Box.frame(height: height,
                    width: box_width,
-                   title: {top_left: __render_tweet_title(tweet)}) do
-                     "#{tweet.url}\n--\n#{contents}\n"
-                   end.to_s
+                   title: {top_left: __render_tweet_title(tweet)}) {body}.to_s
   end
 
   # @api private
@@ -51,7 +43,7 @@ module Pry::SendTweet::TweetRenderer
     user, created_at = tweet.user, tweet.created_at.getlocal
     title = [
       bold("@#{user.screen_name}"),
-      created_at.ago.in_words,
+      time_ago_in_words(created_at),
       created_at.strftime(time_format)
     ].join bright_blue(" | ")
     " #{title} "
@@ -59,8 +51,14 @@ module Pry::SendTweet::TweetRenderer
 
   # @api private
   def __read_tweet_body(tweet)
+    uris = tweet.uris
     text = tweet.attrs[:full_text] ? tweet.attrs[:full_text] :
                                      tweet.full_text
+    # 'text' might be a frozen string
+    text = text.dup
+    uris.each do |uri|
+      text.gsub!(uri.attrs[:url], uri.attrs[:expanded_url])
+    end
     CGI.unescapeHTML(text).strip
   end
 
@@ -82,22 +80,4 @@ module Pry::SendTweet::TweetRenderer
       timeout || (60*5)
     end
   end
-
-  # @api private
-  def __kill_pager!(pid)
-    Process.kill('SIGINT', pid)
-    Process.wait(pid) rescue nil
-  end
-
-  # @api private
-  def __trap_signal_in_fork(pager)
-    trap('SIGINT') {
-      if Pry::Pager::SystemPager === pager
-        syspager = pager.send(:pager)
-        pid = syspager.pid
-        Process.kill('SIGKILL', pid) rescue nil
-      end
-      Process.kill('SIGKILL', Process.pid)
-    }
-  end
 end

data/lib/pry/send_tweet/renderers/user_renderer.rb

@@ -7,8 +7,9 @@ module Pry::SendTweet::UserRenderer
 #{bold("Following")} #{user.friends_count}
 #{user.description}
 USER
+    height = body.lines.count > box_height ? body.lines.count : box_height
     TTY::Box.frame(
-      height: box_height,
+      height: height,
       width: box_width,
       title: {top_left: title}
     ) { body }.to_s

data/lib/pry/send_tweet/tty-box.rb

@@ -5,7 +5,6 @@
 module Pry::SendTweet::TTYPatch
   require 'tty-box'
   require 'unicode/display_width'
-  require 'unicode/emoji'
   # Create a frame
   #
   # @api public
@@ -44,7 +43,7 @@ module Pry::SendTweet::TTYPatch
       unless content[i].nil?
         output << bg.(fg.(content[i]))
         plain_content = Pry::Helpers::Text.strip_color(content[i])
-        content_size -= Unicode::DisplayWidth.of(plain_content, 1, {}, emoji: true)
+        content_size -= Unicode::DisplayWidth.of(plain_content, 1, {})
       end
       if style[:fg] || style[:bg] || !position # something to color
         output << bg.(fg.(' ' * content_size))

data/lib/pry/send_tweet/version.rb

@@ -1,5 +1,5 @@
 class Pry
   module SendTweet
-    VERSION = '0.12.1'
+    VERSION = '0.13.0'
   end
 end

data/lib/time-ago-in-words/lib/time-ago-in-words.rb

@@ -0,0 +1,35 @@
+module TimeAgoInWords
+  require 'time'
+  VERSION = "0.0.5"
+
+  module Units
+    Second     = 1
+    Minute     = Second  * 60
+    Hour       = Minute  * 60
+    Day        = Hour    * 24
+    Week       = Day     * 7
+    Month      = Week    * 4
+    Year       = Day     * 365
+    Decade     = Year    * 10
+    Century    = Decade  * 10
+    Millennium = Century * 10
+    Eon        = 1.0/0
+  end
+
+  module_function
+  def time_ago_in_words(time)
+    time_difference = Time.now.to_i - time.to_i
+    return "0 seconds ago" if time_difference <= 0
+    unit = get_unit(time_difference)
+    unit_rep = time_difference > 1 ? "#{unit.to_s.downcase}s" : unit.to_s.downcase
+    unit_difference = time_difference / Units.const_get(unit.capitalize)
+    "#{unit_difference} #{unit_rep} ago"
+  end
+
+  private
+  def get_unit(time_difference)
+    Units.constants.each_cons(2) do |con|
+      return con.first if (Units.const_get(con[0])...Units.const_get(con[1])) === time_difference
+    end
+  end
+end

data/pry-send_tweet.gemspec

@@ -8,12 +8,17 @@ Gem::Specification.new do |spec|
   spec.description = spec.summary
   spec.homepage = "https://github.com/r-obert/pry-send_tweet.rb"
   spec.licenses = ["MIT"]
-  spec.require_paths = ["lib"]
-  spec.files = Dir["Vagrantfile", "Dockerfile", "Gemfile", "samples/*", "*.{txt,gemspec,md,sh}", "lib/**/*.rb"]
+  spec.require_paths = ["lib", "lib/time-ago-in-words/lib"]
+  spec.files = Dir[
+    "*file",
+    "art/*",
+    "vms/*",
+    "samples/*",
+    "*.{txt,gemspec,md,sh}",
+    "lib/**/*.rb"
+  ]
   spec.add_runtime_dependency "pry", "~> 0.12"
   spec.add_runtime_dependency "twitter", "~> 6.0"
-  spec.add_runtime_dependency "time-lord", "~> 1.0"
   spec.add_runtime_dependency "tty-box", "= 0.3.0"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.4"
-  spec.add_runtime_dependency "unicode-emoji", "~> 1.1"
 end

data/samples/freebsd-zshrc

@@ -0,0 +1,5 @@
+export EDITOR="ee"
+export PAGER="less"
+export LANG="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
+export RUBYLIB='/app/lib:/app/lib/time-ago-in-words/lib'

data/samples/tmuxinator-vagrant.yml

@@ -1,16 +1,11 @@
-name: bsd_send_tweets
+name: pry_send_tweet
 root: /path/to/pry-send_tweet.rb
 
-on_project_start:
-  - vagrant up
-
 windows:
   - twitter:
       layout: even-horizontal
       panes:
-        - vagrant ssh -c 'source ~/.zshrc && cd /app && bundle exec pry -e read-tweets'
-        - vagrant ssh -c 'source ~/.zshrc && cd /app && bundle exec pry'
+        - source ~/.zshrc && cd /app && pry -r pry-send_tweet -e read-tweets
+        - source ~/.zshrc && cd /app && pry -r pry-send_tweet
   - sh:
-    - vagrant ssh
-  - sync:
-    - vagrant rsync-auto
+    -

data/vms/freebsd.rb

@@ -0,0 +1,15 @@
+def run(*cmd)
+  Process.wait Kernel.spawn(*cmd)
+  if !$?.success?
+    raise cmd.join(' ') + " failed."
+  end
+end
+
+ARGV.each do |argument|
+  case argument
+  when '--fresh' then run('vagrant', 'destroy', '--force')
+  end
+end
+
+run 'vagrant', 'up'
+run 'vagrant', 'ssh', '-c', 'tmuxinator start pry_send_tweet'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-send_tweet.rb
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Robert Gleeson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: time-lord
-  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: tty-box
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: unicode-emoji
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: A Twitter client for the Pry REPL.
 email: trebor.g@protonmail.com
 executables: []
@@ -101,13 +73,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- Dockerfile
-- Gemfile
 - LICENSE.txt
 - README.md
 - Vagrantfile
-- dockerize.sh
+- art/44-e44743a5bb.jpg
+- art/52-eec4df2edf.jpg
 - lib/pry-send_tweet.rb
+- lib/pry/pager/system_pager.rb
 - lib/pry/send_tweet/commands/base_command.rb
 - lib/pry/send_tweet/commands/paging/paging_support.rb
 - lib/pry/send_tweet/commands/read_tweets.rb
@@ -125,10 +97,11 @@ files:
 - lib/pry/send_tweet/renderers/user_renderer.rb
 - lib/pry/send_tweet/tty-box.rb
 - lib/pry/send_tweet/version.rb
+- lib/time-ago-in-words/lib/time-ago-in-words.rb
 - pry-send_tweet.gemspec
-- samples/hardenedbsd-zshrc
-- samples/tmuxinator-docker.yml
+- samples/freebsd-zshrc
 - samples/tmuxinator-vagrant.yml
+- vms/freebsd.rb
 homepage: https://github.com/r-obert/pry-send_tweet.rb
 licenses:
 - MIT
@@ -137,6 +110,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- lib/time-ago-in-words/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Dockerfile

@@ -1,41 +0,0 @@
-FROM ruby:2.6.0-stretch
-
-# Add regular user
-RUN groupadd -g 999 appuser
-RUN useradd -d /home/appuser -r -u 999 -g appuser appuser
-RUN mkdir -p /home/appuser
-WORKDIR /home/appuser/
-
-# Bundle
-ADD Gemfile pry-send_tweet.gemspec /home/appuser/
-ADD lib /home/appuser/lib/
-RUN gem install bundler
-# FIXME: During 'bundle install', i got: Could not find gem 'buftok (~> 0.2.0)'
-# Installing twitter as a gem first fixes that.
-RUN gem install twitter
-RUN bundle install
-
-# Install packages
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends locales emacs24-nox less
-
-# Configure locale
-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
-RUN locale-gen
-RUN echo 'Europe/Zurich' > /etc/timezone
-RUN rm /etc/localtime
-RUN dpkg-reconfigure -f noninteractive tzdata
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-# Configure editor
-ENV EDITOR emacs
-
-# Add files to container
-ADD . /home/appuser/
-
-# Finally, drop root permissions to regular user
-RUN chown appuser /home/appuser
-RUN chown -R appuser /home/appuser/*
-USER appuser

data/Gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem 'pry-auto_benching.rb'
-gem 'pry-doc'
-group :test do
-  gem 'rspec'
-end

data/dockerize.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-docker build -t send_tweets .
-docker run -v $PWD/tweets/:/app/tweets -i -t send_tweets bundle exec pry

data/samples/hardenedbsd-zshrc

@@ -1,4 +0,0 @@
-export EDITOR="emacs"
-export PAGER="less"
-export LANG="en_US.UTF-8"
-export LC_ALL="en_US.UTF-8"

data/samples/tmuxinator-docker.yml

@@ -1,15 +0,0 @@
-name: send_tweets
-root: /path/to/pry/send/tweet
-
-on_project_start: docker build -t send_tweets .
-
-windows:
-  - twitter:
-      layout: even-horizontal
-      panes:
-        - docker run -v $PWD/tweets/:/app/tweets -i -t send_tweets bundle exec pry -e "read-tweets"
-        - docker run -v $PWD/tweets/:/app/tweets -i -t send_tweets bundle exec pry
-  - sh:
-    - docker run -v $PWD/tweets/:/app/tweets -i -t send_tweets bash
-
-on_project_start: docker build -t send_tweets .