bunchcli 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010c20799d4e9e35409737ee3dfd5e3a755096ff212eb9a02787dfcee16dc5e2
-  data.tar.gz: daccb516131e6816f4ea5cd153e14df691e3089600e77114e1755cf502efe131
+  metadata.gz: 85429d178706578f82263c19457bf79b369efee746ac17172e1b065c6fb4a1eb
+  data.tar.gz: 12dc65b8c0c8c3b86c3ef050c30e4aa756b8596ca0388d4c4c89b1bdf0db3beb
 SHA512:
-  metadata.gz: b9f94711eadea1d3cf6cd3ebef2244663cc793b1dc3bd121ac2bb1409431c24215d03b172db13d76966143529c99578bfce000bebbba89dbbf16410d1653ab93
-  data.tar.gz: 2923722c6988c146be4eaa19b20b732413eb95fad52c890a0bd47165e50a61e576042d4934d376a6f5ed992723f5d843ee645b3eaa7eb10cdb677628f996ce99
+  metadata.gz: b38da1ccef956f64112c4aa70f2f195b9200f134cf7415d7ed5651e93719acb2d289462b171d61ff7573566467b6804b0039f27ed681fbaf56e758c0428b713b
+  data.tar.gz: 57de9a2b54ad9f6de4bc9328c1badd2342e1b7c8ac6683d3aa4ef4a098d9fcdd03f6d6d01bf1b99b49faad27c4b675793256bbcf22c864d901a2bf6f57e64d07

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 1.1.5
+
+- Add some color to the interactive URL generator
+
+### 1.1.4
+
+- Add `--show-config-key KEY` query for specific keys (dir, toggle, method)
+
+### 1.1.3
+
+- Add --prefs option
+
+### 1.1.2
+
+- Allow app name in x-success if bundle id can't be found
+
+### 1.1
+
+- Add interactive URL builder
+- Snippet handling
+
 ### 1.0
 
 - Initial release

data/Gemfile

@@ -4,3 +4,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
+gem 'term-colorizer'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    bunchcli (1.0.0)
+    bunchcli (1.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     rake (12.3.3)
+    term-colorizer (0.2.1)
 
 PLATFORMS
   x86_64-darwin-19
@@ -14,6 +15,7 @@ PLATFORMS
 DEPENDENCIES
   bunchcli!
   rake (~> 12.0)
+  term-colorizer
 
 BUNDLED WITH
    2.2.4

data/README.md

@@ -10,14 +10,21 @@ A CLI for [Bunch.app](https://brettterpstra.com/projects/bunch).
 
     $ bunch -h  
     CLI for Bunch.app
-    -h, --help                       Display this screen
-    -f, --force-refresh              Force refresh cached preferences
     -l, --list                       List available Bunches
+    -s, --show BUNCH                 Show contents of Bunch
     -o, --open                       Open Bunch ignoring "Toggle Bunches" preference
     -c, --close                      Close Bunch ignoring "Toggle Bunches" preference
     -t, --toggle                     Toggle Bunch ignoring "Toggle Bunches" preference
-    -s, --show BUNCH                 Show contents of Bunch
+        --snippet                    Load as snippet
+        --fragment=FRAGMENT          Run a specific section
+        --vars=VARS                  Variables to pass to a snippet, comma-separated
+        --pref                       Set a preference. Run without argument to list available preferences.
+    -u, --url                        Output URL instead of opening
+    -i, --interactive                Interactively generate a Bunch url
         --show-config                Display configuration values
+    -f, --force-refresh              Force refresh cached preferences
+    -h, --help                       Display this screen
+    -v, --version                    Display Bunch version
 
 Usage: `bunch [options] BUNCH_NAME|PATH_TO_FILE`
 

data/bin/bunch

@@ -6,12 +6,17 @@ require '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 "Use 'bunch -h' to display options"
+end
+
+def version
+  puts "Bunch CLI v#{BunchCLI::VERSION}"
 end
 
 bunch = Bunch.new
 
 optparse = OptionParser.new do |opts|
-  opts.banner = 'CLI for Bunch.app'
+  opts.banner = "CLI for Bunch.app v#{BunchCLI::VERSION}"
 
   opts.on('-l', '--list', 'List available Bunches') do |_opt|
     bunch.list_bunches
@@ -47,6 +52,10 @@ optparse = OptionParser.new do |opts|
     bunch.variables = opt
   end
 
+  opts.on('--pref', 'Set a preference. Run without argument to list available preferences.') do |opt|
+    bunch.url_method = 'setPref'
+  end
+
   opts.on('-u', '--url', 'Output URL instead of opening') do |_opt|
     bunch.show_url = true
   end
@@ -56,11 +65,16 @@ optparse = OptionParser.new do |opts|
     Process.exit 0
   end
 
-  opts.on('--show-config', 'Display configuration values') do |opt|
+  opts.on('--show-config', 'Display all configuration values') do |opt|
     bunch.show_config
     Process.exit 0
   end
 
+  opts.on('--show-config-key KEY', 'Display a config value [dir, toggle, method]') do |opt|
+    bunch.show_config(opt)
+    Process.exit 0
+  end
+
   opts.on('-f', '--force-refresh', 'Force refresh cached preferences') do |opt|
     bunch.update_cache
   end
@@ -70,6 +84,11 @@ optparse = OptionParser.new do |opts|
     help
     Process.exit 0
   end
+
+  opts.on('-v', '--version', 'Display Bunch version') do |_opt|
+    version
+    Process.exit 0
+  end
 end
 
 optparse.parse!
@@ -78,6 +97,8 @@ unless ARGV.length > 0
   if STDIN.stat.size > 0
     bunch.url_method = 'raw'
     bunch.open(CGI.escape(STDIN.read))
+  elsif bunch.url_method == 'setPref'
+    bunch.list_preferences
   else
     puts "CLI for Bunches.app"
     help

data/lib/bunch.rb

@@ -5,4 +5,5 @@ require "bunch/version"
 require 'yaml'
 require 'cgi'
 require 'bunch/url_generator'
+require 'term-colorizer'
 require 'bunch/bunchCLI'

data/lib/bunch/bunchCLI.rb

@@ -13,6 +13,14 @@ class Bunch
     get_cache
   end
 
+  def launch_if_needed
+    pid = `ps ax | grep 'MacOS/Bunch'|grep -v grep`.strip
+    if pid == ""
+      `open -a Bunch`
+      sleep 2
+    end
+  end
+
   def update_cache
     @bunch_dir = nil
     @url_method = nil
@@ -93,6 +101,8 @@ class Bunch
       %(x-bunch://raw?txt=#{bunch}#{params})
     elsif url_method == 'snippet'
       %(x-bunch://snippet?file=#{bunch}#{params})
+    elsif url_method == 'setPref'
+      %(x-bunch://setPref?#{bunch})
     else
       %(x-bunch://#{url_method}?bunch=#{bunch[:title]}#{params})
     end
@@ -124,7 +134,20 @@ class Bunch
     (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
+  end
+
+
   def open(str)
+    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)
@@ -149,6 +172,19 @@ class Bunch
         warn "Opening snippet"
         `open '#{_url}'`
       end
+    elsif @url_method == 'setPref'
+      if str =~ /^(\w+)=([^= ]+)$/
+        _url = url(str)
+        if @show_url
+          $stdout.puts _url
+        else
+          warn "Setting preference #{str}"
+          `open '#{_url}'`
+        end
+      else
+        warn "Invalid key=value pair"
+        Process.exit 1
+      end
     else
       bunch = find_bunch(str)
       unless bunch
@@ -183,12 +219,21 @@ class Bunch
     puts output
   end
 
-  def show_config
-    puts "Bunches Folder: #{bunch_dir}"
-    puts "Default URL Method: #{url_method}"
-    puts "Cached Bunches"
-    bunches.each {|b|
-      puts "    - #{b[:title]}"
-    }
+  def show_config(key=nil)
+    case key
+    when /(folder|dir)/
+      puts bunch_dir
+    when /toggle/
+      puts url_method == 'toggle' ? 'true' : 'false'
+    when /method/
+      puts url_method
+    else
+      puts "Bunches Folder: #{bunch_dir}"
+      puts "Default URL Method: #{url_method}"
+      puts "Cached Bunches"
+      bunches.each {|b|
+        puts "    - #{b[:title]}"
+      }
+    end
   end
 end

data/lib/bunch/url_generator.rb

@@ -17,12 +17,13 @@ module Util
     shortname = app.sub(/\.app$/, '')
     apps = `mdfind -onlyin /Applications -onlyin /Applications/Setapp -onlyin /Applications/Utilities -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemKind==Application'`
 
-    app = apps.split(/\n/).select! { |line| line.chomp =~ /#{shortname}\.app$/ }[0]
+    foundapp = apps.split(/\n/).select! { |line| line.chomp =~ /#{shortname}\.app$/i }[0]
 
-    if app
-      bid = `mdls -name kMDItemCFBundleIdentifier -r "#{app}"`.chomp
+    if foundapp
+      bid = `mdls -name kMDItemCFBundleIdentifier -r "#{foundapp}"`.chomp
     else
-      warn "Could not locate bundle id for #{shortname}"
+      # warn "Could not locate bundle id for #{shortname}, using provided app name"
+      bid = app
     end
     bid
   end
@@ -48,7 +49,8 @@ module Prompt
   def get_line(query = '->')
     stty_save = `stty -g`.chomp
     begin
-      line = Readline.readline("#{query}: ", true)
+      print query.bright_green
+      line = Readline.readline(": ", true)
     rescue Interrupt
       system('stty', stty_save) # Restore
       exit
@@ -59,7 +61,7 @@ module Prompt
   def get_text(query = 'Enter text, ^d to end')
     stty_save = `stty -g`.chomp
     lines = []
-    puts query
+    puts query.bright_green
     begin
       while (line = Readline.readline)
         lines << line
@@ -101,15 +103,15 @@ class Menu
   def choose(query = 'Select an item')
     throw 'No items initialized' if @items.nil?
     STDERR.puts
-    STDERR.puts "┌#{("─" * 74)}┐"
+    STDERR.puts "┌#{("─" * 74)}┐".yellow
     intpad = Math::log10(@items.length).to_i + 1
     @items.each_with_index do |item, idx|
       idxstr = "%#{intpad}d" % (idx + 1)
       line = "#{idxstr}: #{item.title}"
       pad = 74 - line.length
-      STDERR.puts "│#{line}#{" " * pad}│"
+      STDERR.puts "│".yellow + "#{line}#{" " * pad}".bright_white + "│".yellow
     end
-    STDERR.puts "└┤ #{query} ├#{"─" * (70 - query.length)}┘"
+    STDERR.puts "└┤".yellow + " #{query} ".bright_green + "├#{"─" * (70 - query.length)}┘".yellow
     sel = choose_number("> ", @items.length)
     sel ? @items[sel.to_i - 1] : nil
   end

data/lib/bunch/version.rb

@@ -1,3 +1,3 @@
 module BunchCLI
-  VERSION = "1.1.0"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchcli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies: []
 description:
 email: