rwdgutenberg 0.07 → 0.08

data/Readme.txt

@@ -81,6 +81,9 @@ Steven Gibson
 steven@superant.com
 
 == Changelog 
+Version 0.07
+ updated to tinker 1.69
+
 Version 0.06
  Add html viewing tab
  added reset button

data/code/01rwdcore/03helptexthash.rb

@@ -1,31 +1,31 @@
  # Help files for RwdTinker core
 
    
-      :general_help          => "You can work with Applets:  go to 'Selection tab', 
-                                  On that back screen you will find:
-                                  List Applets:  you can see and delete installed applets
-                                  List Zips: you can see lists of applets that you can install
-                                  Edit Configuration: You can view the rwdtinker configuration and change it
-                                  Diagnostic Tab: You can view the environments variables that rwdtinker is running with
+      :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
-init.rb file to something like:\n
-RwdTinker.file(RWDFile).serve(8080, '-r' ? '.rwduids' : nil)\n
+      :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",
 
           
-  :documents_rwdtinker => "Documents:
+  :documents_rwdtinker => "<b>Documents:
+  <p>
   
-  
-  when you click on a document name, the document should pop up in a 
-  browser window, or in another browser tab.",
-  :remote_control => "Remote control gives you a way to determine what applications are running on which ports
-  
-  The name of the application is set in the config file
-  You need to click the show remote command choices first - this will show the port and query choices
-   Then you can click in 'Run Command' to see if other applications are running.
-   
+  when you click on a document name, the document should pop up in a <br>
+  browser window, or in another browser tab.</b>",
+  :remote_control => "<b>Remote control gives you a way to determine what applications are running on which ports
+  <p>
+  The name of the application is set in the config file<br>
+  You need to click the show remote command choices first - this will show the port and query choices<br>
+   Then you can click in 'Run Command' to see if other applications are running.<br>
+<p>
    The remote ports daemon will not be running unless you start it.
-   
+   </b>
   "
       

data/code/dd0viewphoto/dd0viewphoto.rb

@@ -0,0 +1,3 @@
+def viewphoto
+	@rwd_window = "photo"
+end

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

@@ -18,11 +18,7 @@ def runhelpwindowtinkerwin2
 	end
 	if @rwd_tab == "editconfigurationfile"
 		$help_topic = "applet_tinkerbackeditconfiguration"
-
-	end
-	if @rwd_tab == "rwdremotecontrol"
-		$help_topic = "remote_control"
-
+	
 	end
 	if @rwd_tab == "superantcomremotezipsinstall"
 		$help_topic = "remotegemapplet_install"

data/configuration/language.dist

@@ -1,7 +1,8 @@
-##VERSION:1.62
+##VERSION:1.68
 #language selection file
 ##NAME:$lang:0
 #$lang = "jp"
 $lang= "en"
 #$lang= "nl"
 #$lang= "es"
+#$lang= "fr"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION:1.66
+##VERSION:1.69
 $rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdgutenberg.dist

@@ -1,4 +1,4 @@
-##VERSION:0.07
+##VERSION:0.08
 ##NAME:$rwdgutenberg_directory:0
 $rwdgutenberg_directory = "Books"
 ##NAME:$gutenbergcommand:0
@@ -6,11 +6,11 @@ $gutenbergcommand = "openbook"
 ##NAME:$booklocation:0
 $booklocation = 0
 ##NAME:$booksteps:0
-$booksteps = 14
+$booksteps = 12
 ##NAME:BookViewDisplay:0
  BookViewDisplay = 15
 $tinkerdocumentsarray += ["HowTo_Gutenberg.txt"]
 $tinkerhelpaboutarray += ["RwdGutenberg"]
 ##NAME:RwdGutenbergVersion:0
-RwdGutenbergVersion = "0.07"
+RwdGutenbergVersion = "0.08"
  

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.66
+##VERSION:1.69
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -13,7 +13,7 @@ LangDir = "lang"
  $port = 7705
 $rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
 Browser_Exe = 'mozilla '
