cani 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 97a7a44de697f793827e056d88bc55cdc51c8d5d44119b75c3f1fc619b1c10a3
-  data.tar.gz: dc62177619b558a496c499c63754210b157f1a84513b4f24636ad20961995df3
+SHA1:
+  metadata.gz: bbdbb28b9c3709f04c106775b5d019f7d4e29177
+  data.tar.gz: cb812356aac2f7ad341f8d80fe16db97539813b4
 SHA512:
-  metadata.gz: ad9b0f922f4816e1ab336a868f06a732298837ef5d9eecf271e93aa29bee6c78a14f7d04241ef3d2b123fbd117cec43b731edfeaf8df4873a463b24c0280c06b
-  data.tar.gz: '09a7aee1a40aada6855807b20f5de20b4cd5a91db1ff0cdd65d89969ffa3ac50fd762a0f480abc21a470f685b0d78f244f66a0d5a18c5ce6c685b7a3a775231c'
+  metadata.gz: 01ffd79c7dcbb0aae80cac9585d687eaf00c2226f617d4a70cb409384d9938373363e5b38d93c8988f6e92a525ce88774cb0aa922a3435cf4381b1dbb203d8f0
+  data.tar.gz: fc4287ccb47965a06f6218af9de4d67d1ff63d677687d5042fd3df9bb9e13e630463727269bb08a89f2c58d31a05ee66739578b9a97a61a329983306e8fdd781

data/.rubocop.yml

