rwdtinker 1.83 → 1.84

data/code/01rwdcore/01rwdcore.rb

@@ -12,8 +12,7 @@ class RwdTinker  < RWDialog
 
 		@display= "idle"
 		if TestNow 
-
-			rwdtest_harness
+                     rwdtest_harness
 		end
             showjumplinkoptions
             setuptinkerdocuments

data/code/01rwdcore/test_cases.rb

@@ -1,71 +1,120 @@
 # test harness
 
 	
-require 'test/unit/testcase'
-require 'test/unit/assertions'
-include Test::Unit::Assertions
-include Test::Unit  
-def rwdtinker_all_tests 
-	print "in rwdtinker all tests\n"
-  $testrwdtinkertestcase = TestSuite.new
-	test_runrwdtinkerbackwindow
-end
-
-def test_runrwdtinkerbackwindow
-
 
-	begin
-  testasserts = 0
-  print "Starting rwdtinker tests!\n"
+def rwdtinker_all_tests 
+	$rwdtinkerlog.info "in rwdtinker all tests"
+	
+    $rwdtinkerlog.info "Starting rwdtinker tests!\n"
 		runrwdtinkerbackwindow
-    
-    assert_equal("tinkerbackwindow",@rwd_window) ; testasserts += 1 
-     runselectiontab
-     assert_equal("selectiontab",@rwd_tab) ; testasserts += 1
+
+    if  "tinkerbackwindow" == @rwd_window
+       $testasserts += 1 
+       else
+	     $testfailures += 1
+	     $testerrorarray << "runrwdtinkerbackwindow"
+     end
+     
+  runselectiontab
+
+     if "selectiontab" == @rwd_tab
+	     $testasserts += 1
+	       else
+	     $testfailures += 1
+	     $testerrorarray << "selectiontab"
+     end
+         
     showjumplinkoptions
     @a_jumplinkinput = "returntomain"
    runjumplinkcommand
-    assert_equal("main",@rwd_window) ; testasserts += 1 
+    if "main"  == @rwd_window
+  $testasserts += 1
+  	       else
+	     $testfailures += 1
+	     $testerrorarray << "returntomain"
+     end
 		@a_jumplinkinput = "helpscreen"
     runjumplinkcommand 
     
-     assert_equal("rwdtinkerhelpwindow",@rwd_window)  ; testasserts += 1
-     returntomain
-     assert_equal("main",@rwd_window)  ; testasserts += 1
+     if  "rwdtinkerhelpwindow" == @rwd_window
+	     $testasserts += 1
+	            else
+	     $testfailures += 1
+	     $testerrorarray << "helpscreen"
+     end
+
      runtinkerdocuments
-     assert_equal("documentsrwdtinkerone",@rwd_tab)  ; testasserts += 1
-     	runrwdtinkerbackwindow
-    
-    assert_equal("tinkerbackwindow",@rwd_window) ; testasserts += 1 
-    @a_installapplet="/usr/src/rwdapplets/rwdtinker/zips/rwdahelloworld-0.5"
-    viewgemappletcontents
-    assert_not_nil(@appletcontentstext)  ; testasserts += 1
-    runrwdtinkerwin2version
-      assert_equal("applicationversion",@rwd_window) ; testasserts += 1 
-        returntomain
-     assert_equal("main",@rwd_window)  ; testasserts += 1
-      	runrwdtinkerbackwindow
-    
-    assert_equal("tinkerbackwindow",@rwd_window) ; testasserts += 1 
-    runremotezipsinstall
-     assert_equal("superantcomremotezipsinstall",@rwd_tab) ; testasserts += 1
-    runeditconfiguration   
-    assert_equal("editconfigurationfile",@rwd_tab) ; testasserts += 1    
-    
-     
- $stderr.print "tests completed succesfully!\n"
- $stderr.print testasserts, " asserts performed\n"
+     if "documentsrwdtinkerone" == @rwd_tab
+	     $testasserts += 1
+	            else
+	     $testfailures += 1
+	     $testerrorarray << "runtinkerdocuments"
+     end
 
-	rescue  NotImplementedError, Exception
-		$stderr.print $!
 
-	end
-  
-end
+    runrwdtinkerwin2version
+      if "applicationversion" == @rwd_window
+	      $testasserts += 1
+	                  else
+	     $testfailures += 1
+	     $testerrorarray << "runrwdtinkerwin2version"
+     end
 
+  
+    runremotezipsinstall
+     if "superantcomremotezipsinstall" ==  @rwd_tab
+	     $testasserts += 1     
+	     else
+	     $testfailures += 1
+	     $testerrorarray << "runremotezipsinstall"
+     end
 
