bunchcli 1.1.12 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eae5ef196f082cf2f09b09b42f91f5bfa2c87f023337483064549907aeb4c47
-  data.tar.gz: 76a96e232d5d94b12af6073a6c71d5dcd6f652cdeda6a5dad309b903f687deb1
+  metadata.gz: 3e569677c996de604f94399e8006421686b41ccbbaac882a1546d4d14a9d071c
+  data.tar.gz: eabee141d2bbc1dafc8014d6b6e30ef1bada5fc9ec15846509e2cca4c4a788e5
 SHA512:
-  metadata.gz: dce1d77092144c64ff53ad79dbfbf41ce4f669428b9ab9fbf4f9f751e9eb3e538037bf66ad97e50cce88ff95125d5768707f3617a28c4acdb577f9c9987063b4
-  data.tar.gz: 6a0f47f065fc2d3f1bdf8a562957e9c1bc31b035698abc263892a02877974b773e16694dfb2320a815170fa6aed267bfde581ed64da84653a2d78ff2d8da7dac
+  metadata.gz: 5404b8ca066959471a44057905bd1c3d379a6c23b464745b2a061ec93587a8ea6e92a006a7ce8d10bf6704b52bf8e8c9a2f970c8f0b6a9eb6fcc1c7ee22abbea
+  data.tar.gz: 89995c81e7256502f74aef2652076ffb6a29266353bdb89788ff568cd27b72410e2aff485a4bb174b8b4d57a2687d3627caa884ebe83fb26ca7677afd9cf725d

data/AUTHORS

@@ -0,0 +1 @@
+Brett Terpstra <me@brettterpstra.com>

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.1.13
+
+- Sort Bunches when listing and searching
+- Execute shortest match rather than first match
+
 ### 1.1.11pre
 
 - Fix for Terminal when checking for bundle id

data/bin/bunch

@@ -1,11 +1,19 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W1
+# frozen_string_literal: true
 
 require 'optparse'
 require 'bunch'
 
+def app_running?(app)
+  !`ps ax|grep -i "#{app}.app"|grep -v grep`.empty?
+end
+
+TARGET_APP = app_running?('Bunch Beta') ? 'Bunch Beta' : 'Bunch'
+TARGET_URL = TARGET_APP == 'Bunch Beta' ? 'x-bunch-beta' : 'x-bunch'
+
 def help
   puts "\nUsage: #{File.basename(__FILE__)} [options] BUNCH_NAME|PATH_TO_FILE"
-  puts "\nBunch names are case insensitive and will execute first match"
+  puts "\nBunch names are case insensitive and will execute shortest match"
   puts "Use 'bunch -h' to display options"
 end
 
@@ -52,20 +60,20 @@ optparse = OptionParser.new do |opts|
     bunch.variables = opt
   end
 
-  opts.on('--pref', 'Set a preference. Run without argument to list available preferences.') do |opt|
+  opts.on('--pref', 'Set a preference. Run without argument to list available preferences.') do
     bunch.url_method = 'setPref'
   end
 
-  opts.on('-u', '--url', 'Output URL instead of opening') do |_opt|
+  opts.on('-u', '--url', 'Output URL instead of opening') do
     bunch.show_url = true
   end
 
-  opts.on('-i','--interactive', 'Interactively generate a Bunch url') do |opt|
+  opts.on('-i', '--interactive', 'Interactively generate a Bunch url') do
     BunchURLGenerator.new.generate
     Process.exit 0
   end
 
-  opts.on('--show-config', 'Display all configuration values') do |opt|
+  opts.on('--show-config', 'Display all configuration values') do
     bunch.show_config
     Process.exit 0
   end
@@ -75,8 +83,10 @@ optparse = OptionParser.new do |opts|
     Process.exit 0
   end
 
-  opts.on('-f', '--force-refresh', 'Force refresh cached preferences') do |opt|
+  opts.on('-f', '--force-refresh', 'Force refresh cached preferences') do
     bunch.update_cache
