dsktool 0.2.1 → 0.4.1

data/bin/dskexplorer.rb

@@ -83,10 +83,7 @@ def make_absolute_path(relative_path)
 		@@root_directory+relative_path
 	end	
 end
-
-def html_escape(s)
-	s.gsub("&","&amp;").gsub("<","&lt;")
-end
+def html_escape(s)	s.gsub("&","&amp;").gsub("<","&lt;")end
 def uri_encode(s)
 	#standard URI.escape appears to miss some important characters
 	require 'uri'
@@ -121,7 +118,7 @@ def get_directories_and_files(relative_path)
 	[directories,dsk_files]
 end
 
-def make_navigation_path(relative_path,filename=nil)
+def make_navigation_path(relative_path,filename=nil,display_mode=nil)
 	path_parts=relative_path.split("/")
 	#make the cookie-crumb-trail 
 	partial_path=""
@@ -137,8 +134,12 @@ def make_navigation_path(relative_path,filename=nil)
 		end
 	end
 	
+	mode_param=""	
+	if !display_mode.nil? then
+		mode_param="&mode=#{display_mode}"
+	end
 	if !filename.nil? then
-		s<<"/<a href=/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(filename)}>#{filename}</a>"
+		s<<"/<a href=/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(filename)}#{mode_param}>#{filename}</a>"
 	end
 
 	
@@ -166,21 +167,25 @@ def make_catalog(relative_path)
 	begin
 		absolute_path=make_absolute_path(relative_path)
 		dsk=get_dsk_from_cache(absolute_path)
+		s<<"<br>file system: #{dsk.file_system}<br>sector order: #{dsk.sector_order}<br>tracks: #{dsk.track_count}<br>"
 		if (dsk.respond_to?(:files)) then
 			s<<"<table>\n<th>TYPE</th><th>SIZE (BYTES)</th><th>NAME</th></tr>\n"
-			dsk.files.each_value do |f|
-				display_url="/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(f.filename)}"
+			dsk.files.keys.sort.each do |full_path|
+				f=dsk.files[full_path]
+				display_url="/showfile/#{uri_encode(relative_path)+'?filename='+uri_encode(full_path)}"
 				if f.respond_to?(:file_type) then 
 					s<<"<td>#{f.file_type}</td>"
 				else 
 					s<<"<td></td>"
 				end
 				s<<"<td>#{sprintf('%03d',f.contents.length)}</td>"				
-				s<<"<td>#{f.filename}</td>"
+				s<<"<td>#{full_path}</td>"
 				s<<"<td><a href=#{display_url}&mode=hex>hex dump</a></td>"
-				if f.respond_to?(:disassembly)
+				if f.can_be_picture? then
+					s<<"<td><a href=#{display_url}&mode=png>picture</a></td>"
+				elsif f.respond_to?(:disassembly)
 					s<<"<td><a href=#{display_url}&mode=list>disassembly</a></td>"
-				else 
+				else 					
 					s<<"<td><a href=#{display_url}&mode=text>text</a></td>"
 				end				
 				s<<"</tr>\n"
@@ -195,51 +200,48 @@ def make_catalog(relative_path)
 	end
 	s
 end
-def show_sector(relative_path,track,sector)		
-		track="0" if track.nil?
-		sector="0" if sector.nil?
-		track=("0"+track).to_i
-		sector=("0"+sector).to_i
-		absolute_path=make_absolute_path(relative_path)
-		dsk=get_dsk_from_cache(absolute_path)
-		uri="/showsector/#{uri_encode(relative_path)}"
-		s=""
-		s<<"<table><tr><th colspan=16>TRACK</th></tr>"
-		s<<"<tr>"
-		0.upto(0x22) do |track_no| 
-			if track_no==track then
-				s<<"<td><b>$#{sprintf('%02X',track)}</b></td>"
-			else
-				s<<"<td><a href=#{uri}?track=#{track_no}&sector=0>$#{sprintf('%02X',track_no)}</a></td>"
-			end
-			if track_no==0x0f ||track_no==0x1f then
-				s<<"</tr></tr>"
-			end
-		end
-		s<<"</tr>"
-		s<<"</table>"
-
-	s<<"<table><tr><th colspan=16>SECTOR</th></tr>"
-		s<<"<tr>"
-		0.upto(0x0F) do |sector_no| 
-			if sector_no==sector then
-				s<<"<td><b>$#{sprintf('%02X',sector)}</b></td>"
-			else
-				s<<"<td><a href=#{uri}?track=#{track}&sector=#{sector_no}>$#{sprintf('%02X',sector_no)}</a></td>"
-			end
-		end
-		s<<"</tr>"
-		s<<"</table>"
-
-		
-		s<<"<pre>\n"
-		s<<html_escape(dsk.dump_sector(track,sector))
-		s<<"</pre>\n"
-		s<<"<p>"
-		s<<"<pre>\n"
-		s<<html_escape(dsk.disassemble_sector(track,sector))
-		s<<"</pre>\n"
-		
+def show_sector(relative_path,track,sector)
+		track="0" if track.nil?
+		sector="0" if sector.nil?
+		track=("0"+track).to_i
+		sector=("0"+sector).to_i
+		absolute_path=make_absolute_path(relative_path)
+		dsk=get_dsk_from_cache(absolute_path)
+		uri="/showsector/#{uri_encode(relative_path)}"
+		s=""		
+		s<<"<table><tr><th colspan=16>TRACK</th></tr>"
+		s<<"<tr>"
+		0.upto(dsk.track_count-1) do |track_no|
+ 			if track_no==track then
+				s<<"<td><b>$#{sprintf('%02X',track)}</b></td>"
+			else
+				s<<"<td><a href=#{uri}?track=#{track_no}&sector=0>$#{sprintf('%02X',track_no)}</a></td>"
+			end
+			if track_no>0 && track_no%0x10==0 then
+				s<<"</tr></tr>"
+			end
+		end
+		s<<"</tr>"
+		s<<"</table>"
+		s<<"<table><tr><th colspan=16>SECTOR</th></tr>"
+		s<<"<tr>"
+		0.upto(0x0F) do |sector_no|
+ 			if sector_no==sector then
+				s<<"<td><b>$#{sprintf('%02X',sector)}</b></td>"
+			else
+				s<<"<td><a href=#{uri}?track=#{track}&sector=#{sector_no}>$#{sprintf('%02X',sector_no)}</a></td>"
+
+			end
+		end
+		s<<"</tr>"
+		s<<"</table>"
+		s<<"<pre>\n"
+		s<<html_escape(dsk.dump_sector(track,sector))
+		s<<"</pre>\n"
+		s<<"<p>"
+		s<<"<pre>\n"
+		s<<html_escape(dsk.disassemble_sector(track,sector))
+		s<<"</pre>\n"		
 end
 
 def show_file(relative_path,filename,display_mode)
@@ -252,10 +254,13 @@ def show_file(relative_path,filename,display_mode)
 		s="<hl><pre>"
 		if display_mode=="hex" then
 			s<<html_escape(file.hex_dump)
-		elsif display_mode=="list" && file.respond_to?(:disassembly)
-			then s<<html_escape(file.disassembly)
+		elsif display_mode=="list" && file.respond_to?(:disassembly) then
+			s<<html_escape(file.disassembly)
+		elsif display_mode=="png" && file.respond_to?(:to_png) then
+			png_url="/png/#{uri_encode(relative_path)}?filename=#{uri_encode(filename)}"
+			s<<"<IMG SRC=#{png_url} HEIGHT=384 WIDTH=560>"
 		else 
-			s<< (file.to_s)
+			s<<html_escape(file.to_s)
 		end
 		s<<"\n</pre><hl>"
 	end
@@ -284,10 +289,23 @@ class ShowFileServlet < HTTPServlet::AbstractServlet
 		filename=URI.unescape(req.query['filename'])
 		display_mode=req.query['mode']
 		res['Content-Type']="text/html"
-		res.body=common_header+make_navigation_path(relative_path,filename)+show_file(relative_path,filename,display_mode)+common_footer
+		res.body=common_header+make_navigation_path(relative_path,filename,display_mode)+show_file(relative_path,filename,display_mode)+common_footer
 	end
 end
 
+class ShowPNGServlet < HTTPServlet::AbstractServlet
+	def do_GET(req,res)
+		relative_path=URI.unescape(req.path).sub(/^\/png/,"")
+		filename=URI.unescape(req.query['filename'])
+		pallete_mode=req.query['pallete_mode']
+		pallete_mode=:"#{pallete_mode}" unless pallete_mode.nil? #convert string to symbol
+		absolute_path=make_absolute_path(relative_path)
+		dsk=get_dsk_from_cache(absolute_path)
+		file=dsk.files[filename]
+		res['Content-Type']="image/png"
+		res.body=file.to_png(pallete_mode)
+	end
+end
 class ShowSectorServlet < HTTPServlet::AbstractServlet
 	def do_GET(req,res)
 		relative_path=URI.unescape(req.path).sub(/^\/showsector/,"")
@@ -308,7 +326,7 @@ s.mount("/dir",DirectoryServlet)
 s.mount("/catalog",CatalogServlet)
 s.mount("/showfile",ShowFileServlet)
 s.mount("/showsector",ShowSectorServlet)
-
+s.mount("/png",ShowPNGServlet)
 #default page - for now, just redirect to the default dir page
 s.mount("/",DirectoryServlet)
 

data/bin/dsktool.rb

@@ -1,150 +1,251 @@
-#!/usr/bin/ruby
-# dsktool.rb
-#
-# == Synopsis
-#
-# Manipulate DSK format files (as used by Apple 2 emulators)
-#
-# == Usage
-#
-# dsktool.rb [switches] <filename.dsk>
-#  -c | --catalog               display catalog
-#  -e | --extract FILENAME      extract file by name (either to stdout, 
-#                               or file specified by --output)
-#  -h | --help                  display this message
-#  -d | --dump FILENAME         hex dump
-#  -l | --list FILENAME         monitor style listing (disassembles 65C02 opcodes)
-#  -o | --output FILENAME       specify name to save extracted file as
-#  -r | --raw                   don't convert basic files to ASCII
-#  -x | --explode               extract all files 
-#  -v | --version               show version number
-#
-#	Currently only works with DOS 3.3 and NADOL format DSK images 
-#	Will uncompress gzipped files (with extension .gz)
-#	input files can be URLs
-#
-# examples:
-#	dsktool.rb -c DOS3MASTR.dsk.gz
-#	dsktool.rb -l FID DOS3MASTR.dsk
-#	dsktool.rb --list fid -o fid.lst DOS3MASTR.dsk
-#	dsktool.rb --extract "COLOR DEMOSOFT" DOS3MASTR.dsk
-#	dsktool.rb -e HELLO -o HELLO.bas DOS3MASTR.dsk
-#	dsktool.rb -x DOS3MASTR.dsk.gz
-#	dsktool.rb -x DOS3MASTR.dsk.gz -o /tmp/DOS3MASTR/
-#	dsktool.rb -c http://jamtronix.com/dsks/apshai.dsk.gz
+#!/usr/bin/env ruby
 
