rbcurse-core 0.0.8 → 0.0.9

data/README.md

@@ -41,7 +41,9 @@ Core intends to be :
 
 ## Testing Status
 
-   * Works on 1.9.3-p392  (my environment is zsh 5.0.x, tmux, TERM=screen-256color, OSX ML)
+   * Works on 1.9.3-p392  (my environment is zsh 5.0.x, tmux, TERM=screen-256color, OSX ML)  
+   * Cannot promise if working on 1.8.7, am making some fixes (thanks hramrach), but may not be able to to
+     support 1.8.7 indefinitely. Please submit bugs on 1.8.7 if you find them.
 
 ## Other 
 

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/examples/alpmenu.rb

@@ -8,35 +8,35 @@ require 'rbcurse/core/util/app'
     stack :margin_top => 10, :margin_left => 15 do
       #w = "Messages".length + 1
       w = 60
-      menulink :text => "&View Dirs", :width => w, :description => "View Dirs in tree"  do |s|
+      menulink :text => "&View Dirs", :width => w, :description => "View Dirs in tree"  do |s, *stuff|
         message "Pressed #{s.text} "
         load './dirtree.rb'
         #require './viewtodo'; todo = ViewTodo::TodoApp.new; todo.run
       end
       blank
-      menulink :text => "&Tabular", :width => w, :description => "Tabula Rasa"  do |s|
+      menulink :text => "&Tabular", :width => w, :description => "Tabula Rasa"  do |s, *stuff|
         message "Pressed #{s.text} "
         load './tabular.rb'
         #require './testtodo'; todo = TestTodo::TodoApp.new; todo.run
       end
       blank
-      menulink :text => "&Messages", :width => w, :description => "View Tasks"  do |s|
+      menulink :text => "&Messages", :width => w, :description => "View Tasks"  do |s, *stuff|
         message "Pressed #{s.text} "
         load './tasks.rb'
       end
       blank
-      menulink :text => "&Database", :width => w, :description => "Database Demo"  do |s|
+      menulink :text => "&Database", :width => w, :description => "Database Demo"  do |s, *stuff|
         message "Pressed #{s.getvalue} "
         load './dbdemo.rb'
       end
       blank
       # somehow ? in mnemonic won't work
-      menulink :text => "&Setup", :width => w, :description => "Configure Alpine options"  do |s|
+      menulink :text => "&Setup", :width => w, :description => "Configure Alpine options"  do |s, *stuff|
         #message "Pressed #{s.text} "
         alert "Not done!"
       end
       blank
-      menulink :text => "&Quit", :width => w, :description => "Quit this application"  do |s|
+      menulink :text => "&Quit", :width => w, :description => "Quit this application"  do |s, *stuff|
         quit
       end
       @form.bind(:ENTER) do |w|

data/examples/app.sample

@@ -10,7 +10,7 @@ App.new do
       :color => :black, :bgcolor => :white, :attr => :bold 
   message "Press F10 to exit from here, F1 for help, F2 for menu"
 
-  stack :margin_top => 1, height => FFI::NCurses.LINES-3 do
+  stack :margin_top => 1, :height => FFI::NCurses.LINES-3 do
 
   end # stack
   status_line :row => FFI::NCurses.LINES-1

data/examples/dbdemo.rb

@@ -17,7 +17,7 @@ end
 def connect dbname
   $log.debug "XXX:  CONNECT got #{dbname} "
   $current_db = dbname
-  $db = SQLite3::Database.new(dbname)
+  $db = SQLite3::Database.new(dbname) if dbname
 
   return $db
 end
@@ -59,7 +59,9 @@ def create_popup array, selection_mode=:single,  &blk
   end
 end
 
-def view_data fields='*', name
+# 
+# changed order of name and fields, thanks hramrach
+def view_data name, fields="*"
   stmt = "select #{fields} from #{name}"
   stmt << $where_string if $where_string
   stmt << $order_string if $order_string
@@ -192,7 +194,7 @@ App.new do
         command do |menuitem, text|
           $current_table = text
           #alert(get_column_names(text).join(", "))
-          create_popup(get_column_names(text), :multiple) { |value| view_data( value.join(","), text) }
+          create_popup(get_column_names(text), :multiple) { |value| view_data( text, value.join(",") ) }
         end
       end
       item "New", "N" 
@@ -281,7 +283,7 @@ App.new do
           unless c.empty?
             cols = c.join(",")
           end
-          view_data cols, $selected_table
+          view_data $selected_table, cols
         else
           alert "Select a table first." 
         end
@@ -407,7 +409,7 @@ App.new do
           unless c.empty?
             cols = c.join(",")
           end
-          view_data cols, $current_table
+          view_data $current_table, cols
         else
           alert "Select a table first." 
         end

data/lib/rbcurse/core/include/io.rb

@@ -402,7 +402,8 @@ module Io
             else
               raise ArgumentError, "Promptmenu needs hotkey or mnemonic"
             end
-            labels << "%c. %s " % [ hk, item.label ]
+            # 187compat 2013-03-20 - 19:00 throws up
+            labels << "%c. %s " % [ hk.getbyte(0), item.label ]
             h[hk] = item
             valid << hk
           }

data/lib/rbcurse/core/include/listscrollable.rb

@@ -346,7 +346,12 @@ module ListScrollable
           row1 = @list[ix].to_s
 
           # 2011-09-29 crashing on a character F3 in log file
-          row = row1.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")
+          # 2013-03-20 - 18:25 187compat
+          if row1.respond_to? :encode
+            row = row1.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")
+          else
+            row = row1
+          end
 
           m=row.match(regex)
           if !m.nil?
@@ -529,7 +534,10 @@ module ListScrollable
     def sanitize content  #:nodoc:
       if content.is_a? String
         content.chomp!
