cani 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056dad5365e1fa79e23f2f0d0402a1410b7d8719f1521caa1288a60c99bbc8a6
-  data.tar.gz: ab5199feb69612e152dadea893c8a721149c8c9bdf708df4b4b143a91896a93d
+  metadata.gz: d2b242538b6ab9ffed230b58d02a7e8ce24eb0485f5c8360a3275da7d72c3e99
+  data.tar.gz: d623b2ea9fd17610916c4c17b2d4f52dd49d1fc7fd51c938969bcc3c4e4b7792
 SHA512:
-  metadata.gz: e940dca2ceffabead9d8f73c6efece1244a1fbbd6c67ee27a5d81e084b295ce9ac71f1b988da08b647b0325bbc3eb481859c1444883c0334e35f123124ec171c
-  data.tar.gz: 5b1f9e0f8655b6a8040546e0a41c262cbf73501f86041b6367ecd87a11095f622bf57ee4246748b071bf0dc181ffd788cbab133a7a04d42c997d1d6263a06e33
+  metadata.gz: e4d4ebcced02abe4ed0d85152221fa93a1628ffac9549afbd1f0de16839dce2c353490c92d4874a93cbf5f23d364c44e5acde27254a6a7941313996280c412eb
+  data.tar.gz: 3bdf7ce824afbc541ff5cd03ab815d29503b750551f1c08c3980eb645bdb0f72612a717f26baebce2b076ae4461dab51370e177c452a48cdf944874616d5d28f

data/README.md

@@ -8,6 +8,14 @@ This wrapper aims to be easy to use out of the box. To achieve this it ships wit
 for `bash`, `fish`, and `zsh`. [Caniuse data (1.7MB)](https://github.com/Fyrd/caniuse/blob/master/data.json) is fetched and updated automatically
 on a regular interval together with completions.
 
+## Latest changes
+
+### 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:

data/lib/cani.rb

@@ -53,10 +53,10 @@ module Cani
     puts 'table as seen on caniuse.com using curses.'.light_black
     puts ''
     puts 'cani is dependent on fzf (https://github.com/junegunn/fzf) for the interactive TUI to work.'.light_black
-    puts 'without fzf, commands can still be piped to get the regular (colorless) output'.light_black
+    puts 'without fzf, commands can still be piped to get the regular (colorless) output.'.light_black
     puts ''
     puts 'Cani requires at least 20 lines and 40 cols to work properly, this is not a hard limit but'.light_black
-    puts 'below this width, long lines could wrap a lot and reduce visible information.'.light_black
+    puts 'below this width, long lines could wrap a lot and significantly reduce visible information.'.light_black
     puts ''
     puts 'Usage:'.red
     puts '   cani'.yellow + ' [COMMAND [ARGUMENTS]]'
@@ -115,21 +115,22 @@ module Cani
 
   def self.use(feature = nil)
     @use_min_depth ||= feature ? 1 : 0
+    can_go_back      = !(config.nav_type?('forward') && @use_min_depth > 0)
+    matches          = api.find_features feature
 
-    if feature && (feature = api.find_feature(feature))
+    return use if can_go_back && matches.empty?
+    return Api::Feature::Viewer.new(matches.first).render if matches.count == 1
+
+    chosen = Fzf.pick Fzf.feature_rows, query: feature,
+                          header: 'use]   [' + Api::Feature.support_legend,
+                          colors: %i[green light_black light_white light_black]
+
+    # chosen[2] is the title column of a row returned by Fzf.feature_rows
+    if chosen && chosen.any? && (feature = api.find_feature(chosen[2]))
       Api::Feature::Viewer.new(feature).render
-      use unless config.nav_type?('forward') && @use_min_depth > 0
-    elsif (chosen = Fzf.pick(Fzf.feature_rows,
-                             header: 'use]   [' + Api::Feature.support_legend,
-                             colors: %i[green light_black light_white light_black]))
-
-      # chosen[2] is the index of the title column from Fzf.feature_rows
-      if chosen.any? && (feature = api.find_feature(chosen[2]))
-        Api::Feature::Viewer.new(feature).render
-        use
-      else
-        exit
-      end
+      use
+    else
+      exit 0
     end
   end
 

data/lib/cani/api.rb

@@ -62,6 +62,15 @@ module Cani
       features[idx] if idx
     end
 
+    def find_features(name)
+      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)
+      end
+    end
+
     def find_browser(name)
       name = name.to_s.downcase
       idx  = browsers.find_index do |bwsr|

