bunchcli 1.1.4 → 1.1.10.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85d1416d51d972ef7c577b1f143b2b646e9fcd4bb1871253b6ed5f98c5bbb4c
-  data.tar.gz: 5986ff8fdd90521530e7b10c5a151eb0144074fdbed534f869ca03345f8f1988
+  metadata.gz: dcda55808cd36cb2a58d47e7d6e0c0fa10772305ab8334bbd40d7f08f38949ae
+  data.tar.gz: 867e15277ae14bb607337e3bcba90192359bc89747450ec2abd526e441fd825f
 SHA512:
-  metadata.gz: d93fa5c16bc0e49dd24ead5c7d33ba786024e115b71c290142afc520118fc99a601de1bb0b35205aa102317a1a9af430f16d379ff803816ebe92c4fef4ad72af
-  data.tar.gz: 24bb5364188045b58253836044a9980ff1e99adb716841c5af206b08074467eb154a7e29484ad7f311528037eb61463711be43dcdcc7a9d873727670d802a057
+  metadata.gz: 13e69c1cbb174fc1422a6480c96a016067fda4f44fb36a8a711cd3903423ee9b7a441deacd2995ff92f8fbc945c3a3b0dfd0c35e92944cb9bb4eea3713c0bb71
+  data.tar.gz: a7a76acbe1021ca87bad1fad48c8c06b70095d9db73b2c8368ffe157e49eff9ffc828185fa6c0b750f98fb37face66237df24f57b4ea7f79855e5cf43f8d6613

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.1.7
+
+- Bugfix
+
 ### 1.1.4
 
 - Add `--show-config-key KEY` query for specific keys (dir, toggle, method)

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

@@ -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
 
@@ -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

@@ -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.4"
+  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.4
+  version: 1.1.10.pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-04-17 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.3
 signing_key:
 specification_version: 4
 summary: A CLI for use with Bunch.app (macOS)

data/Gemfile.lock

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