mast 1.2.0 → 1.3.0

data/HISTORY.rdoc

@@ -1,6 +1,26 @@
 = RELEASE HISTORY
 
-== 1.2 / 2010-02-19
+== 1.3.0 / 2010-11-21
+
+Version 1.3 primarily makes a few adjustment under-the-hood. It switches
+GetoptLong out for OptionParser, gets rid of it's dependency on Ruby Facets'
+Kernel#ask method, and changes the diff comment short name from `-d` to `-D`.
+Lowecase `-d` is now used as a short name for the `--dir` option. In the
+process a bug was fixed where this `-d` option was not being added to the
+manifest's bang line. Lastly, the `-s`/`--show` option has been enamed to
+`-b`/`--bang`, which is more descriptive.
+
+Changes:
+
+* Use `optparse.rb` library instead of `getoptlong.rb`.
+* Remove dependency on Ruby Facets's Kernel#ask method.
+* Rename `-d` to `-D`, short for `--diff`.
+* Add `-d` option to go with `--dir`.
+* Fix issue with `-d` option not added to bang line.
+* Rename `-s`/`--show` option to `-b`/`--bang`.
+
+
+== 1.2.0 / 2010-02-19
 
 This release adjusts the plugins directory to conform
 to the new Plugin gem and add the -i shortcut to the 
@@ -12,7 +32,7 @@ Changes:
 * Add -i to help output.
 
 
-== 1.1 / 2009-10-24
+== 1.1.0 / 2009-10-24
 
 This release fixes the show and clean commands and makes
 some additional adjustments under the hood.
@@ -23,7 +43,7 @@ Changes:
 * Change to MIT license.
 
 
-== 1.0 / 2009-07-02
+== 1.0.0 / 2009-07-02
 
 This is the initial release of Mast.
 

data/LICENSE

@@ -1,23 +1,205 @@
-The MIT License
+.
 
-Copyright (c) 2009 Thomas Sawyer
+                             Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
 
-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:
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+   1. Definitions.
 
-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.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+.

data/README.rdoc

@@ -6,9 +6,6 @@
   |           |
   '-----------'
 
-* home: http://proutils.github.com/mast/
-* work: http://github.com/proutils/mast/
-* wiki: http://wiki.github.com/proutils/mast/
 
 == DESCRIPTION
 
@@ -24,14 +21,22 @@ or as a stand-alone tool for monitoring file changes.
 * Checksum digests can highlight file changes.
 
 
+== RESOURCES
+
+* home: http://rubyworks.github.com/mast/
+* work: http://github.com/rubyworks/mast/
+* wiki: http://wiki.github.com/rubyworks/mast/
+
+
 == USAGE
 
-Mast makes the process of generating manifests very easy, and even allows manifests
-to be updated without repeating inclusion/exclusion criteria by storing the command
-parameters in a comment line at the top of the generated output.
+Mast makes the process of generating manifests very easy, and even allows
+manifests to be updated without repeating inclusion/exclusion criteria by
+storing the command parameters in a comment line at the top of the generated
+output.
 
-Lets try a simple example. Lets say we have the following folder structure, using 
-<tt>ls -R</tt> we see:
+Lets try a simple example. Lets say we have the following folder structure,
+using <code>ls -R</code> we see:
 
     $ ls -R
     .:
@@ -73,10 +78,12 @@ Now lets look at the same folder via 'mast'.
     mint/loremipsum.txt
     mint/tryme.rb
 
-As you can see it has listed all the files contained in the current folder. Notice also the first
-line is empty except for the '#' character. This is a standard shell comment mark. We can specify
-special criteria to the mast command and these options will be reflected on this line. For example,
-lets say the mint directory is extraneous and we do not want it included in the list of files.
+As you can see it has listed all the files contained in the current folder.
+Notice also the first line is empty except for the '#' character. This is
+a standard shell comment mark. We can specify special criteria to the mast
+command and these options will be reflected on this line. For example, lets
+say the mint directory is extraneous and we do not want it included in the
+list of files.
 
     $ mast -x mint
     #!mast -x mint
@@ -91,9 +98,11 @@ lets say the mint directory is extraneous and we do not want it included in the
     demo_rtar/web/index.html
     demo_rtar/web/rocklobster.jpg
 
-So you can see how the commandline options carry over to the top comment line of the ouput. The advantage of
-this is that if you save the output to a standard location, i.e. a file named MANIFEST or meta/manifest with
-an optional .txt prefix (case insensitive), then you can automaitcally update the file by calling +mast --update+.
+So you can see how the commandline options carry over to the top comment line
+of the ouput. The advantage of this is that if you save the output to a standard
+location, i.e. a file named MANIFEST or meta/manifest with an optional `.txt`
+prefix (case insensitive), then you can automaitcally update the file by calling
+<code>mast --update</code>.
 
     $ mast -x mint > MANIFEST
 
@@ -113,23 +122,30 @@ as omitting default excludes and ignores so that all files are lists. Use the
 
 To install with RubyGems simply open a console and type:
 
-  gem install mast
+  $ gem install mast
 
-Local installation requires Setup.rb (gem install setup),
-then download the tarball package and type:
+For a traditional site installation use Ruby Setup (gem install setup).
 
-  tar -xvzf mast-1.0.0.tgz
-  cd mast-1.0.0.tgz
-  sudo setup.rb all
+  $ tar -xvzf mast-1.3.0.tar.gz
+  $ cd mast-1.3.0.tar.gz
+  $ sudo setup.rb
 
-Windows users use 'ruby setup.rb all'.
+See {Ruby Setup}[http://rubyworks.github.com/setup] for more information.
 
 
 == COPYRIGHT
 
-Copyright (c) 2009 Thomas Sawyer <transfire@gmail.com>
+Copyright (c) 2009 Thomas Sawyer
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-This program is ditributed unser the terms of the MIT license.
+   http://www.apache.org/licenses/LICENSE-2.0
 
-See LICENSE or COPYING file for details.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 

data/lib/mast.rb

@@ -1,5 +1,2 @@
-module Mast
-  VERSION = "1.2.0" #:till: VERSION="<%= version %>"
-end
-
+require 'mast/meta/data'
 require 'mast/manifest'

data/lib/mast/cli.rb

@@ -19,7 +19,7 @@
 #    -c --create         Generate a new manifest. (default)
 #    -u --update         Update an existing manifest.
 #    -l --list           List the files given in the manifest file. (Use -f to specify an alternate file.)
-#    -d --diff           Diff manifest file against actual.
+#    -D --diff           Diff manifest file against actual.
 #    -n --new            List existant files that are not given in the manifest.
 #    -o --old            List files given in the manifest but are non-existent.
 #       --clean          Remove non-manifest files. (Will ask for confirmation first.)
@@ -29,9 +29,9 @@
 #  Options:
 #    -a --all            Include all files. This deactivates deafult exclusions
 #                        so it is possible to make complete list of all contents.
-#       --dir            When creating a list include directory paths; by default
+#    -d --dir            When creating a list include directory paths; by default
 #                        only files are listed.
-#    -s --show           Show files using the options from the manifest file.
+#    -b --bang           Produce new manifest but using options from the bang line of the manifest file.
 #    -f --file PATH      Path to manifest file. This applies to comparison commands.
 #                        If not given then the file matching 'MANIFEST', case-insensitive
 #                        and with an optional '.txt' extension, in the current directory
@@ -46,14 +46,11 @@
 #    -q --quiet          Suppress any extraneous output.
 
 require 'mast'
-
-# both of these can be replaced by using Clio instead.
-require 'getoptlong'
-require 'facets/kernel/ask'
+require 'optparse'
 
 module Mast
 
-  ARGVO = ARGV.dup
+  #ARGVO = ARGV.dup
 
   # Manifest Console Command
   #
@@ -66,31 +63,30 @@ module Mast
     DIGESTS = [:md5, :sha1, :sha128, :sha256, :sha512]
 
     attr_accessor :quiet
-    attr_accessor :file
-    attr_accessor :digest
-    attr_accessor :ignore
-    attr_accessor :include
-    attr_accessor :exclude
-    attr_accessor :all
-    attr_accessor :dir
-    attr_accessor :show
+
+    # Options for Manifest class taken from commandline arguments.
+    attr :options
 
     #
     def initialize
-      @quiet   = false
-      @all     = false
-      @file    = nil
-      @digest  = nil
-      @exclude = []
-      @include = []
-      @ignore  = []
+      @options = {}
+      @options[:all]     = false
+      @options[:file]    = nil
+      @options[:bang]    = nil
+      @options[:digest]  = nil
+      @options[:exclude] = []
+      @options[:ignore]  = []
+      @options[:include] = []
+
       @command = []
+
+      @quiet = false
     end
 
     #
-    def run
+    def run(argv=nil)
       begin
-        run_command
+        run_command(argv)
       rescue => err
         raise err if $DEBUG
         report err
@@ -98,17 +94,24 @@ module Mast
     end
 
     # Run command.
-    def run_command
-      optparse
+    def run_command(argv)
+      argv = (argv || ARGV).dup
+ 
+      @original_arguments = argv.dup
+
+      option_parser.parse!(argv)
+
+      @options[:include] = argv.empty? ? nil : argv #.dup
+
       if @command.size > 1
         raise ArgumentError, "Please issue only one command."
       end
+
       case @command.first
       when :help     then help
       when :create   then generate
       when :update   then update
       when :list     then list
-      #when :show     then show
       when :diff     then diff
       when :new      then new
       when :old      then old
@@ -120,91 +123,66 @@ module Mast
     end
 
     # Parse command line options.
-    def optparse
-      opts = GetoptLong.new(
-        # options
-        [ '--file'   , '-f', GetoptLong::REQUIRED_ARGUMENT ],
-        [ '--digest' , '-g', GetoptLong::REQUIRED_ARGUMENT ],
-        [ '--exclude', '-x', GetoptLong::REQUIRED_ARGUMENT ],
-        #[ '--include', '-i', GetoptLong::REQUIRED_ARGUMENT ],
-        [ '--ignore' , '-i', GetoptLong::REQUIRED_ARGUMENT ],
-        [ '--all'    , '-a', GetoptLong::NO_ARGUMENT ],
-        [ '--dir'    ,       GetoptLong::NO_ARGUMENT ],
-        [ '--show'   , '-s', GetoptLong::NO_ARGUMENT ],
-        [ '--quiet'  , '-q', GetoptLong::NO_ARGUMENT ],
-        # commands
-        [ '--help'   , '-h', GetoptLong::NO_ARGUMENT ],
-        [ '--create' , '-c', GetoptLong::NO_ARGUMENT ],
-        [ '--update' , '-u', GetoptLong::NO_ARGUMENT ],
-        [ '--list'   , '-l', GetoptLong::NO_ARGUMENT ],
-        [ '--diff'   , '-d', GetoptLong::NO_ARGUMENT ],
-        [ '--new'    , '-n', GetoptLong::NO_ARGUMENT ],
-        [ '--old'    , '-o', GetoptLong::NO_ARGUMENT ],
-        [ '--verify' , '-v', GetoptLong::NO_ARGUMENT ],
-        [ '--clean'  ,       GetoptLong::NO_ARGUMENT ]
-      )
-
-      opts.each do |key, val|
-        case key
-        when '--help'
-          @command << :help
-        when '--create'
+    def option_parser
+      OptionParser.new do |opt|
+        opt.on "--file", "-f FILE" do |file|
+          @options[:file] = file
+        end
+        opt.on "--digest", "-g TYPE" do |digest|
+          @options[:digest] = digest
+        end
+        opt.on "--exclude", "-x GLOB" do |glob|
+          @options[:exclude] << glob
+        end
+        opt.on "--ignore", "-i GLOB" do |glob|
+          @options[:ignore] << glob
+        end
+        opt.on "--all", "-a" do |bool|
+          @options[:all] = true
+        end
+        opt.on "--bang", "-b" do |bool|
+          @options[:bang] = true
+        end
+        opt.on "--dir", "-d" do |bool|
+          @options[:dir] = bool
+        end
+        #opt.on "--quiet", "-q", "" do |bool|
+        #  @quiet = bool
+        #end
+        opt.on "--create", "-c" do
           @command << :create
-        when '--update'
+        end
+        opt.on "--update", "-u" do
           @command << :update
-        when '--list'
+        end
+        opt.on "--list", "-l" do
           @command << :list
-        #when '--show'
-        #  @command << :show
-        when '--diff'
+        end
+        opt.on "--diff", "-D" do
           @command << :diff
-        when '--new'
+        end
+        opt.on "--new", "-n" do
           @command << :new
-        when '--old'
+        end
+        opt.on "--old", "-o" do
           @command << :old
-        when '--verify'
+        end
+        opt.on "--verify", "-v" do
           @command << :verify
-        when '--clean'
+        end
+        opt.on "--clean" do
           @command << :clean
-
-        when '--file'
-          @file = val
-        when '--digest'
-          @digest = val
-        when '--exclude'
-          @exclude << val
-        #when '--include'
-        #  @include << val
-        #when '--ignore'
-        #  @ignore << val
-        when '--show'
-          @show = true
-        when '--dir'
-          @dir = true
-        when '--all'
-          @all = true
-        when '--quiet'
-          @quiet = true
+        end
+        opt.on "--help" do
+          @command << :help
+        end
+        opt.on "--debug" do
+          $DEBUG = true
         end
       end
-
-      #unless args.empty?
-      #  if File.file?(args[0])
-      #    opts[:file]      = args[0]
-      #    opts[:directory] = args[1] if args[1]
-      #  else
-      #    opts[:directory] = args[0]
-      #    opts[:file]      = args[1] if args[1]
-      #  end
-      #end
-
-      @include = ARGV.empty? ? nil : ARGV.dup
     end
 
-    #def default; generate; end
-
     # Default command -- output manifest.
-    #
     def generate
       #if file
       #  update
@@ -214,7 +192,6 @@ module Mast
     end
 
     # Update a MANIFEST file for this package.
-    #
     def update
       begin
         file = manifest.update
@@ -287,10 +264,10 @@ module Mast
 
     #
     def manifest
-      @manifest ||= Manifest.new(manifest_options)
+      @manifest ||= Manifest.new(options)
       #@manifest ||= (
       #  begin
-      #    manifest = Manifest.open(file, manifest_options)
+      #    manifest = Manifest.open(file, options)
       #    manifest
       #  rescue LoadError
       #    report_manifest_missing
@@ -299,11 +276,6 @@ module Mast
       #)
     end
 
-    # Options for Manifest class taken from commandline arguments.
-    def manifest_options
-      { :file=>file, :digest=>digest, :exclude=>exclude, :ignore=>ignore, :all=>all, :dir=>dir, :include=>include, :show=>show }
-    end
-
     # Quiet opertation?
     def quiet?
       @quiet
@@ -312,13 +284,13 @@ module Mast
     # Get confirmation for clean.
     def confirm_clean(list)
       puts list.join("\n")
-      ask("The above files will be removed. Continue?", "yN")
+      ask("The above files will be removed. Continue? [yN]")
     end
 
     # Get confirmation for clobber.
     def confirm_clobber(list)
       puts list.join("\n")
-      ask("The above files will be removed. Continue?", "yN")
+      ask("The above files will be removed. Continue? [yN]")
     end
 
     #
@@ -411,94 +383,14 @@ module Mast
         report "Manifest is bad!"
       end
     end
-  end
 
-end
-
-=begin scrap
+    #
+    def ask(prompt=nil)
+      $stdout << "#{prompt}"
+      $stdout.flush
+      $stdin.gets.chomp!
+    end
 
-#     # Lookup manifest.
-#
-#     def manifest(create_missing=false)
-#       @manifest ||= (
-#         file = @options[:file]
-#         #manifest = file ? Manifest.open(file) : Manifest.lookup
-#         manifest = nil
-#
-#         if file
-#           manifest = Manifest.open(file, @options)
-#         elsif create_missing
-#           manifest = Manifest.new(@options)
-#         else
-#           manifest = nil
-#         end
-#
-#         if manifest
-#           #manifest.send(:set, @options)
-#         else
-#           report_manifest_missing
-#           exit 0
-#         end
-#         manifest
-#       )
-#     end
-
-#       @manifest ||= (
-#         file = @options[:file]
-#         #manifest = file ? Manifest.open(file) : Manifest.lookup
-#         manifest = nil
-#
-#         if file
-#           manifest = Manifest.open(file)
-#         elsif create_missing
-#           manifest = Manifest.new
-#         else
-#           manifest = nil
-#         end
-#
-#         if manifest
-#           manifest.change_options(@options)
-#         else
-#           report_manifest_missing
-#           exit 0
-#         end
-#         manifest
-#       )
-#     end
-
-#     # Generate manifest. By default it is a very simple filename
-#     # list. The digest can be supplied and a checksum will
-#     # be given before each filename.
-#
-#     def create
-#       manifest = Manifest.new #lookup
-#
-#       return report_overwrite(manifest) if (
-#         manifest and manifest.location == Dir.pwd
-#       )
-#
-#       report_warn_shadowing(manifest) if manifest
-#
-#       manifest = Manifest.new(options)
-#       file = manifest.create
-#       report_created(file)
-#     end
-
-#     # Clobber non-manifest files.
-#     #--
-#     # TODO Should clobber work off the manifest file itself
-#     #++
-#
-#     def clobber
-#       ansr = confirm_clobber(manifest.toss)
-#       case ansr.downcase
-#       when 'y', 'yes'
-#         manifest.clobber
-#       else
-#         report_cancelled('Clobber')
-#         exit!
-#       end
-#     end
-
-=end
+  end
 
+end