+    warn 'Cache refreshed'
+    Process.exit 0
   end
 
   opts.on('-h', '--help', 'Display this screen') do |_opt|
@@ -93,14 +103,14 @@ end
 
 optparse.parse!
 
-unless ARGV.length > 0
-  if STDIN.stat.size > 0
+if ARGV.empty?
+  if $stdin.stat.size.positive?
     bunch.url_method = 'raw'
-    bunch.open(CGI.escape(STDIN.read))
+    bunch.open(CGI.escape($stdin.read))
   elsif bunch.url_method == 'setPref'
     bunch.list_preferences
   else
-    puts "CLI for Bunches.app"
+    puts 'CLI for Bunches.app'
     help
   end
 else

data/lib/bunch/bunchCLI.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Main Bunch CLI Class
 class Bunch
   include Util
   attr_writer :url_method, :fragment, :variables, :show_url
@@ -15,10 +18,10 @@ class Bunch
 
   def launch_if_needed
     pid = `ps ax | grep 'MacOS/Bunch'|grep -v grep`.strip
-    if pid == ""
-      `open -a Bunch`
-      sleep 2
-    end
+    return unless pid == ''
+
+    `open -a Bunch`
+    sleep 2
   end
 
   def update_cache
@@ -32,20 +35,19 @@ class Bunch
       'bunches' => bunches,
       'updated' => Time.now.strftime('%s').to_i
     }
-    File.open(target,'w') do |f|
+    File.open(target, 'w') do |f|
       f.puts YAML.dump(settings)
     end
-    return settings
+
+    settings
   end
 
   def get_cache
     target = File.expand_path(CACHE_FILE)
-    if File.exists?(target)
+    if File.exist?(target)
       settings = YAML.load(IO.read(target))
       now = Time.now.strftime('%s').to_i
-      if now - settings['updated'].to_i > CACHE_TIME
-        settings = update_cache
-      end
+      settings = update_cache if now - settings['updated'].to_i > CACHE_TIME
     else
       settings = update_cache
     end
@@ -55,14 +57,14 @@ class Bunch
   end
 
   def variable_query
-    vars = @variables.split(/,/).map { |v| v.strip }
+    vars = @variables.split(/,/).map(&:strip)
     query = []
-    vars.each { |v|
-      parts = v.split(/=/).map { |v| v.strip }
+    vars.each do |v|
+      parts = v.split(/=/).map(&:strip)
       k = parts[0]
       v = parts[1]
       query << "#{k}=#{CGI.escape(v)}"
-    }
+    end
     query
   end
 
@@ -72,11 +74,11 @@ class Bunch
     `osascript -e 'tell app "#{TARGET_APP}" to list bunches'`.strip.split(/,/).each do |b|
       b.strip!
       items.push(
-        path: File.join(bunch_dir, b + '.bunch'),
+        path: File.join(bunch_dir, "#{b}.bunch"),
         title: b
       )
     end
-    items
+    items.sort_by { |b| b[:title].downcase }
   end
 
   def bunch_dir
@@ -97,14 +99,16 @@ class Bunch
   end
 
   def url(bunch)
+    bunch = CGI.escape(bunch).gsub(/\+/, '%20')
     params = "&x-success=#{@success}" if @success
