rwdtinker 1.79 → 1.80

data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb

@@ -28,9 +28,8 @@ def initiateapplet(nametextlocal)
 	
 	debuginitiate = 0
 	
-	if $DEBUG
- $stderr.puts "starting config load with: #{nametextlocal}"
-        end
+	$rwdtinkerlog.info  "initiateapplet: starting config load with: #{nametextlocal}"
+
 
 
   Dir.chdir($progdir )    #changes the current working directory
@@ -48,10 +47,10 @@ begin
     
 	
 	 rescue
-   
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - config load"
-          end
+	 
+   $rwdtinkerlog.error  "initiateapplet: error in initiateapplets - config load"
+        
+  
         debuginitiate += 1
 end
 $tempdoc = " "
@@ -178,52 +177,54 @@ $rwd_gui_tinker = $tempdoc
   
  rescue
     $rwd_gui_tinker = tempguistorage # restore old gui
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - gui building"
-          end
+    
+    $rwdtinkerlog.error  "error in initiateapplets - gui building"
+     
 
         debuginitiate += 1
 end
 
 begin # error trap
-# now load in the code files
+            # now load in the code files
 
-$tempdoc  = ""
-tempcodeinstallline  = ""
+            $tempdoc  = ""
+              tempcodeinstallline  = ""
 
-         @fileName = "installed/" + nametextlocal + ".inf"
+            @fileName = "installed/" + nametextlocal + ".inf"
+	    
+	$rwdtinkerlog.debug "initateapplets: loading file: #{@fileName}"
 	
-  tmpfilearray = File.readlines(@fileName)
+            tmpfilearray = File.readlines(@fileName)
   
-  tmpfilearray.each do |line|
+            tmpfilearray.each do |line|
 	  
-       tempcodeinstallline = line.chomp
-       if tempcodeinstallline.include?('code/')
-	     findfiles(tempcodeinstallline  + "/**")
-            tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
-       end
-end 
+                        tempcodeinstallline = line.chomp
+                        if tempcodeinstallline.include?('code/')
+	                           findfiles(tempcodeinstallline  + "/**")
+                                    tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
+                        end
+             end 
 
 
  rescue
-    if $DEBUG
-              $stderr.puts  "error in initiateapplets - code building"
-          end
+ 
+ $rwdtinkerlog.error "error in initiateapplets - code building"
+   
         debuginitiate += 1
     
 
   end
   
- setuphelpaboutoptions # update the help about list
-       setuptinkerdocuments # update the document pull down list
-       runhelpwindow   # update the help menu
-        showjumplinkoptions # update the application link menu
-	runrwdtinkerbackwindow # back to applet window
-
- # resultend =  tempcodeinstallline .index("\n",resultstart)
- tempresult  = @fileName
+          setuphelpaboutoptions # update the help about list
+           setuptinkerdocuments # update the document pull down list
+          runhelpwindow   # update the help menu
+          showjumplinkoptions # update the application link menu
+	  runrwdtinkerbackwindow # back to applet window
+
+         # resultend =  tempcodeinstallline .index("\n",resultstart)
+         tempresult  = @fileName
  
-return " applet loading successful " + tempresult 
+         return " applet loading successful " + tempresult 
 
 
   

data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb

@@ -13,16 +13,18 @@ def installgemapplet
 			zf.extract(entry.to_s, entry.to_s)
 		}
 		
-		rescue
+	rescue
 		
-	if $DEBUG
-	$stderr.puts "unzip error - applet may not be installed correctly"
-       end
-        @installapplettext = " .. "
+		         $rwdtinkerlog.error "installgemapplet: unzip error - applet may not be installed correctly"
 	
-	end # exception rescue
+                           @installapplettext = " .. "
 	
