mrdialog 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2c5f27d587a51acc7503e1b99fdcfdb97af44d3
-  data.tar.gz: e1e584a5d7da7a9647630def35388e3fba207f90
+SHA256:
+  metadata.gz: 4abf284e5f7c5aa297345dbd4506bce9997aae61093f05cb4dab1190f0c40346
+  data.tar.gz: f667bcca5f8556c139a4ee4d38e210df6f6c9163e3dfab588dfecfa8fa4766e2
 SHA512:
-  metadata.gz: 35820b6519e3ee6094a4df9299d7879ebea3f140baeb5621221c6d663cf63b7d581a7e113894a7f22b5b4ec24eaef024ad56f52b1f75910322cf913268029739
-  data.tar.gz: fa921f2ebdfb777fafc614af31ca14cd0b2b90e40059fdfbeb8f1b87f14b7f3dc0bc39c72847b83d31b9cf54fe92ecaf9146cd5c1383d121baf63eeaf3945dc5
+  metadata.gz: f79b47813388ebcf37ae95d3cb3373b792cd6e929c3f83a53fa6818a39fb6909e5096c9b493c89de8ae7f4b9233a4442b0844dd2db067bc7a3f885f88f7a3ffc
+  data.tar.gz: 89ac7a47299c65fc5fef30fbfd6acaba29e9f80ae20b0fc8d57ce8a65e57cec177f3adfdc6168406882cefe1970a9e776abc04b90ff16fb398b557bfd5decdfe

data/ChangeLog.md

@@ -1,3 +1,17 @@
+## 1.0.4
+* Previously only the OK/Yes button read input from forms, menus and lists.
+If an extra button is used, it was treated the same as the Cancel/No 
+button, and no output from the form/menu/list was returned to the caller.
+
+This PR changes the various user input dialogs to treat the Extra button 
+the same way as the OK/Yes button, and to return the dialog's input to the 
+caller.
+
+Thanks to https://github.com/OtherJohnGray for pull request.
+
+(Jun-22-2022)
+
+
 ## 1.0.3
 * Added accessor `rc_file`. It specifies the DIALOGRC file to use.  Default is $HOME/.dialogrc
 * Added accessor `cancel_label`. It specifies the label to use for the 'Cancel' button. 
@@ -29,7 +43,7 @@ This ia exactly same as `dialog.notags = true`
 
 ## 1.0.1
 
-* Jeweler support for making the gem.
+* Juwelier support for making the gem.
 
 Implemented methods for: 
 

data/Gemfile

@@ -8,7 +8,8 @@ source "http://rubygems.org"
 group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem "bundler", ">= 2.0"
+  gem "juwelier", "~> 2.1.0"
   gem "simplecov", ">= 0"
+  gem "test-unit"
 end

data/README.md

@@ -29,7 +29,7 @@ I did the following:
 If you have bug reports, questions, requests or  suggestions, please enter it in the [Issues](https://github.com/muquit/mrdialog/issues) with an appropriate label.
 
 ### Latest Version
-The latest version is 1.0.3. 
+The latest version is 1.0.4. 
 Please look at the [ChangeLog.md](ChangeLog.md) file for details. Please look at he [screenshots](screenshots/) to see how the widgets look like.
 
 ### Screenshots
@@ -171,6 +171,10 @@ Please look at [treeview.rb](samples/treeview.rb) for an example.
 Please look at [yesno.rb](samples/yesno.rb) for an example.
 
 ### For Developers
+Note: Pre-built mrdialog-1.0.4.gem is in the pkg directory
+
+If you need to build the gem yourself:
+
 Install bundler first:
 
     $ gem install bundler
@@ -180,11 +184,11 @@ Install bundler first:
 
 Will create the gem inside the pkg directory
 
-- To install the built gem: ```$ sudo gem install --local pkg/mrdialog-1.0.2.gem```
+- To install the built gem: ```$ sudo gem install --local pkg/mrdialog-1.0.4.gem```
 
 - To install using rake: ```$ sudo rake install```
 
-- To install the gem to a specific directory: ```$ GEM_HOME=/tmp gem install --local pkg/mrdialog-1.0.2.gem```
+- To install the gem to a specific directory: ```$ GEM_HOME=/tmp gem install --local pkg/mrdialog-1.0.4.gem```
 
 The gem will be installed in /tmp/gems directory
 

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "mrdialog"
   gem.homepage = "http://github.com/muquit/mrdialog"
@@ -34,7 +34,7 @@ Jeweler::Tasks.new do |gem|
   gem.files.include 'ChangeLog.md'
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/mrdialog/mrdialog.rb

@@ -442,11 +442,12 @@ class MRDialog
     @exit_code = $?.exitstatus
     log_debug "Exit code: #{exit_code}"
     tag = ''
-    if @exit_code == 0
+    if @exit_code != 1
       tag = tmp.read
     end
-    tmp.close!
     return tag
+  ensure
+    tmp.close!
   end
    
   #
@@ -525,7 +526,7 @@ class MRDialog
     system(cmd)
     @exit_code = $?.exitstatus
     log_debug "Exit code: #{exit_code}"
-    if @exit_code == 0
+    if @exit_code != 1
       lines = tmp.read
       log_debug "lines: #{lines} #{lines.class}"
       sep = Shellwords.escape(@separator)
@@ -535,8 +536,9 @@ class MRDialog
         selected_tags << tag if tag.to_s.length > 0
       end
     end
-    tmp.close!
     return selected_tags
+  ensure
+    tmp.close!
   end
 
   # A  pause  box displays a meter along the bottom of the box.  The
@@ -604,8 +606,9 @@ class MRDialog
     if @exit_code == 0
       result = tmp.read
     end
-    tmp.close!
     return result
+  ensure
+    tmp.close!
   end
 
   #
@@ -693,7 +696,7 @@ class MRDialog
     @exit_code = $?.exitstatus
     log_debug "Exit code: #{exit_code}"
 
-    if @exit_code == 0
+    if @exit_code != 1
       lines = tmp.readlines
       lines.each_with_index do |val, idx|
           key = items[idx][0]
@@ -701,8 +704,9 @@ class MRDialog
       end
     end
 
-    tmp.close!
     return res_hash
+  ensure
+    tmp.close!
   end
 
   #
@@ -754,15 +758,14 @@ class MRDialog
       " 2> " + tmp.path
     success = system(command)
     @exit_code = $?.exitstatus
-    if success
+    if @exit_code != 1
       date = Date::civil(*tmp.readline.split('/').collect {|i| i.to_i}.reverse)
-      tmp.close!
       return date
     else
-      tmp.close!
       return success
     end  
-    
+  ensure    
+    tmp.close!
   end
 
   # A  checklist  box  is similar to a menu box; there are multiple
@@ -800,9 +803,8 @@ class MRDialog
     success = system(command)
     @exit_code = $?.exitstatus
     selected_array = []
-    if success
+    if @exit_code != 1
       selected_string = tmp.readline
-      tmp.close!
       log_debug "Separator: #{@separator}"
 
       sep = Shellwords.escape(@separator)
@@ -813,10 +815,10 @@ class MRDialog
       end
       return selected_array
     else
-      tmp.close!
       return success
     end
-
+  ensure    
+    tmp.close!
   end
 
   #      The file-selection dialog displays a text-entry window in which
@@ -850,18 +852,18 @@ class MRDialog
     success = system(command)
     @exit_code = $?.exitstatus
 
-    if success
+    if @exit_code != 1
       begin
         selected_string = tmp.readline
       rescue EOFError
         selected_string = ""
       end
-      tmp.close!
       return selected_string
     else
-      tmp.close!
       return success
     end
+  ensure
+    tmp.close!
   end
 
 
@@ -914,15 +916,14 @@ class MRDialog
     success = system(command)
     @exit_code = $?.exitstatus
 
-    if success
+    if @exit_code != 1
       selected_string = tmp.readline
-      tmp.close!
       return selected_string
     else
-      tmp.close!
       return success
     end
-
+  ensure    
+    tmp.close!
   end
 
         #      As  its  name  suggests, a menu box is a dialog box that can be
@@ -961,15 +962,14 @@ class MRDialog
     success = system(command)
     @exit_code = $?.exitstatus
 
-    if success
+    if @exit_code != 1
       selected_string = tmp.readline
-      tmp.close!
       return selected_string
     else
-      tmp.close!
       return success
     end
-    
+  ensure    
+    tmp.close!
   end
 
   #      A message box is very similar to a yes/no box.  The  only  dif-
@@ -1012,18 +1012,18 @@ class MRDialog
     success = system(command)
     @exit_code = $?.exitstatus
 
-    if success
+    if @exit_code != 1
       begin
         selected_string = tmp.readline
       rescue EOFError
         selected_string = ""
       end
-      tmp.close!
       return selected_string
     else
-      tmp.close!
       return success
     end
+  ensure
+    tmp.close!
   end
 
   #     The textbox method handles three similar dialog functions, textbox,
@@ -1093,15 +1093,14 @@ class MRDialog
     log_debug("Command:\n#{command}")
     success = system(command)
     @exit_code = $?.exitstatus
-    if success
+    if @exit_code != 1
       time = Time.parse(tmp.readline)
-      tmp.close!
       return time
     else
-      tmp.close!
       return success
     end
-    
+  ensure    
+    tmp.close!
   end
 
   #      An input box is useful when you  want  to  ask  questions  that
@@ -1129,18 +1128,18 @@ class MRDialog
     success = system(command)
     @exit_code = $?.exitstatus
 
-    if success
+    if @exit_code != 1
       begin
         selected_string = tmp.readline
       rescue EOFError
         selected_string = ""
       end
-      tmp.close!      
       return selected_string
     else
-      tmp.close!
       return success
     end
+  ensure
+    tmp.close!
   end
 
   #      A yes/no dialog box of size height rows by width  columns  will

data/mrdialog.gemspec

@@ -0,0 +1,124 @@
+# Generated by juwelier
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: mrdialog 1.0.4 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "mrdialog"
+  s.version = "1.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Aleks Clark", "Muhammad Muquit"]
+  s.date = "2018-04-12"
+  s.description = "A ruby gem for ncurses dialog program.\n      This gem is based on rdialog (http://rdialog.rubyforge.org/) by\n      Aleks Clark. I added support for missing widgets, fixed \n      bugs and wrote the sample apps. I am \n      also renaming the class to MRDialog to avoid conflicts.\n      Please look at ChangeLog.md for details.  "
+  s.email = "muquit@gmail.com"
+  s.extra_rdoc_files = [
+    "ChangeLog.md",
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "ChangeLog.md",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/mrdialog.rb",
+    "lib/mrdialog/mrdialog.rb",
+    "pkg/md5.txt",
+    "pkg/mrdialog-1.0.4.gem",
+    "samples/buildlist.rb",
+    "samples/calendar.rb",
+    "samples/checklist.rb",
+    "samples/editbox.rb",
+    "samples/form1.rb",
+    "samples/form2.rb",
+    "samples/form3.rb",
+    "samples/fselect.rb",
+    "samples/gauge.rb",
+    "samples/infobox.rb",
+    "samples/inputbox.rb",
+    "samples/menubox.rb",
+    "samples/mixedform1.rb",
+    "samples/msgbox.rb",
+    "samples/password.rb",
+    "samples/password2.rb",
+    "samples/passwordform.rb",
+    "samples/pause.rb",
+    "samples/prgbox.rb",
+    "samples/program.rb",
+    "samples/progress.rb",
+    "samples/radiolist.rb",
+    "samples/run_all.rb",
+    "samples/shortlist",
+    "samples/timebox.rb",
+    "samples/treeview.rb",
+    "samples/treeview2.rb",
+    "samples/yesno.rb",
+    "screenshots/README.txt",
+    "screenshots/all.gif",
+    "screenshots/buildlist.png",
+    "screenshots/calendar.png",
+    "screenshots/checklist.png",
+    "screenshots/editbox.png",
+    "screenshots/form1.png",
+    "screenshots/form2.png",
+    "screenshots/form3.png",
+    "screenshots/fselect.png",
+    "screenshots/gauge.png",
+    "screenshots/infobox.png",
+    "screenshots/inputbox.png",
+    "screenshots/menubox.png",
+    "screenshots/mixedform1.png",
+    "screenshots/msgbox.png",
+    "screenshots/password.png",
+    "screenshots/password2.png",
+    "screenshots/passwordform.png",
+    "screenshots/pause.png",
+    "screenshots/prgbox.png",
+    "screenshots/program.png",
+    "screenshots/progress.png",
+    "screenshots/radiolist.png",
+    "screenshots/take_shots.rb",
+    "screenshots/timebox.png",
+    "screenshots/treeview.png",
+    "screenshots/treeview2.png",
+    "screenshots/yesno.png",
+    "test/helper.rb",
+    "test/test_mrdialog.rb"
+  ]
+  s.homepage = "http://github.com/muquit/mrdialog"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.5.2.1"
+  s.summary = "A ruby gem for ncurses dialog program, based on the gem rdialog"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<juwelier>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<juwelier>, ["~> 2.0.1"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<juwelier>, ["~> 2.0.1"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
+end
+

data/pkg/md5.txt

@@ -1 +1 @@
-2e4238d8e121adb4b646a299e63d333f  mrdialog-1.0.3.gem
+e6497d81db203c5c49dfff90c7870a09  mrdialog-1.0.3.gem

data/samples/extra_button/buildlist.rb

@@ -0,0 +1,89 @@
+#!/usr/bin/env ruby
+
+require [File.expand_path(File.dirname(__FILE__)), '../..', 'lib', 'mrdialog'].join('/')
+require 'pp'
+
+begin
+    ME = File.basename($0)
+    if ENV['CHANGE_TITLE']
+      if ME =~ /(.+)\.rb$/
+        base = $1
+        puts "\033]0;mrdialog - #{base}\007"
+      end
+    end
+    text = <<EOF
+This example is taken from dialog/samples/menulist
+shell script.
+
+Hi, this is a buildlist dialog. The list on the left
+shows the unselected items. The list on the right shows
+the selected  items.  Use SPACE bar to select/unselect 
+items. Shadow is set to false.
+
+EOF
+    items = []
+    Struct.new("BuildListData", :tag, :item, :status)
+    data = Struct::BuildListData.new
+
+    data.tag = "1"
+    data.item = "Item number 1"
+    data.status = true
+    items.push(data.to_a)
+
+    data = Struct::BuildListData.new
+    data.tag = "2"
+    data.item = "Item number 2"
+    data.status = false
+    items.push(data.to_a)
+
+    data = Struct::BuildListData.new
+    data.tag = "3"
+    data.item = "Item number 3"
+    data.status = false
+    items.push(data.to_a)
+
+    data = Struct::BuildListData.new
+    data.tag = "4"
+    data.item = "Item number 4"
+    data.status = true
+    items.push(data.to_a)
+
+    data = Struct::BuildListData.new
+    data.tag = "5"
+    data.item = "Item number 5"
+    data.status = false
+    items.push(data.to_a)
+
+    data = Struct::BuildListData.new
+    data.tag = "6"
+    data.item = "Item number 6"
+    data.status = true
+    items.push(data.to_a)
+
+    dialog = MRDialog.new
+    dialog.clear = true
+    dialog.shadow = false
+    dialog.title = "BUILDLIST"
+    dialog.logger = Logger.new(ENV["HOME"] + "/dialog_" + ME + ".log")
+    dialog.extra_button = true
+    dialog.ok_label = "Send"
+    dialog.extra_label = "Archive"
+    dialog.cancel_label = "Quit"
+
+    height = 0
+    width = 0
+    listheight = 0
+
+    selected_items = dialog.buildlist(text, items, height, width, listheight)
+    exit_code = dialog.exit_code
+    puts "Exit code: #{exit_code}"
+    puts "Selecetd tags:"
+    selected_items.each do |item|
+      puts " '#{item}'"
+    end
+
+rescue => e
+    puts "#{$!}"
+    t = e.backtrace.join("\n\t")
+    puts "Error: #{t}"
+end

data/samples/extra_button/calendar.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+########################################################################
+# Example for calendar widget. 
+# muquit@muquit.com Apr-02-2014 
+########################################################################
+#
+require [File.expand_path(File.dirname(__FILE__)), '../..', 'lib', 'mrdialog'].join('/')
+require 'date'
+
+begin
+    ME = File.basename($0)
+    if ENV['CHANGE_TITLE']
+      if ME =~ /(.+)\.rb$/
+        base = $1
+        puts "\033]0;mrdialog - #{base}\007"
+      end
+    end
+
+    text = "Please choose a date..."
+
+    height = 0
+    width = 0
+    day = Date.today.mday
+    month =Date.today.mon
+    year =Date.today.year
+
+    dialog = MRDialog.new
+    dialog.logger = Logger.new(ENV["HOME"] + "/dialog_" + ME + ".log")
+    dialog.clear = true
+    dialog.title = "CALENDAR"
+    dialog.extra_button = true
+    dialog.ok_label = "Save"
+    dialog.extra_label = "Send"
+    dialog.cancel_label = "Quit"
+
+    date = dialog.calendar(text, height, width, day, month, year)
+    puts "Exit code: #{dialog.exit_code}"
+    puts "Result is: #{date.to_s}"
+
+rescue => e
+    puts "#{$!}"
+    t = e.backtrace.join("\n\t")
+    puts "Error: #{t}"
+end

data/samples/extra_button/checklist.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+
+require [File.expand_path(File.dirname(__FILE__)), '../..', 'lib', 'mrdialog'].join('/')
+require 'pp'
+
+begin
+    ME = File.basename($0)
+    if ENV['CHANGE_TITLE']
+      if ME =~ /(.+)\.rb$/
+        base = $1
+        puts "\033]0;mrdialog - #{base}\007"
+      end
+    end
+
+    text = <<EOF
+This example is taken from dialog/samples/radiolist
+shell script.
+
+Hi, this is a radiolist box. You can use this to
+present a list of choices which can be turned on or
+off. If there are more items than can fit on the
+screen, the list will be scrolled. You can use the
+UP/DOWN arrow keys, the first letter of the choice as a
+hot key, or the number keys 1-9 to choose an option.
+Press SPACE to toggle an option on/off. Set the option
+notags to true if you don't want to diaplay the tags.
+
+  Which of the following are fruits?
+
+EOF
+    items = []
+    checklist_data = Struct.new(:tag, :item, :select)
+
+    data = checklist_data.new
+    data.tag = "Apple"
+    data.item = "It's an applie"
+    data.select = false
+    items.push(data.to_a)
+
+    data = checklist_data.new
+    data.tag = "Dog"
+    data.item = "No it's not my dog"
+    data.select = true
+    items.push(data.to_a)
+
+    data = checklist_data.new
+    data.tag = "Orange"
+    data.item = "Yeah! it is juicy"
+    data.select = false
+    items.push(data.to_a)
+
+    data = checklist_data.new
+    data.tag = "Chicken"
+    data.item = "Normally not a pet"
+    data.select = true
+    items.push(data.to_a)
+
+    dialog = MRDialog.new
+#    dialog.notags = false
+#    dialog.dialog_options = "--no-tags"
+    dialog.clear = true
+    dialog.title = "CHECKLIST"
+    dialog.logger = Logger.new(ENV["HOME"] + "/dialog_" + ME + ".log")
+    dialog.extra_button = true
+    dialog.ok_label = "Send"
+    dialog.extra_label = "Save"
+    dialog.cancel_label = "Quit"
+
+    selected_items = dialog.checklist(text, items)
+    exit_code = dialog.exit_code
+    puts selected_items.class
+    puts "Exit code: #{exit_code}"
+    if selected_items
+      puts "Selected Items:"
+      selected_items.each do |item|
+        puts "  '#{item}'"
+      end
+    end
+
+rescue => e
+    puts "#{$!}"
+    t = e.backtrace.join("\n\t")
+    puts "Error: #{t}"
+end