booker 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7951b5a4c5802dd8cd01774cd94908d9ba86aa9e1f75db34d1a59b7eed3e66ca
-  data.tar.gz: b46ae04d09adc03b98346a5d9b502bc617179a266282a68fe7f9709c4e928ade
+  metadata.gz: 072d423925a81f2c79870c6019e99615906fdca3391ce795abc80bac49e4688b
+  data.tar.gz: e01d49d23c0f36282e387c7b2391c225dde73c0aaa5d6106765296e6f0b333e2
 SHA512:
-  metadata.gz: c9c0e5d85e201beeeb7ca9c091f3cfeeaa2c27da3200726f783f662cc87fb51a5007a51b54999b9d6442b102b1be6fea80b4b4c33d84af015705e35fd28b69f5
-  data.tar.gz: 656c7251b8e6b03d1e1a9a60823504cbdea2ec8c076c9afb0700895ae7db70fb89dc85338bad4d97750815b987188495df686d22e69efbbfb2993db19c90efd2
+  metadata.gz: d5facfef0a12be688be4960b4f76f982765870239a43ca1ea1197fcad4c8225d33bea1e14521bd556219d5b6b0ae51f0083ece20f405f53d9fec438e62f69722
+  data.tar.gz: 2b01bbb94d2a50d124b31fd42289f4d2ab24155d333fccc0c96b14f0cc2898dd7823d8cba881f5eaa48b778d13df7c4c48a50f9e79420ce9b166919ce5e3f56d

data/lib/booker.rb

@@ -2,6 +2,7 @@
 require "yaml"
 require "find"
 require "json"
+require "optparse"
 require "shellwords"
 require "fileutils"
 require_relative "bookmarks"
@@ -10,7 +11,7 @@ require_relative "consts"
 
 # get booker opening command
 class Booker
-  @version = "1.2.1"
+  @version = "1.3.0"
   @@version = @version
 
   class << self
@@ -24,53 +25,70 @@ class Booker
   end
 
   def parse(args)
-    # no args given, show interactive bookmark selector
     show_bookmarks if args.none?
 
-    # if arg starts with hyphen, parse option
-    parse_opt args if /^-.*/.match?(args.first)
-
-    # separate bookmark IDs from other args
-    bookmark_ids = []
-    other_args = []
-
-    args.each do |arg|
-      if /^[0-9_]+$/.match?(arg)  # bookmark ID (digits or underscore)
-        bookmark_ids << arg
-      else
-        other_args << arg
-      end
+    if args.first&.start_with?("-")
+      dispatch_option(args)
+      exit 0
     end
 
-    # open all bookmarks first
-    unless bookmark_ids.empty?
-      open_bookmark bookmark_ids
-    end
+    bookmark_ids, other_args = args.partition { |a| /^[0-9_]+$/.match?(a) }
+    open_bookmark(bookmark_ids) unless bookmark_ids.empty?
 
-    # then handle remaining args
     unless other_args.empty?
       if other_args.length == 1 && domain.match(other_args.first)
-        # single website URL
         puts "opening website: ".grn + other_args.first
         openweb(prep(other_args.first))
       else
-        # search for the rest
         open_search(other_args.join(" ").strip)
       end
     end
   end
 
-  def pexit(msg, sig)
-    puts msg
-    exit sig
+  def option_parser
+    @option_parser ||= OptionParser.new do |opts|
+      opts.banner = "Usage: booker [options] [arguments]"
+      opts.separator ""
+      opts.separator "Main options:"
+      opts.on("-b", "--bookmark", "explicitly open bookmark") { @mode = :bookmark }
+      opts.on("-i", "--install", "install: all|bookmarks|completion|config|safari") { @mode = :install }
+      opts.on("-s", "--search", "explicitly search arguments") { @mode = :search }
+      opts.separator ""
+      opts.separator "Other options:"
+      opts.on("-c", "--complete", "show tab completions") { @mode = :complete }
+      opts.on("-v", "--version", "print version") {
+        puts @@version
+        exit 0
+      }
+      opts.on_tail("-h", "--help", "show help") {
+        puts opts
+        exit 0
+      }
+    end
   end
 
-  def helper
-    pexit HELP_BANNER, 0
+  def dispatch_option(args)
+    option_parser.parse!(args)
+
+    case @mode
+    when :bookmark
+      pexit "Error: ".red + "booker --bookmark expects bookmark id", 1 if args.empty?
+      open_bookmark(args)
+    when :install
+      args.empty? ? install(%w[completion config bookmarks]) : install(args)
+    when :search
+      pexit "Error: ".red + "--search requires an argument", 1 if args.empty?
+      open_search(args.join(" "))
+    when :complete
+      Bookmarks.new(args.join(" ")).autocomplete
+    end
+  rescue OptionParser::InvalidOption => e
+    pexit "Error: ".red + e.message, 1
   end
 
-  def version
-    pexit @@version, 0
+  def pexit(msg, sig)
+    puts msg
+    exit sig
   end
 
   def openweb(url)
@@ -153,66 +171,24 @@ class Booker
     exit 0
   end
 
-  # parse and execute any command line options
-  def parse_opt(args)
-    valid_opts = %w[--version -v --install -i --help -h
-      --complete -c --bookmark -b --search -s]
-
-    nextarg = args.shift
-    errormsg = "Error: ".red + "unrecognized option #{nextarg}"
-    pexit errormsg, 1 if !(valid_opts.include? nextarg)
-
-    # forced bookmarking
-    if nextarg == "--bookmark" || nextarg == "-b"
-      if args.first.nil?
-        pexit "Error: ".red + "booker --bookmark expects bookmark id", 1
-      else
-        open_bookmark args
-      end
-    end
-
-    # autocompletion
-    if nextarg == "--complete" || nextarg == "-c"
-      allargs = args.join(" ")
-      bm = Bookmarks.new(allargs)
-      bm.autocomplete
-    end
-
-    # installation
-    if nextarg == "--install" || nextarg == "-i"
-      if !args.empty?
-        install(args)
-      else # do everything
-        install(%w[completion config bookmarks])
-      end
-    end
-
-    # forced searching
-    if nextarg == "--search" || nextarg == "-s"
-      pexit "--search requires an argument", 1 if args.empty?
-      allargs = args.join(" ")
-      open_search allargs
-    end
-
-    # print version information
-    version if nextarg == "--version" || nextarg == "-v"
-
-    # needs some help
-    helper if nextarg == "--help" || nextarg == "-h"
-
-    exit 0 # dont parse_arg
-  end # parse_opt
-
   def install(args)
     target = args.shift
     exit 0 if target.nil?
 
+    # 'all' expands to the full install list (including opt-in safari)
+    if /^all$/i.match?(target)
+      args = %w[completion config bookmarks safari] + args
+      target = args.shift
+    end
+
     if /comp/i.match?(target) # completion installation
       install_completion
     elsif /book/i.match?(target) # bookmarks installation
       install_bookmarks
     elsif /conf/i.match?(target) # default config file generation
       install_config
+    elsif /safari/i.match?(target) # opt-in Safari FDA setup (macOS only)
+      install_safari
     else # unknown argument passed into install
       pexit "Failure: ".red + "unknown installation option (#{target})", 1
     end
@@ -292,7 +268,7 @@ class Booker
 
   def install_bookmarks
     # locate bookmarks file, show user, write to config?
-    puts "searching for chrome and firefox bookmarks..."
+    puts "searching for browser bookmarks..."
     begin
       bms = [] # look for bookmarks with type info
 
@@ -333,14 +309,17 @@ class Booker
         end
       end
 
+      # Search for Safari bookmarks (macOS only)
+      safari_path = File.join(ENV["HOME"], "Library/Safari/Bookmarks.plist")
+      bms << {path: safari_path, type: :safari} if File.exist?(safari_path)
+
       if bms.empty? # no bookmarks found
         puts "Failure: ".red + "bookmarks file could not be found."
         raise
       elsif bms.length == 1
         # Auto-select if only one source found
         selected = bms.first[:path]
-        type_label = (bms.first[:type] == :chrome) ? "[Chrome]" : "[Firefox]"
-        puts "Found bookmark source: #{type_label} #{selected}".yel
+        puts "Found bookmark source: #{bookmark_type_label(bms.first[:type])} #{selected}".yel
         puts "Selected: ".yel + selected
         BConfig.new.write(:bookmarks, selected)
         puts "Success: ".grn + "config file updated with your bookmarks"
@@ -352,8 +331,7 @@ class Booker
         offset = 1
 
         bms.each_with_index do |bm, i|