@@ -0,0 +1 @@
+TargetRubyVersion: "2.1"

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### 24-07-2019 VERSION 0.5.6
+
+- Fix issue where `cani` would crash when used without arguments. Original behavior of showing `cani help` in that case is restored. ([#14](../../pull/14))
+- Disable FZF's preview window using `--no-preview` to override `FZF_DEFAULT_OPTS` ([#12](../../issues/12))
+
+### 06-07-2019 VERSION 0.5.5
+
+- Added ability to (permanently) toggle between enabling and disabling of automatic shell configuration injection
+
+### 06-10-2018 VERSION 0.5.4
+
+- Fixed issue where `system` prints the version of fzf before running the command.
+- When multiple matches are found for a given query: `cani use shadow`, an fzf window will
+  now be opened with results filtered by the text `shadow` as initial query string.
+

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in cani.gemspec
 gemspec

data/README.md

@@ -10,6 +10,13 @@ on a regular interval together with completions.
 
 ## Latest changes
 
+dates are in dd-mm-yyyy format older changes can be found in the [changelog](/CHANGELOG.md)
+
+### 16-09-2019 VERSION 0.5.9
+
+- Fix glitch where current era border would be drawn incorrectly at certain widths.
+- Do not print an empty era row if none of the visible browsers show anything.
+
 ### 28-07-2019 VERSION 0.5.8
 
 - Fix line overflow issue when terminal is too small for "widest" display
@@ -19,21 +26,6 @@ on a regular interval together with completions.
 
 - Titles shown in `cani use` may take up to 50 characters if the terminal is wide enough.
 
-### 24-07-2019 VERSION 0.5.6
-
-- Fix issue where `cani` would crash when used without arguments. Original behavior of showing `cani help` in that case is restored. ([#14](../../pull/14))
-- Disable FZF's preview window using `--no-preview` to override `FZF_DEFAULT_OPTS` ([#12](../../issues/12))
-
-### 06-07-2019 VERSION 0.5.5
-
-- Added ability to (permanently) toggle between enabling and disabling of automatic shell configuration injection
-
-### 06-10-2018 VERSION 0.5.4
-
-- Fixed issue where `system` prints the version of fzf before running the command.
-- When multiple matches are found for a given query: `cani use shadow`, an fzf window will
-  now be opened with results filtered by the text `shadow` as initial query string.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -227,9 +219,9 @@ Last but not least, all `cani` commands can be piped. This will skip running `fz
 **use** _(the output of_ `cani use ft-name` _cannot be piped)_
 ```sh
 cani use | head -3
-[rc]   97.11%   PNG alpha transparency       +chr   +ff   +edge   +ie   +saf   +saf.ios   +op   +and   +bb
-[un]   75.85%   Animated PNG (APNG)          +chr   +ff   -edge   -ie   +saf   +saf.ios   +op   -and   -bb
-[ls]   94.32%   Video element                +chr   +ff   +edge   +ie   +saf   +saf.ios   +op   +and   +bb
+[rc]   97.11%   PNG alpha transparency   +chr   +ff   +edge   +ie   +saf   +saf.ios   +op   +and   +bb
+[un]   75.85%   Animated PNG (APNG)      +chr   +ff   -edge   -ie   +saf   +saf.ios   +op   -and   -bb
+[ls]   94.32%   Video element            +chr   +ff   +edge   +ie   +saf   +saf.ios   +op   +and   +bb
 ```
 
 **show**

data/cani.gemspec

@@ -10,27 +10,29 @@ Gem::Specification.new do |spec|
   spec.email                 = ['sidneyliebrand@gmail.com']
 
   spec.summary               = 'A simple caniuse CLI.'
-  spec.description           = 'An interactive TUI (using FZF / Curses) for exploring caniuse.com in your terminal.'
+  spec.description           = 'An interactive TUI (using FZF / Curses) ' \
+                               'for exploring caniuse.com in your terminal.'
   spec.homepage              = 'https://github.com/SidOfc/cani'
   spec.license               = 'MIT'
 
-  spec.files                 = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files                 = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
       f.match(%r{^(test|spec|features|assets)/})
     end
   end
 
-  spec.bindir                = 'exe'
-  spec.require_paths         = ['lib']
-  spec.executables          << 'cani'
+  spec.bindir        = 'exe'
+  spec.require_paths = ['lib']
+
+  spec.executables << 'cani'
 
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'curses'
-  spec.add_runtime_dependency 'tty-screen'
   spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'tty-screen'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'rspec'
 end

data/lib/cani/api.rb

@@ -66,8 +66,8 @@ module Cani
       name = Regexp.new name.to_s.downcase.gsub(/(\W)/, '.*'), :i
       features.select do |ft|
         ft.title.downcase.match(name) ||
-        ft.name.downcase.match(name)  ||
-        ft.description.downcase.match(name)
+          ft.name.downcase.match(name) ||
+          ft.description.downcase.match(name)
       end
     end
 

data/lib/cani/api/browser.rb

@@ -5,24 +5,24 @@ module Cani
 
       ABBR_MAP  = { 'ios' => 'saf.ios' }.freeze
       LABEL_MAP = {
-        'ie'      => 'Internet Explorer',
-        'edge'    => 'Edge',
-        'ff'      => 'Firefox',
-        'chr'     => 'Chrome',
-        'saf'     => 'Safari',
-        'op'      => 'Opera',
+        'ie' => 'Internet Explorer',
+        'edge' => 'Edge',
+        'ff' => 'Firefox',
+        'chr' => 'Chrome',
+        'saf' => 'Safari',
+        'op' => 'Opera',
         'saf.ios' => 'IOS Safari',
-        'o.mini'  => 'Opera Mini',
-        'and'     => 'Android Browser',
-        'bb'      => 'BlackBerry Browser',
-        'o.mob'   => 'Opera Mobile',
+        'o.mini' => 'Opera Mini',
+        'and' => 'Android Browser',
+        'bb' => 'BlackBerry Browser',
+        'o.mob' => 'Opera Mobile',
         'chr.and' => 'Chrome for Android',
-        'ff.and'  => 'Firefox for Android',
-        'ie.mob'  => 'Internet Explorer Mobile',
-        'uc'      => 'UC Browser for android',
-        'ss'      => 'Samsung Internet',
-        'qq'      => 'QQ Browser',
-        'baidu'   => 'Baidu Browser'
+        'ff.and' => 'Firefox for Android',
+        'ie.mob' => 'Internet Explorer Mobile',
+        'uc' => 'UC Browser for android',
+        'ss' => 'Samsung Internet',
+        'qq' => 'QQ Browser',
+        'baidu' => 'Baidu Browser'
       }.freeze
 
       def initialize(attributes = {})

data/lib/cani/api/feature.rb

@@ -4,19 +4,19 @@ module Cani
       attr_reader :title, :status, :spec, :stats, :percent, :name, :browser_note_nums, :notes, :notes_by_num, :description
 
       STATUSES = {
-        'rec'   => 'rc',
+        'rec' => 'rc',
         'unoff' => 'un',
         'other' => 'ot'
       }.freeze
 
       TYPES = {
-        'y' => {symbol: '+', name: :default,     short: :sup},
-        'a' => {symbol: '~', name: :partial,     short: :prt},
-        'n' => {symbol: '-', name: :unsupported, short: :not},
-        'p' => {symbol: '#', name: :polyfill,    short: :ply},
-        'x' => {symbol: '@', name: :prefix,      short: :pfx},
-        'd' => {symbol: '!', name: :flag,        short: :flg},
-        'u' => {symbol: '?', name: :unknown,     short: :unk}
+        'y' => { symbol: '+', name: :default,     short: :sup },
+        'a' => { symbol: '~', name: :partial,     short: :prt },
+        'n' => { symbol: '-', name: :unsupported, short: :not },
+        'p' => { symbol: '#', name: :polyfill,    short: :ply },
+        'x' => { symbol: '@', name: :prefix,      short: :pfx },
+        'd' => { symbol: '!', name: :flag,        short: :flg },
+        'u' => { symbol: '?', name: :unknown,     short: :unk }
       }.freeze
 
       def initialize(attributes = {})

data/lib/cani/api/feature/viewer.rb

@@ -2,33 +2,47 @@ module Cani
   class Api
     class Feature
       class Viewer
-        attr_reader :width, :height, :feature, :browsers, :viewable, :col_width, :table_width
+        attr_reader :width, :height, :feature, :browsers, :viewable,
+                    :col_width, :table_width
 
         COLOR_PAIRS = {
           # foreground colors
-          69  => [70,  -1], # green on default   (legend supported, feature status, percentage counter)
-          213 => [208, -1], # orange on default  (legend partial, percentage counter)
-          195 => [160, -1], # red on default     (legend unsupported, percentage counter)
-          133 => [134, -1], # magenta on default (legend flag, current feature status)
-          12  => [75,  -1], # blue on default    (legend prefix)
+
+          # green on default
+          # (legend supported, feature status, percentage counter)
+          69 => [70,  -1],
+
+          # orange on default
+          # (legend partial, percentage counter)
+          213 => [208, -1],
+
+          # red on default
+          # (legend unsupported, percentage counter)
+          195 => [160, -1],
+
+          # magenta on default
+          # (legend flag, current feature status)
+          133 => [134, -1],
+
+          12 => [75, -1], # blue on default    (legend prefix)
           204 => [205, -1], # pink on default    (legend polyfill)
-          99  => [239, -1], # gray on default    (legend unknown)
+          99 => [239, -1], # gray on default    (legend unknown)
 
           # note background + foreground colors
-          71  => [22,   70], # dark green on green     (supported feature)
+          71 => [22, 70], # dark green on green     (supported feature)
           209 => [130, 208], # dark orange on orange   (partial feature)
           197 => [88,  160], # dark red on red         (unsupported feature)
           135 => [91,  134], # dark magenta on magenta (flag features)
-          13  => [27,   75], # dark blue on blue       (prefix feature)
+          13 => [27, 75], # dark blue on blue       (prefix feature)
           101 => [235, 239], # dark gray on gray       (unknown features)
           206 => [127, 205], # dark pink on pink       (polyfill features)
 
           # background colors
-          70  => [7,  70], # white on green      (supported feature)
+          70 => [7, 70], # white on green      (supported feature)
           208 => [7, 208], # white on orange     (partial feature)
           196 => [7, 160], # white on red        (unsupported feature)
           134 => [7, 134], # white on magenta    (flag features)
-          11  => [7,  75], # white on blue       (prefix feature)
+          11 => [7, 75], # white on blue       (prefix feature)
           100 => [7, 239], # white on gray       (unknown features)
           205 => [7, 205], # white on pink       (polyfill features)
 
@@ -39,45 +53,48 @@ module Cani
 
         COLORS = {
           # table headers
-          header:      {fg: Curses.color_pair(254), bg: Curses.color_pair(254)},
+          header: { fg: Curses.color_pair(254), bg: Curses.color_pair(254) },
 
           # current era border
-          era_border:  {fg: Curses.color_pair(239), bg: Curses.color_pair(239)},
+          era_border: { fg: Curses.color_pair(239),
+                        bg: Curses.color_pair(239) },
 
           # support types
-          default:     {fg: Curses.color_pair(69),  bg: Curses.color_pair(70)},
-          partial:     {fg: Curses.color_pair(213), bg: Curses.color_pair(208)},
-          prefix:      {fg: Curses.color_pair(12),  bg: Curses.color_pair(11)},
-          polyfill:    {fg: Curses.color_pair(204), bg: Curses.color_pair(205)},
-          flag:        {fg: Curses.color_pair(133), bg: Curses.color_pair(134)},
-          unsupported: {fg: Curses.color_pair(195), bg: Curses.color_pair(196)},
-          unknown:     {fg: Curses.color_pair(99),  bg: Curses.color_pair(100)},
+          default: { fg: Curses.color_pair(69),  bg: Curses.color_pair(70) },
+          partial: { fg: Curses.color_pair(213), bg: Curses.color_pair(208) },
+          prefix: { fg: Curses.color_pair(12), bg: Curses.color_pair(11) },
+          polyfill: { fg: Curses.color_pair(204), bg: Curses.color_pair(205) },
+          flag: { fg: Curses.color_pair(133), bg: Curses.color_pair(134) },
+          unknown: { fg: Curses.color_pair(99), bg: Curses.color_pair(100) },
+          unsupported: { fg: Curses.color_pair(195),
+                         bg: Curses.color_pair(196) },
 
           # statuses
-          un:          {fg: Curses.color_pair(213), bg: Curses.color_pair(208)},
-          ot:          {fg: Curses.color_pair(133), bg: Curses.color_pair(134)}
+          un: { fg: Curses.color_pair(213), bg: Curses.color_pair(208) },
+          ot: { fg: Curses.color_pair(133), bg: Curses.color_pair(134) }
         }.freeze
 
         NOTE_COLORS = {
-          default:     {fg: Curses.color_pair(71),  bg: Curses.color_pair(70)},
-          partial:     {fg: Curses.color_pair(209), bg: Curses.color_pair(208)},
-          prefix:      {fg: Curses.color_pair(13),  bg: Curses.color_pair(11)},
-          polyfill:    {fg: Curses.color_pair(206), bg: Curses.color_pair(205)},
-          flag:        {fg: Curses.color_pair(135), bg: Curses.color_pair(134)},
-          unsupported: {fg: Curses.color_pair(197), bg: Curses.color_pair(196)},
-          unknown:     {fg: Curses.color_pair(101), bg: Curses.color_pair(100)},
-        }
+          default: { fg: Curses.color_pair(71),  bg: Curses.color_pair(70) },
+          partial: { fg: Curses.color_pair(209), bg: Curses.color_pair(208) },
+          prefix: { fg: Curses.color_pair(13), bg: Curses.color_pair(11) },
+          polyfill: { fg: Curses.color_pair(206), bg: Curses.color_pair(205) },
+          flag: { fg: Curses.color_pair(135), bg: Curses.color_pair(134) },
+          unknown: { fg: Curses.color_pair(101), bg: Curses.color_pair(100) },
+          unsupported: { fg: Curses.color_pair(197),
+                         bg: Curses.color_pair(196) }
+        }.freeze
 
         PERCENT_COLORS = {
-          70..101 => {fg: Curses.color_pair(69),  bg: Curses.color_pair(70)},
-          40..70  => {fg: Curses.color_pair(213), bg: Curses.color_pair(208)},
-          0..40   => {fg: Curses.color_pair(195), bg: Curses.color_pair(196)}
+          70..101 => { fg: Curses.color_pair(69), bg: Curses.color_pair(70) },
+          40..70 => { fg: Curses.color_pair(213), bg: Curses.color_pair(208) },
+          0..40 => { fg: Curses.color_pair(195), bg: Curses.color_pair(196) }
         }.freeze
 
-        ERAS    = 6  # range of eras to show around current era (incl current)
-        COMPACT = 60 # column width at which to compress the layout
-        PADDING = 1  # horizontal cell padding
-        MARGIN  = 1  # horizontal cell margin
+        ERAS                    = 6   # range of eras to show around current era (incl current)
+        COMPACT                 = 60  # column width at which to compress the layout
+        PADDING                 = 1   # horizontal cell padding
+        MARKET_SHARE_THRESHHOLD = 0.5 # predefined market share threshhold
 
         def initialize(feature, browsers = Cani.api.browsers)
           @feature  = feature
@@ -103,7 +120,7 @@ module Cani
           at_exit(&method(:close))
         end
 
-        def close(*args)
+        def close(*_args)
           Curses.close_screen
         end
 
@@ -149,7 +166,8 @@ module Cani
           end
 
           # status positioning and drawing
-          # when compact? draw it on the second line instead of the first line at the end of the title
+          # when compact? draw it on the second line instead of the
+          # first line at the end of the title
           cy       += 1
           status_yp = offset_y + (compact? ? 1 : 0)
           status_xp = offset_x + (compact? ? table_width - status_format.size
@@ -161,7 +179,8 @@ module Cani
           end
 
           # 'more or less' predict a height that is too small
-          # since we don't know the entire height but draw it line-by-line at the moment
+          # since we don't know the entire height but draw
+          # it line-by-line at the moment
           compact_height = height <= 40
 
           # by default, notes are only shown if visible in the actual table
@@ -173,21 +192,28 @@ module Cani
 
           # meaty part, loop through browsers to create
           # the final feature table
-          browsers.each.with_index do |browser, x|
+          relevant_era_count = browsers[0...viewable].map do |browser|
+            era_idx   = browser.most_popular_era_idx
+            era_range = (era_idx - (ERAS / 2.0).floor + 1)..(era_idx + (ERAS / 2.0).ceil)
+
+            era_range.map do |cur_era|
+              era = browser.eras[cur_era].to_s
+              browser.usage[era].to_f >= MARKET_SHARE_THRESHHOLD || (!era.empty? && cur_era >= era_idx - 1)
+            end.select { |x| x }.size
+          end.max
+
+          browsers[0...viewable].each.with_index do |browser, x|
             # some set up to find the current era for each browser
             # and creating a range around that to show past / coming support
             era_idx   = browser.most_popular_era_idx
-            era_range = (era_idx - (ERAS / 2.0).floor + 1)..(era_idx + (ERAS / 2.0).ceil)
+            era_range = (era_idx - (relevant_era_count / 2.0).floor + 1)..(era_idx + (relevant_era_count / 2.0).ceil)
             bx        = offset_x + x * col_width + x
             by        = offset_y + cy
-            do_draw   = x < viewable
 
-            if do_draw
-              # draw browser names
-              Curses.setpos by, bx
-              Curses.attron color(:header) do
-                Curses.addstr browser.name.tr('_', '.').center(col_width)
-              end
+            # draw browser names
+            Curses.setpos by, bx
+            Curses.attron color(:header) do
+              Curses.addstr browser.name.tr('_', '.').center(col_width)
             end
 
             # accordingly increment current browser y for the table header (browser names)
@@ -205,45 +231,45 @@ module Cani
               bot_pad    = compact_height ? 0 : 1
               ey         = by + (y * (2 + top_pad + bot_pad)) + (bot_pad.zero? && past_curr ? 1 : 0)
               note_nums  = feature.browser_note_nums.fetch(browser.name, {})
-                                                    .fetch(era, [])
+                                  .fetch(era, [])
 
               # do not draw era's that exceed screen height
               break if (ey + (is_current ? 1 : bot_pad) + 1) >= height
 
-              if do_draw && is_current
-                Curses.setpos ey - top_pad - 1, bx - 1
+              # draw current era outline before drawing all era cells on top
+              if is_current
+                Curses.setpos ey - top_pad - 1, [bx - 1, 0].max
                 Curses.attron(color(:era_border)) { Curses.addstr ' ' * (col_width + 2) }
 
-                Curses.setpos ey + (is_current ? 1 : bot_pad) + 1, bx - 1
+                Curses.setpos ey + (is_current ? 1 : bot_pad) + 1, [bx - 1, 0].max
                 Curses.attron(color(:era_border)) { Curses.addstr ' ' * (col_width + 2) }
               end
 
               # only show visible / relevant browsers
-              if browser.usage[era].to_i >= 0.5 || (!era.empty? && cur_era >= era_idx - 1)
-                if do_draw
-                  ((ey - top_pad)..(ey + (is_current ? 1 : bot_pad))).each do |ry|
-                    txt = (bot_pad.zero? && !is_current) ? (ry >= ey + (is_current ? 1 : bot_pad) ? era.to_s : ' ')
-                                        : (ry == ey ? era.to_s : ' ')
-
-                    Curses.setpos ry, bx
-                    Curses.attron(colr) { Curses.addstr txt.center(col_width) }
-
-                    if is_current
-                      Curses.setpos ry, bx - 1
-                      Curses.attron(color(:era_border)) { Curses.addstr ' ' }
-
-                      Curses.setpos ry, offset_x + table_width + 2
-                      Curses.attron(color(:era_border)) { Curses.addstr ' ' }
-                    end
+              # era's can either be empty or too new to determine
+              # their usefulness by usage (when newer than current era).
+              if browser.usage[era].to_f >= MARKET_SHARE_THRESHHOLD || (!era.empty? && cur_era >= era_idx - 1)
+                ((ey - top_pad)..(ey + (is_current ? 1 : bot_pad))).each do |ry|
+                  txt = (bot_pad.zero? && !is_current) ? (ry >= ey + (is_current ? 1 : bot_pad) ? era.to_s : ' ')
+                                      : (ry == ey ? era.to_s : ' ')
+
+                  Curses.setpos ry, bx
+                  Curses.attron(colr) { Curses.addstr txt.center(col_width) }
+
+                  # draw current ara border inbetween the cells
+                  if is_current
+                    Curses.setpos ry, bx - 1
+                    Curses.attron(color(:era_border)) { Curses.addstr ' ' }
+
+                    Curses.setpos ry, offset_x + table_width + 2
+                    Curses.attron(color(:era_border)) { Curses.addstr ' ' }
                   end
                 end
 
                 if note_nums.any?
                   notes_visible.concat(note_nums).uniq!
-                  if do_draw
-                    Curses.setpos ey - top_pad, bx
-                    Curses.attron(note_color(supp_type)) { Curses.addstr ' ' + note_nums.join(' ') }
-                  end
+                  Curses.setpos ey - top_pad, bx
+                  Curses.attron(note_color(supp_type)) { Curses.addstr ' ' + note_nums.join(' ') }
                 end
               end
             end
@@ -253,7 +279,7 @@ module Cani
           # plus the 4 lines around the current era
           # plus the 1 line of browser names
           # plus the 2 blank lines above and below the eras
-          cy += (ERAS - 1) * (compact_height ? 3 : 4) + ERAS
+          cy += (relevant_era_count - 1) * (compact_height ? 3 : 4) + relevant_era_count + (relevant_era_count % 2 == 0 ? 0 : 1)
 
           if height > cy + 3
             # print legend header
@@ -272,6 +298,7 @@ module Cani
           # showing which label belongs to which color
           if height > cy + 1
             Feature::TYPES.values.each_slice viewable do |group|
+              # draw legend texts at proper position
               group.compact.each.with_index do |type, lx|
                 Curses.setpos offset_y + cy, offset_x + lx * col_width + lx
                 Curses.attron color(type[:name], :fg) do
@@ -292,8 +319,8 @@ module Cani
           filter_vis    = Cani.config.notes == 'relevant' ? notes_visible.map(&:to_s) : feature.notes_by_num.keys
 
           num_chunked   = feature.notes_by_num
-                            .select { |(k, _)| filter_vis.include? k }
-                            .each_with_object({}) { |(k, nt), h| h[k] = nt.chars.each_slice(outer_width - 5).map(&:join).map(&:strip) }
+                                 .select { |(k, _)| filter_vis.include? k }
+                                 .each_with_object({}) { |(k, nt), h| h[k] = nt.chars.each_slice(outer_width - 5).map(&:join).map(&:strip) }
           notes_total   = (notes_chunked.map(&:size) + num_chunked.map(&:size)).reduce(0) { |total, add| total + add }
 
           if height > cy + 2 && (notes_chunked.any? || num_chunked.any?)
@@ -308,8 +335,10 @@ module Cani
           # and one empty line below it
           cy += 2
 
+          # print global notes, wrapped on terminal width
           notes_chunked.each do |chunks|
             break if cy + 1 + chunks.size > height
+
             chunks.each do |part|
               Curses.setpos offset_y + cy, offset_x
               Curses.addstr part
@@ -319,8 +348,10 @@ module Cani
             cy += 1
           end
 
+          # print numbered notes, wrapped on terminal width
           num_chunked.each do |num, chunks|
             break if cy + 1 + chunks.size > height
+
             Curses.setpos offset_y + cy, offset_x
             Curses.attron color(:header) do
               Curses.addstr num.center(3)
@@ -367,9 +398,7 @@ module Cani
           @height, @width = IO.console.winsize
           @viewable       = browsers.size
 
-          while tablew > @width
-            @viewable -= 1
-          end
+          @viewable -= 1 while tablew >= @width
 
           @col_width   = [colw, Feature::TYPES.map { |(_, h)| h[:short].size }.max + 3].max
           @table_width = tablew - 2 # vertical padding at start and end of current era line

data/lib/cani/config.rb

@@ -10,14 +10,14 @@ module Cani
     NO_MODIFY_FILE = File.join(DIRECTORY, '.no-modify-shellrc').freeze
     DEFAULTS       = {
       # data settings
-      'expire'   => 86_400,
-      'source'   => 'https://raw.githubusercontent.com/Fyrd/caniuse/master/data.json',
+      'expire' => 86_400,
+      'source' => 'https://raw.githubusercontent.com/Fyrd/caniuse/master/data.json',
 
       # usage settings
       'versions' => 1,
       'browsers' => %w[ie edge chrome firefox safari ios_saf opera android bb],
       'navigate' => 'always',
-      'notes'    => 'relevant'
+      'notes' => 'relevant'
     }.freeze
 
     def initialize(**opts)

data/lib/cani/fzf.rb

@@ -44,7 +44,7 @@ module Cani
 
     def self.to_feature_row(ft)
       pc = format('%.2f%%', ft.percent).rjust 6
-      cl = {'un' => :yellow, 'ot' => :magenta}.fetch ft.status, :green
+      cl = { 'un' => :yellow, 'ot' => :magenta }.fetch ft.status, :green
 
       total_len = ft.current_support.map(&:size).reduce(&:+) + pc.size + 6 + (ft.current_support.size + 2) * 3
       rem_len   = [longest_title_size, 50, [dimensions.first - total_len, 24].max].min
@@ -52,19 +52,19 @@ module Cani
       tt = format("%-#{rem_len}s", ft.title.size > rem_len ? ft.title[0...rem_len].strip + '..'
                                               : ft.title)
 
-      [{content: "[#{ft.status}]", color: cl}, pc,
-       {content: tt, color: :default}, *ft.current_support]
+      [{ content: "[#{ft.status}]", color: cl }, pc,
+       { content: tt, color: :default }, *ft.current_support]
     end
 
     def self.browser_rows
       @browser_rows ||= Cani.api.browsers.map do |bwsr|
-        [{content: bwsr.title, color: :default},
+        [{ content: bwsr.title, color: :default },
          'usage: ' + format('%.4f%%', bwsr.usage.values.reduce(0) { |total, add| total + add })]
       end
     end
 
     def self.browser_usage_rows(brwsr)
-      brwsr.usage.map { |(v, u)| [{content: v, color: :default}, 'usage: ' + format('%.4f%%', u)] }.reverse
+      brwsr.usage.map { |(v, u)| [{ content: v, color: :default }, 'usage: ' + format('%.4f%%', u)] }.reverse
     end
 
     def self.browser_feature_rows(brwsr, version)
@@ -73,9 +73,9 @@ module Cani
       Api::Feature::TYPES.flat_map do |(status, type)|
         if (features = features_by_support.fetch(type[:name], nil))
           features.map do |feature|
-            color = {'un' => :yellow, 'ot' => :magenta}.fetch feature[:status], :green
-            [{content: "[#{feature[:status]}]", color: color},
-             "[#{type[:symbol]}]", {content: feature[:title], color: :default}]
+            color = { 'un' => :yellow, 'ot' => :magenta }.fetch feature[:status], :green
+            [{ content: "[#{feature[:status]}]", color: color },
+             "[#{type[:symbol]}]", { content: feature[:title], color: :default }]
           end
         end
       end.compact

data/lib/cani/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cani
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cani
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-28 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-screen
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: An interactive TUI (using FZF / Curses) for exploring caniuse.com in
   your terminal.
 email:
@@ -133,7 +133,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -175,7 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple caniuse CLI.