bunchcli 1.1.3 → 1.1.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4847384ea201a976c5bb01448035d0511679bd459b39453b6c9b365dc1115650
-  data.tar.gz: 8818fdae95f080c396ec5ea9831b7fd0e5ebf68a47af58cdfbeb3948a35be411
+  metadata.gz: 0a0125c6936b9621c4d8252a1df185e668c8dc85c8d6ed563fd203f7f018a475
+  data.tar.gz: ef01962a5939067128ffd5024055561b60ee8118e09216065e3642e0a9f33c6c
 SHA512:
-  metadata.gz: 04f82ea1c595ede5ad9ec37f33ed5a8c2a7d8e39d6dfaf91b09a5d38e1ec28b7549c5d35d8ef3983c4fe3a85107b9043a3215ab9025ba6312f6a07313fa8d483
-  data.tar.gz: e8f1c4bf213d6d7fc375a8a3d29dc8d2c81eff6a31fab970c9bc9852b6d548de4b114794a31743c1907d297dbc10397269437aea6f429dab67e625f395023cc3
+  metadata.gz: 282e71d31323a1496eb98f6f06e360ca8a5564f004da13ceda9939ddf2cc5b5bc3bda694250e598f51d398796ff598461e0d9250600a1e931d332f924fa7d03a
+  data.tar.gz: a202098f10ef8da9c3017c5c7e61e342b59dfef5cd3cb8c6fb8725cb49923b42ff430fcc23ff4a405e57ac3cb308927d7191ac1c2c8075761629c8c6a9644a3a

data/.gitignore

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

data/CHANGELOG.md

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

data/bin/bunch

@@ -18,6 +18,10 @@ 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
@@ -65,11 +69,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

data/lib/bunch/bunchCLI.rb

@@ -1,8 +1,9 @@
 class Bunch
   include Util
-  attr_writer :url_method, :fragment, :variables, :show_url
+  attr_writer :target_app, :url_method, :fragment, :variables, :show_url
 
   def initialize
+    @target_app = nil
     @bunch_dir = nil
     @url_method = nil
     @bunches = nil
@@ -13,15 +14,25 @@ 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
     @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|
@@ -44,6 +55,7 @@ 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
@@ -61,10 +73,10 @@ class Bunch
   # items.push({title: 0})
   def generate_bunch_list
     items = []
-    Dir.glob(File.join(bunch_dir, '*.bunch')).each do |f|
+    Dir.glob(File.join(bunch_dir, '**/*.bunch')).each do |f|
       items.push(
         path: f,
-        title: File.basename(f, '.bunch')
+        title: f.sub(/^#{bunch_dir}\//,'').sub(/\.bunch$/,'')
       )
     end
     items
@@ -72,13 +84,19 @@ 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 target_app
+    @target_app ||= "Bunch"
+  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
@@ -139,6 +157,7 @@ EOF
 
 
   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)
@@ -210,12 +229,21 @@ EOF
     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/version.rb

@@ -1,3 +1,3 @@
 module BunchCLI
-  VERSION = "1.1.3"
+  VERSION = "1.1.9.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchcli
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.9.pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-04-14 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