rubyslippers 1.07 → 1.08

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/listzips.rb

@@ -5,8 +5,14 @@ def fillziptoinstallname(inffile)
 	
 end
 
-def  listzipfilestoinstall
-	startlangdir = File.join($progdir, $zipslocation )
+def  listzipfilestoinstall
+	
+	if  $zipslocation.slice(0,1) == "/" ||   $zipslocation.include?(":")
+	    startlangdir = $zipslocation 
+         else	
+	    startlangdir = File.join($progdir, $zipslocation )
+	end
+	
 	#get a list of the files and subdirectories on the starting directory only
 	
 

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/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.76
+##VERSION: (1.82)
 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.76"
+##NAME: (RwdTinkerVersion):(1.82)
+RwdTinkerVersion = "1.82"
 

data/configuration/tinkerwin2variables.dist

@@ -1,17 +1,23 @@
-##VERSION:1.69
+##VERSION: (1.82)
 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"
+$rwdapplicationidentity = "rwdtinker main application"
 
+RwdTinkerWin2Version = "1.81"
+Browser_Exe = 'mozilla '
+#language selection file
+##NAME: ($langarray):(1.82)
+$langarray = [ "en","ja", "nl","es", "fr","hi"]

data/configuration/{wrubyslippers-1.07.dist → wrubyslippers.dist}

@@ -1,24 +1,24 @@
-##VERSION:1.07
-##NAME:$gemdirectory:0
+##VERSION: (1.08)
+##NAME: ($gemdirectory):(1.07)
 #$gemdirectory = "c:\\ruby\\lib\\ruby\\gems\\1.8"  # XP machine
 $gemdirectory = "/usr/lib/ruby/gems/1.8/gems" # Linux machine
-##NAME:$gemspecificationsdirectory:0
+##NAME: ($gemspecificationsdirectory):(1.07)
 #$gemspecificationsdirectory = "c:\\ruby\\lib\\ruby\\gems\\1.8\\specifications" # XP
 $gemspecificationsdirectory = "/usr/lib/ruby/gems/1.8/specifications"
-##NAME:$xpcommand:0
+##NAME: ($xpcommand):(1.07)
 #$xpcommand = "cmd /C "  # XP machines with cmd shell
 $xpcommand = " "     # Linux machines
-##NAME:$gemspec_directory:0
+##NAME: ($gemspec_directory):(1.07)
 $gemspec_directory = "/usr/lib/ruby/gems/1.8/specifications"
 ##NAME:$gembuild_directory:0
 $gembuild_directory = "/usr/src/rubygems"
 $tinkerdocumentsarray += ["HowTo_RubySlippers.txt"]
-##NAME:$testharnessarray:0
+##NAME: ($testharnessarray):(1.07)
 $testharnessarray += ["rubyslippers_all_tests"]
 $tinkerhelpaboutarray += ["RubySlippers"]
-##NAME: JumpLink:0
+##NAME: (JumpLink):(1.07)
 JumpLink.update(:RubyslippersWindow=>"runrubyslippersbackwindow",:GemCommands=>"runrubyslippersmenu1",   :GemspecUtilities =>"runrubyslippersmenu8",  :RubyslippersConfiguration=>"runrubyslippersmenu10" )
-##NAME:$rwdjumplink:0
+##NAME: ($rwdjumplink):(1.07)
 $rwdjumplink +=["RubyslippersWindow","GemCommands","GemspecUtilities","RubyslippersConfiguration"]
-##NAME: RubySlippersVersion:0
-RubySlippersVersion = "1.07"
+##NAME: (RubySlippersVersion):(1.08)
+RubySlippersVersion = "1.08"

data/gui/tinkerbackwindows/superant.com.rubyslippersbackwindow/91viewconfiguration.rwd

@@ -0,0 +1,27 @@
+$rwdguivar=
+"
+ <tab name=\"viewrubyslippersconfiguration\" caption=\"Rubyslippers Configuration\">
+
+
+	
+ <table>
+ <row> <p> </row>
+ <row> <p align=\"right\">You can view or edit the Rubyslippers configuration file here</row>
+ <row> <p> </row>
+ <horizontal>
+      <button caption=\"Fill Record\" action=\"loadrubyslippersconfiguration\"/>
+      <button caption=\"Save Changes\" action=\"saverubyslippersconfiguration\"/>
+     <button caption=\"Reload Variables\" action=\"loadrubyslippersconfigurationvariables\"/>
+       <button caption=\"Help\" action=\"runhelpwindowrubyslippers\"/>
+    </horizontal>
+   <table>
+  <row> <p align=\"right\">FileName:</p>  <text size=55 name=\"a_rsconfigurationfilename\"/> </row>
+  <table>
+       <textarea name=\"a_rsconfigdata\"/> </row>
+      
+    </table>
+
+      
+
+	</tab>"
+

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,44 +21,18 @@
 #* 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'
 
 $progdir = File::expand_path( File.dirname(__FILE__))
 
-$tempdoc = " "
-
-def findfiles(d)
-	a = Array.new(Dir[d].entries.sort)
-	#loop through and get the files names
-	a.each do |x|
-		#adjust the filters to the files you want to see...
-		if(!test(?d,x))
-			# only rwd files
-			if x =~ /rb|rwd|txt/
-				fileA=File.open("#{x}","r")        #opens the file thats in fileName as read only
-				$tempdoc+=fileA.read    #reads the file into the doc string
-				fileA.close    
-			end
-		end
-	end
-end
-def loadguifile(d)
-	a = Array.new(Dir[d].entries.sort)
-	#loop through and get the files names
-	a.each do |x|
-		#adjust the filters to the files you want to see...
-		if(!test(?d,x))
-			# only rwd files
-			if x =~ /rb|rwd|txt/
-
-				load x      #opens the file thats in fileName and reads it
-				$tempdoc += $rwdguivar # adds the file into the doc string
-			end
-		end
-	end
-end 
+tempdoc = " "
 
 # integrate the new configuration files
 MAINconfignew =  "rwdconfig.cnf"
@@ -94,148 +68,70 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 
   Dir.chdir($progdir) # change back to top program directory
 
+
   # build the English Language hash file from the parts
-  languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
-  langmessage = {' + "\n"
-  startlangdir = File.join(LangDir,"en")
-  #get a list of the files and subdirectories on the starting directory only
-  alanghash = Array.new(Dir[startlangdir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  alanghash.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  # add to the original list of directories
-		  @@tmproot = x + "/**"
-		  #adds the new ones to the array
-		  blanghash = Dir[@@tmproot].entries.sort
-		  blanghash.each do |x|
-			  if(test(?d,x))
-				  alanghash.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  alanghash.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x))
-		  alanghash.delete(x)
-	  else              #it is a directory...
-		  findfiles(x + "/**")
-	  end
+  Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
+  langmessage = { :clear => "Clear", :rwdtinker => "Rwdtinker" }  ; langmessage.each { |kk, vv| Message[kk] = vv }
+  
+    def msgid(programkey)
+	  $programkey = programkey
   end
-
+  
+  def msgstr(programmsg)
+	  if programmsg == ""
+		  $rwdtinkerlog.info "msgstr: no translation for #{$programkey}"
+	 else
+                 Message.update( $programkey.to_sym => programmsg ) 
+        end
+end
+ 
+  require 'lib/rwdtinker/rwdlangdir'
+ 
+  tempdoc = " "
+  #go get all the po language file files in english
+    tempdoc = RwdtinkerTools.findlanguagefiles(LangDir,"en")
 
   #writes the contents of doc into the  languagehashvariable 
-  languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
+  languagehashvariable  =  tempdoc 
 
   # END of en Lang building
-  $tempdoc = " "
+  tempdoc = " "
   Dir.chdir($progdir) # change back to top program directory
 
   # build the local Language hash file from the parts
-  startlangdir = File.join(LangDir,$lang)
-  #get a list of the files and subdirectories on the starting directory only
-  alanghash = Array.new(Dir[startlangdir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  alanghash.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  # add to the original list of directories
-		  @@tmproot = x + "/**"
-		  #adds the new ones to the array
-		  blanghash = Dir[@@tmproot].entries.sort
-		  blanghash.each do |x|
-			  if(test(?d,x))
-				  alanghash.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  alanghash.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x))
-		  alanghash.delete(x)
-	  else              #it is a directory...
-		  findfiles(x + "/**")
-	  end
-  end
-
-
-  #writes the contents of doc into the variable
-  languagehashvariable =  languagehashvariable  + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
-
-
-  $tempdoc = " "
-
-  Dir.chdir($progdir) # change back to top program directory
+    
+    $lang = $langarray[0]  # pick the language of choice
+  
+   # Go get all the po files for the language of choice
+    tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,$lang)
+    # the contents of doc into the variable
+    languagehashvariable =  languagehashvariable   + tempdoc 
 
-  temp = eval(   languagehashvariable )
+    Dir.chdir($progdir) # change back to top program directory
+    
+    # lets read those po files, first english then the chosen language
+    temp = eval(   languagehashvariable )
 
-  $tempdoc = " "
+  
 
   # build the actual program from the code parts
-  #get a list of the files and subdirectories on the starting directory only
-  a = Array.new(Dir[CodeDir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  a.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  # add to the original list of directories
-		  @@root = x + "/**"
-		  #adds the new ones to the array
-		  b = Dir[@@root].entries.sort
-		  b.each do |x|
-			  if(test(?d,x))
-				  a.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  a.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x))
-		  a.delete(x)
-	  else              #it is a directory...
-		  findfiles(x + "/**")
-	  end
-  end
-
+  require 'lib/rwdtinker/rwdcodedir'
+  
+  tempdoc =  RwdtinkerTools.findprogramfiles(CodeDir)
 
   # load the program file
-  tempcoderesult = eval( $tempdoc )
+ 
+  tempcoderesult = eval( tempdoc )
 
   # build the actual GUI from the gui parts
-  $tempdoc = " "
-  #get a list of the files and subdirectories on the starting directory only
-  a = Array.new(Dir[GuiDir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  a.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  #use this new dir find to add to the original list of directories
-		  @@root = x + "/**"
-		  #adds the new ones to the array
-		  b = Dir[@@root].entries.sort
-		  b.each do |x|
-			  if(test(?d,x))
-				  a.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  a.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x)) 
-		  a.delete(x)
-
-	  else #it is a directory...
-		  loadguifile(x + "/**")
-	  end
-  end
+   require 'lib/rwdtinker/rwdguidir'
+   
+  tempdoc = RwdtinkerTools.findguifiles(GuiDir)
+  
 
   # gui variable is done
   guiRWD = ""
-  $rwd_gui_tinker = $tempdoc
+  $rwd_gui_tinker =  tempdoc
   require 'socket'		# Network stuff
   host = "127.0.0.1"
   port = $port
@@ -250,27 +146,27 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 		  $port = port
 		  # Rescue the "Address in use" error
 	  rescue Errno::EADDRINUSE
-		  puts "RWD Startup: Port #{port} on host #{host} is already in use."
+		  $rwdtinkerlog.warn "RWD Startup: Port #{port} on host #{host} is already in use."
 		  port=port +1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue the "Address not available' error
 	  rescue Errno::EADDRNOTAVAIL
-		  puts "RWD Startup: Address #{host} is not available to bind."
+		  $rwdtinkerlog.warn "RWD Startup: Address #{host} is not available to bind."
 		  port =port + 1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue "permission denied errors
 	  rescue Errno::EACCES
-		  puts "RWD Startup: Access denied when binding interface addresses. ?"
+		  $rwdtinkerlog.warn "RWD Startup: Access denied when binding interface addresses. ?"
 		  port =port + 1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue all other errors
 	  rescue
-		  puts "RWD Startup: An error occured."
+		  $rwdtinkerlog.warn "RWD Startup: An error occured."
 		  port =port + 1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue all other errors
 	  end
-
+  $port = port
   end