-        content.replace(content.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?"))
+        # 2013-03-20 - 18:29 187compat
+        if content.respond_to? :encode
+          content.replace(content.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?"))
+        end
         content.gsub!(/[\t\r\n]/, '  ') # don't display tab, newline
         content.gsub!(/\n/, '  ') # don't display tab, newline
         content.gsub!(/[^[:print:]]/, '')  # don't display non print characters

data/lib/rbcurse/core/system/colormap.rb

@@ -7,8 +7,7 @@ module ColorMap
     # added check for fixnum if we go beyond these constants 2011-11-28 
     # e.g. to use full 256 colors
     return colorstring if colorstring.is_a? Fixnum 
-    ret = FFI::NCurses.const_get "COLOR_#{colorstring.upcase}"
-    #raise  "color const nil ColorMap 8 " if !ret
+    ret = FFI::NCurses.const_get "COLOR_#{colorstring.to_s.upcase}"
   end
   ## private
   # creates a new color pair, puts in color map and returns color_pair

data/lib/rbcurse/core/util/ansiparser.rb

@@ -7,7 +7,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 07.11.11 - 13:17
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: use ,,L
+#  Last update: 2013-03-21 00:44
 # ----------------------------------------------------------------------------- #
 # == TODO
 #    - perhaps we can compile the regexp once and reuse
@@ -37,7 +37,7 @@ class AnsiParser
     a.each { |e| 
       ## process color or attrib portion
       #[ "", "\e[1m", "", "\e[34m", "", "\e[47m", "Showing all items...", "\e[0m", "", "\e[0m", "\n"]
-      if e[0] == "\x1b" && e[-1] == "m"
+      if e[0,1] == "\x1b" && e[-1,1] == "m"
 
         #e.each { |f|  x=/^.\[(.*).$/.match(f) 
           $log.debug "XXX: ANSI e #{e} "

data/lib/rbcurse/core/util/colorparser.rb

@@ -7,7 +7,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 07.11.11 - 13:17
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: use ,,L
+#  Last update: 2013-03-21 00:42
 # ----------------------------------------------------------------------------- #
 # == TODO
 #    - perhaps we can compile the regexp once and reuse
@@ -24,6 +24,7 @@ class DefaultColorParser
   # @since 1.4.1  2011-11-3 experimental, can change
   # @return [nil] knows nothign about output format. 
 
+  # 187compat 2013-03-20 - 19:33 not working in 187 so added ,1 in some cases for string
   def parse_format s  # yields attribs or text
     ## set default colors
     color   = :white
@@ -35,7 +36,7 @@ class DefaultColorParser
     a       = s.split /(#\[[^\]]*\])/
     a.each { |e| 
       ## process color or attrib portion
-      if e[0,2] == "#[" && e[-1] == "]"
+      if e[0,2] == "#[" && e[-1,1] == "]"
         # now resetting 1:20 PM November 3, 2011 , earlier we were  carrying over
         color, bgcolor, attrib = nil, nil, nil
         catch(:done) do

data/lib/rbcurse/core/util/rcommandwindow.rb

@@ -37,12 +37,14 @@ module RubyCurses
       @window = VER::Window.new(@layout)
       @start = 0 # row for display of text with paging
       @list = []
-      require 'forwardable'
+      # 2013-03-21 - 00:34 removed due to 187
+      #require 'forwardable'
       require 'rbcurse/core/util/bottomline'
       @bottomline = Bottomline.new @window, 0
       @bottomline.name = "rcommandwindow's bl"
-      extend Forwardable
-      def_delegators :@bottomline, :ask, :say, :agree, :choose #, :display_text_interactive
+      # 187compat next line throws up on 187 module_eval undefined method for commandwindow
+      #extend Forwardable
+      #def_delegators :@bottomline, :ask, :say, :agree, :choose #, :display_text_interactive
       if @box == :border
         @window.box 0,0
       elsif @box
@@ -63,6 +65,20 @@ module RubyCurses
         @row_offset = 1
       end
     end
+    # 2013-03-21 - 187compat
+    #def_delegators :@bottomline, :ask, :say, :agree, :choose #, :display_text_interactive
+    def ask *args
+      @bottomline.send(:ask, *args)
+    end
+    def say *args
+      @bottomline.send(:say, *args)
+    end
+    def agree *args
+      @bottomline.send(:agree, *args)
+    end
+    def choose *args
+      @bottomline.send(:choose, *args)
+    end
     # modify the window title, or get it if no params passed.
     def title t=nil
       return @title unless t

data/lib/rbcurse/core/util/widgetshortcuts.rb

@@ -4,7 +4,7 @@
 #               Also, stacks and flows objects
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 05.11.11 - 15:13 
-#  Last update: 2011-11-21 - 19:28
+#  Last update: 2013-03-21 00:55
 #
 #  I hope this slowly does not become an unmaintainable maze like vimsplit
 #
@@ -93,7 +93,7 @@ module RubyCurses
      if path
       p="require \"#{path}\""
     end
-     short ||= klass.downcase
+     short ||= klass.to_s.downcase
       eval %{
         def #{short}(config={}, &block)
           if config.is_a? String

data/lib/rbcurse/core/widgets/rcombo.rb

@@ -8,7 +8,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 2011-11-11 - 21:42
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: use ,,L
+#  Last update: 2013-03-21 01:45
 # ----------------------------------------------------------------------------- #
 #
 require 'rbcurse'
@@ -35,7 +35,13 @@ module RubyCurses
     def initialize form, config={}, &block
       @arrow_key_policy = :ignore
       @editable         = false
-      @COMBO_SYMBOL = "v".ord  # trying this out
+      #@COMBO_SYMBOL = "v".ord  # trying this out
+      # thanks hramrach for fix
+      if RUBY_VERSION < "1.9" then
+        @COMBO_SYMBOL = "v"[0]  # trying this out
+      else
+        @COMBO_SYMBOL = "v".ord  # trying this out
+      end 
       @current_index    = 0
       super
       # added if  check since it was overriding set_buffer in creation. 2009-01-18 00:03 
@@ -48,8 +54,11 @@ module RubyCurses
       @show_symbol = true if @show_symbol.nil? # if set to false don't touch
       #@show_symbol = false if @label # 2011-11-13 
       @COMBO_SYMBOL ||= FFI::NCurses::ACS_DARROW #GEQUAL
-      bind_key(KEY_UP) { previous_row }
-      bind_key(KEY_DOWN) { next_row }
+
+      # next 2 lines giving an error in newtabbedwindow.rb example since the methods
+      # have been deprecated.
+      #bind_key(KEY_UP) { previous_row }
+      #bind_key(KEY_DOWN) { next_row }
     end
     def selected_item
       @list[@current_index]

data/lib/rbcurse/core/widgets/rwidget.rb

@@ -9,7 +9,7 @@
   * Author: rkumar (arunachalesha)
   * Date: 2008-11-19 12:49 
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-  * Last update: 2013-03-16 20:06
+  * Last update: 2013-03-21 00:30
 
   == CHANGES
   * 2011-10-2 Added PropertyVetoException to rollback changes to property
@@ -30,10 +30,11 @@ require 'rbcurse/core/include/rinputdataevent' # for FIELD 2010-09-11 12:31
 require 'rbcurse/core/include/io'
 require 'rbcurse/core/system/keydefs'
 
-BOLD ||= FFI::NCurses::A_BOLD
-REVERSE ||= FFI::NCurses::A_REVERSE
-UNDERLINE ||= FFI::NCurses::A_UNDERLINE
-NORMAL ||= FFI::NCurses::A_NORMAL
+# 2013-03-21 - 187compat removed ||
+BOLD = FFI::NCurses::A_BOLD
+REVERSE = FFI::NCurses::A_REVERSE
+UNDERLINE = FFI::NCurses::A_UNDERLINE
+NORMAL = FFI::NCurses::A_NORMAL
 
 class Object
 # thanks to terminal-table for this method
@@ -116,15 +117,24 @@ end
 
 # 2009-10-04 14:13 added RK after suggestion on http://www.ruby-forum.com/topic/196618#856703
 # these are for 1.8 compatibility
-class Fixnum
-   def ord
-     self
-   end
-## mostly for control and meta characters
-   def getbyte(n)
-     self
-   end
-end unless "a"[0] == "a"
+unless "a"[0] == "a"
+  class Fixnum
+    def ord
+      self
+    end
+    ## mostly for control and meta characters
+    def getbyte(n)
+      self
+    end
+  end unless "a"[0] == "a"
+  # 2013-03-21 - 187compat
+  class String
+    ## mostly for control and meta characters
+    def getbyte(n)
+      self[n]
+    end
+  end
+end
 
 module RubyCurses
   extend self
@@ -461,7 +471,9 @@ module RubyCurses
       else
         raise ArgumentError, "Don't know how to handle #{arg.class} in PrefixManager"
       end
-      @descriptions ||= []
+      # 2013-03-20 - 18:45 187compat gave error in 187 cannot convert string to int
+      #@descriptions ||= []
+      @descriptions ||= {}
       @descriptions[_keycode] = desc
 
       if !block_given?

data/lib/rbcurse/core/widgets/statusline.rb

@@ -95,6 +95,7 @@ module RubyCurses
         t = Time.now
         tt = t.strftime "%F %H:%M:%S"
         r = Ncurses.LINES
+        # 2013-03-20 - 19:04 next line printing as is in 187 ???? what to do
         ftext = "#[fg=green,bg=blue] %-20s" % [tt] # print a default
         @form.window.printstring_formatted_right @row, nil, ftext, $datacolor, Ncurses::A_REVERSE
       end

data/rbcurse-core.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2013-03-18"
-  s.description = "Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9, 1.8)"
+  s.date = "2013-03-21"
+  s.description = "Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9)"
   s.email = "sentinel1879@gmail.com"
   s.extra_rdoc_files = [
     "README.md"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-core
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0
 description: Ruby curses/ncurses widgets for easy application development on text
-  terminals (ruby 1.9, 1.8)
+  terminals (ruby 1.9)
 email: sentinel1879@gmail.com
 executables: []
 extensions: []