pry-send_tweet.rb 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60dbebe89f0db1ac7023b9e2e30f9d06413b704a9f06bf46c989afd0d4f6c09f
-  data.tar.gz: 484501f241913b90d987ec10de8710d5d00e1940b19ad095a49c2dd164bcfe3b
+  metadata.gz: 4464a0e5487676221d3f0809dab2dcdb2ac192d84ded42dbbae6cb9d8593e459
+  data.tar.gz: 4944d0716568bb7687a5ca0917cd2df1772b4af5cb2bb25117a51d79a8ea9a45
 SHA512:
-  metadata.gz: 79c7445acdebf4fe759f7de18d814627bca324bb29ac3f8fa5b3fd6e010a288360fd86759ef24fabc3b43356732e375f0c2b1cf449c2c9746d147e98297db970
-  data.tar.gz: 6c0d1f74bfa20d83a5c82ac32d97f611220737d012f7a2bb86951a71c142a2f48ab12b211d3322c40d95d452d2b76cbef84bbb145f145703b260ea2ade2c5df5
+  metadata.gz: 39cca7be237772f1ee3e4ad9c60d4db9bd35a7e96a23274c3d1bb852b838879b20dffe8a7c63568980e3ab022d67b2ae04c2615afea4e99f1fb6469c87bc2509
+  data.tar.gz: 71ffdc012830a01ceb5a03b1b9ada4bb8899e7422a0e74e6824ff19296cea032fabca05d511dbdcbd202baf37816547414c89b01ad68806f2a083be8e46b5156

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # CHANGELOG
 
-## master
+## v0.10.1
+
+* Improve forking implementation in `Pry::SendTweet::TweetRenderer`.
+
+* Improve the workaround for weak unicode support in tty-box.
+
+* Add `Pry.config.twitter.box_height` - for defining the height of the box that  
+  contains a tweet or user.
+
+* Add `Pry.config.twitter.box_width`, formerly `Pry.config.twitter.line_width`.
+
+## v0.10.0
 
 * Avoid a negative argument error when following / unfollowing other user(s) by  
   bypassing tty-box for those operations.

data/README.md

@@ -18,6 +18,8 @@
   * [Tip: Command Aliases](#tip)
 * [Multi-tasking: tmux / screen](#multi-tasking)
 * [Install](#install)
+  * [Rubygem](#install-rubygem)
+  * [Docker](#install-docker)
 * [License](#license)
 
 ## <a id='Introduction'>Introduction</a>
@@ -27,8 +29,10 @@ 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.
+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>
 
@@ -51,10 +55,12 @@ Pry.configure do |config|
     access_token_secret: '<access token secret>'
     # Optional configuration
     # The User-Agent to use when making requests to the Twitter API.
-    # Default is: 'pry-send_tweet.rb vX.Y.Z'
+    # Default is: 'pry-send_tweet.rb vX.Y.Z'.
     user_agent: 'Custom User-Agent',
-    # The width of a line before word wrapping occurs, the default is 100.
-    line_width: 120
+    # The width & height of a box that contains a tweet or user.
+    # The default width is 100 and the default height is 8.
+    box_width: 120,
+    box_height: 10
   })
 end
 ```
@@ -238,7 +244,7 @@ The `twitter-search` command can be used to search Twitter.
 * 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
-      
+
 * Set the URL visible on your profile:
 
       [1] pry(main)> on-twitter --set-profile-url=https://github.com/you
@@ -321,14 +327,15 @@ as inspiration for your own configuration.
 
 ## <a id='install'>Install</a>
 
-Install the gem:
+### <a id='install-rubygem'>Rubygem</a>
 
     $ gem install pry-send_tweet.rb
 
-There's also the option to clone this repository and then use the provided  
-`Dockerfile` to run pry-send_tweet.rb inside a Docker container.  
-The container is configured to use `emacs` when sending tweets and when using  
-other commands that open an editor.  
+### <a id='install-docker'>Docker</a>
+
+This method is how I install and use `pry-send_tweet.rb`, I recommend giving it  
+a try - especially if on Windows. The Docker container is configured to use `emacs`  
+when sending tweets and when using other commands that open an editor.  
 
     $ git clone https://github.com/r-obert/pry-send_tweet.rb
     $ cd pry-send_tweet.rb

data/lib/pry-send_tweet.rb

@@ -2,11 +2,17 @@ class Pry
   module SendTweet
     #
     # @return [Integer]
-    #   The size of a line before word wrapping occurs.
+    #   The default width of a box that contains a tweet or user.
     #
     # @api private
     #
-    DEFAULT_LINE_WIDTH = 100
+    DEFAULT_BOX_WIDTH = 100
+
+    #
+    # @return [Integer]
+    #   The default height of a box that contains a tweet or user.
+    #
+    DEFAULT_BOX_HEIGHT = 8
 
     #
     # @return [Integer]

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

@@ -18,6 +18,14 @@ class Pry::SendTweet::BaseCommand < Pry::ClassCommand
 
   private
 
+  def box_height
+    _pry_.config.twitter.box_height || Pry::SendTweet::DEFAULT_BOX_HEIGHT
+  end
+
+  def box_width
+    _pry_.config.twitter.box_width || Pry::SendTweet::DEFAULT_BOX_WIDTH
+  end
+  
   def search_str_for_users(*ary)
     ary.map do |str|
       if str.start_with?('https://twitter.com')
@@ -46,10 +54,6 @@ class Pry::SendTweet::BaseCommand < Pry::ClassCommand
     "%-d %b %Y, %-I:%M:%S %p"
   end
 
-  def line_width
-    _pry_.config.twitter.line_width || Pry::SendTweet::DEFAULT_LINE_WIDTH
-  end
-
   def twitter
     @twitter ||= _pry_.binding_stack[-1].eval('_twitter_')
   end

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

@@ -2,20 +2,12 @@ module Pry::SendTweet::TweetRenderer
   include Timeout
 
   def render_tweets(tweet_fetcher, title:, timeout: _pry_.config.twitter.refresh_interval)
-    interval = __choose_render_interval(timeout)
     pid = nil
-    timeout(interval) do
-      pid = Kernel.fork do
-        _pry_.pager.open do |pager|
-          __trap_signal(pager)
-          tweets = __fetch_tweets(tweet_fetcher)
-          tweets.empty? ? pager.write("No tweets to show.") :
-                          pager.write(__render_tweets(title, tweets))
-
-        end
-      end
+    timeout(__choose_render_interval(timeout)) {
+      tweets = __fetch_tweets(tweet_fetcher)
+      pid = __fork_pager(tweets)
       Process.wait(pid)
-    end
+    }
   rescue Interrupt
     __kill_pager!(pid)
     system 'reset'
@@ -26,6 +18,18 @@ module Pry::SendTweet::TweetRenderer
   end
 
   private
+  # @api private
+  def __fork_pager(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("Twitter", tweets))
+
+      end
+    end
+  end
+
   # @api private
   def __render_tweets(title, tweets)
     title = bright_blue(bold((" " * 40) + title) + "\n\n")
@@ -35,8 +39,8 @@ module Pry::SendTweet::TweetRenderer
   # @api private
   def __render_tweet(tweet)
     contents = __get_tweet_contents(tweet)
-    TTY::Box.frame(height: 7,
-                   width: line_width,
+    TTY::Box.frame(height: box_height,
+                   width: box_width,
                    title: {top_left: __render_tweet_title(tweet)}) do
                      "#{tweet.url}\n--\n#{contents}\n"
                    end.to_s
@@ -58,7 +62,7 @@ module Pry::SendTweet::TweetRenderer
     text = tweet.attrs[:full_text] ? tweet.attrs[:full_text] :
                                      tweet.full_text
     text = __tty_box_sanitize(CGI.unescapeHTML(text)).strip
-    text.size == 0 || text == '.' ? "\n[ Outside ASCII charset ]\n" : text
+    text.size == 0 || text !~ /[a-z0-9]{1,}/i ? "\n[ Outside ASCII charset ]\n" : text
   end
 
   # @api private
@@ -71,6 +75,7 @@ module Pry::SendTweet::TweetRenderer
     end
   end
 
+  # @api private
   def __choose_render_interval(timeout)
     if timeout == false
       nil
@@ -82,13 +87,16 @@ module Pry::SendTweet::TweetRenderer
   # @api private
   def __kill_pager!(pid)
     Process.kill('SIGINT', pid)
+    Process.wait(pid) rescue nil
   end
 
   # @api private
-  def __trap_signal(pager)
+  def __trap_signal_in_fork(pager)
     trap('SIGINT') {
-      # SimplePager does not have a PID, ignore NoMethodError
-      Process.kill('SIGKILL', pager.send(:pager).pid) rescue nil
+      if Pry::Pager::SystemPager === pager
+        syspager = pager.send(:pager)
+        Process.kill('SIGKILL', syspager.pid) rescue nil
+      end
       Process.kill('SIGKILL', Process.pid)
     }
   end

data/lib/pry/send_tweet/version.rb

@@ -1,5 +1,5 @@
 class Pry
   module SendTweet
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-send_tweet.rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Robert Gleeson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry