dsktool 0.1.2 → 0.1.3

data/bin/dsktool.rb

@@ -3,12 +3,12 @@
 #
 # == Synopsis
 #
-# Manipulate DSK format files
+# Manipulate DSK format files (as used by Apple 2 emulators)
 #
 # == Usage
 #
 # dsktool.rb [switches] <filename.dsk>
-#  -c | --catalog               display catalog
+#  -c | --log               display catalog
 #  -e | --extract FILENAME      extract file by name (either to stdout, 
 #                               or file specified by --output)
 #  -h | --help                  display this message
@@ -17,16 +17,19 @@
 #  -x | --explode               extract all files 
 #  -v | --version               show version number
 #
+# Currently only works with DOS 3.3 format 
+# DSK images can be
+#
 # examples:
-#	dsktool.rb -c DOS3MASTR.dsk
+#	dsktool.rb -c DOS3MASTR.dsk.gz
 #	dsktool.rb -l FID DOS3MASTR.dsk
 #	dsktool.rb --list fid -o fid.asm DOS3MASTR.dsk
 #	dsktool.rb --extract "COLOR DEMOSOFT" DOS3MASTR.dsk
 #	dsktool.rb -e HELLO -o HELLO.bas DOS3MASTR.dsk
-#	dsktool.rb -x DOS3MASTR.dsk
+#	dsktool.rb -x DOS3MASTR.dsk.gz
 #
 
-DSKTOOL_VERSION="0.1.2"
+DSKTOOL_VERSION="0.1.3"
 
 require 'optparse'
 require 'rdoc/usage'
@@ -93,11 +96,15 @@ output_file= case
 end
 	
 if(catalog) then	
-	dsk.dump_catalog
+	if (dsk.is_dos33?) then
+		dsk.dump_catalog
+	else
+		puts "#{filename} is not in DOS 3.3 format"
+	end
 end
 
 if(explode) then
-	output_dir=filename.sub(/\.[^.]*$/,"")
+	output_dir=File.basename(filename,".*")
 	if !(File.exists?(output_dir)) then
 		Dir.mkdir(output_dir)	
 	end

data/doc/classes/AppleSoftFile.html

@@ -83,9 +83,10 @@
       <map id="map" name="map">
   <area shape="RECT" coords="5,101,109,149"      href="IntegerBasicFile.html" alt="IntegerBasicFile">
   <area shape="RECT" coords="133,101,227,149"      href="AppleSoftFile.html" alt="AppleSoftFile">
-  <area shape="RECT" coords="251,101,325,149"      href="BinaryFile.html" alt="BinaryFile">
-  <area shape="RECT" coords="197,5,269,53"      href="DOSFile.html" alt="DOSFile">
-  <area shape="RECT" coords="349,101,421,149"      href="TextFile.html" alt="TextFile">
+  <area shape="RECT" coords="251,101,333,149"      href="SCAsmFile.html" alt="SCAsmFile">
+  <area shape="RECT" coords="357,101,432,149"      href="BinaryFile.html" alt="BinaryFile">
+  <area shape="RECT" coords="256,5,328,53"      href="DOSFile.html" alt="DOSFile">
+  <area shape="RECT" coords="456,101,528,149"      href="TextFile.html" alt="TextFile">
 </map>
 <img src="../dot/f_3.png" usemap="#map" border=0 alt="TopLevel">
     </div>
@@ -118,9 +119,9 @@ Applesoft file format:
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000012">file_extension</a>&nbsp;&nbsp;
-      <a href="#M000010">file_type</a>&nbsp;&nbsp;
-      <a href="#M000011">to_s</a>&nbsp;&nbsp;
+      <a href="#M000014">file_extension</a>&nbsp;&nbsp;
+      <a href="#M000012">file_type</a>&nbsp;&nbsp;
+      <a href="#M000013">to_s</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -155,12 +156,12 @@ Applesoft file format:
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000012" class="method-detail">
-        <a name="M000012"></a>
+      <div id="method-M000014" class="method-detail">
+        <a name="M000014"></a>
 
         <div class="method-heading">
