rwdruby 1.06 → 1.07

data/code/superant.com.rwdshell/0uninstallapplet.rb

@@ -1,6 +1,6 @@
 # uninstall
 
-def rwdwruby_1_06()
+def rwdwruby_1_07()
 
 $tinkerdocumentsarray.delete_if {|x| x == "HowTo_Ruby.txt"} 
 $tinkerhelpaboutarray.delete_if {|x| x == "RwdRuby"} 

data/configuration/language.dist

@@ -1,6 +1,6 @@
-##VERSION:1.69
+##VERSION: (1.79)
 #language selection file
-##NAME:$lang:0
+##NAME: ($lang):(1.78)
 #$lang = "jp"
 $lang= "en"
 #$lang= "nl"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION:1.69
+##VERSION: (1.79)
 $rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.77
+##VERSION: (1.79)
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -7,12 +7,9 @@ LangDir = "lang"
  CodeDir = "code" 
  GuiDir = "gui"  
   $help_topic = "general_help"
-   $helptopicsarray = [ "general_help","network_help"]
-  $prevouswindow ="main" 
-   $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]   # remote control code not actived 2007
+    $prevouswindow ="main" 
+   $rwdcontrolports =["13713","13714","13715","13716"]   # remote control code not actived 2007
  $port = 7705
-$rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
 Browser_Exe = 'mozilla '
-$tinkerdocumentsarray +=["HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
-RwdTinkerVersion = "1.77"
+RwdTinkerVersion = "1.79"
 

data/configuration/{rwdwruby-1.06.dist → rwdwruby-1.07.dist}

@@ -1,5 +1,5 @@
-##VERSION:1.06
-##NAME:$shellscript_directory:0
+##VERSION: (1.07)
+##NAME: ($shellscript_directory):(1.06)
 $shellscript_directory = "scripts"
 AcpiCommand = "acpi"
 DateCommand = 'date +"Date is %D %n%t %t   Time is %T"'
@@ -11,14 +11,14 @@ ApacheAccesslogCommand = "tail /var/log/apache/access.log"
 ApacheAccesslogDelay = 5
 ApacheErrorlogCommand = "tail /var/log/apache/error.log"
 ApacheErrorlogDelay = 5
-##NAME:$testharnessarray:0
-$testharnessarray += ["rwdruby_all_tests"]
-##NAME:$tinkerhelpaboutarray:0
-$tinkerhelpaboutarray += ["RwdRuby"] 
-##NAME:$tinkerdocumentsarray
-$tinkerdocumentsarray += ["HowTo_Ruby.txt"]
+##NAME: ($testharnessarray):(1.06)
+$testharnessarray << "rwdruby_all_tests"
+##NAME: ($tinkerhelpaboutarray):(1.06)
+$tinkerhelpaboutarray << "RwdRuby"
+##NAME: ($tinkerdocumentsarray):(1.06)
+$tinkerdocumentsarray << "HowTo_Ruby.txt"
 JumpLink.update(:RwdRubyBackWindow=>"runrwdrubybackwindow", :RunRuby=>"runrwdrubywindow", :RefreshAcpi=>"runrefreshacpiwindow")
-##NAME:$rwdjumplink:0
-$rwdjumplink +=["RwdRubyBackWindow", "RunRuby", "RefreshAcpi"]
-##NAME:RwdRubyVersion:0
-RwdRubyVersion = "1.06"
+##NAME: ($rwdjumplink):(1.06)
+$rwdjumplink << "RwdRubyBackWindow" << "RunRuby" << "RefreshAcpi"
+##NAME: (RwdRubyVersion):(1.06)
+RwdRubyVersion = "1.07"

data/configuration/tinkerwin2variables.dist

@@ -1,17 +1,18 @@
-##VERSION:1.69
+##VERSION: (1.79)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
-##NAME:$zipslocation:0
+##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
- $zipsarray = [""] ; $zipsarraylocal = [""]
-##NAME:$xpcommand:0
+ $zipsarray = [""]
+  $zipsarraylocal = [""]
+##NAME: ($xpcommand):(1.78)
  $xpcommand = " "  # Linux machines
 # $xpcommand =  "cmd /C "  # XP machines with cmd shell
-##NAME:$gemdirectory_withgemfiles:0
+##NAME: ($gemdirectory_withgemfiles):(1.78)
  $gemdirectory_withgemfiles = "/var/lib/gems/1.8/gems"
 # $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems"  # XP machine
-##NAME:$geminstalled_directory:0
+##NAME: ($geminstalled_directory):(1.78)
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
-RwdTinkerWin2Version = "0.8"
+RwdTinkerWin2Version = "1.79"
 

data/gui/tinkerbackwindows/superant.com.ashellscripts/2arubyeval.rwd

@@ -0,0 +1,17 @@
+$rwdguivar=
+"
+	<tab name=\"rwdlinesruby\" caption=\"ruby lines\">
+    <table>
+      
+    </table>
+      <horizontal>
+      <button caption=\"Execute\" action=\"rubyeval\"/>
+      <button caption=\"Cancel\" action=\"main\"/>
+      <button caption=\"Help\" action=\"runhelpwindowrwdshell\"/>
+    </horizontal>
+    <row>
+     <textarea name=\"a_rubyeval\"/> </row>
+    <p>%rubydisplay%</p>
+
+      	</tab>"
+

data/installed/{rwdwruby-1.06.inf → rwdwruby-1.07.inf}

@@ -7,6 +7,6 @@ code/superant.com.rwdshell
 tests/gemspec-rwdwruby
 tests/makedist-rwdwruby.rb
 rwd_files/HowTo_Ruby.txt
-configuration/rwdwruby-1.06.dist
-configuration/rwdwruby-1.06.cnf
+configuration/rwdwruby-1.07.dist
+configuration/rwdwruby-1.07.cnf
 

data/lib/rconftool.rb

@@ -121,13 +121,17 @@ module Rconftool
         next
       end
       if old_setting.version == src_setting.version
+	      if $DEBUG
+		      $stderr.puts "old setting: #{old_setting.version}"
+		      $stderr.puts "src setting: #{src_setting.version}"
+		 end     
         debug << "  #{name}: unchanged\n"
-        src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
+         src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
         src_setting.add_comment(src_setting.content)
         src_setting.content = old_setting.content
         next
       end
-      # Otherwise, must install updated setting and comment out
+       # Otherwise, must install updated setting and comment out
       # the current setting for reference
       debug << "  #{name}: UPDATED\n"
       src_setting.add_comment("\n Previous setting (inserted by rconftool):\n\n")
@@ -215,9 +219,10 @@ module Rconftool
         20.times do
           line = f.gets
           break unless line
-          curr_setting << line
+	  linetmp = line.chop + "\r\n"
+          curr_setting << linetmp
           if line =~ /\A##VERSION:/
-            @version = line
+            @version = line.chop
             break
           end
         end
@@ -225,7 +230,8 @@ module Rconftool
 
         while line = f.gets
           unless line =~ /\A##NAME:(.*):(.*)/
-            curr_setting << line
+	   linetmp = line.chop + "\r\n"
+            curr_setting << linetmp
             next
           end
           curr_setting = Setting.new($1,$2)
@@ -238,7 +244,8 @@ module Rconftool
     def write(filename)
       File.open(filename,"w") do |f|
         @settings.each do |s|
-          f << s.to_s
+		stmp =  s.to_s.chop + "\r\n"
+          f << stmp
         end
       end
     end

data/lib/rwd/net.rb

@@ -562,6 +562,12 @@ class RequestRequest
   end
 end
 
+def url_unescape(string)
+string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+[$1.delete('%')].pack('H*')
+end
+end
+
 class Request < Hash
   attr_reader :peeraddr
   attr_reader :request
@@ -604,10 +610,14 @@ class Request < Hash
         @vars	= RequestGet.new(@request.data.nil? ? "" : @request.data)
       when "POST"
         data	= (@io.read(self["content-length"].to_i) or "")
+      #  data = url_unescape(data)
         @vars	= RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
       else
         $stderr.puts "Unknown request ('#{firstline}')."
       end
+        if $DEBUG
+           $stderr.puts data  
+        end
     end
 
     @peeraddr	= @io.peeraddr

data/lib/rwd/ruby.rb

@@ -275,7 +275,7 @@ class String
     s.gsub!(/"/ , "\"")
     s.gsub!(/´/, "\'")
 
-    s	= CGI.unescapeHTML(self)
+   # s	= CGI.unescapeHTML(self)
 
     if eolconversion
       s.gsub!(/<br>/, "\n")

data/lib/rwd/rwd.rb

@@ -683,70 +683,70 @@ class RWDWindow
 
     vars	= vars.deep_dup
 
-begin # error wrap
+    begin # error wrap
 
-    vars.each do |key, value|
-      if not key.empty?
-        if value.respond_to? "to_s"
-          @rwd.gsub!(/%%#{key}%%/, value.to_s)
-          @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
+           vars.each do |key, value|
+                                 if not key.empty?
+                                             if value.respond_to? "to_s"
+                                                   @rwd.gsub!(/%%#{key}%%/, value.to_s)
+                                                  @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
 
-          @helprwd.gsub!(/%%#{key}%%/, value.to_s)
-          @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
+                                                  @helprwd.gsub!(/%%#{key}%%/, value.to_s)
+                                                  @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
 
-          varshtml[key]		= value.to_s.to_html
-          varsstring[key]	= value.to_s
-        end
-      end
-    end
+                                                  varshtml[key]		= value.to_s.to_html
+                                                  varsstring[key]	= value.to_s
+                                            end
+                                  end
+                           end
 
-    windowobject	= RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
-    helpobject		= RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
+                           windowobject	= RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
+                             helpobject		= RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
 
-    tabsobj	= windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
+                                   tabsobj	= windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
 
-    if not tabsobj.nil?
-      tabs	= tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
+                     if not tabsobj.nil?
+                              tabs	= tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
 
-      if tab.empty?
-        tab			= tabs[0].args["name"]
-      end
+                                    if tab.empty?
+                                              tab			= tabs[0].args["name"]
+                                      end
 
-      tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
-    end
+                                      tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
+                           end
 
-    if help
-      helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
-    else
-      windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
-    end
+                     if help
+                                helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
+                        else
+                                  windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
+                        end
 
-    html	= html.join("")	# ???
+           html	= html.join("")	# ???
 
-    html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "")	if not $rwd_debug
-    html.gsub!(/%%/, "%")
-    html.gsub!(/\n\n*/, "\n")
+             html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "")	if not $rwd_debug
+             html.gsub!(/%%/, "%")
+             html.gsub!(/\n\n*/, "\n")
 
-    if oneormorefields.empty?
-      focus	= ""
-    else
-      focus	= "document.bodyform.elements[0].focus();"
-    end
+           if oneormorefields.empty?
+                focus	= ""
+             else
+                focus	= "document.bodyform.elements[0].focus();"
+            end
 
-    firstaction	= action	if windowobject.args.keys.include?("refresh")	unless action.nil?
+              firstaction	= action	if windowobject.args.keys.include?("refresh")	unless action.nil?
 
-    html.gsub!(/\$RWD_FIRSTACTION\$/	, firstaction)
-    html.gsub!(/\$RWD_FOCUS\$/		, focus)
+                                                  html.gsub!(/\$RWD_FIRSTACTION\$/	, firstaction)
+                                             html.gsub!(/\$RWD_FOCUS\$/		, focus)
 
-    html
-  end
+                                          html
+                                          end
   
   rescue 
-  if $DEBUG
+			
   $stderr.puts  "error in RWDWindow - render method"
   end
   end
-end
+
 
 class RWDMessage < RWDWindow
   def initialize(msg)
@@ -830,7 +830,9 @@ class RWDialog
 
     self
   end
+  
 
+  
   def render(res, path, post, download, downloadfile, pda, sessionid)
 		# Avoid a timeout.
 
@@ -862,8 +864,13 @@ class RWDialog
 
     post.sort.each do |key, value|
       puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
-
+ if $DEBUG
+	$stderr.puts  "Post: #{key} -> #{value.from_html.inspect}\n"
+	end
       vars[key]	= value.from_html
+       if $DEBUG
+	$stderr.puts  " #{value.from_html}\n"
+	end
     end
 
 		# Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -931,7 +938,17 @@ class RWDialog
 		# Copy vars from window to instance.
 
       vars.each do |k, v|
-        instance_eval "@#{k}	= vars['#{k}']"		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
+	      if $DEBUG
+	$stderr.puts  "Post: #{k} -> #{v}\n"
+	end
+       		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
+			
+			 instance_eval "@#{k}	= ''"
+			instance_variable_set("@#{k}", vars.fetch("#{k}"))   
+			       if $DEBUG
+	$stderr.puts  "Post: #{k} -> #{v}\n"
+	end
+		end	 
       end
 
 		# Callback.

data/rwd_files/HowTo_Ruby.txt

@@ -210,11 +210,16 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 
 Thanks, Steven Gibson
 
-== 
+== Changes
+Version 1.07
+ fix config files
+
 Version 1.06
  help button on ruby tab
  suggestions for ruby commands
- 
+ widen command text box
+ rearrange tabs
+
 Version 1.05
  combine acpi into rwdshell and rename to ruby
  make refresh tab with date/time like a stopwatch

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,13 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 1.79
+ edited net.rb to fix text editing 
+ 
+version 1.78
+ modify config files
+ modify rconftools.rb to handle \r\n dos vs unix
+
 Version 1.77
  Fixed zips location to be relative or absolute
  Made themes loadable

data/rwdconfig.dist

@@ -1,21 +1,22 @@
-##VERSION:1.69
+##VERSION: (1.78)
 # rwdtinker core configuration file
-##NAME: ConfigLocation:0
+##NAME: (ConfigLocation):(1.78)
 ConfigLocation=""
-##NAME: ZipsLocation:0
+##NAME: (ZipsLocation):(1.78)
  ZipsLocation=""
-##NAME:$testharnessarray:0
+##NAME: ($testharnessarray):(1.78)
 $testharnessarray = ["rwdtinker_all_tests"]
-##NAME:TestNow:0
+##NAME: (TestNow):(1.78)
 TestNow=false  # turning this on will run the unit tests
-##NAME:$testharness:0
+##NAME: ($testharness):(1.78)
 $testharness=true
-##NAME:$tinkerhelpaboutarray:0
+##NAME: ($tinkerhelpaboutarray):(1.78)
 $tinkerhelpaboutarray = ["Tinker"]
-##NAME:$tinkerdocumentsarray:0
-$tinkerdocumentsarray = ["Readme.txt"]
-##NAME:$tinkeruninstallarray:0
-$tinkeruninstallarray = ["Tinker"]
-##NAME:JumpLink:0
+##NAME: ($helptopicsarray):(1.78)
+$helptopicsarray = [ "general_help","network_help"]
+##NAME: ($tinkerdocumentsarray):(1.78)
+$tinkerdocumentsarray = ["HowTo_Tinker.txt" , "rwdapplications.html" , "RubyWebDialogs.html"]
+##NAME: (JumpLink):(1.78)
 JumpLink = Hash.new { |hh, kk| hh[kk] = "ERROR: link not found: #{kk.inspect}."; hh[kk] }
-
+##NAME: ($rwdjumplink):(1.78)
+$rwdjumplink = ["helpscreen", "tinkerbackwindow", "returntomain",  "opendocuments",  "editconfiguration"]

data/tests/makedist-rwdwruby.rb

@@ -12,7 +12,7 @@ JumpLink = Hash.new("default")
 $rwdjumplink= [""]
 require 'fileutils'
 DistroName = "rwdwruby"
-DistroVersion="1.06"
+DistroVersion="1.07"
 load "configuration/#{DistroName}-#{DistroVersion}.dist"
 
 
@@ -27,10 +27,12 @@ puts "creating #{DistroName} distribution files version #{DistroVersion}"
 
 #puts "moving up one directory"
 #Dir.chdir("..")
-
+findcmd = "find _arx > /tmp/excludezip"
+puts "#{findcmd}"
+`#{findcmd}`
 
 FileUtils.rm_rf("#{DistroTitle}.zip")
-zipcreatecmd = "zip  -r #{DistroTitle}.zip *" 
+zipcreatecmd = "zip  -r #{DistroTitle}.zip * -x@/tmp/excludezip" 
 puts "#{zipcreatecmd}"
  `#{zipcreatecmd}`
 

data/tests/makedist.rb

@@ -14,7 +14,7 @@ require 'fileutils'
 
 DistroName = "rwdwruby"
 
-DistroVersion="1.06"
+DistroVersion="1.07"
 
 DistroTitle="#{DistroName}-#{DistroVersion}.dist"
 load "configuration/#{DistroTitle}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdruby
 version: !ruby/object:Gem::Version 
-  version: "1.06"
+  version: "1.07"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-18 00:00:00 -07:00
+date: 2008-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -122,7 +122,7 @@ files:
 - code/superant.com.rwdshell/viewscript.rb
 - code/superant.com.rwdshell/savechangedscript.rb
 - code/superant.com.rwdshell/0runrefreshacpi.rb
-- configuration/rwdwruby-1.06.dist
+- configuration/rwdwruby-1.07.dist
 - configuration/rwdtinker.dist
 - configuration/tinkerwin2variables.dist
 - configuration/language.dist
@@ -140,6 +140,7 @@ files:
 - gui/tinkerbackwindows/superant.com.refreshwindow/rwdrefreshacpi.rwd
 - gui/tinkerbackwindows/superant.com.refreshwindow/rwdrefresh.rwd
 - gui/tinkerbackwindows/superant.com.ashellscripts
+- gui/tinkerbackwindows/superant.com.ashellscripts/2arubyeval.rwd
 - gui/tinkerbackwindows/superant.com.ashellscripts/1appname.rwd
 - gui/tinkerbackwindows/superant.com.ashellscripts/45listscripts.rwd
 - gui/tinkerbackwindows/superant.com.ashellscripts/44listplayscripts.rwd
@@ -193,7 +194,7 @@ files:
 - gui/zzcoreguiend/yy9rwdend.rwd
 - installed/rwdrubydata1.inf
 - installed/temp.rb
-- installed/rwdwruby-1.06.inf
+- installed/rwdwruby-1.07.inf
 - rwd_files/tinker.png
 - rwd_files/favicon.ico
 - rwd_files/rdoc-style.css
@@ -205,10 +206,10 @@ files:
 - rwd_files/HowTo_Ruby.txt
 - zips/rwdwgutenberg-0.09.zip
 - zips/temp.rb
-- zips/rwdwfoldeditor-0.03.zip
-- zips/rwdwcalc-0.61.zip
-- zips/rwdwruby-1.06.zip
-- zips/rwdwaddresses-1.05.zip
+- zips/rwdwfoldeditor-0.04.zip
+- zips/rwdwcalc-0.62.zip
+- zips/rwdwruby-1.07.zip
+- zips/rwdwaddresses-1.06.zip
 - zips/wrubyslippers-1.06.zip
 - tests/rdep.rb
 - tests/cleancnf.sh