bunchcli 1.1.5 → 1.1.11.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85429d178706578f82263c19457bf79b369efee746ac17172e1b065c6fb4a1eb
-  data.tar.gz: 12dc65b8c0c8c3b86c3ef050c30e4aa756b8596ca0388d4c4c89b1bdf0db3beb
+  metadata.gz: 70d3422a46d0fcef92ba107d45988048e87861e7c43850804ae8f694fc68073a
+  data.tar.gz: d0e9a81d6681c68440171064ee6b43890848ae3a598fe5824ac4d879a57de8e2
 SHA512:
-  metadata.gz: b38da1ccef956f64112c4aa70f2f195b9200f134cf7415d7ed5651e93719acb2d289462b171d61ff7573566467b6804b0039f27ed681fbaf56e758c0428b713b
-  data.tar.gz: 57de9a2b54ad9f6de4bc9328c1badd2342e1b7c8ac6683d3aa4ef4a098d9fcdd03f6d6d01bf1b99b49faad27c4b675793256bbcf22c864d901a2bf6f57e64d07
+  metadata.gz: ae5f34bb75d84b59e86ed3646a30f5ef86d90ff7e6cf91fac65a31bbc9d505d8b0944c61e2d4f3445504893639f7591ed0b9dc31a2aa17cf7392a0c7585e9663
+  data.tar.gz: 27a8b4693967cc09fd11036caa1162454a393907fff8036f6c8decb4ec47759d758dbc8e59201a797c6978df9d9e066d08e0d085edadfe1cc73adc1b37e0ba39

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 /vendor/
+Gemfile.lock

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-### 1.1.5
+### 1.1.7
 
-- Add some color to the interactive URL generator
+- Bugfix
 
 ### 1.1.4
 

data/Gemfile

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

data/lib/bunch.rb

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

data/lib/bunch/bunchCLI.rb

@@ -69,10 +69,11 @@ class Bunch
   # items.push({title: 0})
   def generate_bunch_list
     items = []
-    Dir.glob(File.join(bunch_dir, '*.bunch')).each do |f|
+    `osascript -e 'tell app "#{TARGET_APP}" to list bunches'`.strip.split(/,/).each do |b|
+      b.strip!
       items.push(
-        path: f,
-        title: File.basename(f, '.bunch')
+        path: File.join(bunch_dir, b + '.bunch'),
+        title: b
       )
     end
     items
@@ -80,13 +81,15 @@ class Bunch
 
   def bunch_dir
     @bunch_dir ||= begin
-      dir = `/usr/bin/defaults read #{ENV['HOME']}/Library/Preferences/com.brettterpstra.Bunch.plist configDir`.strip
+      dir = `osascript -e 'tell app "#{TARGET_APP}" to get preference "Folder"'`.strip
+      # dir = `/usr/bin/defaults read #{ENV['HOME']}/Library/Preferences/com.brettterpstra.Bunch.plist configDir`.strip
       File.expand_path(dir)
     end
   end
 
   def url_method
-    @url_method ||= `/usr/bin/defaults read #{ENV['HOME']}/Library/Preferences/com.brettterpstra.Bunch.plist toggleBunches`.strip == '1' ? 'toggle' : 'open'
+    @url_method ||= `osascript -e 'tell app "#{TARGET_APP}" to get preference "Toggle"'`.strip == '1' ? 'toggle' : 'open'
+    # @url_method ||= `/usr/bin/defaults read #{ENV['HOME']}/Library/Preferences/com.brettterpstra.Bunch.plist toggleBunches`.strip == '1' ? 'toggle' : 'open'
   end
 
   def bunches
@@ -96,15 +99,15 @@ class Bunch
   def url(bunch)
     params = "&x-success=#{@success}" if @success
     if url_method == 'file'
