pullbox 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2f534754efeeb67e20f795dc0c6593f5f7c378bc5493d0d05a53c04cc7b4207
-  data.tar.gz: 888cbe6a7966336d76da1d273c69f98580bef9eae2d7c6218acf79417b9b3984
+  metadata.gz: e721acd3845f22b0cbba4fcea949777d7deeabf0d9373018ae18521196aaf66e
+  data.tar.gz: 1c069eb6bb2ebd32bf3b51b832ec77293a40403c2b45f688970b8ed59097e8ef
 SHA512:
-  metadata.gz: a04bd17a33c23f78d18a4c5132b89ea46ecc9548bd3ca1ed702febcc5ca35a01768b4c3174e6d599b8599936b8989209780a27789e496c942cce40b5a519b36c
-  data.tar.gz: d251bc033b8301038517c2fb7f93e6ff8a6631099e6efaabf811918909f800e9c3167442e3df8f6d1e80eb14bba0c424daa6688c71cf1de45d25fa4040eac05b
+  metadata.gz: 6f49441a2c0c98c657880982d28798e82bb5843e6eb7067cd86106006b16ccedd5515493b00b6672188644063c3d2a1465d8a2a121e535269d4af29993a5f09f
+  data.tar.gz: d23e5b59248593bfc0c8653f49725264cfe72073f53535cfe5be80c2e98e769a16f2ce0e4ba18e83d545dad4104f37a3029b47b983575e793679752a9930afc2

data/exe/mailmate_beta

@@ -1,12 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "english"
+require "English"
 require "plist"
-require "pullbox/applescript"
+require_relative "../lib/pullbox/applescript"
 
-result = Plist.parse_xml("/Applications/MailMate.app/Contents/Info.plist")
-raise "MailMate not installed." if result.nil?
+mailmate = "/Applications/MailMate.app/Contents/Info.plist"
+raise "MailMate not installed." unless File.exist? mailmate
+
+result = Plist.parse_xml(mailmate)
+raise "MailMate not properly installed." if result.nil?
 
 long_version = result["CFBundleGetInfoString"]
 version = long_version.match(/\(r(?<number>\d+)\)/i)
@@ -15,6 +18,6 @@ search_string = "MailMate_r#{following_release}.tbz"
 
 content = `curl -s https://updates.mailmate-app.com/archives/ | grep #{search_string}`
 
-if !content.empty? && $CHILD_STATUS.zero?
+if !content.empty? && $CHILD_STATUS.exited?
   Pullbox::AppleScript.display_dialog "Update available.\nVersion: #{following_release}", "MailMate"
 end

data/lib/pullbox/applescript.rb

@@ -22,41 +22,49 @@ module Pullbox
 
     def self.display_dialog(message, title, defaults = {})
       defaults = { answer: false, buttons: %w[OK] }.merge(defaults)
-      answer = defaults[:answer] == true ? ' default answer ""' : ""
+      answer = defaults[:answer] ? ' default answer ""' : ""
+      default_button = defaults[:buttons].last
+      cancel_button = defaults[:buttons].first
       buttons = 'buttons {"'
-      buttons << defaults[:buttons].join('", "')
-      buttons << "\"} default button \"#{defaults[:buttons].last}\""
+      button_construct = buttons.dup
+      button_construct << defaults[:buttons].join('", "')
+      button_construct << "\"} default button \"#{default_button}\" cancel button \"#{cancel_button}\""
       applescript = <<~APS.strip
         #{intro}
         try
-          return text returned of (display dialog "#{message}"#{buttons}#{answer} with title "#{title}")
+          set theReturnedValue to (display dialog "#{message}" #{button_construct}#{answer} with title "#{title}")
+          if button returned of theReturnedValue is "#{default_button}" then
+            if text returned of theReturnedValue is not "" then
+              return text returned of theReturnedValue
+            else
+              return
+            end if
+          end if
         on error errorMessage number errorNumber
           if errorNumber is equal to -128 -- aborted by user
-            return ""
+            return
           end if
         end try
       APS
       answer = `osascript -e '#{applescript}'`.strip
 
-      exit! if answer == ""
+      exit(0) if answer.empty?
 
       answer
     end
 
     def self.export_playlist(name, to, format = :xml)
-      allowed_formats = {
+      formats = {
         m3u: "M3U",
         m3u8: "M3U8",
         plain_text: "plain text",
         unicode_text: "Unicode text",
         xml: "XML"
       }
-      raise ArgumentError, "Export format not supported" unless allowed_formats.keys.include? format
 
-      format = allowed_formats[format]
       applescript = <<~APS.strip
         #{intro}
-        tell application "Music" to export playlist "#{name}" as #{format} to "#{to}"
+        tell application "Music" to export playlist "#{name}" as #{formats.fetch(format, 'XML')} to "#{to}"
       APS
       system "osascript -e '#{applescript}'"
     end

data/lib/pullbox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pullbox
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pullbox
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - PuLLi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist