rwdruby 1.07 → 1.08

data/code/01rwdcore/02helptexthashbegin.rb

@@ -2,3 +2,13 @@
 
  Helptext = Hash.new { |hh, kk| hh[kk] = "ERROR: Identificador de mensaje desconocido: #{kk.inspect}."; hh[kk] }
     helpmessage = {
+    :general_help          => "You can work with Applets:  go to 'Selection tab', <br>
+                                  On that back screen you will find:<br>
+                                  List Applets:  you can see and delete installed applets<br>
+                                  List Zips: you can see lists of applets that you can install<br>
+                                  Edit Configuration: You can view the rwdtinker configuration and change it<br>
+                                  Diagnostic Tab: You can view the environments variables that rwdtinker is running with<br>
+      "
+
+    }
+    helpmessage.each { |kk, vv| Helptext[kk] = vv }

data/code/01rwdcore/03helptexthash.rb

@@ -1,23 +1,21 @@
- # Help files for RwdTinker core
+ # this code loads the help text
 
-   
-      :general_help          => "You can work with Applets:  go to 'Selection tab', <br>
-                                  On that back screen you will find:<br>
-                                  List Applets:  you can see and delete installed applets<br>
-                                  List Zips: you can see lists of applets that you can install<br>
-                                  Edit Configuration: You can view the rwdtinker configuration and change it<br>
-                                  Diagnostic Tab: You can view the environments variables that rwdtinker is running with<br>
-      ",
-      :network_help  => "Using over a Network: To serve the application over your local LAN,change the last line in the<br>
-init.rb file to something like:\n<br>
-RwdTinker.file(RWDFile).serve(8080, '-r' ? '.rwduids' : nil)\n<br>
-Then you should be able to login at: http://yourhostname:8080",
+                  
+               tmphelpfilename = "Tinkerhelptexthash.txt" 
+               tmphelpdir = "rwd_files"
+	      
+        begin # exception trapped block
+       
+       
+	      fileName = File.join(tmphelpdir ,tmphelpfilename )
+        
+        
+	      fd = File.open(fileName,"r")
+	      tmphelptext =        fd.read
+             fd.close
+	     eval  tmphelptext
+        rescue SystemCallError, StandardError
+	    $rwdtinkerlog.error  "Tinkerbell help file load: system call error: "
+        end # exception rescue
 
-          
-  :documents_rwdtinker => "<b>Documents:
-  <p>
   
-  when you click on a document name, the document should pop up in a <br>
-  browser window, or in another browser tab.</b>
-  "
-      

data/code/01rwdcore/runopentinkerdocument.rb

@@ -1,7 +1,7 @@
 # open document for rwdtinker application
 def runopentinkerdocument
 
-tinkerdocumenturl = "http://localhost:7705/" + @a_tinkerdocumentinput
+tinkerdocumenturl = "http://localhost:#{$port}/" + @a_tinkerdocumentinput
     Thread.new( tinkerdocumenturl){ |t|  `#{Browser_Exe} #{tinkerdocumenturl}`  }
  end
    

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

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

data/code/superant.com.rwdshell/loadconfigurationrecord.rb

@@ -3,7 +3,7 @@
  
          require 'fileutils'
           
-               rwdrubyname = "rwdwruby-" + RwdRubyVersion + ".cnf"
+               rwdrubyname = "rwdwruby.cnf"
                @a_rshellconfigurationfilename = rwdrubyname 
                
 	      

data/code/superant.com.rwdshell/loadconfigurationvariables.rb

@@ -1,6 +1,6 @@
    # this method loads the on screen variables into the running class
    def loadrwdshellconfigurationvariables
-    rwdrubyname = "rwdwruby-" + RwdrubyVersion + ".cnf"
+    rwdrubyname = "rwdwruby.cnf"
    
    configfiletoload = File.join(ConfigurationDir, rwdrubyname )
    begin

data/code/superant.com.rwdshell/saveconfigurationrecord.rb

@@ -1,7 +1,7 @@
   # this method adds a new address record
   def saverwdshellconfiguration
    require 'fileutils'
-   rwdshellname = "rwdwruby-" + RwdRubyVersion + ".cnf"
+   rwdshellname = "rwdwruby.cnf"
    newname = rwdshellname # grab the filename to create
    newdata =@a_rshellconfiguration
 	 

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

@@ -28,10 +28,7 @@ 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
 	  
@@ -45,13 +42,10 @@ begin
 	 
        eval configfileload  #load  config file
        
-    
-	
 	 rescue
-   
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - config load"
-          end
+	 
+   $rwdtinkerlog.error  "initiateapplet: error in initiateapplets - config load"
+        
         debuginitiate += 1
 end
 $tempdoc = " "
@@ -59,80 +53,24 @@ $tempdoc = " "
   Dir.chdir($progdir) # change back to top program directory
 
   # build the English Language hash file from the parts
-  languagehashvariable = 'Message.update('
-  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
-  end
-
+  require 'lib/rwdtinker/rwdlangdir'
+  
+  tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,"en")
 
   #writes the contents of doc into the  languagehashvariable 
-
   
-  languagehashvariable  =  languagehashvariable + $tempdoc + ' :rwdtinker => "Rwdtinker" ) ;'
+  languagehashvariable  =  tempdoc  
 
   # END of en Lang building
   $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
+  tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,$lang)
 
+   #writes the contents of doc into the variable
 
-  #writes the contents of doc into the variable
-
- languagehashvariable =  languagehashvariable  + "  Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
- 
-  
-    
-  $tempdoc = " "
+ languagehashvariable =  languagehashvariable + tempdoc 
 
   Dir.chdir($progdir) # change back to top program directory
 
@@ -143,87 +81,63 @@ $tempdoc = " "
   begin # error trap
   
 	# 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
-
-$rwd_gui_tinker = $tempdoc
-
+  tempdoc = " "
+  
+   require 'lib/rwdtinker/rwdguidir'
+   
+  tempdoc = RwdtinkerTools.findguifiles(GuiDir)
+  
+ $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 
 
 
   
@@ -236,5 +150,21 @@ return " applet loading successful " + tempresult
 end
 
 
+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
+
 
   

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

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

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

@@ -1,4 +1,4 @@
-##VERSION: (1.07)
+##VERSION: (1.08)
 ##NAME: ($shellscript_directory):(1.06)
 $shellscript_directory = "scripts"
 AcpiCommand = "acpi"
@@ -21,4 +21,4 @@ JumpLink.update(:RwdRubyBackWindow=>"runrwdrubybackwindow", :RunRuby=>"runrwdrub
 ##NAME: ($rwdjumplink):(1.06)
 $rwdjumplink << "RwdRubyBackWindow" << "RunRuby" << "RefreshAcpi"
 ##NAME: (RwdRubyVersion):(1.06)
-RwdRubyVersion = "1.07"
+RwdRubyVersion = "1.08"