-		@nametextbase = File.basename(nametext)
+        end # exception rescue
+
+                @rwd_ignore_vars << @nametextbase << @returninitiateresults << @installapplettext	
+		tmpnametext = File.basename(nametext)
+		tmpnametext.chop!; tmpnametext.chop!; tmpnametext.chop!; tmpnametext.chop!
+		@nametextbase = tmpnametext.chop!
 		@returninitateresults = initiateapplet(@nametextbase)
 		@installapplettext = Message[:applet_installed] + " " +   @returninitateresults 
 

data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb

@@ -24,14 +24,14 @@
 def removeappletvariables(tempremovename)
 	
  	 begin # exception trapped block
-	 if $DEBUG
-	$stderr.puts "in removeappletvariables"
-	end
+	
+        $rwdtinkerlog.info "in removeappletvariables"
+
 	 # removefileinf = File.open(tempremove){|f| f.read}
 	 
-        temp = tempremovename.gsub("-","_")
-        removemethod =  temp.gsub(".","_")
-       
+        
+        removemethod =  tempremovename
+        
           
         send "#{removemethod}"
 	

data/code/superant.com.rwdtinkerbackwindow/viewlogfile.rb

@@ -0,0 +1,13 @@
+def rwdtinkerrunviewlog
+	   require 'lib/rwdtinker/rwdtinkertools'
+	   
+           if @a_rwdtinkerlognumber == nil
+		        @a_rwdtinkerlognumber = 11
+	                 @returnlogdisplay = RwdtinkerTools.tail("rwd_files/log/rwdtinker.log",@a_rwdtinkerlognumber.to_i)
+			 
+	   else
+		         @returnlogdisplay = RwdtinkerTools.tail("rwd_files/log/rwdtinker.log",@a_rwdtinkerlognumber.to_i)
+
+           end
+end
+

data/configuration/language.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.79)
+##VERSION: (1.80)
 #language selection file
 ##NAME: ($lang):(1.78)
 #$lang = "jp"

data/configuration/rwdapplicationidentity.dist

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

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.79)
+##VERSION: (1.80)
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -11,5 +11,5 @@ LangDir = "lang"
    $rwdcontrolports =["13713","13714","13715","13716"]   # remote control code not actived 2007
  $port = 7705
 Browser_Exe = 'mozilla '
-RwdTinkerVersion = "1.79"
+RwdTinkerVersion = "1.80"
 

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.79)
+##VERSION: (1.80)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
@@ -14,5 +14,5 @@ $zipslocation = "zips" # location of applets to add
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
-RwdTinkerWin2Version = "1.79"
+RwdTinkerWin2Version = "1.80"
 

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd

@@ -0,0 +1,20 @@
+$rwdguivar=
+"
+	<tab name=\"rwdlogfiletab\" caption=\"RWD Log Files\">
+             <table>   
+                      <horizontal>
+  
+  
+                             <p align=\"left\">Number of lines to display</p>  <text size=11  name=\"a_rwdtinkerlognumber\"/> 
+
+                           <button caption=#{Message[:viewlogger_information]} action=\"rwdtinkerrunviewlog\"/>
+                      </horizontal>
+        
+                </table>    
+
+                <p>%returnlogdisplay%</p>
+
+	</tab>"
+
+
+

data/init.rb

@@ -21,6 +21,11 @@
 #* at "smalllinux@gmail.com".
 #***********************************************************************/
 
+require 'logger'
+
+$rwdtinkerlog = Logger.new( 'rwd_files/log/rwdtinker.log', 'weekly' )
+$rwdtinkerlog.level = Logger::INFO
+
 require "lib/rwd/rwd"
 require 'fileutils'
 require 'lib/rconftool'

data/lang/en/rwdcore/languagefile.rb

@@ -51,6 +51,7 @@
  :viewinstalled_text => '"View Install Text"', 
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
+ :viewlogger_information => '"View Logger Information"',  
  :view_event => '"View event"',       
  :viewinstall_text => '"View Install Text"' ,  
  :viewlistinstall_files => '"View List of Installed Files"', 

data/lang/es/rwdcore/languagefile-es.rb

