dialogbind 0.9.4 → 0.9.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15db92bd3bcd2c1f15e7dd00f4f643f0e3cf967e0c4ca6822fd51bba303a9c37
-  data.tar.gz: 0d7f0743dbd44377eed925c1927eb61d85b99ac8d9677341cb407917759cc979
+  metadata.gz: 5b6ae43bbbb3723872dc171fa5fee54053b579cd4c78a63bc72d1cdf05e9ecae
+  data.tar.gz: 7c2f954dad2452fe21374eca48e07efd7270e2d88793a74ce7c18629b4bb8556
 SHA512:
-  metadata.gz: 3a05bba5157559fe28498d1ea90757f84e21dcf37405331be852d31cb7b9c5f950eaa19ada11ad36a4ad2588af89b1b26e76b6802a13a97b8c8b6069bd0b4ab6
-  data.tar.gz: 501746e21d415a8e7a9b97677e337e13222631bc9792fc0bbf281394cb4127a4f726f6445671b9410511f03606b7986d9fa903b6f469f689bc68bda20efe9c15
+  metadata.gz: c318c17e91699f02fbf2531d25e8fb8c8d2eada0bcd0f0c9f9882ae0995b3f8f30ee4c55ede97f770659668aa78506a360185779c5f95e989a258d8b12195668
+  data.tar.gz: 4795b55a9cd36909f618b5454ff686e58114d982fdcbe3746c4f2eb20abcca65e97e4ae789206b834bae24c2b8fbb7e63aebd2c0e7b5501d5cac248b3429558f

data/lib/dialogbind.rb

@@ -8,7 +8,7 @@
 require 'fiddle/import'
 
 $dialogbind_macos_script_cmd = ''
-$dialogbind_version = '0.9.4'
+$dialogbind_version = '0.9.4.1'
 
 # @!visibility private
 def zenity(arg)
@@ -182,14 +182,14 @@ if $dialogbind_dialog_backend == 'win32' then
 		end
 		File.write(tmpfile_loc, write_out)
 		tmpfile_loc_w = tmpfile_loc.gsub('/', "\\")
-		cmd_out = `cscript //Nologo "#{tmpfile_loc_w}"`.gsub("\r\n", "")
+		cmd_out = `cscript //Nologo "#{tmpfile_loc_w}"`.gsub("\r\n", "\n").gsub("\n", "")
 		File.delete(tmpfile_loc)
 		return cmd_out
 	end
 
 	# @!visibility private
 	def win32_vbinputbox(text)
-		write_out = 'a = inputbox("' + text.gsub('"', '') + '")'
+		write_out = 'a = inputbox("' + text.gsub('"', '').gsub("\r\n", "\n").gsub("\n", "\" + chr(13) + _ \n \"") + '")'
 		write_out += "\r\nWScript.Echo a"
 		return win32_generatevbs(write_out)
 	end
@@ -346,7 +346,7 @@ end
 
 # Shows either a message box with buttons matching the items specified in the array ``entries`` or a list message box.
 #
-# @param entries [Array] an array of strings that should be displayed as list in a message box. More than two items are currently not supported.
+# @param entries [Array] an array of strings that should be displayed as list in a message box.
 # @param text [String] the text that should be displayed in a message box
 # @param title [String] an optional parameter specifying the title of the message box. Ignored on macOS.
 # @return [String] the selected string or nil on cancel
@@ -377,12 +377,28 @@ def guiselect(entries, text='Choose one of the items below:', title='DialogBind'
 			return nil
 		end
 		item_index = File.read('/tmp/kdialog.sock').gsub("\n", "").to_i
+		if item_index > entries.length then
+			return ''
+		end
 		return entries[item_index].clone
 	elsif $dialogbind_dialog_backend == 'macos' then
 		if entries.include? 'false' then
 			raise 'The list of items to present to the user cannot contain the words "true" or "false" without additional punctuation due to limitations of AppleScript that is called from Ruby on macOS to display dialogs.'
 		end
 		return macselect(entries, text)
+	elsif $dialogbind_dialog_backend == 'win32' then
+		combined_msg = text.clone
+		count = 0
+		entries.each do |entry_item|
+			combined_msg += "\r\n" + count.to_s + '. ' + entry_item.to_s
+			count += 1
+		end
+		combined_msg += "\r\n" + " (To select one of the items above, enter the matching number before the dot)"
+		entered_id = win32_vbinputbox(combined_msg).to_i
+		if entered_id > entries.length then
+			return ''
+		end
+		return entries[entered_id].clone
 	else
 		raise 'The selected backend does not support license message boxes.'
 		return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dialogbind
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.4.1
 platform: ruby
 authors:
 - Tim K