bunchcli 1.1.9.pre → 1.1.10.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a0125c6936b9621c4d8252a1df185e668c8dc85c8d6ed563fd203f7f018a475
-  data.tar.gz: ef01962a5939067128ffd5024055561b60ee8118e09216065e3642e0a9f33c6c
+  metadata.gz: dcda55808cd36cb2a58d47e7d6e0c0fa10772305ab8334bbd40d7f08f38949ae
+  data.tar.gz: 867e15277ae14bb607337e3bcba90192359bc89747450ec2abd526e441fd825f
 SHA512:
-  metadata.gz: 282e71d31323a1496eb98f6f06e360ca8a5564f004da13ceda9939ddf2cc5b5bc3bda694250e598f51d398796ff598461e0d9250600a1e931d332f924fa7d03a
-  data.tar.gz: a202098f10ef8da9c3017c5c7e61e342b59dfef5cd3cb8c6fb8725cb49923b42ff430fcc23ff4a405e57ac3cb308927d7191ac1c2c8075761629c8c6a9644a3a
+  metadata.gz: 13e69c1cbb174fc1422a6480c96a016067fda4f44fb36a8a711cd3903423ee9b7a441deacd2995ff92f8fbc945c3a3b0dfd0c35e92944cb9bb4eea3713c0bb71
+  data.tar.gz: a7a76acbe1021ca87bad1fad48c8c06b70095d9db73b2c8368ffe157e49eff9ffc828185fa6c0b750f98fb37face66237df24f57b4ea7f79855e5cf43f8d6613

data/bin/bunch

@@ -18,10 +18,6 @@ bunch = Bunch.new
 optparse = OptionParser.new do |opts|
   opts.banner = "CLI for Bunch.app v#{BunchCLI::VERSION}"
 
-  opts.on('-b', '--beta', 'Use Bunch Beta for commands') do |_opt|
-    bunch.target_app = 'Bunch Beta'
-  end
-
   opts.on('-l', '--list', 'List available Bunches') do |_opt|
     bunch.list_bunches
     Process.exit 0

data/lib/bunch.rb

@@ -1,5 +1,8 @@
 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'

data/lib/bunch/bunchCLI.rb

@@ -1,9 +1,8 @@
 class Bunch
   include Util
-  attr_writer :target_app, :url_method, :fragment, :variables, :show_url
+  attr_writer :url_method, :fragment, :variables, :show_url
 
   def initialize
-    @target_app = nil
     @bunch_dir = nil
     @url_method = nil
     @bunches = nil
@@ -26,13 +25,11 @@ class Bunch
     @bunch_dir = nil
     @url_method = nil
     @bunches = nil
-    @target_app = nil
     target = File.expand_path(CACHE_FILE)
     settings = {
       'bunchDir' => bunch_dir,
       'method' => url_method,
       'bunches' => bunches,
-      'target_app' => target_app,
       'updated' => Time.now.strftime('%s').to_i
     }
     File.open(target,'w') do |f|
@@ -55,7 +52,6 @@ class Bunch
     @bunch_dir = settings['bunchDir'] || bunch_dir
     @url_method = settings['method'] || url_method
     @bunches = settings['bunches'] || generate_bunch_list
-    @target_app = settings['target_app'] || target_app
   end
 
   def variable_query
@@ -73,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: f.sub(/^#{bunch_dir}\//,'').sub(/\.bunch$/,'')
+        path: File.join(bunch_dir, b + '.bunch'),
+        title: b
       )
     end
     items
@@ -84,18 +81,14 @@ class Bunch
 
   def bunch_dir
     @bunch_dir ||= begin
-      dir = `osascript -e 'tell app "#{@target_app}" to get preference "Folder"'`.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 target_app
-    @target_app ||= "Bunch"
-  end
-
   def url_method
-    @url_method ||= `osascript -e 'tell app "#{@target_app}" to get preference "Toggle"'`.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
 
@@ -106,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
 
@@ -197,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

@@ -158,7 +158,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 +167,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 +189,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.9.pre"
+  VERSION = "1.1.10.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchcli
 version: !ruby/object:Gem::Version
-  version: 1.1.9.pre
+  version: 1.1.10.pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email: