rwdshell 0.97 → 0.98

data/rwd_files/HowTo_Shell.txt

@@ -193,6 +193,10 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 0.98
+ updated for rwdtinker version 1.61 
+ add in test harness
+
 version 0.97
  correct bug in shell command eval
  beginning to add context help 

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,20 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+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
+
+version 1.59
+ removed rwdtinkerwin2 inf file
+ refactored diagnotic page - one button to see all information
+ added bug report upload to diagnostic page
+ 
 version 1.58
  check for zlib
  check for files to delete

data/rwdconfig.dist

@@ -1,6 +1,10 @@
-##VERSION:1.57
+##VERSION:1.61
 # 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

@@ -26,4 +26,19 @@ puts "#{tarcreatecmd}"
 puts "#{tarcreatecmd2}"
 `#{tarcreatecmd2}`
 
-print Dir["rwdshell*.{gz,bz2,deb,gem}"]
+gemspecfilename = "rwdshell-#{RwdShellVersion}.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{rwdshell}\n")
+fd.print("  s.version = \"#{RwdShellVersion}\"\n")
+fd.print("  s.date = %q{#{year}-#{month}-#{daydate}}")
+load 'rwdshell/tests/gemspec'
+fd.print($gemspecvar)
+fd.close
+
+print Dir["rwdshell*.{gz,bz2,deb,gem}"]

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: rwdshell
 version: !ruby/object:Gem::Version 
-  version: "0.97"
-date: 2005-03-09
+  version: "0.98"
+date: 2005-03-23
 summary: rwdshell is a GUI front end for operating system commands with rwdtinker and RubyWebDialogs features.
 require_paths: 
   - "."
@@ -37,6 +37,9 @@ files:
   - code/01rwdcore/returntomain.rb
   - 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
@@ -88,16 +91,13 @@ files:
   - configuration/language.dist
   - configuration/rwdapplicationidentity.dist
   - configuration/rwdshell.dist
-  - extras/zip
-  - extras/cmdline_parse
-  - extras/config_file
-  - extras/errorMsg
-  - extras/makePlaylist
-  - extras/mp3controld
-  - extras/playlist
-  - extras/plugins
-  - extras/showHelp
   - extras/rconftool.rb
+  - extras/zip/ioextras.rb
+  - extras/zip/stdrubyext.rb
+  - extras/zip/tempfile_bugfixed.rb
+  - extras/zip/zip.rb
+  - extras/zip/zipfilesystem.rb
+  - extras/zip/ziprequire.rb
   - scripts/date.sh
   - scripts/echo2.sh
   - scripts/lister.sh
@@ -145,12 +145,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.shellhelpabout
-  - 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
@@ -184,7 +180,6 @@ files:
   - gui/tinkerbackwindows/superant.com.rwdshellbackwindow/94rwddiagnostics.rwd
   - gui/tinkerbackwindows/superant.com.rwdshellbackwindow/v9returntab.rwd
   - gui/zzcoreguiend/tinkerapplicationguiend/yy9rwdend.rwd
-  - installed/rwdtinkerwin2-0.5.inf
   - installed/rwdviewlogo-0.4.inf
   - rwd_files/favicon.ico
   - rwd_files/HowTo_Tinker.txt

data/extras/cmdline_parse

@@ -1,47 +0,0 @@
-#!/usr/bin/ruby
-# --- Parse command line ---
-#
-# Author:	Magnus Engstr�m
-# Email:		magnus@gisab.se
-# File:		cmdline_parse
-#
-# Description
-# -----------
-# Parses the commandline and
-# returns a hash with the 
-# switch as key and the 
-# value as value :)
-# --------------------------
-
-class Commandline
-  def Commandline::parse()
-
-	 params	= Hash::new()	# Could be useful to have something to put the commandline in ;)
-	 key		= false			# Just a really ugly hack to keep track on if we're reading key or value
-	 foo		= ''				# Keeps the key name
-
-	 # Iterate through the command line ($*) and put it in the params hash
-	 $*.each { |param|
-		key = ( key == true ? false : true ) # Negate the value of key
-		if(key)
-		  foo = param
-		else
-		  params[foo] = param
-		end
-	 }
-
-	 # Validate the command line.
-	 # Every key should begin with at least one '-' and have a value
-	 if( !key ) # If key equals true, then the user should enter one more parameter
-		passed = true
-		params.each { |key, value| # Iterate through all parameters
-		  passed = false if(key[0].chr() != '-') # Doesn't it start with a '-'? Not passed...
-		  passed = false if(value == '') # I really want a value here, not just an empty string
-		}
-	 end
-
-	 # Return params if check passed, else return -1
-	 passed ? params : -1
-
-  end
-end