-          type_label = (bm[:type] == :chrome) ? "[Chrome]".yel : "[Firefox]".blu
-          puts (i + offset).to_s.grn + " - " + type_label + " " + bm[:path]
+          puts (i + offset).to_s.grn + " - " + bookmark_type_label(bm[:type], color: true) + " " + bm[:path]
         end
 
         input = gets
@@ -381,6 +359,17 @@ class Booker
     end
   end
 
+  def bookmark_type_label(type, color: false)
+    label = {chrome: "[Chrome]", firefox: "[Firefox]", safari: "[Safari]"}[type] || "[?]"
+    return label unless color
+    case type
+    when :chrome then label.yel
+    when :firefox then label.blu
+    when :safari then label.cyan
+    else label
+    end
+  end
+
   def parse_firefox_profiles(ini_path, firefox_base)
     profiles = []
     current_profile = {}
@@ -420,4 +409,75 @@ class Booker
   rescue
     pexit "Failure: ".red + "could not write example config file to ~/.booker", 1
   end
+
+  # Opt-in Safari setup: walks through granting Full Disk Access so booker
+  # can read ~/Library/Safari/Bookmarks.plist. Not included in the default
+  # --install flow because it requires a TCC permission grant.
+  def install_safari
+    plist = File.join(ENV["HOME"], "Library/Safari/Bookmarks.plist")
+    fda_url = "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles"
+
+    unless RUBY_PLATFORM.include?("darwin")
+      puts "Skip: ".yel + "Safari support is macOS-only."
+      return
+    end
+
+    unless File.exist?(plist)
+      puts "Skip: ".yel + "Safari bookmarks not found at #{plist}"
+      puts "Hint: ".grn + "launch Safari at least once, then re-run."
+      return
+    end
+
+    if safari_readable?(plist)
+      puts "PASS: ".grn + "Safari bookmarks are already readable."
+      return
+    end
+
+    puts "Safari stores bookmarks at:"
+    puts "  #{plist}".cyan
+    puts
+    puts "That file is protected by macOS TCC. Grant Full Disk Access to one of:"
+    puts
+    puts "  [A] ".cyan + "Your terminal app".yel + " (simplest; inherited by any tool)"
+    puts "  [B] ".cyan + "/usr/bin/plutil only".yel + " (narrower scope)"
+    puts
+    print "Pick [A] or [B] (default A): "
+    $stdout.flush
+    choice = $stdin.gets.to_s.strip.upcase
+    choice = "A" if choice.empty?
+    pexit "Error: ".red + "invalid choice.", 1 unless %w[A B].include?(choice)
+
+    puts
+    puts "Opening the Full Disk Access pane..."
+    system("open", fda_url)
+    puts
+
+    puts "In the pane that just opened:"
+    if choice == "A"
+      puts "  1. Click ".yel + "+".cyan + ", add your terminal app from /Applications"
+      puts "  2. Toggle it ".yel + "on".cyan
+      puts "  3. ".yel + "Fully quit".cyan + " the terminal (Cmd+Q), reopen it,"
+      puts "     and re-run ".yel + "booker --install safari".cyan + " to verify."
+    else
+      puts "  1. Click ".yel + "+".cyan
+      puts "  2. Press ".yel + "Cmd+Shift+G".cyan + " (opens 'Go to Folder')".yel
+      puts "  3. Type ".yel + "/usr/bin/plutil".cyan + " and press Return".yel
+      puts "  4. Click ".yel + "Open".cyan + ", then toggle it ".yel + "on".cyan
+      puts
+      print "Press Return once you've added plutil and toggled it on... "
+      $stdout.flush
+      $stdin.gets
+
+      if safari_readable?(plist)
+        puts "PASS: ".grn + "Safari bookmarks are now readable."
+      else
+        puts "FAIL: ".red + "still can't read the bookmarks file."
+        puts "Try fully quitting the terminal (Cmd+Q) and re-running."
+      end
+    end
+  end
+
+  def safari_readable?(plist)
+    system("plutil", "-lint", "-s", plist, out: File::NULL, err: File::NULL)
+  end
 end

data/lib/bookmarks.rb

@@ -216,31 +216,138 @@ class FirefoxBookmarkParser < BookmarkParser
   end
 end
 
