rwdmovies 0.93 → 0.94

data/init.rb

@@ -24,251 +24,254 @@
 require "ev/rwd"
 require 'fileutils'
 require 'extras/rconftool'
-	
+
 $progdir = File::expand_path( File.dirname(__FILE__))
 
-        $tempdoc = " "
- 
- 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
-  def 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 
-        
+$tempdoc = " "
+
+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
+def 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 
+
 # integrate the new configuration files
 MAINconfignew =  "rwdconfig.cnf"
 MAINconfigdist = "rwdconfig.dist"
 Rconftool::install(MAINconfigdist,MAINconfignew)
 
- Dir.chdir("configuration")    #changes the current working directory
-      
- fileList = Dir.new(".").entries.sort.reverse.delete_if { |x| ! (x =~ /dist$/) } #creates an Array separated with \n
- @doc = ""
- fileList.length.times{               #opening of a block
-    configdist =fileList.pop                #pops the first item out of the Array
+#load main config file
+load 'rwdconfig.cnf'
+
+Dir.chdir("configuration")    #changes the current working directory
+
+fileList = Dir.new(".").entries.sort.reverse.delete_if { |x| ! (x =~ /dist$/) } #creates an Array separated with \n
+@doc = ""
+fileList.length.times{               #opening of a block
+configdist =fileList.pop                #pops the first item out of the Array
 tempconfigfile = configdist.gsub(/\.dist$/, "")
 confignew = tempconfigfile + ".cnf"
 Rconftool::install(configdist,confignew)     #integrates new file with old 
   }       #closing block
- # END of configuration integration 
-Dir.chdir($progdir)
-
-# Read in the configuration files
- Dir.chdir("configuration")    #changes the current working directory
-      
- fileList = Dir.new(".").entries.sort.reverse.delete_if { |x| ! (x =~ /cnf$/) } #creates an Array separated with \n
- @doc = ""
- fileList.length.times{               #opening of a block
-    fileName=fileList.pop                #pops the first item out of the Array
-    load fileName     #loads the the config file thats in fileName 
+  # END of configuration integration 
+  Dir.chdir($progdir)
+
+  # Read in the configuration files
+  Dir.chdir("configuration")    #changes the current working directory
+
+  fileList = Dir.new(".").entries.sort.reverse.delete_if { |x| ! (x =~ /cnf$/) } #creates an Array separated with \n
+  @doc = ""
+  fileList.length.times{               #opening of a block
+  fileName=fileList.pop                #pops the first item out of the Array
+  load fileName     #loads the the config file thats in fileName 
   }       #closing block
- # END of configuration reading 
- 
- Dir.chdir($progdir) # change back to top program directory
-
- # build the English Language hash file from the parts
- languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
-    langmessage = {' + "\n"
- 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
-
- 
-       #writes the contents of doc into the  languagehashvariable 
+  # END of configuration reading 
+
+  Dir.chdir($progdir) # change back to top program directory
+
+  # build the English Language hash file from the parts
+  languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
+  langmessage = {' + "\n"
+  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
+
+
+  #writes the contents of doc into the  languagehashvariable 
   languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
- 
- # END of en Lang building
+
+  # 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
-
- 
-                #writes the contents of doc into the variable
+
+  # 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
+
+
+  #writes the contents of doc into the variable
   languagehashvariable =  languagehashvariable  + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
-  
 
-$tempdoc = " "
- 
- Dir.chdir($progdir) # change back to top program directory
- 
- temp = eval(   languagehashvariable )
-
- $tempdoc = " "
-
- # build the actual program from the code parts
- #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...
-                        findfiles(x + "/**")
-                end
-        end
-
-
-# load the program file
- tempcoderesult = eval( $tempdoc )
-
-# 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
-
-   # gui variable is done
-    guiRWD = $tempdoc
-   
-   require 'socket'		# Network stuff
-    host = "127.0.0.1"
-	 port = $port
-	 
-	 # Create a socket to listen on and bind it to the host and port 
-	 freeportfound = false
-   until freeportfound
-   begin
-		@socket = UDPSocket::new()
-		@socket.bind(host, port)
-    freeportfound = true
-$port = port
-	 # Rescue the "Address in use" error
-	 rescue Errno::EADDRINUSE
-		 puts "RWD Startup: Port #{port} on host #{host} is already in use."
-		port=port +1
-    puts "trying port: #{port}"
-	 # Rescue the "Address not available' error
-	 rescue Errno::EADDRNOTAVAIL
-		puts "RWD Startup: Address #{host} is not available to bind."
-		port =port + 1
-	  puts "trying port: #{port}"
-   # Rescue "permission denied errors
-    rescue Errno::EACCES
-		puts "RWD Startup: Access denied when binding interface addresses. ?"
-			port =port + 1
-       puts "trying port: #{port}"
-	 # Rescue all other errors
-	 rescue
-   puts "RWD Startup: An error occured."
-		port =port + 1
-     puts "trying port: #{port}"
-	 # Rescue all other errors
-	 end
 
-end
+  $tempdoc = " "
+
+  Dir.chdir($progdir) # change back to top program directory
+
+  temp = eval(   languagehashvariable )
+
+  $tempdoc = " "
+
+  # build the actual program from the code parts
+  #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...
+		  findfiles(x + "/**")
+	  end
+  end
+
+
+  # load the program file
+  tempcoderesult = eval( $tempdoc )
+
+  # 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
+
+  # gui variable is done
+  guiRWD = $tempdoc
+
+  require 'socket'		# Network stuff
+  host = "127.0.0.1"
+  port = $port
+
+  # Create a socket to listen on and bind it to the host and port 
+  freeportfound = false
+  until freeportfound
+	  begin
+		  @socket = UDPSocket::new()
+		  @socket.bind(host, port)
+		  freeportfound = true
+		  $port = port
+		  # Rescue the "Address in use" error
+	  rescue Errno::EADDRINUSE
+		  puts "RWD Startup: Port #{port} on host #{host} is already in use."
+		  port=port +1
+		  puts "trying port: #{port}"
+		  # Rescue the "Address not available' error
+	  rescue Errno::EADDRNOTAVAIL
+		  puts "RWD Startup: Address #{host} is not available to bind."
+		  port =port + 1
+		  puts "trying port: #{port}"
+		  # Rescue "permission denied errors
+	  rescue Errno::EACCES
+		  puts "RWD Startup: Access denied when binding interface addresses. ?"
+		  port =port + 1
+		  puts "trying port: #{port}"
+		  # Rescue all other errors
+	  rescue
+		  puts "RWD Startup: An error occured."
+		  port =port + 1
+		  puts "trying port: #{port}"
+		  # Rescue all other errors
+	  end
+
+  end
 
 
-RwdTinker.new(  guiRWD).serve(port) # start the main class and program
+  RwdTinker.new(  guiRWD).serve(port) # start the main class and program

data/installed/rwdviewlogo-0.4.inf

@@ -0,0 +1,4 @@
+# rwdviewlogo - small applet to display one picture
+code/dd0viewphoto
+gui/cc0viewphoto
+rwd_files/tinker.png

data/rwd_files/HowTo_Movies.txt

@@ -48,6 +48,9 @@ steven@superant.com
 http://rwdapplications.rubyforge.org/wiki/wiki.pl
 
 == Changelog
+Version 0.94
+ exception rescue wrapping Amazon lib
+
 version 0.93
  some code comments 
  search screen help

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,16 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 1.62
+ improve distro release script
+ code cleanup
+ removed redundent network code
+ 
+version 1.61
+ add in test harness
+ rwdtinkerwin2 help about removed
+ load main config file in init.rb
+
 version 1.60
  add rwdapplication info to diagnostic
  turn rescue on in diagnostic upload

data/rwdconfig.dist

@@ -1,6 +1,10 @@
-##VERSION:1.57
+##VERSION:1.62
 # rwdtinker core configuration file
 ##NAME: ConfigLocation:0
 ConfigLocation=""
 ##NAME: ZipsLocation:0
- ZipsLocation=""
+ ZipsLocation=""
+##NAME:$testharnessarray:0
+$testharnessarray = ["rwdtinker_all_tests"]
+##NAME:TestNow:0
+TestNow=false

data/tests/makedist.rb

@@ -1,29 +1,58 @@
 #!/usr/bin/ruby -w
 #***********************************************************************
-#* Rwd/Movies -- A Ruby program for the RudyWebDialog.
+#* Rwd/Tinker -- A Ruby program for the RudyWebDialog.
 #* Copyright (c) 2004, 2005 by Steven Gibson. All Rights Reserved.
 #* at "steven@superant.com".
 #***********************************************************************/
-
+$progdir =""
 require 'fileutils'
-load 'configuration/rwdmovies.dist'
+DistroName = "rwdmovies"
+load "configuration/#{DistroName}.dist"
+DistroVersion=RwdMoviesVersion
+
+DistroTitle="#{DistroName}-#{DistroVersion}"
+
+
 	
 $progdir = File::expand_path( File.dirname(__FILE__))
 results = " "
-puts "creating rwdmovies distribution files version #{RwdMoviesVersion}"
+
+puts "creating #{DistroName} distribution files version #{DistroVersion}"
 puts "cleaning conf files"
 `tests/cleancnf.sh`
 puts "moving up one directory"
 Dir.chdir("..")
 
-zipcreatecmd = "zip  -r rwdmovies-#{RwdMoviesVersion}.zip rwdmovies" 
+
+
+FileUtils.rm_rf("#{DistroTitle}.zip")
+zipcreatecmd = "zip  -r #{DistroTitle}.zip #{DistroName}" 
 puts "#{zipcreatecmd}"
  `#{zipcreatecmd}`
- tarcreatecmd = "tar --gzip -cf  rwdmovies-#{RwdMoviesVersion}.tar.gz rwdmovies"
+ tarcreatecmd = "tar --gzip -cf  #{DistroTitle}.tar.gz #{DistroName}"
 puts "#{tarcreatecmd}"
 `#{tarcreatecmd}`
- tarcreatecmd2 = "tar --bzip2 -cf  rwdmovies-#{RwdMoviesVersion}.tar.bz2 rwdmovies"
+ tarcreatecmd2 = "tar --bzip2 -cf  #{DistroTitle}.tar.bz2 #{DistroName}"
 puts "#{tarcreatecmd2}"
 `#{tarcreatecmd2}`
 
-print Dir["rwdmovies*.{gz,bz2,deb,gem}"]
+gemspecfilename = "#{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{#{DistroName}}\n")
+fd.print("  s.version = \"#{DistroVersion}\"\n")
+fd.print("  s.date = %q{#{year}-#{month}-#{daydate}}")
+load "#{DistroName}/tests/gemspec"
+fd.print($gemspecvar)
+fd.close
+
+ListingCommand = "ls -1 -s -h #{DistroTitle}*"
+
+puts `#{ListingCommand}`
+
+print "Build finished\n"

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: rwdmovies
 version: !ruby/object:Gem::Version 
-  version: "0.93"
-date: 2005-03-19
+  version: "0.94"
+date: 2005-03-29
 summary: rwdmovies application is a movie database using RubyWebDialogs.
 require_paths: 
   - "."
@@ -36,6 +36,8 @@ files:
   - code/01rwdcore/rwdtinkerversion.rb
   - code/01rwdcore/rwdwindowreturn.rb
   - code/01rwdcore/uploadreturns.rb
+  - code/01rwdcore/test_cases.rb
+  - code/01rwdcore/test_harness.rb
   - code/superant.com.rwdtinkerbackwindow/controlclient.rb
   - code/superant.com.rwdtinkerbackwindow/diagnostictab.rb
   - code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb
@@ -126,12 +128,8 @@ files:
   - gui/frontwindowz1end/frontwindowend/xx0rwdfirsttab.rwd
   - gui/helpaboutbegin/superant.com.helpaboutbegin
   - gui/helpaboutbegin/superant.com.helpaboutbegin/ya0helpscreenstart.rwd
-  - gui/helpaboutinstalled/superant.com.rwdwin2helpabout
   - gui/helpaboutinstalled/superant.com.tinkerhelpabout
   - gui/helpaboutinstalled/superant.com.rwdmovieshelpabout
-  - gui/helpaboutinstalled/superant.com.rwdwin2helpabout/1appname.rwd
-  - gui/helpaboutinstalled/superant.com.rwdwin2helpabout/3copyright.rwd
-  - gui/helpaboutinstalled/superant.com.rwdwin2helpabout/5version.rwd
   - gui/helpaboutinstalled/superant.com.tinkerhelpabout/1appname.rwd
   - gui/helpaboutinstalled/superant.com.tinkerhelpabout/3copyright.rwd
   - gui/helpaboutinstalled/superant.com.tinkerhelpabout/5version.rwd
@@ -158,6 +156,7 @@ files:
   - gui/tinkerbackwindows/superant.com.versionwindow/1appname.rwd
   - gui/tinkerbackwindows/superant.com.rwdmoviespicture/xx8moviephotoview.rwd
   - gui/zzcoreguiend/tinkerapplicationguiend/yy9rwdend.rwd
+  - installed/rwdviewlogo-0.4.inf
   - rwd_files/favicon.ico
   - rwd_files/HowTo_Tinker.txt
   - rwd_files/HowTo_TinkerWin2.txt
@@ -165,7 +164,6 @@ files:
   - rwd_files/Readme.txt
   - rwd_files/rwdapplications.html
   - rwd_files/rwdindex.html
-  - rwd_files/tinker.png
   - rwd_files/HowTo_Movies.txt
   - rwd_files/moviestmp.jpg
   - zips/rwdahelloworld-0.5.zip
@@ -191,8 +189,8 @@ files:
   - tests/checkdepends.sh
   - tests/makedist.rb
   - init.rb
-  - Readme.txt
   - rwdconfig.dist
+  - Readme.txt
 test_files: []
 rdoc_options: 
   - "--main"

data/gui/helpaboutinstalled/superant.com.rwdwin2helpabout/1appname.rwd

@@ -1,4 +0,0 @@
-$rwdguivar=
-"
-<panel>
- <row> <p align=\"center\">#{Message[:rwdtinker_window_2]}</p></row>"

data/gui/helpaboutinstalled/superant.com.rwdwin2helpabout/3copyright.rwd

@@ -1,3 +0,0 @@
-$rwdguivar=
-"
- <row> <p align=\"center\">copyright s. gibson 2004</p></row>"