-      %(x-bunch://raw?file=#{bunch}#{params})
+      %(#{TARGET_URL}://raw?file=#{bunch}#{params})
     elsif url_method == 'raw'
-      %(x-bunch://raw?txt=#{bunch}#{params})
+      %(#{TARGET_URL}://raw?txt=#{bunch}#{params})
     elsif url_method == 'snippet'
-      %(x-bunch://snippet?file=#{bunch}#{params})
+      %(#{TARGET_URL}://snippet?file=#{bunch}#{params})
     elsif url_method == 'setPref'
-      %(x-bunch://setPref?#{bunch})
+      %(#{TARGET_URL}://setPref?#{bunch})
     else
-      %(x-bunch://#{url_method}?bunch=#{bunch[:title]}#{params})
+      %(#{TARGET_URL}://#{url_method}?bunch=#{bunch}#{params})
     end
   end
 
@@ -150,7 +153,7 @@ 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)
+    bid = bundle_id(front_app) rescue false
     @success = bid if (bid)
 
     if @url_method == 'raw'
@@ -187,25 +190,32 @@ EOF
       end
     else
       bunch = find_bunch(str)
+      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(str)
+            $stdout.puts _url
           else
             warn "Opening file"
-            `open '#{url(str)}'`
+            `open '#{_url}'`
           end
         else
           warn 'No matching Bunch found'
           Process.exit 1
         end
       else
+        _url = url(bunch[:title])
+        _url += '&' + params.join('&') if params.length
         if @show_url
-          $stdout.puts url(str)
+          $stdout.puts _url
         else
           warn "#{human_action} #{bunch[:title]}"
-          `open '#{url(bunch)}'`
+          `open '#{_url}'`
         end
       end
     end

data/lib/bunch/url_generator.rb

@@ -15,9 +15,17 @@ 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 'kMDItemKind==Application'`
+    apps = `mdfind -onlyin /Applications -onlyin /Applications/Setapp -onlyin /Applications/Utilities -onlyin ~/Applications -onlyin /Developer/Applications -onlyin /System/Applications 'kMDItemKind==Application'`
 
-    foundapp = apps.split(/\n/).select! { |line| line.chomp =~ /#{shortname}\.app$/i }[0]
+    return false if !apps || apps.strip.length == 0
+
+    foundapps = apps.split(/\n/).select! { |line| line.chomp =~ /#{shortname}\.app$/i }
+
+    if foundapps.length > 0
+      foundapp = foundapps[0]
+    else
+      return false
+    end
 
     if foundapp
       bid = `mdls -name kMDItemCFBundleIdentifier -r "#{foundapp}"`.chomp
@@ -49,8 +57,7 @@ module Prompt
   def get_line(query = '->')
     stty_save = `stty -g`.chomp
     begin
-      print query.bright_green
-      line = Readline.readline(": ", true)
+      line = Readline.readline("#{query}: ", true)
     rescue Interrupt
       system('stty', stty_save) # Restore
       exit
@@ -61,7 +68,7 @@ module Prompt
   def get_text(query = 'Enter text, ^d to end')
     stty_save = `stty -g`.chomp
     lines = []
-    puts query.bright_green
+    puts query
     begin
       while (line = Readline.readline)
         lines << line
@@ -103,15 +110,15 @@ class Menu
   def choose(query = 'Select an item')
     throw 'No items initialized' if @items.nil?
     STDERR.puts
-    STDERR.puts "┌#{("─" * 74)}┐".yellow
+    STDERR.puts "┌#{("─" * 74)}┐"
     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 "│".yellow + "#{line}#{" " * pad}".bright_white + "│".yellow
+      STDERR.puts "│#{line}#{" " * pad}│"
     end
-    STDERR.puts "└┤".yellow + " #{query} ".bright_green + "├#{"─" * (70 - query.length)}┘".yellow
+    STDERR.puts "└┤ #{query} ├#{"─" * (70 - query.length)}┘"
     sel = choose_number("> ", @items.length)
     sel ? @items[sel.to_i - 1] : nil
   end
@@ -159,7 +166,7 @@ class BunchFinder
   attr_accessor :config_dir
 
   def initialize
-    config_dir = `defaults read com.brettterpstra.bunch configDir`.strip
+    config_dir = `osascript -e 'tell app "#{TARGET_APP}" to get preference "Folder"'`.strip
     config_dir = File.expand_path(config_dir)
     if File.directory?(config_dir)
       @config_dir = config_dir
@@ -168,6 +175,15 @@ class BunchFinder
     end
   end
 
+  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
+    items
+  end
+
   def files_to_items(dir, pattern)
     Dir.chdir(dir)
     items = []
@@ -181,12 +197,12 @@ class BunchFinder
   end
 
   def choose_bunch
-    items = files_to_items(@config_dir, '*.bunch')
-    items.map! do |item|
-      item.title = File.basename(item.title, '.bunch')
-      item.value = File.basename(item.title, '.bunch')
-      item
-    end
+    items = bunches_to_items
+    # items.map! do |item|
+    #   item.title = File.basename(item.title, '.bunch')
+    #   item.value = File.basename(item.title, '.bunch')
+    #   item
+    # end
     menu = Menu.new(items)
     menu.choose('Select a Bunch')
   end

data/lib/bunch/version.rb

@@ -1,3 +1,3 @@
 module BunchCLI
-  VERSION = "1.1.5"
+  VERSION = "1.1.11.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchcli
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.11.pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -21,7 +21,6 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -49,11 +48,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A CLI for use with Bunch.app (macOS)

data/Gemfile.lock

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