-    if url_method == 'file'
+    case url_method
+    when /file/
       %(#{TARGET_URL}://raw?file=#{bunch}#{params})
-    elsif url_method == 'raw'
+    when /raw/
       %(#{TARGET_URL}://raw?txt=#{bunch}#{params})
-    elsif url_method == 'snippet'
+    when /snippet/
       %(#{TARGET_URL}://snippet?file=#{bunch}#{params})
-    elsif url_method == 'setPref'
+    when /setPref/
       %(#{TARGET_URL}://setPref?#{bunch})
     else
       %(#{TARGET_URL}://#{url_method}?bunch=#{bunch}#{params})
@@ -122,30 +126,24 @@ class Bunch
   end
 
   def find_bunch(str)
-    found_bunch = false
+    matches = []
 
-    bunches.each do |bunch|
-      if bunch[:title].downcase =~ /.*?#{str}.*?/i
-        found_bunch = bunch
-        break
-      end
-    end
-    found_bunch
+    bunches.each { |bunch| matches.push(bunch) if bunch[:title].downcase =~ /.*?#{str}.*?/i }
+    matches.min_by(&:length)
   end
 
   def human_action
-    (url_method.gsub(/e$/, '') + 'ing').capitalize
+    "#{url_method.gsub(/e$/, '')}ing".capitalize
   end
 
   def list_preferences
-    prefs =<<EOF
-toggleBunches=[0,1]        Allow Bunches to be both opened and closed
-configDir=[path]           Absolute path to Bunches folder
-singleBunchMode=[0,1]      Close open Bunch when opening new one
-preserveOpenBunches=[0,1]  Restore Open Bunches on Launch
-debugLevel=[0-4]           Set the logging level for the Bunch Log
-EOF
-    puts prefs
+    puts <<~EOHELP
+      toggleBunches=[0,1]        Allow Bunches to be both opened and closed
+      configDir=[path]           Absolute path to Bunches folder
+      singleBunchMode=[0,1]      Close open Bunch when opening new one
+      preserveOpenBunches=[0,1]  Restore Open Bunches on Launch
+      debugLevel=[0-4]           Set the logging level for the Bunch Log
+    EOHELP
   end
 
 
@@ -153,39 +151,40 @@ EOF
     launch_if_needed
     # get front app
     front_app = %x{osascript -e 'tell application "System Events" to return name of first application process whose frontmost is true'}.strip
-    bid = bundle_id(front_app) rescue false
-    @success = bid if (bid)
+    bid = bundle_id(front_app) || false
+    @success = bid if bid
 
-    if @url_method == 'raw'
+    case @url_method
+    when /raw/
       warn 'Running raw string'
       if @show_url
         $stdout.puts url(str)
       else
         `open '#{url(str)}'`
       end
-    elsif @url_method == 'snippet'
-      _url = url(str)
+    when /snippet/
+      this_url = url(str)
       params = []
       params << "fragment=#{CGI.escape(@fragment)}" if @fragment
       params.concat(variable_query) if @variables
-      _url += '&' + params.join('&')
+      this_url += "&#{params.join('&')}" if params.length.positive?
       if @show_url
-        $stdout.puts _url
+        $stdout.puts this_url
       else
-        warn "Opening snippet"
-        `open '#{_url}'`
+        warn 'Opening snippet'
+        `open '#{this_url}'`
       end
-    elsif @url_method == 'setPref'
+    when /setPref/
       if str =~ /^(\w+)=([^= ]+)$/
-        _url = url(str)
+        this_url = url(str)
         if @show_url
-          $stdout.puts _url
+          $stdout.puts this_url
         else
           warn "Setting preference #{str}"
-          `open '#{_url}'`
+          `open '#{this_url}'`
         end
       else
-        warn "Invalid key=value pair"
+        warn 'Invalid key=value pair'
         Process.exit 1
       end
     else
@@ -193,30 +192,28 @@ EOF
       params = []
       params << "fragment=#{CGI.escape(@fragment)}" if @fragment
       params.concat(variable_query) if @variables
-      unless bunch
-        if File.exists?(str)
-          @url_method = 'file'
-          _url = url(str)
-          _url += '&' + params.join('&') if params.length
-          if @show_url
-            $stdout.puts _url
-          else
-            warn "Opening file"
-            `open '#{_url}'`
-          end
+      if bunch
+        this_url = url(bunch[:title])
+        this_url += "&#{params.join('&')}" if params.length
+        if @show_url
+          $stdout.puts this_url
         else
-          warn 'No matching Bunch found'
-          Process.exit 1
+          warn "#{human_action} #{bunch[:title]}"
+          `open '#{this_url}'`
         end
-      else
-        _url = url(bunch[:title])
-        _url += '&' + params.join('&') if params.length
+      elsif File.exist?(str)
+        @url_method = 'file'
+        this_url = url(str)
+        this_url += "&#{params.join('&')}" if params.length
         if @show_url
-          $stdout.puts _url
+          $stdout.puts this_url
         else
-          warn "#{human_action} #{bunch[:title]}"
-          `open '#{_url}'`
+          warn 'Opening file'
+          `open '#{this_url}'`
         end
+      else
+        warn 'No matching Bunch found'
+        Process.exit 1
       end
     end
     # attempt to restore front app
@@ -229,7 +226,7 @@ EOF
     puts output
   end
 
-  def show_config(key=nil)
+  def show_config(key = nil)
     case key
     when /(folder|dir)/
       puts bunch_dir
@@ -240,10 +237,8 @@ EOF
     else
       puts "Bunches Folder: #{bunch_dir}"
       puts "Default URL Method: #{url_method}"
-      puts "Cached Bunches"
-      bunches.each {|b|
-        puts "    - #{b[:title]}"
-      }
+      puts 'Cached Bunches'
+      bunches.each { |b| puts "    - #{b[:title]}" }
     end
   end
 end

data/lib/bunch/url_generator.rb

@@ -15,25 +15,31 @@ end
 module Util
   def bundle_id(app)
     shortname = app.sub(/\.app$/, '')
-    apps = `mdfind -onlyin /Applications -onlyin /Applications/Setapp -onlyin /Applications/Utilities -onlyin ~/Applications -onlyin /Developer/Applications -onlyin /System/Applications 'kMDItemKind==Application'`
+    app_dirs = [
+      '/Applications',
+      '/Applications/Setapp',
+      '/Applications/Utilities',
+      '~/Applications',
+      '/Developer/Applications',
+      '/System/Applications'
+    ]
+    only_in = app_dirs.map { |dir| "-onlyin #{dir}" }.join(' ')
+    apps = `mdfind #{only_in} 'kMDItemKind==Application'`
 
-    return false if !apps || apps.strip.length == 0
+    return false if !apps || apps.strip.empty?
 
     foundapps = apps.split(/\n/).select! { |line| line.chomp =~ /#{shortname}\.app$/i }
 
-    if foundapps.length > 0
-      foundapp = foundapps[0]
-    else
-      return false
-    end
+    return false if foundapps.empty?
+
+    foundapp = foundapps[0]
 
     if foundapp
-      bid = `mdls -name kMDItemCFBundleIdentifier -r "#{foundapp}"`.chomp
+      `mdls -name kMDItemCFBundleIdentifier -r "#{foundapp}"`.chomp
     else
       # warn "Could not locate bundle id for #{shortname}, using provided app name"
-      bid = app
+      app
     end
-    bid
   end
 end
 
@@ -80,10 +86,43 @@ module Prompt
     lines.join("\n").chomp
   end
 
+  def yn(question, default_response: false)
+    default = default_response || 'n'
+
+    # if this isn't an interactive shell, answer default
+    return default.downcase == 'y' unless $stdout.isatty
+
+    # clear the buffer
+    if ARGV&.length
+      ARGV.length.times do
+        ARGV.shift
+      end
+    end
+    system 'stty cbreak'
+
+    options = if default
+                default =~ /y/i ? '[Y/n]' : '[y/N]'
+              else
+                '[y/n]'
+              end
+
+    $stdout.syswrite "#{question.sub(/\?$/, '')} #{options}? "
+    res = $stdin.sysread 1
+    puts
+    system 'stty cooked'
+
+    res.chomp!
+    res.downcase!
+
+    res = default.downcase if res == ''
+
+    res =~ /y/i
+  end
+
   def url_encode_text
     text = get_text
     puts
-    CGI.escape(text)
+    CGI.escape(text).gsub(/\+/, '%20')
   end
 end
 
@@ -109,17 +148,17 @@ class Menu
 
   def choose(query = 'Select an item')
     throw 'No items initialized' if @items.nil?
-    STDERR.puts
-    STDERR.puts "┌#{("─" * 74)}┐"
-    intpad = Math::log10(@items.length).to_i + 1
+    $stderr.puts
+    warn "┌#{'─' * 74}┐"
+    intpad = Math.log10(@items.length).to_i + 1
     @items.each_with_index do |item, idx|
-      idxstr = "%#{intpad}d" % (idx + 1)
+      idxstr = format("%#{intpad}d", idx + 1)
       line = "#{idxstr}: #{item.title}"
       pad = 74 - line.length
-      STDERR.puts "│#{line}#{" " * pad}│"
+      warn "│#{line}#{' ' * pad}│"
     end
-    STDERR.puts "└┤ #{query} ├#{"─" * (70 - query.length)}┘"
-    sel = choose_number("> ", @items.length)
+    warn "└┤ #{query} ├#{'─' * (70 - query.length)}┘"
+    sel = choose_number('> ', @items.length)
     sel ? @items[sel.to_i - 1] : nil
   end
 end
@@ -130,13 +169,13 @@ class Snippet
   def initialize(file)
     if File.exist?(File.expand_path(file))
       @contents = IO.read(File.expand_path(file))
-      @fragments = fragments
+      @fragments = find_fragments
     else
-      throw ('Tried to initialize snippet with invalid file')
+      throw 'Tried to initialize snippet with invalid file'
     end
   end
 
-  def fragments
+  def find_fragments
     rx = /(?i-m)(?:[-#]+)\[([\s\S]*?)\][-# ]*\n([\s\S]*?)(?=\n(?:-+\[|#+\[|$))/
     matches = @contents.scan(rx)
     fragments = {}
@@ -167,6 +206,7 @@ class BunchFinder
 
   def initialize
     config_dir = `osascript -e 'tell app "#{TARGET_APP}" to get preference "Folder"'`.strip
+    config_dir.sub!(%r{^file://}, '')
     config_dir = File.expand_path(config_dir)
     if File.directory?(config_dir)
       @config_dir = config_dir
@@ -177,10 +217,8 @@ class BunchFinder
 
   def bunches_to_items
     items = []
-    `osascript -e 'tell app "#{TARGET_APP}" to list bunches'`.strip.split(/,/).each do |b|
-      filename = b.strip
-      items << MenuItem.new(filename, filename, filename)
-    end
+    bunches = `osascript -e 'tell app "#{TARGET_APP}" to list bunches'`.strip.split(/,/).map(&:strip)
+    bunches.sort_by(&:downcase).each { |b| items << MenuItem.new(b, b, b) }
     items
   end
 
@@ -307,8 +345,15 @@ class BunchURLGenerator
       parameters << ['x-delay', delay.to_s] if delay =~ /^\d+$/
     end
 
-    query_string = parameters.map { |param| "#{param[0]}=#{param[1]}" }.join('&')
+    query_string = parameters.map { |param| "#{param[0]}=#{param[1].gsub(/\+/, '%20')}" }.join('&')
+    full_url = "#{url}?#{query_string}".strip
 
-    puts url + '?' + query_string
+    res = yn('Copy URL to clipboard')
+    if res
+      `echo '#{full_url}'|tr -d '\n'|pbcopy`
+      warn 'Copied to clipboard'
+    else
+      puts full_url
+    end
   end
 end

data/lib/bunch/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BunchCLI
-  VERSION = "1.1.12"
+  VERSION = '1.1.14'
 end

data/lib/bunch.rb

@@ -1,10 +1,7 @@
 CACHE_TIME = 86400 #seconds, 1 day = 86400
 CACHE_FILE = "~/.bunch_cli_cache"
-TARGET_APP = "Bunch"
 
-TARGET_URL = TARGET_APP == 'Bunch Beta' ? 'x-bunch-beta' : 'x-bunch'
-
-require "bunch/version"
+require 'bunch/version'
 require 'yaml'
 require 'cgi'
 require 'bunch/url_generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchcli
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.14
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2022-07-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- AUTHORS
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt