bunchcli 1.1.6 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8a77faa358820416820ef2bd81752c699bfdc5f4d94b634833b85b4f740c9f
-  data.tar.gz: a32335c4354e2a0958192d670c8a7d348ca283a1b077489c79e0c694fcd94acb
+  metadata.gz: b2530126243a46b0988296fa99b222a492b5dd13db8280526634f8bb0a6b9d9b
+  data.tar.gz: da78a9df0845088fb8604fb7c9b40ec4dff2e498cbe0e6ab04f7828c3629eb79
 SHA512:
-  metadata.gz: 067dd0a90cf0464744465b378540c7ee9271f5d8571b1ff5116588402c22800d3a85e4c0d3f4e3c5f8fa779f3004deecccc256fb4640b937b6d9723bb87c9a20
-  data.tar.gz: 6782b96d641b539cb465645d7d881300ec88e0a40f894fb5a2a9ff964671863e51a3251135f9084856d4f9a8747192b633906f7d98bb69ca67cb25125c7977c8
+  metadata.gz: aff4ef65e0f00f815c2daa511cbd6e611f8e5f52e478fdaa881e3e41694ad7b4157ca10e4e76e510a7fe276ea6743b1ebba88419f62e80c96392d944aba1abe6
+  data.tar.gz: 7e5b1ba166e51e181fc260afe5e8c97fbea6bf0746f86a735a1bf5afbd0fa6e406fb6c2167b8fb7da7fe00affcca29437daa6157eac02a302c5ee19b1f6735c8

data/.gitignore

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

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-### 1.1.6
+### 1.1.11pre
+
+- Fix for Terminal when checking for bundle id
+
+### 1.1.7
 
 - Bugfix
 

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
@@ -158,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
@@ -167,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 = []
@@ -180,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.6"
+  VERSION = "1.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchcli
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.11
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -21,7 +21,6 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -53,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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