+# Safari bookmark parser (binary plist format)
+class SafariBookmarkParser < BookmarkParser
+  def parse
+    xml = convert_plist_to_xml(@file_path)
+    return if xml.nil?
+
+    begin
+      require "rexml/document"
+      doc = REXML::Document.new(xml)
+      plist_el = doc.root
+      root_node = plist_el.elements.to_a.first
+      root = parse_node(root_node)
+    rescue => e
+      puts "Warning: ".yel + "Could not parse Safari bookmarks: #{e.message}"
+      return
+    end
+
+    walk(root, "|")
+  end
+
+  private
+
+  def convert_plist_to_xml(path)
+    contents = File.read(path)
+    # Already an XML plist (fixtures, non-macOS). Binary plists need plutil
+    # (macOS-only); the JSON converter rejects <data>/<date> fields, so xml1.
+    return contents if contents.start_with?("<?xml") || contents.include?("<plist")
+
+    output = IO.popen(["plutil", "-convert", "xml1", "-o", "-", path], err: File::NULL, &:read)
+    return output if $?.success?
+
+    puts "Warning: ".yel + "Could not read Safari bookmarks file."
+    puts "Suggest: ".grn + "grant terminal 'Full Disk Access' in System Settings"
+    nil
+  rescue Errno::ENOENT
+    puts "Warning: ".yel + "Safari bookmarks file not found."
+    nil
+  end
+
+  def parse_node(el)
+    case el.name
+    when "dict"
+      result = {}
+      children = el.elements.to_a
+      children.each_slice(2) do |key_el, val_el|
+        next if key_el.nil? || val_el.nil?
+        result[key_el.text.to_s] = parse_node(val_el)
+      end
+      result
+    when "array"
+      el.elements.map { |c| parse_node(c) }
+    when "string"
+      el.text.to_s
+    when "integer"
+      el.text.to_i
+    when "real"
+      el.text.to_f
+    when "true"
+      true
+    when "false"
+      false
+    when "data", "date"
+      el.text.to_s
+    end
+  end
+
+  def walk(node, folder_title)
+    children = node["Children"]
+    return unless children.is_a?(Array)
+
+    children.each do |child|
+      case child["WebBookmarkType"]
+      when "WebBookmarkTypeLeaf"
+        parse_leaf(folder_title, child)
+      when "WebBookmarkTypeList"
+        name = child["Title"].to_s
+        sub_title = folder_title + name.gsub(/[:,'"]/, "-").downcase + "/"
+        walk(child, sub_title)
+      end
+    end
+  end
+
+  def parse_leaf(folder, leaf)
+    uri = leaf["URIDictionary"] || {}
+    title = (uri["title"] || "").to_s
+    url = (leaf["URLString"] || "").to_s
+    id = (leaf["WebBookmarkUUID"] || "").to_s
+
+    values = [folder, title, url, id]
+    if matches_search?(values)
+      @allurls << Bookmark.new(folder, title, url, id)
+    end
+  end
+end
+
 # Main Bookmarks facade class
 class Bookmarks
+  PARSER_SOURCE = {
+    ChromeBookmarkParser => "chrome",
+    FirefoxBookmarkParser => "firefox",
+    SafariBookmarkParser => "safari"
+  }
+
   def initialize(search_term = "")
     @conf = BConfig.new
-    file_paths = @conf.bookmarks  # Now returns an array
+    file_paths = @conf.bookmarks
     @allurls = []
+    seen = {}
+
+    loaded_sources = file_paths.count { |p| p && File.exist?(p) }
+    @multi_source = loaded_sources > 1
 
-    # Parse bookmarks from all sources
     file_paths.each_with_index do |file_path, source_index|
       next unless file_path && File.exist?(file_path)
 
       parser_class = detect_parser(file_path)
+      source = PARSER_SOURCE[parser_class]
       parser = parser_class.new(file_path, search_term)
       parser.parse
 
-      # Merge results, prefixing IDs to ensure uniqueness across sources
       parser.results.each do |bookmark|
-        # Create unique ID: source_index + original_id
-        unique_bookmark = Bookmark.new(
+        key = [bookmark.title, bookmark.url]
+        next if seen[key]
+        seen[key] = true
+
+        @allurls << Bookmark.new(
           bookmark.folder,
           bookmark.title,
           bookmark.url,
-          "#{source_index}_#{bookmark.id}"
+          "#{source_index}_#{bookmark.id}",
+          source
         )
-        @allurls << unique_bookmark
       end
     end
   end
@@ -260,8 +367,9 @@ class Bookmarks
     folder = url.folder.gsub(/^\|/, "")
     folder = (folder == "/") ? "[root]" : folder.chomp("/")
 
-    # Format: folder | title
-    name = folder + " |" + url.title.gsub(/[^a-z0-9\-\/_ ]/i, "")
+    # Format: [source] folder | title (source only when multi-source)
+    prefix = (@multi_source && url.source) ? "[#{url.source}] " : ""
+    name = prefix + folder + " | " + url.title.gsub(/[^a-z0-9\-\/_ ]/i, "")
     name.squeeze!("-")
     name.squeeze!(" ")
     # Use half terminal width for name to leave room for URL
@@ -290,6 +398,8 @@ class Bookmarks
   def detect_parser(file_path)
     if file_path&.end_with?(".sqlite")
       FirefoxBookmarkParser
+    elsif file_path&.end_with?(".plist")
+      SafariBookmarkParser
     else
       ChromeBookmarkParser
     end
@@ -314,11 +424,12 @@ end
 
 # clean bookmark title, set attrs
 class Bookmark
-  attr_reader :title, :folder, :url, :id
-  def initialize(f, t, u, id)
+  attr_reader :title, :folder, :url, :id, :source
+  def initialize(f, t, u, id, source = nil)
     @title = t.gsub(/[:'"+]/, " ").downcase
     @folder = f
     @url = u
     @id = id
+    @source = source
   end
 end

data/lib/config.rb

@@ -77,7 +77,7 @@ class BConfig
   end
 
   def detect_default_bookmarks
-    # Return ALL available bookmark sources (both Chrome and Firefox)
+    # Return ALL available bookmark sources (Chrome, Firefox, Safari)
     all_sources = discover_all_bookmark_sources
 
     # If we found sources, return them all; otherwise return a default single path
@@ -140,6 +140,9 @@ class BConfig
       end
     end
 
+    safari_path = HOME + "/Library/Safari/Bookmarks.plist"
+    sources << safari_path if File.exist?(safari_path)
+
     sources.uniq
   end
 

data/lib/consts.rb

@@ -2,21 +2,6 @@
 
 # todo - wrap in module
 
-HELP_BANNER = <<~EOS
-  Open browser:
-      $ booker [option] [arguments]
-  
-  Main options:
-      --bookmark, -b: explicity open bookmark
-       --install, -i: install [bookmarks, completion, config]
-        --search, -s: explicity search arguments
-  
-  Others:
-      --complete, -c: show tab completions
-       --version, -v: print version
-          --help, -h: show help
-EOS
-
 DEF_CONFIG = <<~EOS
   ---
   :searcher:  https://google.com/search?q=
@@ -78,8 +63,8 @@ COMPLETION = <<~EOS
           '(--bookmark)--bookmark[do bookmark completion]'\
           '(-c)-c[show bookmark completions]'\
           '(--complete)--complete[show bookmark completions]'\
-          '(-i)-i[perform installations (bookmarks, completion, config)]'\
-          '(--install)--install[perform installations (bookmarks, completion, config)]'\
+          '(-i)-i[perform installations (all, bookmarks, completion, config, safari)]'\
+          '(--install)--install[perform installations (all, bookmarks, completion, config, safari)]'\
           '(-s)-s[search google for...]'\
           '(--search)--search[search google for...]'\
           '(-h)-h[show booker help]'\

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremy Warner
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,11 +65,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: |2
       Search, browse, and open bookmarks from the command line. Supports Chrome,
-      Chromium, and Firefox. Browse all bookmarks interactively, or search by
-      keyword. ZSH users get tab completion through bookmark matches. Can also
-      open websites directly or search with your preferred search engine.
+      Chromium, Firefox, and Safari. Browse all bookmarks interactively, or
+      search by keyword. ZSH users get tab completion through bookmark matches.
+      Can also open websites directly or search with your preferred search
+      engine.
 email: jeremywrnr@gmail.com
 executables:
 - booker
@@ -87,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 4.0.8
 specification_version: 4
-summary: CLI bookmark manager for Chrome and Firefox
+summary: CLI bookmark manager for Chrome, Firefox, and Safari
 test_files: []