data/lib/cani/api/feature.rb

@@ -1,7 +1,7 @@
 module Cani
   class Api
     class Feature
-      attr_reader :title, :status, :spec, :stats, :percent, :name, :browser_note_nums, :notes, :notes_by_num
+      attr_reader :title, :status, :spec, :stats, :percent, :name, :browser_note_nums, :notes, :notes_by_num, :description
 
       STATUSES = {
         'rec'   => 'rc',
@@ -20,12 +20,13 @@ module Cani
       }.freeze
 
       def initialize(attributes = {})
-        @name    = attributes[:name].to_s.downcase
-        @title   = attributes['title']
-        @status  = STATUSES.fetch attributes['status'], attributes['status']
-        @spec    = attributes['spec']
-        @percent = attributes['usage_perc_y']
-        @notes   = attributes['notes'].split "\n"
+        @name         = attributes[:name].to_s.downcase
+        @title        = attributes['title']
+        @description  = attributes['description']
+        @status       = STATUSES.fetch attributes['status'], attributes['status']
+        @spec         = attributes['spec']
+        @percent      = attributes['usage_perc_y']
+        @notes        = attributes['notes'].split "\n"
         @notes_by_num = attributes['notes_by_num']
         @stats, @browser_note_nums = attributes['stats'].each_with_object([{}, {}]) do |(browser, info), (stts, notes)|
           stts[browser], notes[browser] = info.each_with_object([{}, {}]) do |(version, stat), (st, nt)|

data/lib/cani/fzf.rb

@@ -9,10 +9,11 @@ module Cani
 
         rows   = tableize_rows(rows, **opts).join "\n"
         ohdr   = opts.fetch :header, []
+        query  = "--query=\"#{opts[:query]}\"" if opts[:query]
         header = ohdr.is_a?(Array) ? [:cani, *ohdr].map { |v| v.to_s.downcase }.join(':')
                                    : 'cani:' + ohdr.to_s
 
-        `echo "#{rows}" | fzf --ansi --header="[#{header}]"`.split '   '
+        `echo "#{rows}" | fzf --ansi --header="[#{header}]" #{query}`.split '   '
       else
         # when output of any initial command is being piped
         # print results and exit this command.
@@ -22,19 +23,21 @@ module Cani
     end
 
     def self.executable?
-      @exe ||= !system('fzf --version').nil?
+      @exe ||= system 'fzf --version > /dev/null 2>&1'
     end
 
     def self.feature_rows
-      @feature_rows ||= Cani.api.features.map do |ft|
-        pc = format('%.2f%%', ft.percent).rjust 6
-        cl = {'un' => :yellow, 'ot' => :magenta}.fetch ft.status, :green
-        tt = format('%-24s', ft.title.size > 24 ? ft.title[0..23].strip + '..'
-                                                : ft.title)
+      @feature_rows ||= Cani.api.features.map(&Fzf.method(:to_feature_row))
+    end
 
-        [{content: "[#{ft.status}]", color: cl}, pc,
-         {content: tt, color: :default}, *ft.current_support]
-      end
+    def self.to_feature_row(ft)
+      pc = format('%.2f%%', ft.percent).rjust 6
+      cl = {'un' => :yellow, 'ot' => :magenta}.fetch ft.status, :green
+      tt = format('%-24s', ft.title.size > 24 ? ft.title[0..23].strip + '..'
+                                              : ft.title)
+
+      [{content: "[#{ft.status}]", color: cl}, pc,
+       {content: tt, color: :default}, *ft.current_support]
     end
 
     def self.browser_rows

data/lib/cani/version.rb

@@ -1,3 +1,3 @@
 module Cani
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cani
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize