rubyslippers 1.07 → 1.08

data/Readme.txt

@@ -19,13 +19,6 @@ ruby init.rb
 Then point your web browser to:
 http://localhost:7705/
 
-Change language at:
-
-configuration/language.dist
-
-Change to Windows XP directory structure at:
-configuration/tinkerwin2variables.dist
-
 == Viewing installed Applets:
  
 Go to "List Scripts" tab
@@ -234,6 +227,26 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 1.77
+ Fixed zips location to be relative or absolute
+ Made themes loadable
+
+Version 1.76
+ Move rwd code files into lib directory - bug - 21886
+ change tab name list applets - bug - 21864	
+ change extra folder to be lib folder - bug 21887
+  remove duplicate intall applet code - bug  21885	
+  On Menu tab/Selection Tab - add help button - bug 21884
+  clean up directory structure in gui directory - bug 21882
+
+Version 1.75
+ change rwd.rb to use UTF-8 for web pages
+ add language load for applets
+ 
+Version 1.74
+  remove remote control from help
+  more dependable gui loading for applets
+
 Version 1.73
   more debug info in initiateapplet
   remove gutenberg lang translations 

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.rubyslippers/0uninstallapplet.rb

@@ -1,4 +1,4 @@
-def wrubyslippers_1_07()
+def wrubyslippers()
 
 $tinkerdocumentsarray.delete_if {|x| x == "HowTo_RubySlippers.txt"}
 $tinkerhelpaboutarray.delete_if {|x| x == "RubySlippers"}

data/code/superant.com.rubyslippers/gemwhich.rb

@@ -1,7 +1,7 @@
 #gemwhich command
   def rungemwhichcommand
    
-    commandtext = "gemwhich " + @a_gemwhichcommandinput.to_s + " " + @a_gemcommandoptioninput.to_s
+    commandtext = "gem which " + @a_gemwhichcommandinput.to_s + " " + @a_gemcommandoptioninput.to_s
     commandtemp = $xpcommand  + commandtext
     begin # exception trapped block
          

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

@@ -3,37 +3,21 @@
  
          require 'fileutils'
           
-               @a_rsconfigurationfilename = "wrubyslippers-#{RubySlippersVersion}.cnf" 
+               @a_rsconfigurationfilename = "wrubyslippers.cnf" 
         
 	      
         begin # exception trapped block
        
-       Dir.chdir($progdir)
-	      fileName = File.join(ConfigurationDir, "wrubyslippers-#{RubySlippersVersion}.cnf")
+               Dir.chdir($progdir)
+	      fileName = File.join(ConfigurationDir,  @a_rsconfigurationfilename )
         
         
 	      fd = File.open(fileName,"r")
-	      @a_rsconfigline1=        fd.readline.chomp
-	      @a_rsconfigline2 =  fd.readline.chomp
-        @a_rsconfigline3 = fd.readline.chomp
-          @a_rsconfigline4 = fd.readline.chomp
-        @a_rsconfigline5 = fd.readline.chomp
-         @a_rsconfigline6 = fd.readline.chomp 
-          @a_rsconfigline7 =fd.readline.chomp
-          @a_rsconfigline8 = fd.readline.chomp
-           @a_rsconfigline9 = fd.readline.chomp
-           @a_rsconfigline10 = fd.readline.chomp
-           @a_rsconfigline11 = fd.readline.chomp
-           @a_rsconfigline12 = fd.readline.chomp
-           @a_rsconfigline13 = fd.readline.chomp
-	  @a_rsconfigline14 = fd.readline.chomp
-           @a_rsconfigline15 = fd.readline.chomp
-	  @a_rsconfigline16 = fd.readline.chomp
-	      while ! fd.eof?
-	        @extrarsconfigdatadisplay = fd.readline
-	      end
-        fd.close
-        rescue SystemCallError, StandardError
+	      @a_rsconfigdata =        fd.read
+	
+               fd.close
+       
+       rescue SystemCallError, StandardError
             $stderr.print "system call error: " + $!
         end # exception rescue
 

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

@@ -1,13 +1,13 @@
    # this method loads the on screen variables into the running class
    def loadrubyslippersconfigurationvariables
    
-   configfiletoload = File.join(ConfigurationDir,"rubyslippers.cnf")
+   configfiletoload = File.join(ConfigurationDir,"wrubyslippers.cnf")
    begin
-    load configfiletoload
-    @extrarsconfigdatadisplay = ""
-@newrsconfigurationresult = "Config Variables loaded"
-rescue
- @extrarsconfigdatadisplay = ""
- @newrsconfigurationresult = "loading error"
- end
+          load configfiletoload
+    
+          $rwdtinkerlog.info "loadrubyslippersconfigurationvariables: Config Variables loaded"
+     rescue
+
+             $rwdtinkerlog.error "loadrubyslippersconfigurationvariables: loading error"
+       end
   end

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

@@ -2,8 +2,8 @@
   def saverubyslippersconfiguration
    require 'fileutils'
    
-   newname = "rubyslippers.cnf" # grab the filename to create
-   newdata =@a_rsconfigline1.to_s + "\n" + @a_rsconfigline2.to_s + "\n" + @a_rsconfigline3.to_s + "\n" + @a_rsconfigline4.to_s + "\n" + @a_rsconfigline5.to_s + "\n" + @a_rsconfigline6.to_s + "\n" + @a_rsconfigline7.to_s + "\n" + @a_rsconfigline8.to_s + "\n" + @a_rsconfigline9.to_s + "\n"+ @a_rsconfigline10.to_s + "\n"+ @a_rsconfigline11.to_s + "\n"+ @a_rsconfigline12.to_s + "\n"+ @a_rsconfigline13.to_s + "\n"+ @a_rsconfigline14.to_s + "\n"+ @a_rsconfigline15.to_s + "\n"+ @a_rsconfigline16.to_s + "\n"
+   newname = "wrubyslippers.cnf" # grab the filename to create
+   newdata = @a_rsconfigdata
 	 
         begin # exception trapped block
           fileName = File.join( ConfigurationDir, newname )

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
+