@@ -55,6 +55,7 @@
  :viewinstalled_text => '"View Install Text"', 
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
+ :viewlogger_information => '"View Logger Information"',  
  :view_event => '"Ver evento"',       
  :viewinstall_text => '"Ver Texto"'   ,
  :viewlistinstall_files => '"View List of Installed Files"', 

data/lang/fr/rwdcore/languagefile.rb

@@ -56,6 +56,7 @@
  :viewinstalled_text => '"View Install Text"', 
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
+ :viewlogger_information => '"View Logger Information"',  
  :view_event => '"View event"',       
  :view_gem    => '"View Gem"',  
  :viewinstall_text => '"View Install Text"' ,  

data/lang/jp/rwdcore/languagefile.rb

@@ -66,6 +66,7 @@
  :viewinstalled_text => '"View Install Text"', 
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
+ :viewlogger_information => '"View Logger Information"',  
  :viewinstall_text => '"View Install Text"' ,  
  :viewlistinstall_files => '"View List of Installed Files"', 
  :view_photo => '"View Photo"',  

data/lang/nl/rwdcore/languagefile.rb

@@ -68,6 +68,7 @@
  :viewinstalled_text => '"View Install Text"', 
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
+ :viewlogger_information => '"View Logger Information"',  
  :view_event => '"View event"',       
  :viewinstall_text => '"View Install Text"' ,  
  :viewlistinstall_files => '"View List of Installed Files"', 

data/lib/rwd/net.rb

@@ -614,10 +614,10 @@ class Request < Hash
         @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
+
+$rwdtinkerlog.debug  data  
+     
     end
 
     @peeraddr	= @io.peeraddr
@@ -739,14 +739,15 @@ class HTTPServerException < Exception
 end
 
 class HTTPServer
-  def self.serve(portio=80, remote=false, auth=nil, realm="ev/net")
+  def self.serve(portio=80, remote=false, auth=nil, realm="rwd/net")
     port, server	= portio
 
     begin
       server	= TCPServer.new(remote ? "0.0.0.0" : "localhost", port)	if server.nil?
-
+if $DEBUG
       $stderr.puts "Just point your browser to http://localhost:#{port}/ ..."
-    rescue
+end  
+  rescue
       server	= nil
 
       $stderr.puts "Port #{port} is in use."

data/lib/rwd/rwd.rb

@@ -57,7 +57,8 @@ if ENV["RWDTHEME"]
 		load 'lib/rwdthemes/default.rwd'
 	end
 	if ENV["RWDTHEME"] = "DEFAULT"
-           $stderr.puts  "loading theme DEFAULT"
+		$rwdtinkerlog.info "rwd: loading theme DEFAULT"
+           
           load 'lib/rwdthemes/default.rwd'
        end
         if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
@@ -267,7 +268,7 @@ class EVTable
 end
 
 class OpenTag
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     bef	= before[-1]
     res << Format % ["Before", @subtype]	if ($rwd_debug and not bef.nil?)
     res << bef	if not bef.nil?
@@ -299,7 +300,7 @@ class OpenTag
       args["nohelpbutton"]	= (not help)
 
       template	= $rwd_html_1
-      template	= $rwd_html_PDA_1	if pda
+      # template	= $rwd_html_PDA_1	if pda
 
       res << (template(template, args))
     when "p"		then res << "<p #{align}>"
@@ -493,7 +494,7 @@ class OpenTag
     after.push(aft)
   end
 
-  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     case @subtype
     when "vertical", "window", "helpwindow", "tab", "panel"
       res << Format % ["BefPost", @subtype]	if $rwd_debug
@@ -635,7 +636,7 @@ class OpenTag
 end
 
 class Text
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     if not @text.scan(/[^ \t\r\n]/).empty?
       res << Format % ["Text", ""]	if $rwd_debug
       res << "#{@text}"
@@ -742,8 +743,8 @@ class RWDWindow
                                           end
   
   rescue 
-			
-  $stderr.puts  "error in RWDWindow - render method"
+		$rwdtinkerlog.error 	"error in RWDWindow - render method"
+  
   end
   end
 
@@ -864,13 +865,11 @@ 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
+      $rwdtinkerlog.info "Post: #{key} -> #{value.from_html.inspect}\n"
+
       vars[key]	= value.from_html
-       if $DEBUG
-	$stderr.puts  " #{value.from_html}\n"
-	end
+      $rwdtinkerlog.info  "rwd: #{value.from_html}\n"
+    
     end
 
 		# Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -938,16 +937,14 @@ class RWDialog
 		# Copy vars from window to instance.
 
       vars.each do |k, v|
-	      if $DEBUG
-	$stderr.puts  "Post: #{k} -> #{v}\n"
-	end
+	      $rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+	 
        		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
+			$rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+
 		end	 
       end
 
@@ -955,7 +952,9 @@ class RWDialog
 
       if (not back) or @rwd_call_after_back.include?(@rwd_action)
         unless @rwd_action =~ /^rwd_/
-          puts  "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
+	
+	$rwdtinkerlog.debug  "Method: #{@rwd_action}(#{@rwd_args})"	
+       
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -1025,9 +1024,9 @@ begin # error block
 	      end
             res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
 rescue
- if $DEBUG
- $stderr.puts  "error in render"
- end
+
+$rwdtinkerlog.error "rwd: error in render"
+
  end
 end
         end
@@ -1105,7 +1104,9 @@ end
       Thread.new do
         loop do
           if Time.now - @rwd_time > @rwd_timeout
-            $stderr.puts "Exiting due to timeout (#{@rwd_timeout} seconds)."
+		  
+		  $rwdtinkerlog.info "rwd: Exiting due to timeout (#{@rwd_timeout} seconds)."
+            
             exit 1
           end
           sleep interval
@@ -1185,7 +1186,7 @@ class RWDSession < Hash
     @lastaccess	= Time.now
   end
 
-  def render(res, path, post, download, downloadfile, pda)
+  def render(res, path, post, download, downloadfile, pda=false)
     done	= self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
 
     res.gsub!(/\$RWD_SESSION\$/, done ? "" : "#{@sessionid}")
@@ -1212,7 +1213,8 @@ class RWDServer
 
         @browserthread	=
         Thread.new do
-          puts "Starting the browser..."
+		$rwdtinkerlog.warn "rwd: Starting the browser..."
+       
 
           #if ENV["RWDBROWSER"].downcase =~ /iexplore/	# ???
             #@ie	= IE.new("http://localhost:#{port}/")
@@ -1226,7 +1228,7 @@ class RWDServer
 
             command.gsub!(/%port%/, port.to_s)
 
-            system(command) or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+            system(command) or $rwdtinkerlog.error "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
           #end
 
           puts "The browser has terminated."
@@ -1337,8 +1339,8 @@ class RWDServer
               resp << download
             end
           rescue
-            puts "Sending response to browser failed."
-
+           
+     $rwdtinkerlog.error "rwd: Sending response to browser failed."
             @sessions.delete(session.sessionid)
           end
 
@@ -1352,8 +1354,9 @@ class RWDServer
 
               if @browserstarted and not @browserthread.nil? and @browserthread.alive?
                 resp.stop do
-                  puts "Waiting for the browser to terminate..."
-
+                 
+         $rwdtinkerlog.warn "rwd: Waiting for the browser to terminate..."
+	 
                   @browserthread.join
                 end
               end

data/lib/rwdthemes/default.rwd

@@ -1,4 +1,4 @@
-$stderr.puts "in default theme load"
+$rwdtinkerlog.info "in default theme load"
 
 $rwd_html["DEFAULT"]	= "
 <!-- Generated by RubyWebDialog.                                               -->

data/lib/rwdtinker/rwdtinkertools.rb

@@ -0,0 +1,24 @@
+
+
+module RwdtinkerTools
+
+# tools to use in rwdtinker
+
+   def RwdtinkerTools.tail(filename, lines=12)
+     
+           
+           begin
+                   tmpFile = File.open(filename, 'r') 
+       
+	           return     tmpFile.readlines.reverse!.slice(0,lines)
+     
+                   tmpFile.close
+          rescue
+              	return "error in opening log"
+ 	        $rwdtinkerlog.error "RwdtinkerTools.tail: file open error"
+          end
+    end
+
+end
+
+

data/rwd_files/HowTo_Tinker.txt

@@ -220,13 +220,18 @@ under the terms of the GPL licence:
   For more information see:
 http://rwdapplications.rubyforge.org/wiki/wiki.pl
 
-
 For more information about RubyWebDialogs see:
 http://www.erikveen.dds.nl/rubywebdialogs/index.html
 
 Thanks, Steven Gibson
 
 == Changelog
+version 1.80
+ changed pda handling in rwd.rb
+ added logging
+ added log review screen on tinker back window
+ changed handling of live applet loading, to not list version in file names
+ 
 version 1.79
  edited net.rb to fix text editing 
  

data/rwd_files/log/rwdtinker.log

@@ -0,0 +1,2 @@
+# Logfile created on Fri Oct 03 00:39:14 -0700 2008 by smalllinux.superant.com
+

data/tests/makedist.rb

@@ -15,7 +15,7 @@ require 'fileutils'
 
 DistroName = "rwdtinker"
 
-DistroVersion="1.79"
+DistroVersion="1.80"
 
 DistroTitle="#{DistroName}.dist"
 load "configuration/#{DistroTitle}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.79"
+  version: "1.80"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-25 00:00:00 -07:00
+date: 2008-10-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -44,8 +44,10 @@ files:
 - lib/rwdthemes/default.rwd
 - lib/rwdthemes/pda.rwd
 - lib/rwdthemes/windowslike.rwd
+- lib/rwdtinker/rwdtinkertools.rb
 - code/zz0applicationend/zz0end.rb
 - code/superant.com.rwdtinkerbackwindow/listgemdirs.rb
+- code/superant.com.rwdtinkerbackwindow/viewlogfile.rb
 - code/superant.com.rwdtinkerbackwindow/diagnostictab.rb
 - code/superant.com.rwdtinkerbackwindow/listgemzips.rb
 - code/superant.com.rwdtinkerbackwindow/saveconfigurationrecord.rb
@@ -112,6 +114,7 @@ files:
 - gui/tinkerbackwindows/superant.com.tinkerbackwindow/9backend.rwd
 - gui/tinkerbackwindows/superant.com.tinkerbackwindow/60editconfiguration.rwd
 - gui/tinkerbackwindows/superant.com.tinkerbackwindow/40rwdlistzips.rwd
+- gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd
 - gui/tinkerbackwindows/superant.com.tinkerbackwindow/81jumplinkcommands.rwd
 - gui/tinkerbackwindows/superant.com.versionwindow
 - gui/tinkerbackwindows/superant.com.versionwindow/helpaboutwindow.rwd
@@ -129,6 +132,7 @@ files:
 - gui/frontwindowselections/00selectiontabbegin.rwd
 - gui/zzcoreguiend/yy9rwdend.rwd
 - installed/temp.rb
+- rwd_files/log/rwdtinker.log
 - rwd_files/tinker.png
 - rwd_files/favicon.ico
 - rwd_files/rdoc-style.css
@@ -137,14 +141,11 @@ files:
 - rwd_files/HowTo_TinkerWin2.txt
 - rwd_files/RubyWebDialogs.html
 - rwd_files/HowTo_Tinker.txt
-- zips/tinkerbellw-0.02.zip
-- zips/rwdwgutenberg-0.09.zip
 - zips/temp.rb
-- 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
+- zips/rwdwfoldeditor-0.05.zip
+- zips/rwdwcalc-0.63.zip
+- zips/rwdwruby-1.08.zip
+- zips/wrubyslippers-1.07.zip
 - tests/rdep.rb
 - tests/cleancnf.sh
 - tests/makedist.rb