-          <a href="AppleSoftFile.src/M000012.html" target="Code" class="method-signature"
-            onclick="popupCode('AppleSoftFile.src/M000012.html');return false;">
+          <a href="AppleSoftFile.src/M000014.html" target="Code" class="method-signature"
+            onclick="popupCode('AppleSoftFile.src/M000014.html');return false;">
           <span class="method-name">file_extension</span><span class="method-args">()</span>
           </a>
         </div>
@@ -169,12 +170,12 @@ Applesoft file format:
         </div>
       </div>
 
-      <div id="method-M000010" class="method-detail">
-        <a name="M000010"></a>
+      <div id="method-M000012" class="method-detail">
+        <a name="M000012"></a>
 
         <div class="method-heading">
-          <a href="AppleSoftFile.src/M000010.html" target="Code" class="method-signature"
-            onclick="popupCode('AppleSoftFile.src/M000010.html');return false;">
+          <a href="AppleSoftFile.src/M000012.html" target="Code" class="method-signature"
+            onclick="popupCode('AppleSoftFile.src/M000012.html');return false;">
           <span class="method-name">file_type</span><span class="method-args">()</span>
           </a>
         </div>
@@ -183,12 +184,12 @@ Applesoft file format:
         </div>
       </div>
 
-      <div id="method-M000011" class="method-detail">
-        <a name="M000011"></a>
+      <div id="method-M000013" class="method-detail">
+        <a name="M000013"></a>
 
         <div class="method-heading">
-          <a href="AppleSoftFile.src/M000011.html" target="Code" class="method-signature"
-            onclick="popupCode('AppleSoftFile.src/M000011.html');return false;">
+          <a href="AppleSoftFile.src/M000013.html" target="Code" class="method-signature"
+            onclick="popupCode('AppleSoftFile.src/M000013.html');return false;">
           <span class="method-name">to_s</span><span class="method-args">()</span>
           </a>
         </div>

data/doc/classes/AppleSoftFile.src/M000011.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>to_s (AppleSoftFile)</title>
+  <title>file_type (AppleSoftFile)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 275</span>
-        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
-                <span class="ruby-identifier">buffer_as_applesoft_file</span>(<span class="ruby-ivar">@contents</span>)
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 271</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_type</span>
+                <span class="ruby-value str">&quot;A&quot;</span>
         <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/AppleSoftFile.src/M000012.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>file_extension (AppleSoftFile)</title>
+  <title>file_type (AppleSoftFile)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 279</span>
-        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_extension</span>
-                <span class="ruby-value str">&quot;.bas&quot;</span>
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 271</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_type</span>
+                <span class="ruby-value str">&quot;A&quot;</span>
         <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/AppleSoftFile.src/M000013.html

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>to_s (AppleSoftFile)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 275</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+                <span class="ruby-identifier">buffer_as_applesoft_file</span>(<span class="ruby-ivar">@contents</span>)
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/AppleSoftFile.src/M000014.html

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>file_extension (AppleSoftFile)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 279</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_extension</span>
+                <span class="ruby-value str">&quot;.bas&quot;</span>
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/BinaryFile.html

@@ -83,9 +83,10 @@
       <map id="map" name="map">
   <area shape="RECT" coords="5,101,109,149"      href="IntegerBasicFile.html" alt="IntegerBasicFile">
   <area shape="RECT" coords="133,101,227,149"      href="AppleSoftFile.html" alt="AppleSoftFile">
-  <area shape="RECT" coords="251,101,325,149"      href="BinaryFile.html" alt="BinaryFile">
-  <area shape="RECT" coords="197,5,269,53"      href="DOSFile.html" alt="DOSFile">
-  <area shape="RECT" coords="349,101,421,149"      href="TextFile.html" alt="TextFile">
+  <area shape="RECT" coords="251,101,333,149"      href="SCAsmFile.html" alt="SCAsmFile">
+  <area shape="RECT" coords="357,101,432,149"      href="BinaryFile.html" alt="BinaryFile">
+  <area shape="RECT" coords="256,5,328,53"      href="DOSFile.html" alt="DOSFile">
+  <area shape="RECT" coords="456,101,528,149"      href="TextFile.html" alt="TextFile">
 </map>
 <img src="../dot/f_3.png" usemap="#map" border=0 alt="TopLevel">
     </div>
@@ -98,9 +99,9 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000025">disassembly</a>&nbsp;&nbsp;
-      <a href="#M000024">file_extension</a>&nbsp;&nbsp;
-      <a href="#M000023">file_type</a>&nbsp;&nbsp;
+      <a href="#M000031">disassembly</a>&nbsp;&nbsp;
+      <a href="#M000030">file_extension</a>&nbsp;&nbsp;
+      <a href="#M000029">file_type</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -122,12 +123,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000025" class="method-detail">
-        <a name="M000025"></a>
+      <div id="method-M000031" class="method-detail">
+        <a name="M000031"></a>
 
         <div class="method-heading">
-          <a href="BinaryFile.src/M000025.html" target="Code" class="method-signature"
-            onclick="popupCode('BinaryFile.src/M000025.html');return false;">
+          <a href="BinaryFile.src/M000031.html" target="Code" class="method-signature"
+            onclick="popupCode('BinaryFile.src/M000031.html');return false;">
           <span class="method-name">disassembly</span><span class="method-args">()</span>
           </a>
         </div>
@@ -136,12 +137,12 @@
         </div>
       </div>
 
-      <div id="method-M000024" class="method-detail">
-        <a name="M000024"></a>
+      <div id="method-M000030" class="method-detail">
+        <a name="M000030"></a>
 
         <div class="method-heading">
-          <a href="BinaryFile.src/M000024.html" target="Code" class="method-signature"
-            onclick="popupCode('BinaryFile.src/M000024.html');return false;">
+          <a href="BinaryFile.src/M000030.html" target="Code" class="method-signature"
+            onclick="popupCode('BinaryFile.src/M000030.html');return false;">
           <span class="method-name">file_extension</span><span class="method-args">()</span>
           </a>
         </div>
@@ -150,12 +151,12 @@
         </div>
       </div>
 
-      <div id="method-M000023" class="method-detail">
-        <a name="M000023"></a>
+      <div id="method-M000029" class="method-detail">
+        <a name="M000029"></a>
 
         <div class="method-heading">
-          <a href="BinaryFile.src/M000023.html" target="Code" class="method-signature"
-            onclick="popupCode('BinaryFile.src/M000023.html');return false;">
+          <a href="BinaryFile.src/M000029.html" target="Code" class="method-signature"
+            onclick="popupCode('BinaryFile.src/M000029.html');return false;">
           <span class="method-name">file_type</span><span class="method-args">()</span>
           </a>
         </div>

data/doc/classes/BinaryFile.src/M000024.html

@@ -5,14 +5,14 @@
 
 <html>
 <head>
-  <title>file_extension (BinaryFile)</title>
+  <title>file_type (BinaryFile)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 49</span>
-        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_extension</span>
-                <span class="ruby-value str">&quot;.bin&quot;</span>
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 45</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_type</span>
+                <span class="ruby-value str">&quot;B&quot;</span>
         <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/BinaryFile.src/M000025.html

@@ -5,15 +5,14 @@
 
 <html>
 <head>
