rwdgutenberg 0.08 → 0.09

data/ev/rwd.rb

@@ -635,7 +635,7 @@ class RWDWindow
 
   def initialize(rwd, window=nil)
     rwd	= rwd.join("\n")	if rwd.kind_of?(Array)
-
+  
     if @@windows[rwd].nil?
       @@windows[rwd]		= {}
       @@helpwindows[rwd]	= {}
@@ -666,6 +666,8 @@ class RWDWindow
 
     vars	= vars.deep_dup
 
+begin # error wrap
+
     vars.each do |key, value|
       if not key.empty?
         if value.respond_to? "to_s"
@@ -721,6 +723,12 @@ class RWDWindow
 
     html
   end
+  
+  rescue 
+  if $DEBUG
+  $stderr.puts  "error in RWDWindow - render method"
+  end
+  end
 end
 
 class RWDMessage < RWDWindow
@@ -763,8 +771,10 @@ class RWDDone < RWDWindow
 end
 
 class RWDialog
+	
   def initialize(xml)
-    @rwd_xml			= xml
+    @rwd_xml			=  $rwd_gui_tinker
+    # change from default ev - was xml
     @rwd_exitbrowser		= false
     @rwd_history		= []
     @rwd_ignore_vars		= []
@@ -818,6 +828,7 @@ class RWDialog
     help		= false
     back		= false
     tab			= ""
+    @rwd_progress_thread = nil
     @rwd_msgtype	= nil	if @rwd_progress_thread.nil?
     @rwd_download	= nil
     @rwd_download_file	= nil
@@ -833,7 +844,7 @@ class RWDialog
 		# Copy the vars from the window to vars. vars wil later on be copied to instance variables.
 
     post.sort.each do |key, value|
-      puts "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
+      puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
 
       vars[key]	= value.from_html
     end
@@ -910,7 +921,7 @@ 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
+          puts  "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -948,7 +959,7 @@ class RWDialog
 		# just ignore.
 
     vars.sort.each do |key, value|
-      puts "Pre: #{key} -> #{value.inspect}"	if $rwd_debug
+      puts  "Pre: #{key} -> #{value.inspect}"	if $rwd_debug
     end
 
 
@@ -971,11 +982,20 @@ class RWDialog
             res << RWDError.new(@rwd_msg).render(pda)	if @rwd_msgtype == "error"
             res << @rwd_msg				if @rwd_msgtype == "text"
           else
-            puts "Window: #{@rwd_window}"		if $rwd_debug
-            puts "Tab: #{@rwd_tab}"		if $rwd_debug
-
-            res << RWDWindow.new(@rwd_xml, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
-          end
+           puts   "Window: #{@rwd_window}"		if $rwd_debug
+            puts  "Tab: #{@rwd_tab}"		if $rwd_debug
+
+begin # error block
+      if @rwd_window.empty? 
+	      @rwd_window = "main"
+	      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
+ end
+end
         end
       end
     end

data/extras/zip/zip.rb

@@ -1047,8 +1047,9 @@ module Zip
 
     def write_file(entry, destPath, continueOnExistsProc = proc { false })
       if File.exists?(destPath) && ! yield(entry, destPath)
-	raise ZipDestinationFileExistsError,
-	  "Destination '#{destPath}' already exists"
+
+#	raise ZipDestinationFileExistsError,
+	$stderr.puts  "Destination '#{destPath}' already exists"
       end
       File.open(destPath, "wb") { 
 	  |os|

data/gui/00coreguibegin/applicationguitop.rwd

@@ -1,4 +1,4 @@
 $rwdguivar=
 "<application>
-  <window name=\"main\" title=\"RwdTinker - RubyWebDialogs\">
+  <window name=\"main\" title=\"RwdGutenberg - RwdTinker\">
 <tabs>"

data/gui/frontwindow0/viewlogo/cc0openphoto.rwd

@@ -0,0 +1,22 @@
+$rwdguivar=  
+	
+"	
+	<tab name=\"viewtinkerlogo\" caption=\"Tinker\">
+
+    <table>
+      <row> <p align=\"right\">#{Message[:tinker_logo]}</row>
+
+    </table>
+    <image src=\"tinker.png\"> </image>
+    <table>
+      <row> <p></row>
+
+    </table>
+      <horizontal>
+      
+      <button caption=#{Message[:help]} action=\"runhelpwindow\"/>
+      
+      
+     </horizontal>
+
+	</tab>"

data/gui/tinkerbackwindows/superant.com.gutenberg/10appletbegin.rwd

@@ -0,0 +1,4 @@
+$rwdguivar=
+"<application>
+  <window name=\"rwdgutenbergwindow\" title=\"RwdGutenberg RwdTinker\">
+<tabs>"

data/gui/tinkerbackwindows/superant.com.gutenberg/81jumplinkcommands.rwd

@@ -0,0 +1,17 @@
+$rwdguivar=
+"
+<tab name=selectiontab caption=#{Message[:selection_tab]}>
+<horizontal>
+<button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=#{Message[:jumptoapplication_location]} action=\"runjumplinkcommand\"/>
+    </horizontal>
+    </tab>
+"

data/gui/tinkerbackwindows/superant.com.gutenberg/9end.rwd

@@ -0,0 +1,6 @@
+$rwdguivar=
+"
+</tabs>
+</window>"
+
+

data/gui/tinkerbackwindows/superant.com.gutendisplay/gutendisplayhtmlwindow.rwd

@@ -1,6 +1,6 @@
 $rwdguivar=
 "
-  <window name=\"gutendisplayhtmlwindowtwo\" title=\"Auto HTML Display\" refresh=#{BookViewDisplay}>
+  <window name=\"gutendisplayhtmlwindowtwo\" title=\"Auto HTML Display\" refresh=#{$bookviewdisplay}>
     <small>
     <p>%%gutendisplayvariable%%</p>
     </small>   

data/gui/tinkerbackwindows/superant.com.gutendisplay/gutendisplaywindow.rwd

@@ -1,6 +1,6 @@
 $rwdguivar=
 "
-  <window name=\"gutendisplaywindowtwo\" title=\"Book Display\" refresh=#{BookViewDisplay}>
+  <window name=\"gutendisplaywindowtwo\" title=\"Book Display\" refresh=#{$bookviewdisplay}>
     <small>
     <p>%gutendisplayvariable%</p>
     </small>   

data/init.rb

@@ -18,7 +18,7 @@
 #* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #*
 #* For further information please contact the author by e-mail
-#* at "steven@superant.com".
+#* at "smalllinux@gmail.com".
 #***********************************************************************/
 
 require "ev/rwd"
@@ -234,8 +234,8 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
   end
 
   # gui variable is done
-  guiRWD = $tempdoc
-
+  guiRWD = ""
+  $rwd_gui_tinker = $tempdoc
   require 'socket'		# Network stuff
   host = "127.0.0.1"
   port = $port
@@ -273,5 +273,5 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 
   end
 
-
-  RwdTinker.new(  guiRWD).serve(port) # start the main class and program
+  
+  RwdTinker.new(  $rwd_gui_tinker ).serve(port) # start the main class and program

data/installed/{rwdwgutenberg-0.06.inf → rwdwgutenberg-0.09.inf}

@@ -1,7 +1,9 @@
 #rwdgutenberg - text reading frontend
-configuration/rwdgutenberg.dist
 gui/tinkerbackwindows/superant.com.gutenberg
 gui/tinkerbackwindows/superant.com.gutendisplay
-rwd_files/HowTo_Gutenberg.txt
 code/superant.com.gutenberg
-tests/makerwdwgutenberg-0.06.rb
+tests/gemspec-rwdwgutenberg
+tests/makedist-rwdwgutenberg.rb
+rwd_files/HowTo_Gutenberg.txt
+configuration/rwdwgutenberg-0.09.cnf
+configuration/rwdwgutenberg-0.09.dist

data/installed/temp.rb

@@ -0,0 +1 @@
+# this file does nothing

data/lang/en/rwdcore/languagefile.rb

@@ -10,13 +10,8 @@
  :edit             =>   "edit" , 
  :file_name => '"File Name:"',
  :fill_record => '"Fill Record"',
-   :gemcommands => '"Gem Commands"',   
-   :gemfiles => '"Gem Files"'   ,  
-   :gemdocs  => '"Gem Documents"'  ,  
-   :gem_name  => '"Gem Name"'        ,
    :help       => '"Help"',
  :help_about => '"Help About"',
-   :installgem  => '"Install Gem"'  ,
  :install_applet => '"install (rwdtinker) applet"',  
  :jumptoapplication_location => '"Jump to Application Location"', 
  :list_applets   => '"List Applets"',
@@ -57,7 +52,6 @@
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
  :view_event => '"View event"',       
- :view_gem    => '"View Gem"',  
  :viewinstall_text => '"View Install Text"' ,  
  :viewlistinstall_files => '"View List of Installed Files"', 
  :view_photo => '"View Photo"',  

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

@@ -10,13 +10,8 @@
  :edit             =>   "Editar" , 
  :file_name => '"Fila Nombre:"',
  :fill_record => '"Fill Record"',
-  :gem_commands => '"Comando de Gems"',   
-  :gem_files => '"Gem Archivos"'   ,  
-  :gem_docs  => '"Gem Documentos"'    ,  
-  :gem_name  => '"Gem Nombre"'      ,
   :help       => '"Ayuda"',
  :help_about => '"Ayuda sobre"',
-  :install_gem  =>  '"instale Gem"' ,
  :install_applet => '"instale (rwdtinker) applet"',  
  :jumptoapplication_location => '"Jump to Application Location"', 
  :list_applets   => '"List Applets"',
@@ -61,7 +56,6 @@
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
  :view_event => '"Ver evento"',       
- :view_gem    => '"Ver Gem"',  
  :viewinstall_text => '"Ver Texto"'   ,
  :viewlistinstall_files => '"View List of Installed Files"', 
  :view_photo => '"Ver Photo"' ,  

data/lang/nl/rwdcore/languagefile.rb

@@ -29,13 +29,8 @@
  :edit             =>   "edit" , 
  :file_name => '"File Name:"',
  :fill_record => '"Fill Record"',
-   :gem_commands => '"Gem Commands"',   
-   :gem_files => '"Gem Files"'   ,  
-   :gem_docs  => '"Gem Documents"'  ,  
-   :gem_name  => '"Gem Name"'        ,
    :help       => '"Help"',
  :help_about => '"Help About"',
-   :installgem  => '"Install Gem"'  ,
  :install_applet => '"install (rwdtinker) applet"',  
  :jumptoapplication_location => '"Jump to Application Location"', 
  :list_applets   => '"List Applets"',
@@ -74,7 +69,6 @@
  :view_platform => '"view platform"', 
  :viewplatform_information => '"View Platform Information"',  
  :view_event => '"View event"',       
- :view_gem    => '"View Gem"',  
  :viewinstall_text => '"View Install Text"' ,  
  :viewlistinstall_files => '"View List of Installed Files"', 
  :view_photo => '"View Photo"',  

data/rwd_files/HowTo_Gutenberg.txt

@@ -35,7 +35,43 @@ To exit, press the x inside the browser window.
  
  Edit Configuration - to change the configuration of rwdgutenberg
  
-        
+ == Help
+ 
+ 
+
+ Helptext.update( :rwdgutenberg_generalhelp => "This program is a text file reader
+      
+ links to a text file can be saved in the Books directory
+ 
+ There are tabs to enter notes and links and edit configurations
+ 
+ 'View/Edit Booklist' - to create or edit a file
+ 
+ 'Booklist Utilities' - to rename or delete files
+ 
+ 'Edit Configuration' - to change the configuration of rwdgutenberg
+ 
+ edit_help: You can create or edit booklists
+   click the bottom button 'list Booklists' to see a lists 
+   of the notes you already have.
+   'save changes' to save your edits
+   'clear' to clear the screen
+   'Create New List' to start a new booklist
+   After creating a new note, you must list below to find it
+   and select it, or it will NOT be SAVED
+  
+  utility_help: You can change the file
+   rename
+   delete
+   copy name
+   
+configuration:  click on 'Edit Configuration'
+  You can view the configuration file
+  You can edit the configuration
+   Remember to reload the configuration variables if you want your
+  changes used.
+  
+       
 == Using over a Network
   
 To serve the application over your local LAN,change the last line in the
@@ -80,7 +116,17 @@ Don't use the back-button of the browser! Strange and unpredictable things may a
 Steven Gibson
 steven@superant.com
 
-== Changelog 
+== Changelog 
+Version 0.09
+ refactored to load and unload under rwdtinker 1.73
+
+Version 0.08
+ updated to tinker 1.69
+
+Version 0.07
+ fixed file creation from directory search
+ added clear file list
+
 Version 0.06
  Add html viewing tab
  added reset button

data/rwdconfig.dist

@@ -14,6 +14,8 @@ $testharness=true
 $tinkerhelpaboutarray = ["Tinker"]
 ##NAME:$tinkerdocumentsarray:0
 $tinkerdocumentsarray = ["Readme.txt"]
-
-
+##NAME:$tinkeruninstallarray:0
+$tinkeruninstallarray = ["Tinker"]
+##NAME:JumpLink:0
+JumpLink = Hash.new { |hh, kk| hh[kk] = "ERROR: link not found: #{kk.inspect}."; hh[kk] }
 

data/rwdgutenberg.rb

@@ -0,0 +1 @@
+# this file does nothing

data/tests/cleancnf.sh

@@ -2,4 +2,5 @@
 rm *.cnf
 rm *.bak
 rm configuration/*.cnf
-rm configuration/*.bak
+rm configuration/*.bak
+rm *.gem

data/tests/makedist-rwdwgutenberg.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/ruby -w
+#***********************************************************************
+#* Rwd/Tinker -- A Ruby program for the RudyWebDialog.
+#* Copyright (c) 2004, 2005 by Steven Gibson. All Rights Reserved.
+#* at "steven@superant.com".
+#***********************************************************************/
+$progdir =""
+$tinkerhelpaboutarray = [""]
+$tinkerdocumentsarray = [""]
+$testharnessarray = [""]
+$rwdjumplink = [""]
+JumpLink = Hash.new("default")
+require 'fileutils'
+DistroName = "rwdwgutenberg"
+DistroVersion=0.09
+load "configuration/#{DistroName}-#{DistroVersion}.dist"
+
+
+DistroTitle="#{DistroName}-#{DistroVersion}"
+
+
+	
+$progdir = File::expand_path( File.dirname(__FILE__))
+results = " "
+
+puts "creating #{DistroName} distribution files version #{DistroVersion}"
+
+#puts "moving up one directory"
+#Dir.chdir("..")
+
+
+FileUtils.rm_rf("#{DistroTitle}.zip")
+zipcreatecmd = "zip  -r #{DistroTitle}.zip *" 
+puts "#{zipcreatecmd}"
+ `#{zipcreatecmd}`
+
+gemspecfilename = "rwdzip#{DistroTitle}.gemspec"
+tobject = Time.now
+year = tobject.year.to_s
+month = tobject.mon.to_s
+daydate = tobject.day.to_s
+
+fd = File.open(gemspecfilename,"w")
+fd.print("Gem::Specification.new do |s|\n")
+fd.print("  s.name = %q{rwdzip#{DistroName}}\n")
+fd.print("  s.version = \"#{DistroVersion}\"\n")
+fd.print("  s.date = %q{#{year}-#{month}-#{daydate}}")
+load "tests/gemspec-#{DistroName}"
+fd.print($gemspecvar)
+fd.close
+
+ListingCommand = "ls -1 -s -h rwdzip#{DistroTitle}*"
+
+puts `#{ListingCommand}`
+
+print "Build finished\n"

data/tests/makedist.rb

@@ -5,15 +5,21 @@
 #* at "steven@superant.com".
 #***********************************************************************/
 $progdir =""
+$tinkerhelpaboutarray = [""]
+$tinkerdocumentsarray = [""]
+$testharnessarray = [""]
+$rwdjumplink = [""]
+JumpLink = Hash.new("default")
 require 'fileutils'
-load 'rwdconfig.dist'
-DistroName = "rwdgutenberg"
-load "configuration/#{DistroName}.dist"
-DistroVersion=RwdGutenbergVersion
 
-DistroTitle="#{DistroName}-#{DistroVersion}"
+DistroName = "rwdwgutenberg"
 
+DistroVersion="0.09"
 
+DistroTitle="#{DistroName}-#{DistroVersion}.dist"
+load "configuration/#{DistroTitle}"
+DistroTitle = "rwdgutenberg-#{DistroVersion}"
+DistroName = "rwdgutenberg"
 	
 $progdir = File::expand_path( File.dirname(__FILE__))
 results = " "