+    runeditconfiguration   
+    if "editconfigurationfile" == @rwd_tab
+	    $testasserts += 1
+	        else
+	     $testfailures += 1
+	     $testerrorarray << "runeditconfiguration"
+     end
+ runhelpwindowtinkerwin2
+ 
+  if  @rwd_tab == "editconfigurationfile"  && @rwdhelpdataoutput.include?("Remember to reload the configuration variables")
+   $testasserts += 1
+	        else
+	     $testfailures += 1
+	     $testerrorarray << "applet_tinkerbackeditconfiguration"
+     end
+     
+     
+   rwd_jump("rwdlogfiletab", "rwd_tab_rwdlogfiletab")
+ 
+     if  @rwd_tab == "rwdlogfiletab"
+	    $testasserts += 1
+	        else
+	     $testfailures += 1
+	     $testerrorarray << "rwdlogfiletab"
+     end
+     
+    rwd_jump( "diagnostictab")
+         if  @rwd_tab == "diagnostictab"
+	    $testasserts += 1
+	        else
+	     $testfailures += 1
+	     $testerrorarray << "diagnostictab"
+     end
+ end
+ 
+ def rwd_jump(tab, go="")
+	 @rwd_tab = tab
+  @rwd_action = go
+  end
+ 
+ def teststobedown  
+          	runrwdtinkerbackwindow
+        @a_installapplet="/usr/src/rwdapplets/rwdtinker/zips/rwdahelloworld-0.5"
+    viewgemappletcontents
+    assert_not_nil(@appletcontentstext)  ; testasserts += 1
 
-def teststobedown
  runtinkerhelpabout
           assert_equal("rwdtinkerhelpwindow",@rwd_tab)  ; testasserts += 1
 	raise NotImplementedError, 'Need to write test_choosenewhelptopic'

data/code/01rwdcore/test_harness.rb

@@ -2,12 +2,19 @@
 def rwdtest_harness
 
 	print "in test harness\n"
-  
+       $testasserts = 0
+       $testerrorarray = [""]
+        $testfailures = 0 
+ 	
 	$testharnessarray.each { |x| 
 		print "calling #{x}\n"
 		eval("#{x}")
 
 	}
+	$rwdtinkerlog.info "successes = #{$testasserts}"
+	$rwdtinkerlog.info "failures  =  #{$testfailures}"
+	$rwdtinkerlog.info  "failed methods #{$testerrorarray}" 
+	$rwdtinkerlog.info  "tested methods #{$testharnessarray}"
 
 end
 

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

@@ -0,0 +1,84 @@
+
+#***********************************************************************
+#* Rwd/Tinker -- A Ruby program for the RudyWebDialog.
+#* Copyright (c) 2004, 2005 by Steven Gibson. All Rights Reserved.
+#*
+#* This library is free software; you can redistribute it and/or
+#* modify it under the terms of the GNU General Public
+#* License as published by the Free Software Foundation; either
+#* .
+#*
+#* These files are distributed in the hope that they will be useful,
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#* General Public License for more details.
+#*
+#* You should have received a copy of the GNU General Public
+#* License along with these files; if not, write to the Free Software
+#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#*
+#* For further information please contact the author by e-mail
+#* at "smalllinux@gmail.com".
+#***********************************************************************/
+
+def  runlocalechangercommand
+	
+	$rwdtinkerlog.info "preparing to restart gui"
+	
+	  $lang = @a_localechooseinput  # pick the language of choice
+	  
+tempdoc = " "
+
+  Dir.chdir($progdir) # change back to top program directory
+
+
+  # build the English Language hash file from the parts
+
+   
+  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  =  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
+    
+  
+  
+   # 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 
+
+    Dir.chdir($progdir) # change back to top program directory
+    
+    # lets read those po files, first english then the chosen language
+    temp = eval(   languagehashvariable )
+
+  
+
+
+  # build the actual GUI from the gui parts
+   require 'lib/rwdtinker/rwdguidir'
+   
+  tempdoc = RwdtinkerTools.findguifiles(GuiDir)
+  
+
+  # gui variable is done
+  guiRWD = ""
+  $rwd_gui_tinker =  tempdoc
+  
+   $rwdtinkerlog.info "restarting gui now"
+   
+RWDWindow.new($rwd_gui_tinker, @rwd_window).render("DEFAULT")
+
+end
+
+  

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

@@ -23,7 +23,9 @@ def runhelpwindowtinkerwin2
 	if @rwd_tab == "superantcomremotezipsinstall"
 		$help_topic = "remotegemapplet_install"
 	end
-
+	if @rwd_tab == "localechangertab"
+        $help_topic = "localechanger_help"
+	end
 	
 	if @rwd_window != "rwdtinkerhelpwindow"
 		$previouswindow = @rwd_window

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

@@ -0,0 +1,9 @@
+# Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
+# help about option setup for rwdtinker application
+
+
+def showlocalechoicesoptions
+
+  @localechooseoptions = $langarray.rwd_options
+end	
+   

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.83)
+##VERSION: (1.84)
 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
-##NAME: (RwdTinkerVersion):(1.83)
-RwdTinkerVersion = "1.83"
+##NAME: (RwdTinkerVersion):(1.84)
+RwdTinkerVersion = "1.84"
 

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.82)
+##VERSION: (1.84)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add

data/gui/00coreguibegin/applicationguitop.rwd

@@ -3,9 +3,7 @@ $rwdguivar=
   <window name=\"main\" title=\"RwdTinker - Webdialogs for Ruby\">
 <tabs>"
 
-__END__
 
-=begin
-Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
-This is the first part of the window for the core application
-=end
+#Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
+#This is the first part of the window for the core application
+

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/80localechanger.rwd

@@ -0,0 +1,17 @@
+$rwdguivar=
+"
+<tab name=localechangertab caption=#{Message[:localechangertablabel]}>
+<horizontal>
+<button caption=#{Message[:tinkercoreshowlocale_choices]} action=\"showlocalechoicesoptions\"/>
+<button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
+</horizontal>
+ <table>
+      <select name=\"a_localechooseinput\">  %%localechooseoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=#{Message[:tinkercorechangelocale]} action=\"runlocalechangercommand\"/>
+    </horizontal>
+    </tab>
+"

data/lang/en/rwdcore/en.po

@@ -66,6 +66,12 @@ msgid "file_name"
   msgid "listzipdirappletsavailable"  
   msgstr  '"List (zip directory) applets available for installation"'
   
+  msgid "localechangertablabel"
+   msgstr  '"Locale Changer"'
+   
+    msgid "locale_changer_help"
+    msgstr  "You can change the locale on this tab<br>Click on Show Locale Choices to fill in  the pull down options<br>When you click on Change Locale Now the entire GUI will be reloaded" 
+  
   msgid "menu_panel"     
   msgstr  '"Menu Panel"'
   
@@ -129,6 +135,12 @@ msgid "selection_panel"
 msgid "selection_tab" 
   msgstr  '"Menu Tab"'
 
+msgid "tinkercoreshowlocale_choices"
+ msgstr  '"Show Locale Choices"'
+ 
+msgid "tinkercorechangelocale"
+ msgstr  '"Change Locale Now"'
+
 msgid "tinker_logo"
   msgstr  '"Tinker Logo"'
 
@@ -173,7 +185,7 @@ msgstr  '"View Install Text"'
                        rwdapplications. On the front screen you can view
                        documents and make menu choices.  On the back 
                        screen you will find:<p>
-                       You can work with Applets:  go to 'Selection tab', <br>
+                       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>

data/lang/es/rwdcore/es.po

@@ -135,6 +135,12 @@ msgstr   '"Panel de Selección"'
  msgid "tinker_logo"
  msgstr   '"Insignia de Tinker"'
 
+ msgid "tinkercorechangelocale"
+ msgstr  '"Cambiar localización ahora"'
+
+ msgid "tinkercoreshowlocale_choices"
+ msgstr '"Mostrar opciones de localización"'
+ 
 msgid "selection_tab"
 msgstr   '"Tab de Selección"'
 

data/lib/zip/ioextras.rb

@@ -1,4 +1,16 @@
-module IOExtras
+module IOExtras  #:nodoc:
+
+  CHUNK_SIZE = 32768
+
+  RANGE_ALL = 0..-1
+
+  def self.copy_stream(ostream, istream)
+    s = ''
+    ostream.write(istream.read(CHUNK_SIZE, s)) until istream.eof? 
+  end
+
+
+  # Implements kind_of? in order to pretend to be an IO object
   module FakeIO
     def kind_of?(object)
       object == IO || super
@@ -20,6 +32,34 @@ module IOExtras
 
     attr_accessor :lineno
 
+    def read(numberOfBytes = nil, buf = nil)
+      tbuf = nil
+
+      if @outputBuffer.length > 0
+        if numberOfBytes <= @outputBuffer.length
+          tbuf = @outputBuffer.slice!(0, numberOfBytes)
+        else
+          numberOfBytes -= @outputBuffer.length if (numberOfBytes)
+          rbuf = sysread(numberOfBytes, buf)
+          tbuf = @outputBuffer
+          tbuf << rbuf if (rbuf)
+          @outputBuffer = ""
+        end
+      else
+        tbuf = sysread(numberOfBytes, buf)
+      end
+
+      return nil unless (tbuf)
+
+      if buf
+        buf.replace(tbuf)
+      else
+        buf = tbuf
+      end
+
+      buf
+    end
+
     def readlines(aSepString = $/)
       retVal = []
       each_line(aSepString) { |line| retVal << line }
@@ -66,7 +106,8 @@ module IOExtras
   end
 
 
-  #relies on <<
+  # Implements many of the output convenience methods of IO.
+  # relies on <<
   module AbstractOutputStream 
     include FakeIO