-DSKTOOL_VERSION="0.2.1"
-
-#make sure the relevant folder with our libraries is in the require path
-lib_path=File.expand_path(File.dirname(__FILE__)+"//..//lib")
-$:.unshift(lib_path) unless $:.include?(lib_path)
-
-require 'optparse'
-require 'rdoc_patch' #RDoc::usage patched to work under gem executables
-
-catalog=false
-explode=false
-output_filename=nil
-extract_filename=nil
-extract_mode=:default
-explode_directory=nil
-opts=OptionParser.new
-opts.on("-h","--help") {RDoc::usage_from_file(__FILE__)}
-opts.on("-v","--version") do
-		puts File.basename($0)+" "+DSKTOOL_VERSION
-	exit
-end
-opts.on("-r","--") {extract_mode=:raw}
-opts.on("-c","--catalog") {catalog=true}
-opts.on("-x","--explode") {explode=true}
+# dsktool.rb
+#
+# == Synopsis
+#
+# Manipulate DSK format files (as used by Apple 2 emulators)
+#
+# == Usage
+#
+# dsktool.rb [switches] <filename.dsk>
+#  -a | --add FILENAME       (*) add file
+#  -b | --base BASE          use BASE as address to load Binary File
+#                            this will add 2 bytes to the start of file
+#                            BASE should be a hex number 
+#                            (can be prefixed with $, 0x, or nothing)
+#  -B | --bootcode FILENAME  FILENAME gets written to track 0, sector 0
+#                            FILENAME should be compiled to run at $0801
+#                            FILENAME can be up to 4Kb in size.
+#  -c | --catalog            display catalog
+#  -d | --dump FILENAME      hex dump
+#  -D | --diskdump           hex dump of entire disk
+#       --delete FILENAME    (*) delete named file
+#  -e | --extract FILENAME   extract file by name (either to stdout, 
+#                            or file specified by --output)
+#  -h | --help               display this message
+#  -I | --init FILESYSTEM    initialise the disk with the specified filesytem
+#                            DSK will be created if it doesn't exist.
+#                            FILESYSTEM can be : prodos,dos33,nadol,pascal,none
+#  -l | --list FILENAME      monitor style listing (disassembles 65C02 opcodes)
+#  -o | --output FILENAME    specify name to save extracted file as
+#  -r | --raw                don't convert files to ASCII
+#  -S | --showtrace          show full stack trace on any error
+#  -t | --filetype FILETYPE  file type for file being added.
+#                            Can be a single letter (A/I/B/T) or number.
+#                            Default for DOS 3.3 is 0x00 (Text)
+#  -T | --tokenise           (*) tokenise input file before adding
+#  -v | --version            show version number
+#  -x | --explode            extract all files 
+#
+#   (*) options marked with an asterisk are only available for
+#       file systems that have READ/WRITE support.
+#    
+#	Currently supported filesystems:
+#		Apple Pascal         (read only)
+#		DOS 3.3              (READ/WRITE)
+#		NADOL                (READ/WRITE)
+#		ProDOS 8             (read only)
+#
+#	Supports 16 sector DSK images 
+#	files with extension .gz will be read & written using gzip
+#	input files can be URLs
+#
+# examples:
+#	dsktool.rb -c http://jamtronix.com/dsks/apshai.dsk.gz
+#	dsktool.rb --list fid -o fid.lst DOS3MASTR.dsk
+#	dsktool.rb --extract "COLOR DEMOSOFT" DOS3MASTR.dsk
+#	dsktool.rb -e HELLO -o HELLO.bas DOS3MASTR.dsk
+#	dsktool.rb -x DOS3MASTR.dsk.gz -o /tmp/DOS3MASTR/
+#	dsktool.rb --add STARTUP -T nadol.po
+#	dsktool.rb --add c:\src\dosdemo\a.out -t B -b $2000 dosdemo.dsk
+#	dsktool.rb --init dos33 new_dos_disk.dsk.gz
+#	dsktool.rb --I none -B /tmp/a.out demo1.dsk
+
+
+DSKTOOL_VERSION="0.4.1"
+
+#make sure the relevant folder with our libraries is in the require path
+lib_path=File.expand_path(File.dirname(__FILE__)+"//..//lib")
+$:.unshift(lib_path) unless $:.include?(lib_path)
+require 'rubygems'
+require 'optparse'
+require 'rdoc_patch' #RDoc::usage patched to work under gem executables
+
+catalog=false
+explode=false
+diskdump=false
+show_trace=false
+add_filename=nil
+output_filename=nil
+extract_filename=nil
+delete_filename=nil
+add_file_options={}
+init_filesystem=nil
+boot_filename=nil
+
+extract_mode=:default
+explode_directory=nil
+opts=OptionParser.new
+opts.on("-h","--help") {RDoc::usage_from_file(__FILE__)}
+opts.on("-v","--version") do
+		puts File.basename($0)+" "+DSKTOOL_VERSION
+	exit
+end
+opts.on("-r","--raw") {extract_mode=:raw}
+opts.on("-c","--catalog") {catalog=true}
+opts.on("-D","--diskdump") {diskdump=true}
+opts.on("-x","--explode") {explode=true}
 opts.on("-l","--list FILENAME",String) do |val| 
 	extract_filename=val.upcase
 	extract_mode=:list	
 end
+
+opts.on("-S","--showtrace") {show_trace=true}
+
 opts.on("-d","--dump FILENAME",String) do |val| 
 	extract_filename=val.upcase
 	extract_mode=:hex
-end
-opts.on("-e","--extract FILENAME",String) {|val| extract_filename=val.upcase}
-opts.on("-o","--output FILENAME",String) {|val| output_filename=val}
-filename=opts.parse(ARGV)[0] rescue RDoc::usage_from_file(__FILE__,'Usage')
-RDoc::usage_from_file(__FILE__,'Usage') if (filename.nil?)
-
-	
-require 'DSK'
-dsk=DSK.read(filename)
-output_file= case
-	when (output_filename.nil?) || (explode) then STDOUT
-	else File.open(output_filename,"wb")
-end
-	
-if(catalog) then	
-	if (dsk.respond_to?(:dump_catalog)) then
-		dsk.dump_catalog
-	else
-		puts "#{filename} does not have a recognised file system"
-	end
-end
-
-if(explode) then
-	output_dir=output_filename.nil??File.basename(filename,".*"):output_filename
-	if !(File.exists?(output_dir)) then
-		Dir.mkdir(output_dir)	
-	end
-			
-	dsk.files.each_value do |f|
-		if (extract_mode==:raw) then
-			output_filename=output_dir+"/"+f.filename+".raw"
-			File.open(output_filename,"wb") <<f.contents
-		else
-			output_filename=output_dir+"/"+f.filename+f.file_extension
-			File.open(output_filename,"wb") <<f
-		end
-	end
-end
-
-
-if (!extract_filename.nil?) then
-	file=dsk.files[extract_filename]
-	if file.nil? then
-		puts "'#{extract_filename}' not found in #{filename}"
-	else
-		output_file<< case extract_mode
-			when :raw then file.contents
-			when :hex then file.hex_dump
-			when :list then 	
-				if file.respond_to?(:disassembly)
-					file.disassembly
-				else
-					puts "'#{extract_filename}' is not a binary file"
-					exit
-				end
-			else	file.to_s 
-		end
-	end
-end
-
-# == Author
-# Jonno Downes (jonno@jamtronix.com)
-#
-# == Copyright
-# Copyright (c) 2007 Jonno Downes (jonno@jamtronix.com)
-#
-#Permission is hereby granted, free of charge, to any person obtaining
-#a copy of this software and associated documentation files (the
-#"Software"), to deal in the Software without restriction, including
-#without limitation the rights to use, copy, modify, merge, publish,
-#distribute, sublicense, and/or sell copies of the Software, and to
-#permit persons to whom the Software is furnished to do so, subject to
-#the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+end
+opts.on("-e","--extract FILENAME",String) {|val| extract_filename=val.upcase}
+opts.on("-o","--output FILENAME",String) {|val| output_filename=val}
+opts.on("-a","--add FILENAME",String) {|val| add_filename=val}
+opts.on("-I","--init FILESYSTEM",String) {|val| init_filesystem=val}
+opts.on("-B","--bootcode FILENAME",String) {|val| boot_filename=val}
+opts.on("-t","--filetype FILETYPE",String) {|val| add_file_options[:filetype]=val}
+opts.on("-T","--tokenise") {add_file_options[:tokenise]=true}
+opts.on("-delete","--delete FILENAME",String) {|val| delete_filename=val}
+opts.on("-b","--base BASE",String) {|val| add_file_options[:base]=val}
+
+filename=opts.parse(ARGV)[0] rescue RDoc::usage_from_file(__FILE__,'Usage')
+RDoc::usage_from_file(__FILE__,'Usage') if (filename.nil?)
+
+	
+require 'DSK'
+
+begin #to wrap a rescue clause
+
+  begin
+   
+  if !init_filesystem.nil? then
+    dsk=DSK.create_new(:"#{init_filesystem}")
+    dsk.save_as(filename)
+  end
+
+
+  dsk=DSK.read(filename)
+  rescue 
+    #if we run dsktool.rb in a batch or shell file iterating over a bunch of dsk files, we may not know what file	
+    #has the error
+  STDERR << "error while parsing #{filename}\n"
+  raise
+  end
+
+  output_file= case
+    when (output_filename.nil?) || (explode) then STDOUT
+    else File.open(output_filename,"wb")
+  end
+
+  puts "#{filename}\nsector order:\t#{dsk.sector_order}\nfilesystem:\t#{dsk.file_system}"
+  if (dsk.respond_to?(:volume_name)) then    
+    puts "volume name:\t#{dsk.volume_name}"
+  end 
+  if (diskdump) then
+    puts dsk.hex_dump
+  end
+
+  if !boot_filename.nil? then
+    dsk.set_boot_track(File.open(boot_filename,"rb").read)
+    dsk.save_as(filename)
+  end
+
+  if (!delete_filename.nil?) then
+    if dsk.files[delete_filename].nil? then
+      puts "#{delete_filename.upcase} not found in #{filename}"
+    else
+      puts "deleting #{delete_filename}"
+      dsk.delete_file(delete_filename)
+      dsk.save_as(filename)
+    end
+  end
+
+  if (!add_filename.nil?) then
+    filecontents=File.open(add_filename,"rb").read
+    new_file=dsk.make_file(File.basename(add_filename).upcase,filecontents,add_file_options)
+    dsk.add_file(new_file)
+    dsk.save_as(filename)
+  end
+
+  if(catalog) then	
+    if (dsk.respond_to?(:dump_catalog)) then    
+      puts dsk.dump_catalog
+    else
+      puts "#{filename} does not have a recognised file system"
+    end
+  end
+
+  if(explode) then
+    output_dir=output_filename.nil??File.basename(filename,".*"):output_filename
+    if !(File.exists?(output_dir)) then
+      Dir.mkdir(output_dir)	
+    end
+        
+    dsk.files.each_value do |f|
+      if (extract_mode==:raw) then
+        output_filename=output_dir+"/"+f.filename+".raw"
+        File.open(output_filename,"wb") <<f.contents
+      else
+        output_filename=output_dir+"/"+f.filename+f.file_extension
+        File.open(output_filename,"wb") <<f
+      end
+    end
+  end
+
+
+  if (!extract_filename.nil?) then
+    file=dsk.files[extract_filename]
+    if file.nil? then
+      puts "'#{extract_filename}' not found in #{filename}"
+    else
+      output_file<< case extract_mode
+        when :raw then file.contents
+        when :hex then file.hex_dump
+        when :list then 	
+          if file.respond_to?(:disassembly)
+            file.disassembly
+          else
+            puts "'#{extract_filename}' is not a binary file"
+            exit
+          end
+        else	file.to_s 
+      end
+    end
+  end
+rescue
+  puts $!
+  raise if show_trace
+end
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2007 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/romdump.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+# romdump.rb
+#
+# == Synopsis
+#
+# display a BIN file assuming it is a Apple 2 ROM dump
+#
+# == Usage
+#
+# romdump.rb [switches] <filename.bin>
+#  -b | --base BASE   use BASE as start of disassembly (implies --list)
+#                     BASE will be interpreted as a hex number 
+#                     (can be prefixed with $, 0x, or nothing)
+#  -f | --font        treat all bytes as 8 bit wide font
+#  -l | --list        list disassembly of all bytes
+#  -x | --hex         dump as hex and ASCII
+#  -h | --help        display this message
+#  -v | --version     show version number
+#
+# switchs can be combined, as in
+#   romdump.rb edm.bin -xl -b $D000
+
+
+ROMDUMP_VERSION="0.0.1"
+
+#make sure the relevant folder with our libraries is in the require path
+lib_path=File.expand_path(File.dirname(__FILE__)+"//..//lib")
+$:.unshift(lib_path) unless $:.include?(lib_path)
+require 'rubygems'
+require 'optparse'
+require 'rdoc_patch' #RDoc::usage patched to work under gem executables
+base_address=0
+font=false
+hex=false
+list=false
+opts=OptionParser.new
+opts.on("-h","--help") {RDoc::usage_from_file(__FILE__)}
+opts.on("-v","--version") do
+		puts File.basename($0)+" "+ROMDUMP_VERSION
+	exit
+end
+opts.on("-f","--font"){font=true}
+opts.on("-x","--hex"){hex=true}
+opts.on("-l","--list"){list=true}
+opts.on("-b","--base BASE",String) do |val| 
+  base_address=val.tr("$","").hex
+  list=true
+end
+filename=opts.parse(ARGV)[0] rescue RDoc::usage_from_file(__FILE__,'Usage')
+RDoc::usage_from_file(__FILE__,'Usage') if (filename.nil?)
+
+file_bytes=open(filename,"rb").read
+
+require 'DumpUtilities'
+require 'D65'
+if (font) then
+  puts DumpUtilities.font_dump(file_bytes)
+end
+if (hex) then
+  puts DumpUtilities.hex_dump(file_bytes)
+end
+if (list) then
+  puts D65.disassemble(file_bytes,base_address)
+end