booker 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a33aad3cbed45ed09f6fa35f2046223dca0d5dd82fe15be7c49cb8aaa4c41d
-  data.tar.gz: 3054f0c7657e98c6c794b768ca9450992d3ee83b91526fc9cb88c5de6a4bc5ad
+  metadata.gz: 13dc462a7bedf194daa250fdd6fc0b7bdcc61374873c23fb3a03e48e73c5e287
+  data.tar.gz: bffeeb80575559e1404dd81543ab5b36a87fe74cb8e3c908495c5afb0196f0cd
 SHA512:
-  metadata.gz: e6ced499e2b20d75987fc8c538b95bfb5a9912549b49848c0b6e827bc3c5f8dd3aed72c17c585b5080d16c60a48832d57f6a829d5ebf465f9068969418dc4898
-  data.tar.gz: fb1a648048fbe579ae1cdaee106da02fc1dc345874119fa0ef846dbc1d0631e63dbec150c5509b66a325ecce991969acf369ce5b096b9571d4c97269294bb66a
+  metadata.gz: 11fc60dbe348abd38052010e3073f7ad524bc81b0aeb1017741f25a1a8b3108654443c91444c40d07d065907f9b59117768ab5f2e9923b3fbd529f335c5082c7
+  data.tar.gz: 130643b4c4920f03d273cdfde85955295ca6fd701031fffe6228aad52e26e8b5e7f11c784d6ad5f914371785ad321074e155fff2a5eab657030bb45a60671d9c

data/lib/booker/config.rb

@@ -71,7 +71,11 @@ module Booker
       def reset! = @default = nil
     end
 
-    def initialize
+    # quiet_missing is for --install, which is about to write the very file the
+    # warning would tell the user to go and create
+    def initialize(quiet_missing: false)
+      @quiet_missing = quiet_missing
+
       # the yaml file if there is one, and only work out the defaults when
       # there is not: discovery walks every chrome profile directory to answer
       # a question the config file has already answered
@@ -109,9 +113,11 @@ module Booker
       # #write emits symbol keys, so they have to be permitted on the way back
       YAML.safe_load_file(file, permitted_classes: [Symbol])
     rescue Errno::ENOENT
-      warn "Warning: ".yel +
-        "YAML configuration file couldn't be found. Using defaults."
-      warn "Suggest: ".grn + "booker --install config"
+      unless @quiet_missing
+        warn "Warning: ".yel +
+          "YAML configuration file couldn't be found. Using defaults."
+        warn "Suggest: ".grn + "booker --install config"
+      end
       false
     rescue Psych::Exception
       # every psych failure means the same thing here - an unusable config to

data/lib/booker/installer.rb

@@ -242,6 +242,13 @@ module Booker
       yield if block_given?
     end
 
+    # every target that touches the config is about to write it, so the
+    # missing-file warning would only tell the user to do what they are doing.
+    # its own instance rather than Config.default: that memo is shared with the
+    # rest of the run, and whichever caller built it first would decide whether
+    # the warning shows for everyone
+    def config = @config ||= Config.new(quiet_missing: true)
+
     def home
       ENV["HOME"] || "/usr/local"
     end
@@ -288,7 +295,7 @@ module Booker
           if selection == 0
             # User selected "ALL" - save array of all paths
             puts "Selected: ".yel + "All sources (#{bms.length} bookmark files)"
-            Config.default.write(:bookmarks, bms)
+            config.write(:bookmarks, bms)
             puts "Success: ".grn + "config file updated to search all bookmark sources"
           else
             save_bookmarks(bms[selection - 1], "config file updated with your bookmarks")
@@ -302,7 +309,7 @@ module Booker
 
     def save_bookmarks(selected, message)
       puts "Selected: ".yel + selected
-      Config.default.write(:bookmarks, selected)
+      config.write(:bookmarks, selected)
       puts "Success: ".grn + message
     end
 
@@ -316,7 +323,7 @@ module Booker
     end
 
     def install_config
-      Config.default.write
+      config.write
       puts "Success: ".grn + "example config file written to ~/.booker"
     rescue
       pexit "Failure: ".red + "could not write example config file to ~/.booker"

data/lib/booker/picker.rb

@@ -12,7 +12,10 @@ module Booker
   module Picker
     # --delimiter/--with-nth hide the id column: it is noise on screen, and
     # hiding it also takes it out of the match, so typing "2_" does not pull up
-    # every bookmark from the second source. --no-sort keeps booker's ordering.
+    # every bookmark from the second source. fzf ranks by match score, so a
+    # literal "sofa" beats s..o..f..a scattered across a long url, and
+    # --tiebreak=index keeps booker's ordering among equal scores (and for the
+    # empty query, which fzf never sorts).
     #
     # deliberately no --multi: under it fzf reads tab as "mark this and move
     # down" - the one key booker's own completion trained everybody to press -
@@ -25,7 +28,7 @@ module Booker
       "fzf",
       "--height=40%",
       "--reverse",
-      "--no-sort",
+      "--tiebreak=index",
       "--delimiter=\t",
       "--with-nth=2..",
       "--prompt=bookmark> "

data/lib/booker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Booker
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeremy Warner
@@ -13,16 +13,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.21'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.21'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.18
+rubygems_version: 4.0.23
 specification_version: 4
 summary: CLI bookmark manager for Chrome, Firefox, and Safari
 test_files: []