data/extras/config_file

@@ -1,69 +0,0 @@
-#!ruby
-require 'ftools'
-require 'tempfile'
-
-class ConfigFile
-
-  def ConfigFile::parse(filename)
-	 # Make sure this file exists and is readable
-	 if( FileTest::readable_real?(filename) )
-		new(filename) # Return the class instance
-	 else
-		-1 # Return -1 on failure
-	 end
-  end
-
-  def initialize(filename)
-	 @filename	= filename
-	 @config		= Hash::new() # The class internal variable that holds the config data
-	 section		= ''
-
-	 # Parse the configuration file (and in only TWO rows, God I love Ruby! =)
-	 IO::foreach(@filename) { |configLine| @config[section = $1] = Hash::new() if(configLine.gsub(/\s*#.*$/, '') =~ /\s*(\S+)\s*\{/) 
-	 @config[section].update({$1 => $2}) if(configLine.gsub(/\s*#.*$/, '') =~ /\s*(\S+)\s*=\s*(.*)/) }
-  end
-
-  # Return the requested parameter
-  def getParam(section, parameter)
-	 @config[section][parameter] if(@config[section].type == Hash)
-  end
-
-  # Set the provided parameter
-  def setParam(section, parameter, value)
-	 # Create a temp file
-	 temp = Tempfile::new('config')
-
-	 current_section = ''
-	 # Loop through the config file
-	 IO::foreach(@filename) { |line|
-		current_section = $1 if( line =~ /^\s*(\S+)\s*{\s*(#.*)?$/ ) # Handle the section stuff
-		# Is this a correct parameter entry?
-		if( line =~ /^\s*(\S+)\s*=\s*\S+\s*(#.*)?$/ )
-		  
-		  if( current_section == section && $1 == parameter ) # This is the line we want to change!
-			 line.gsub!( /^(\s*\S+\s*=\s*)\S+(\s*(#.*)?)$/, "\\1#{value}\\2" ) # Change the parameter value to the one the user supplied
-		  end
-		  
-		end
-
-		temp.puts(line) # Write the line to the tempfile
-	 }
-
-	 temp.close() # Close the file
-	 File::copy(temp.path, @filename) # Copy the tempfile to overwrite the old one
-	 temp.close(true) # Remove the file
-  end
-
-  # Loop through all sections
-  def each_section()
-	 @config.each { |key,value| yield(key) }
-  end
-
-  # Loop through all parameters in a section
-  def each_parameter(section)
-	 @config[section].each { |key,value| yield(key) }
-  end
-
-  attr_reader :filename
-
-end

data/extras/errorMsg

@@ -1,19 +0,0 @@
-#!ruby
-
-# --- errorMsg ---
-#
-# Author:	Magnus Engstr�m
-# Email:		magnus@gisab.se
-# File:		errorWrite
-#
-# Description
-# -----------
-# Outputs an error message to the administrator
-# ------------------
-
-def errorMsg(message, exitapp = false)
-  STDERR.puts(message)
-  MP3Control::exit_mpg123() if(exitapp)
-  Kernel::exit(exitapp) if(exitapp) # Terminate application and return the exitapp value if it isn't falsew
-
-end

data/extras/makePlaylist

@@ -1,34 +0,0 @@
-#!/usr/bin/ruby
-require 'mp3tag'
-
-def getList(dir)
-  Dir::chdir(dir)
-
-  # Find the files in this directory
-  Dir['*mp3'].each { |file|
-	 if(FileTest::file?(file))
-		mp3tag = Mp3Tag::new(Dir::getwd()+"/"+file)
-		if(mp3tag.songname.length > 0)
-		  puts("#{Dir::getwd()+"/"+file}||#{mp3tag.songname}||#{mp3tag.artist}||#{mp3tag.album}||#{mp3tag.year}||#{mp3tag.comment}||#{mp3tag.tracknum}||#{mp3tag.genre_id}||#{mp3tag.genre}")
-		else
-		  name = Dir::getwd()+"/"+file
-		  name =~ /([^\/]+)\.mp3$/
-		  puts("#{Dir::getwd()+"/"+file}||#{$1}||#{mp3tag.artist}||#{mp3tag.album}||#{mp3tag.year}||#{mp3tag.comment}||#{mp3tag.tracknum}||#{mp3tag.genre_id}||#{mp3tag.genre}")
-		end
-	 end
-  }
-
-  Dir['*'].each { |entry|
-	 if(FileTest::directory?(entry))
-		getList(entry)
-	 end
-  }
-  Dir::chdir('..')
-end
-
-# Change current directory to user supplied one
-Dir::chdir(ARGV[0])
-getList(ARGV[0])
-
-#song = Mp3Tag::new(ARGV[0])
-#puts song.songname()

data/extras/mp3controld

@@ -1,289 +0,0 @@
-#!/usr/bin/ruby
-
-# ---    MP3 Control    ---
-# 
-# Author: 	Magnus Engstr�m
-# Email:		magnus@gisab.se
-# File:		mp3controld
-#
-# Description
-# -----------
-# An application which manages
-# mp3 songs on the poor users
-# computer.
-# -------------------------
-
-# --- External files ---
-# Change directory to find all functions
-#Dir::chdir("/usr/lib/mp3control")
-
-load "extras/config_file"		# Handles the mp3controld.conf configuration file
-load "extras/cmdline_parse"	# Provides the Commandline::parse which returns an hash of the commandline
-load "extras/showHelp"			# Hmmm... guess what? This function shows the help message =)
-load "extras/errorMsg"			# Outputs error messages to the admin
-load "extras/playlist"			# Core playlist functionality
-
-# --- MP3Control - the main class ---
-class MP3Control
-  # --- Core functions ---
-  # initialize() reads the config files and daemonizes! 
-  def initialize()
-	 # Parse the commandline
-	 $commandline = Commandline::parse()
-	 
-	 # Display help if the commandline sucks
-	 if($commandline == -1)
-		showHelp()
-		Kernel::exit(-1)
-	 end
-
-	 # Make this class instance a background daemon
-	 daemonize() if($commandline["--daemon"] != 'no' && $commandline["-D"] != 'no')
-
-	 # Read the configuration file
-	 configfile = ( $commandline["--configfile"] ? $commandline["--configfile"] : 'configuration/mp3controld.conf' ) # Use the --configfile if supplied, else use the default /etc/mp3controld/mp3controld.conf
-	 $configFile = ConfigFile::parse(configfile) # Create an new config file object
-	 errorMsg("Configuration file #{configfile} isn't readable or doesn't exist!", 137) if($configFile == -1)
-	 
-	 # Find the default playlist (or use the user supplied one from the commandline)
-	 defaultPlaylist = $configFile.getParam("programConfig", "defaultPlaylist")
-	 defaultPlaylist = $commandline["--playlist"] if($commandline["--playlist"])
-	 if( $configFile.getParam(defaultPlaylist, 'listFile').type == String) # Make sure the listFile contains a value
-		if(FileTest.readable_real?( $configFile.getParam(defaultPlaylist, 'listFile') )) # Make sure this file is readable
-		  # Cool. Everything looks alright. Lets create a playlist!
-		  errorMsg("Loading playlist '#{defaultPlaylist}' from #{$configFile.getParam(defaultPlaylist, 'listFile')}...") if($commandline['--verbose'] == 'on')
-		  $current_playlist = Playlist::create_from_file($configFile.getParam(defaultPlaylist, 'listFile'))
-		  $current_playlist_name = defaultPlaylist
-		  
-		  # Errorhandling
-		  errorMsg("Playlist creation from #{$current_playlist.filename} failed.", 1) if($current_playlist == -1) # Quit and complain if it didn't work
-		  errorMsg("Playlist #{defaultPlaylist} (#{$current_playlist.filename}) doesn't contain any entries.", 1) if($current_playlist.length() < 1)
-		  errorMsg("Playlist '#{defaultPlaylist}' loaded successfully.") if($commandline["--verbose"] == 'on')
-
-		  # Fix wrap/repeat and shuffle the playlist if the configfile says so
-		  $current_playlist.wrap = true	if($configFile.getParam(defaultPlaylist, 'repeat') == 'true')
-		  $current_playlist.shuffle()		if($configFile.getParam(defaultPlaylist, 'random') == 'true')
-		  $current_playlist.goto(0)		# Rewind the playlist
-		else
-		  errorMsg("The default playlist doesn't appear to exist, or has the wrong permissions. That's not good.", 1)
-		end
-	 else # listFile returns other than string, that's baaaaad
-		errorMsg("the listFile value for '#{defaultPlaylist}' doesn't appear to exist in your #{$configFile.filename}. That's not good.", 1)
-	 end
-
-	 # Check for the existence of our mpg123 instance
-	 errorMsg("Trying to find the mp3 player...") if($commandline["--verbose"] == 'on')
-	 @mpg123 = $configFile.getParam('programConfig', 'application') # Get the application name, path, and possible arguments
-	 mpg123_application = @mpg123.scan(/^\S+/)
-	 if(mpg123_application.type == Array)
-		mpg123_application = mpg123_application[0] 
-	 else
-		errorMsg("Please check your ProgramConfig/application setting in the configuration file. It seems weird.", 1)
-	 end
-
-	 # Do some nice errorhandling
-	 if( !FileTest::executable_real?(mpg123_application) )
-		errorMsg("#{mpg123_application} doesn't appear to exist. Please do something about it (no, not \"touch #{mpg123_application}\"! Stupid!).", 1)
-	 else
-		errorMsg("Found #{mpg123_application}!") if($commandline["--verbose"] == 'on')
-	 end
-
-	 # Open an instance of mpg123, our high-performance mp3 player
-	 @@mpg123 = IO::popen("#{@mpg123} -R -", 'r+')
-
-	 # Start all plugins
-	 load_plugins()
-
-	 # Start the mp3 player
-	 mpg123_control()
-
-  end
-
-  # mpg123_control() gets the input from the mpg123 process and handles it hopefully correctly :)
-  def mpg123_control()
-
-	 # Initialize class variables
-	 @@stopped = false
-
-	 # Start playing if the configfile says so
-	 if( $configFile.getParam('programConfig', 'playOnStartup') == 'true' )
-		MP3Control::play()
-	 else
-		puts("Dont want to play!")
-	 end
-	 
-	 # The infinite 5 second loop =)
-	 while(true)
-		begin
-		  input = @@mpg123.readline.chop()
-		rescue EOFError
-		  errorMsg("mpg123 error! Probably just a file that didn't exist (#{$current_playlist.song_info["filename"]}).")
-		  @@mpg123 = IO::popen("#{@mpg123} -R -", 'r+') # Just start it again...
-		  MP3Control::next_song() # Next song, so it doesn't die again...
-		end
-
-		# Song stopped
-		MP3Control::next_song() if(input == '@P 0' && @@stopped != true) # Change to the next song if current song stops and the user didn't told it to
-		@@stopped = false if(input == '@P 0' && @@stopped == true) # Reset the stop-flag if the user ordered the stop
-
-		# Time left
-		if(input[0,2] == '@F')
-		  input =~ /^@F\s+\S+\s+\S+\s+(\S+)\s+(\S+)$/
-		  @@time			= $1
-		  @@timeleft	= $2
-		end
-
-	 end
-  end
-
-  # start() creates a new instance. Just like .new, but a nicer name. 
-  def MP3Control::start()
-	 MP3Control::new()
-  end
-
- # daemonize() daemonizes this process. Cool =) 
-  def daemonize()
-	 if(child_pid = fork) # Parent code
-		puts("PID #{child_pid}")
-		Kernel::exit(0) # We dont want this parent process any more. Too bad.
-	 end
-
-	 # Child code. And child wants to be free from parent
-	 Process.setsid()
-  end
-
-  # load_plugins() loads all plugins that can be found in the plugins directory
-  def load_plugins()
-	 Dir::entries('extras/plugins/').each { |plugin|
-		# Try to load every plugin except all files that begins with a dot
-		if(plugin[0].chr() != '.')
-		  retval = 0
-		  # Do some errorhandling
-		  begin
-			 load("extras/plugins/#{plugin}") # Load the files
-			 errorMsg("Loaded plugin '#{plugin}'") if($commandline['--verbose'] == 'no')
-		  rescue SyntaxError
-			 errorMsg("Plugin '#{plugin}' has syntax errors.")
-		  end
-
-		  # Run the plugin in a separate thread
-		  # Try to start the class with the same name as the plugin
-		  eval("
-		    Thread::new() {
-				start_again = true
-				while(start_again)
-				  puts(\"Plugin starting...\")
-				  begin
-					 retval = #{plugin}::start()
-				  rescue
-					 error = $!
-					 puts(error)
-					 puts(error.backtrace)
-					 puts(\"Error in plugin #{plugin}! Waiting for 5 seconds before attempting to start again...\")
-					 sleep(5)
-				  end
-				  if(retval == -1) 
-					 errorMsg(\"Plugin 'plugins/#{plugin}' failed to load...\")
-					 start_again = false
-				  end
-				end
-		    }
-		  ") 
-
-		end
-	 }
-  end
-
-  # exit_mpg123() terminates the current mpg123 session
-  def MP3Control::exit_mpg123()
-	 #system("kill `pidof mpg123`") # Yes, I know this isn't a nice way to do it in, please fix this and send me a patch :)
-  end
-
-  # mpg123_command() sends a command to mpg123 
-  def MP3Control::mpg123_command(command)
-	 errorMsg("mpg123 command: '#{command}'") if($commandline['--verbose'] == 'on')
-	 @@mpg123.write("#{command}\n")
-	 @@mpg123.flush()
-  end
-
-
-  # --- play functions ---
-  # play() plays the current index of the current playlist 
-  def MP3Control::play()
-	 @@stopped = false
-	 mpg123_command("LOAD #{$current_playlist.song_info["filename"]}")
-  end
-
-  # stop() stops playing 
-  def MP3Control::stop()
-	 mpg123_command("PAUSE")
-	 @@stopped = true # Set the stop-status to true
-  end
-
-  # pause() pauses playing 
-  def MP3Control::pause()
-	 @@stopped = false
-	 mpg123_command("PAUSE")
-  end
-
-  # next_song() loads the next song. Yay... 
-  def MP3Control::next_song()
-	 retval = $current_playlist.next()
-	 if(retval == -1)
-		errorMsg("Error while changing to the next song.") # Tell him/her
-	 else
-		MP3Control::play() if(@@stopped == false)
-	 end
-  end
-
-  # prev_song() loads the previous song. Yay... 
-  def MP3Control::prev_song()
-	 retval = $current_playlist.prev()
-	 if(retval == -1)
-		errorMsg("Error while changing to the previous song.") # Tell him/her
-	 else
-		MP3Control::play() if(@@stopped == false)
-	 end
-  end
-
-  # forward(sec) jumps sec seconds forward
-  def MP3Control::forward(sec)
-	 mpg123_command("JUMP +#{sec*38}")
-  end
-
-  # backward(sec) jumps sec seconds backward
-  def MP3Control::backward(sec)
-	 mpg123_command("JUMP -#{sec*38}")
-  end
-
-
-  #  --- Misc functions ---
-  # getTime() - Get the current song time information. getTime(true) for time left 
-  def MP3Control::getTime(whichTime = 'elapsed')
-	 case whichTime
-	 when 'elapsed'
-		parsed	= Time::at(@@time.to_i)
-	 when 'left'
-		parsed	= Time::at(@@timeleft.to_i)
-	 when 'total'
-		parsed	= Time::at( (@@time.to_f + @@timeleft.to_f).to_i )
-	 end
-
-	 hour	= (parsed.hour - 1).to_s
-	 min	= parsed.min.to_s
-	 sec	= parsed.sec.to_s
-
-	 hour	= "0#{hour}"	if(hour.length == 1)
-	 min	= "0#{min}"		if(min.length == 1)
-	 sec	= "0#{sec}"		if(sec.length == 1)
-
-	 hour = (hour == '00' ? '' : "#{hour}:")
-
-	 # Return the now formatted time
-	 "#{hour}#{min}:#{sec}"
-  end
-
-end
-
-# Create an instance of the MP3Control class and start the application
-MP3Control::start()