-$tinkerdocumentsarray +=["COPYING","HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
-RwdTinkerVersion = "1.66"
+$tinkerdocumentsarray +=["HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
+RwdTinkerVersion = "1.69"
 	
    

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION:1.66
+##VERSION:1.69
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME:$zipslocation:0
 $zipslocation = "zips" # location of applets to add
@@ -7,11 +7,11 @@ $zipslocation = "zips" # location of applets to add
  $xpcommand = " "  # Linux machines
 # $xpcommand =  "cmd /C "  # XP machines with cmd shell
 ##NAME:$gemdirectory_withgemfiles:0
- $gemdirectory_withgemfiles = "/usr/lib/ruby/gems/1.8/gems"
+ $gemdirectory_withgemfiles = "/var/lib/gems/1.8/gems"
 # $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems"  # XP machine
 ##NAME:$geminstalled_directory:0
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
- $geminstalled_directory = "/usr/lib/ruby/gems/1.8/gems" # Debian Linux
+ $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
 RwdTinkerWin2Version = "0.8"
 

data/ev/browser.rb

@@ -16,20 +16,33 @@ def windowsbrowser
   application	= nil
 
   begin
-    Win32::Registry::HKEY_CLASSES_ROOT.open('.html') do |reg|
+    Win32::Registry::HKEY_CLASSES_ROOT.open(".html") do |reg|
       filetype		= reg[""]
     end
 
-    Win32::Registry::HKEY_CLASSES_ROOT.open(filetype + '\shell\open\command') do |reg|
+    Win32::Registry::HKEY_CLASSES_ROOT.open(filetype + "\\shell\\open\\command") do |reg|
       application	= reg[""]
     end
   rescue NameError
-    $stderr.puts "Only available for Windows."
+    $stderr.puts "Only available for Windows and Cygwin."
   end
 
   application
 end
 
+def cygwinbrowser
+  browser, *args	= windowsbrowser.splitwords
+  browser		= browser.gsub(/\\/, "/")
+  #browser		= browser
+
+  args.collect!{|a| a.gsub(/\\/, "/")}
+  #args.collect!{|a| "\"%s\"" % [a.gsub(/\\/, "/")]}
+  #args.collect!{|a| "\"%s\"" % [a]}
+
+  res	= "\"%s\" %s" % [browser, args.join(" ")]
+  res
+end
+
 def linuxbrowser
   application	= ""
 
@@ -47,25 +60,26 @@ end
 def defaultbrowser
   res	= nil
   res	= windowsbrowser	if windows?
+  res	= cygwinbrowser		if cygwin?
   res	= linuxbrowser		if linux?
   res
 end
 
+def showurlinbrowser(url, browser=defaultbrowser)
+  command	= "#{browser} \"#{url}\""
+
+  system(command)	or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+end
+
 def showinbrowser(html, browser=defaultbrowser)
   port, io	= TCPServer.freeport(7701, 7709)
 
   unless browser.nil?
     Thread.new do
       begin
-	#command	= "1234 \"http://localhost:#{port}\""										if linux?
-	#command	= "L:/prog/MozillaFirefox/firefox.exe \"http://localhost:#{port}\""						if cygwin?
-	#command	= Win32::Registry::HKEY_CLASSES_ROOT.open('htmlfile\shell\open\command')[0] + " \"http://localhost:#{port}/\""	if windows?
-
-	command	= "#{browser} \"http://localhost:#{port}\""
-
 	Thread.pass
 
-	system(command)
+        showurlinbrowser("http://localhost:#{port}/", browser)
       rescue
       end
     end

data/ev/ftools.rb

@@ -1,22 +1,12 @@
 require "ftools"
 
 class Dir
-  def self.mkdirrec(dir)
-    pdir	= File.dirname(dir)
-
-    if not pdir.empty? and not File.directory?(pdir)
-      Dir.mkdirrec(pdir)
-    end
-
-    Dir.mkdir(dir)	rescue nil
-  end
-
   def self.copy(from, to)
     if File.directory?(from)
       pdir	= Dir.pwd
       todir	= File.expand_path(to)
 
-      mkdirrec(todir)
+      File.mkpath(todir)
 
       Dir.chdir(from)
         Dir.new(".").each do |e|
@@ -26,7 +16,7 @@ class Dir
     else
       todir	= File.dirname(File.expand_path(to))
 
-      mkdirrec(todir)
+      File.mkpath(todir)
 
       File.copy(from, to)
     end
@@ -38,6 +28,8 @@ class Dir
   end
 
   def self.rm_rf(entry)
+    File.chmod(0755, entry)
+
     if File.ftype(entry) == "directory"
       pdir	= Dir.pwd
 
@@ -47,16 +39,24 @@ class Dir
         end
       Dir.chdir(pdir)
 
-      Dir.delete(entry)
+      begin
+        Dir.delete(entry)
+      rescue => e
+        $stderr.puts e.message
+      end
     else
-      File.delete(entry)
+      begin
+        File.delete(entry)
+      rescue => e
+        $stderr.puts e.message
+      end
     end
   end
 
   def self.find(entry=nil, mask=nil)
     entry	= "."	if entry.nil?
 
-    entry	= entry.gsub!(/[\/\\]*$/, "")	unless entry.nil?
+    entry	= entry.gsub(/[\/\\]*$/, "")	unless entry.nil?
 
     mask	= /^#{mask}$/i	if mask.kind_of?(String)
 
@@ -77,8 +77,8 @@ class Dir
         ensure
           Dir.chdir(pdir)
         end
-      rescue Errno::EACCES => error
-        puts error
+      rescue Errno::EACCES => e
+        $stderr.puts e.message
       end
     else
       res += [entry]	if mask.nil? or entry =~ mask
@@ -99,7 +99,7 @@ class File
 	# Rollback
 
     if File.file?(backupfile) and File.file?(controlfile)
-      $stdout.puts "Restoring #{file}..."
+      $stderr.puts "Restoring #{file}..."
 
       File.copy(backupfile, file)				# Rollback from phase 3
     end
@@ -139,7 +139,11 @@ class File
   end
 
   def self.touch(file)
-    File.open(file, "a"){|f|}
+    if File.exists?(file)
+      File.utime(Time.now, File.mtime(file), file)
+    else
+      File.open(file, "a"){|f|}
+    end
   end
 
   def self.which(file)