rwdmpd 0.06 → 0.07

data/lib/rwd/rwd.rb

@@ -57,7 +57,8 @@ if ENV["RWDTHEME"]
 		load 'lib/rwdthemes/default.rwd'
 	end
 	if ENV["RWDTHEME"] = "DEFAULT"
-           $stderr.puts  "loading theme DEFAULT"
+		$rwdtinkerlog.info "rwd: loading theme DEFAULT"
+           
           load 'lib/rwdthemes/default.rwd'
        end
         if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
@@ -267,7 +268,7 @@ class EVTable
 end
 
 class OpenTag
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     bef	= before[-1]
     res << Format % ["Before", @subtype]	if ($rwd_debug and not bef.nil?)
     res << bef	if not bef.nil?
@@ -299,7 +300,7 @@ class OpenTag
       args["nohelpbutton"]	= (not help)
 
       template	= $rwd_html_1
-      template	= $rwd_html_PDA_1	if pda
+      # template	= $rwd_html_PDA_1	if pda
 
       res << (template(template, args))
     when "p"		then res << "<p #{align}>"
@@ -493,7 +494,7 @@ class OpenTag
     after.push(aft)
   end
 
-  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     case @subtype
     when "vertical", "window", "helpwindow", "tab", "panel"
       res << Format % ["BefPost", @subtype]	if $rwd_debug
@@ -635,7 +636,7 @@ class OpenTag
 end
 
 class Text
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     if not @text.scan(/[^ \t\r\n]/).empty?
       res << Format % ["Text", ""]	if $rwd_debug
       res << "#{@text}"
@@ -742,8 +743,8 @@ class RWDWindow
                                           end
   
   rescue 
-			
-  $stderr.puts  "error in RWDWindow - render method"
+		$rwdtinkerlog.error 	"error in RWDWindow - render method"
+  
   end
   end
 
@@ -864,13 +865,11 @@ class RWDialog
 
     post.sort.each do |key, value|
       puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
- if $DEBUG
-	$stderr.puts  "Post: #{key} -> #{value.from_html.inspect}\n"
-	end
+      $rwdtinkerlog.info "Post: #{key} -> #{value.from_html.inspect}\n"
+
       vars[key]	= value.from_html
-       if $DEBUG
-	$stderr.puts  " #{value.from_html}\n"
-	end
+      $rwdtinkerlog.info  "rwd: #{value.from_html}\n"
+    
     end
 
 		# Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -938,16 +937,14 @@ class RWDialog
 		# Copy vars from window to instance.
 
       vars.each do |k, v|
-	      if $DEBUG
-	$stderr.puts  "Post: #{k} -> #{v}\n"
-	end
+	      $rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+	 
        		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
 			
 			 instance_eval "@#{k}	= ''"
 			instance_variable_set("@#{k}", vars.fetch("#{k}"))   
-			       if $DEBUG
-	$stderr.puts  "Post: #{k} -> #{v}\n"
-	end
+			$rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+
 		end	 
       end
 
@@ -955,7 +952,9 @@ 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
+	
+	$rwdtinkerlog.debug  "Method: #{@rwd_action}(#{@rwd_args})"	
+       
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -1025,9 +1024,9 @@ begin # error block
 	      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
+
+$rwdtinkerlog.error "rwd: error in render"
+
  end
 end
         end
@@ -1105,7 +1104,9 @@ end
       Thread.new do
         loop do
           if Time.now - @rwd_time > @rwd_timeout
-            $stderr.puts "Exiting due to timeout (#{@rwd_timeout} seconds)."
+		  
+		  $rwdtinkerlog.info "rwd: Exiting due to timeout (#{@rwd_timeout} seconds)."
+            
             exit 1
           end
           sleep interval
@@ -1185,7 +1186,7 @@ class RWDSession < Hash
     @lastaccess	= Time.now
   end
 
-  def render(res, path, post, download, downloadfile, pda)
+  def render(res, path, post, download, downloadfile, pda=false)
     done	= self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
 
     res.gsub!(/\$RWD_SESSION\$/, done ? "" : "#{@sessionid}")
@@ -1212,7 +1213,8 @@ class RWDServer
 
         @browserthread	=
         Thread.new do
-          puts "Starting the browser..."
+		$rwdtinkerlog.warn "rwd: Starting the browser..."
+       
 
           #if ENV["RWDBROWSER"].downcase =~ /iexplore/	# ???
             #@ie	= IE.new("http://localhost:#{port}/")
@@ -1226,7 +1228,7 @@ class RWDServer
 
             command.gsub!(/%port%/, port.to_s)
 
-            system(command) or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+            system(command) or $rwdtinkerlog.error "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
           #end
 
           puts "The browser has terminated."
@@ -1337,8 +1339,8 @@ class RWDServer
               resp << download
             end
           rescue
-            puts "Sending response to browser failed."
-
+           
+     $rwdtinkerlog.error "rwd: Sending response to browser failed."
             @sessions.delete(session.sessionid)
           end
 
@@ -1352,8 +1354,9 @@ class RWDServer
 
               if @browserstarted and not @browserthread.nil? and @browserthread.alive?
                 resp.stop do
-                  puts "Waiting for the browser to terminate..."
-
+                 
+         $rwdtinkerlog.warn "rwd: Waiting for the browser to terminate..."
+	 
                   @browserthread.join
                 end
               end

data/lib/rwdthemes/default.rwd

@@ -1,4 +1,4 @@
-$stderr.puts "in default theme load"
+$rwdtinkerlog.info "in default theme load"
 
 $rwd_html["DEFAULT"]	= "
 <!-- Generated by RubyWebDialog.                                               -->

data/lib/rwdtinker/rwdcodedir.rb

@@ -0,0 +1,56 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+require 'lib/rwdtinker/rwdtinkertools'
+
+tmpmodload = '
+def RwdtinkerTools.findfilesp(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
+
+def RwdtinkerTools.findprogramfiles(codedir, specificdir = "")
+ @@tempdoc = ""
+#get a list of the files and subdirectories on the starting directory only
+  a = Array.new(Dir[codedir].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))
+		  # 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...
+		  findfilesp(x + "/**")
+	  end
+  end
+  return @@tempdoc
+end
+'
+
+RwdtinkerTools.module_eval(tmpmodload)

data/lib/rwdtinker/rwdguidir.rb

@@ -0,0 +1,57 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+require 'lib/rwdtinker/rwdtinkertools'
+
+tmpmodload = '
+def RwdtinkerTools.loadguifile(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/
+
+				load x      #opens the file thats in fileName and reads it
+				@@tempdoc += $rwdguivar # adds the file into the doc string
+			end
+		end
+	end
+end 
+
+def RwdtinkerTools.findguifiles(guidir)
+      @@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
+      return @@tempdoc
+      
+end
+'
+
+RwdtinkerTools.module_eval(tmpmodload)

data/lib/rwdtinker/rwdlangdir.rb

@@ -0,0 +1,60 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+require 'lib/rwdtinker/rwdtinkertools'
+
+tmpmodload = '
+def RwdtinkerTools.findfilest(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|po|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
+
+
+def RwdtinkerTools.findlanguagefiles(langdir,lang)
+     @@tempdoc = ""
+
+            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...
+		                      findfilest(x + "/**")
+	                       end
+                end
+  
+	        return @@tempdoc
+  
+end
+'
+
+RwdtinkerTools.module_eval(tmpmodload)

data/lib/rwdtinker/rwdtinkertools.rb

@@ -0,0 +1,25 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+module RwdtinkerTools
+
+# tools to use in rwdtinker
+
+   def RwdtinkerTools.tail(filename, lines=12)
+     
+           
+           begin
+                   tmpFile = File.open(filename, 'r') 
+       
+	           return     tmpFile.readlines.reverse!.slice(0,lines)
+     
+                   tmpFile.close
+          rescue
+              	return "error in opening log"
+ 	        $rwdtinkerlog.error "RwdtinkerTools.tail: file open error"
+          end
+    end
+
+end
+
+

data/music/playlist.m3u

@@ -0,0 +1,2 @@
+music/classicalmues.mp3||classicalmues||||||0||||0||0||Blues
+

data/rwd_files/HowTo_Mpd.txt

@@ -72,6 +72,13 @@ The $rwdmpdplaylist_directory needs to be set
    You can load and edit playlists
     The song locations start from the MPD music directory
 
+== Configuration files
+
+  The configuration file will be copied from *.dist to *.cnf in the configuration directory
+  a constant in the dist file determines if the copied file will be deleted when the applet is uninstalled
+  be careful with leaving the file, because the operation of the framework will be effected by leaving the config file intact
+  This file would be useful if you plan to install the applet again (like an updated version)
+  
 == RWD Framework
 
 The rwdtinker framework is used by:<br>
@@ -93,9 +100,6 @@ I have tested this under Linux-Debian kernel 2.6.9
 PROBLEMS:
 you should consult what beginning 3 characters for you files.
 
-
-don't type in the extension .sch
-
 Closing the browser doesn't terminate the application. You have to use the application's close-button  And terminating the application doesn't terminate the application when running in network mode. You just log out.
 
 Steven Gibson
@@ -104,12 +108,18 @@ smalllinux@gmail.com
 http://rwdapplications.rubyforge.org/
 
 == Changelog
-version 0.06
+version 0.07
+  updated for rwdtinker 1.80
+  added optional config file deleting
+
+version 0.06
   added free-form entry MPD commands
-  playlist editing
-
+  playlist editing
+
 version 0.05
   added more choices
+  added free-form entry MPD commands
+  playlist editing
   
 version 0.04
   moved extra files to lib

data/rwd_files/HowTo_Tinker.txt

@@ -97,8 +97,7 @@ There are two ways to add applets to the directories.
       The gui files go into your gui directory
       The gui files need to be in order by name and end with .rwd
         
-
-      
+  
       If you need a config file that goes in the configuration directory
 
  internationalization and localization are helped by replacing the
@@ -136,9 +135,11 @@ To exit, press the x inside the browser window.
 
 == Languages
 
-
  You can add tranlations in the lang subdirectory
- You change the $lang constant in Tinker config file in the configuration directory
+ You change the $langarray constant in Tinker config file in the configuration directory
+
+to change language => in the tinkerwin2variables.cnf file the [0] setting of $langarray will be the language choosen.
+
  You can see one translation on the install applet tab, after you have installed and applet
  
 == Using over a Network
@@ -168,14 +169,15 @@ Ruby I am using version 1.8.2
 
 I have tested this under Linux-Debian kernel 2.6.9
 
-= Operation:
+== Operation:
+
 The code files reside in the code directory and are combined before 
 the main Class is loaded
 
 The rwd files in gui are combined before the gui is activated
 
 Translated text reside in the lang directory
-
+ 
 == Installing:
 
 untar the file
@@ -220,13 +222,30 @@ under the terms of the GPL licence:
   For more information see:
 http://rwdapplications.rubyforge.org/wiki/wiki.pl
 
-
 For more information about RubyWebDialogs see:
 http://www.erikveen.dds.nl/rubywebdialogs/index.html
 
 Thanks, Steven Gibson
 
 == Changelog
+version 1.82
+  switch to po files for translation files
+  add beginning of Hindi po file
+  added more Japanese strings
+  changed handling of lang change = in the tinkerwin2variables.cnf file the [0] setting of $langarray will be the language choosen.
+ 
+version 1.81
+  condensed config files from 4 -> 2
+  fixed document launch bug 
+  add $KCODE = 'u'
+  move help files to rwd_files directory
+  
+version 1.80
+ changed pda handling in rwd.rb
+ added logging
+ added log review screen on tinker back window
+ changed handling of live applet loading, to not list version in file names
+ 
 version 1.79
  edited net.rb to fix text editing 
  

data/rwd_files/Tinkerhelptexthash.txt

@@ -0,0 +1,81 @@
+ # Help files for RwdTinker core
+   
+  
+ Helptext.update(  :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")
+
+   
+ Helptext.update(   :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>
+  ")
+      
+ Helptext.update( :tinkerwin2_help => "    You can view the list of applets you can install
+      by clicking on the list files button
+<br><br>
+           You can download an applet created by someone else
+           <br><br>
+      put the file in the zips directory
+      <br>
+      rwdtinker applets packaged as RubyGems can be used if you have RubyGems installed.
+      You can download rwdtinker gems at the 'Install Remote Applets' tab
+      to install applets you need the ruby zlib library installed
+      ")
+      
+       Helptext.update( 
+     :applet_viewing   =>  "You can get a list of all installed applets by clicking the 'listfiles button'<br>
+         To see the text of a install file<br>
+       Type in the name of the file you want.<br>
+      <p>
+       type it without the inf ending
+       rwdapplet-0.1<br>
+       <p>
+       Then click the 'View Installed File' button
+       <p>
+       If it finds the file it will open it. It displays the text the search box.
+<p>
+      You can uninstall applets on this screen")
+      
+     Helptext.update(   
+  :applet_installation  => " You can download an applet created by someone else<br>
+      put the file in the zips directory<br>
+      
+      click on the 'list zips' tab<br>
+      click on 'list applets available for installing<br>
+      <br>
+      chose the applet you want<br>
+      click on 'install applet'<br>
+      If all goes well the applet should be installed.<br>
+      You will need to restart rwdtinker to see the new screens<br>
+       to install applets you need the ruby zlib library installed")
+       
+ Helptext.update( 
+     :applet_tinkerbackeditconfiguration  => " You can edit the configuration
+  <p>
+  Remember to reload the configuration variables if you want your
+  changes used.")
+  
+   Helptext.update( 
+  :remotegemapplet_install  => " To download and install use the 'Install Remote Applets'
+  <br>
+  First click on 'List applets in the Remote GEM Repository available for downloading'<br>
+  then go to the very bottom to click on the applet you want<br>
+  then on the top click 'install remote Gem applet package'
+  <br>
+  This installs the package in the Gem system<br>
+  You still need to install it into rwdtinker - do that in the 'List Zips' tab<br>
+  <br>
+  For this feature to work, you need<br>
+  RubyGems installed<br>
+   Variables set correctly in the tinerwin2.cnf file<br>
+      $xpcommand,  $gemdirectory_withgemfiles and  $geminstalled_directory<br>
+    the defaults as shipped will normally be for a Debian Linux system  <br>
+   On Debian Linux, you would usually need to be running rwdtinker as root in order to install RubyGems
+   <br><br>
+   You can view the list of rwdtinker applets you have installed already by clicking 'view already installed GEM applets'
+ "
+)

data/rwd_files/log/rwdtinker.log

@@ -0,0 +1,2 @@
+# Logfile created on Fri Oct 03 00:39:14 -0700 2008 by smalllinux.superant.com
+

data/tests/makedist-rwdwmpd.rb

@@ -12,8 +12,8 @@ $rwdjumplink = [""]
 JumpLink = Hash.new("default")
 require 'fileutils'
 DistroName = "rwdwmpd"
-DistroVersion="0.06"
-load "configuration/#{DistroName}-#{DistroVersion}.dist"
+DistroVersion="0.07"
+load "configuration/#{DistroName}.dist"
 
 
 DistroTitle="#{DistroName}-#{DistroVersion}"

data/tests/makedist-tinkerbellw.rb

@@ -0,0 +1,58 @@
+#!/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 = "tinkerbellw"
+DistroVersion="0.03"
+load "configuration/#{DistroName}.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("..")
+findcmd = "find _arx > /tmp/excludezip"
+puts "#{findcmd}"
+`#{findcmd}`
+
+FileUtils.rm_rf("#{DistroTitle}.zip")
+zipcreatecmd = "zip  -r #{DistroTitle}.zip * -x@/tmp/excludezip" 
+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

@@ -14,9 +14,9 @@ require 'fileutils'
 
 DistroName = "rwdwmpd"
 
-DistroVersion="0.06"
+DistroVersion="0.07"
 
-DistroTitle="#{DistroName}-#{DistroVersion}.dist"
+DistroTitle="#{DistroName}.dist"
 load "configuration/#{DistroTitle}"
 DistroName = "rwdmpd"
  DistroTitle = "#{DistroName}-#{DistroVersion}"