-  <title>disassembly (BinaryFile)</title>
+  <title>file_extension (BinaryFile)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 53</span>
-        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">disassembly</span>
-                        <span class="ruby-identifier">start_address</span>=(<span class="ruby-ivar">@contents</span>[<span class="ruby-value">0</span>]<span class="ruby-operator">+</span><span class="ruby-ivar">@contents</span>[<span class="ruby-value">1</span>]<span class="ruby-operator">*</span><span class="ruby-value">256</span>)
-                        <span class="ruby-constant">D65</span>.<span class="ruby-identifier">disassemble</span>(<span class="ruby-ivar">@contents</span>[<span class="ruby-value">2</span><span class="ruby-operator">..</span><span class="ruby-ivar">@contents</span>.<span class="ruby-identifier">length</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>],<span class="ruby-identifier">start_address</span>)
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 49</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_extension</span>
+                <span class="ruby-value str">&quot;.bin&quot;</span>
         <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/BinaryFile.src/M000026.html

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>disassembly (BinaryFile)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 53</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">disassembly</span>
+                        <span class="ruby-identifier">start_address</span>=(<span class="ruby-ivar">@contents</span>[<span class="ruby-value">0</span>]<span class="ruby-operator">+</span><span class="ruby-ivar">@contents</span>[<span class="ruby-value">1</span>]<span class="ruby-operator">*</span><span class="ruby-value">256</span>)
+                        <span class="ruby-constant">D65</span>.<span class="ruby-identifier">disassemble</span>(<span class="ruby-ivar">@contents</span>[<span class="ruby-value">2</span><span class="ruby-operator">..</span><span class="ruby-ivar">@contents</span>.<span class="ruby-identifier">length</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>],<span class="ruby-identifier">start_address</span>)
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/BinaryFile.src/M000029.html

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>file_type (BinaryFile)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 45</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_type</span>
+                <span class="ruby-value str">&quot;B&quot;</span>
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/BinaryFile.src/M000030.html

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>file_extension (BinaryFile)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 49</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_extension</span>
+                <span class="ruby-value str">&quot;.bin&quot;</span>
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/BinaryFile.src/M000031.html

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>disassembly (BinaryFile)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSFile.rb, line 53</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">disassembly</span>
+                        <span class="ruby-identifier">start_address</span>=(<span class="ruby-ivar">@contents</span>[<span class="ruby-value">0</span>]<span class="ruby-operator">+</span><span class="ruby-ivar">@contents</span>[<span class="ruby-value">1</span>]<span class="ruby-operator">*</span><span class="ruby-value">256</span>)
+                        <span class="ruby-constant">D65</span>.<span class="ruby-identifier">disassemble</span>(<span class="ruby-ivar">@contents</span>[<span class="ruby-value">2</span><span class="ruby-operator">..</span><span class="ruby-ivar">@contents</span>.<span class="ruby-identifier">length</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>],<span class="ruby-identifier">start_address</span>)
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/D65.html

@@ -92,8 +92,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000008">annotations</a>&nbsp;&nbsp;
-      <a href="#M000009">disassemble</a>&nbsp;&nbsp;
+      <a href="#M000010">annotations</a>&nbsp;&nbsp;
+      <a href="#M000011">disassemble</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -133,12 +133,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
+      <div id="method-M000010" class="method-detail">
+        <a name="M000010"></a>
 
         <div class="method-heading">
-          <a href="D65.src/M000008.html" target="Code" class="method-signature"
-            onclick="popupCode('D65.src/M000008.html');return false;">
+          <a href="D65.src/M000010.html" target="Code" class="method-signature"
+            onclick="popupCode('D65.src/M000010.html');return false;">
           <span class="method-name">annotations</span><span class="method-args">()</span>
           </a>
         </div>
@@ -151,12 +151,12 @@ writes a ^G to stdout&quot;}
         </div>
       </div>
 
-      <div id="method-M000009" class="method-detail">
-        <a name="M000009"></a>
+      <div id="method-M000011" class="method-detail">
+        <a name="M000011"></a>
 
         <div class="method-heading">
-          <a href="D65.src/M000009.html" target="Code" class="method-signature"
-            onclick="popupCode('D65.src/M000009.html');return false;">
+          <a href="D65.src/M000011.html" target="Code" class="method-signature"
+            onclick="popupCode('D65.src/M000011.html');return false;">
           <span class="method-name">disassemble</span><span class="method-args">(buffer,start_address=0)</span>
           </a>
         </div>