amp 0.5.2 → 0.5.3

data/site/src/about/commands.haml

@@ -96,7 +96,7 @@
                 end
               end
           %p
-            Last, but not least, we have the #{shellscript "on_run"} method. This is how we declare what <em>happens</em> when our command is run - which is what we really care about! You specify what the command does in #{shellscript "on_run"}'s block, which takes two arguments: #{shellscript "options"} and #{shellscript "args"}. These are, respectively, the command-line options passed in plus amp's additions, and the arguments provided by the user. For example: #{shellscript "amp log --verbose --limit=3 arg1 arg2"} would provide #{shellscript "{:verbose => true, :limit => 3, :repository => #&lt;LocalRepository repo&gt;}"} as #{shellscript "options"} and #{shellscript "[arg1, arg2]"} as #{shellscript "args"}.
+            Last, but not least, we have the #{shellscript "on_run"} method. This is how we declare what <em>happens</em> when our command is run - which is what we really care about! You specify what the command does in #{shellscript "on_run"}'s block, which takes two arguments: #{shellscript "options"} and #{shellscript "args"}. These are, respectively, the command-line options passed in plus amp's additions, and the arguments provided by the user. For example: #{shellscript "amp log --verbose --limit=3 arg1 arg2"} would provide #{shellscript "{:verbose => true, :limit => 3, :repository => #&lt;LocalRepository repo&gt;}"} as #{shellscript "options"} and #{shellscript "[\"arg1\", \"arg2\"]"} as #{shellscript "args"}.
           %p
             Our command is getting changeset information, so it needs a repository to interact with. Unless told to do otherwise, #{blue_amp} will look for a repository and store it in #{shellscript "options[#{symbol :repository}]"}. This will always be an object of the class #{link_to "http://amp.carboni.ca/docs/Amp/Repositories/LocalRepository.html", "LocalRepository"}.
           %p

data/site/src/css/amp.css

@@ -189,7 +189,7 @@ p, .infopage ul.bullets, .infopage ul.bullets li {
 	margin:3px 3px 3px 30px;
 }
 
-ul.bullets, ul.bullets li { list-style-type:disc; }
+ul.bullets, ul.bullets li { list-style-type:disc; position:relative;clear:left; }
 
 .half-border { border-right: none 1px #ccc; border-bottom: none 1px #ccc; }
 

data/site/src/index.haml

@@ -15,7 +15,7 @@
             .rounded.bigbox.pink
               %h1#latest-version
                 Get Amp
-                %span.red-text v0.5.1
+                %span.red-text== v#{::Amp::VERSION}
               %ul{:style => "margin-left:2px;"}
                 %li== 1. Get #{ruby_link}. 2. sudo gem install #{blue_amp} --no-wrappers
         .floatleft{ :style => "width:100%;padding:10px 0em 6px;" }
@@ -97,10 +97,10 @@
                   %span.shellscript hg clone http://bitbucket.org/carbonica/amp/
                 %li Make your changes
                 %li
-                  %span.shellscript hg diff -r rev1 -r rev2 -U 3 > your.patch
+                  %span.shellscript hg diff > your.patch
                 %li Create ticket on #{lighthouse_link "Lighthouse, attach your patch"}
                 %li Land one patch, you get commit rights
-              %p== Want more details? Check out our #{link_to "/contribute/", "contributing page." } Or join us at #{link_to "irc://irc.freenode.net/#amp", "#amp on freenode" }.
+              %p== Want more details? Check out our #{link_to "/contribute/", "contributing page." } Or join us at #{link_to "irc://irc.freenode.net/#amp-vcs", "#amp-vcs on freenode" }.
     = render("include/_footer.haml")
     :plain
       <script type="text/javascript">

data/tasks/man.rake

@@ -0,0 +1,39 @@
+require 'rtfm/tasks'
+
+RTFM::ManPage.new("amp", 1) do |page|
+  page.summary = "Ruby VCS engine"
+  
+  page.option :verbose, "Enables verbose output for the entire Amp process."
+  page.option :d, "Prings a variety of debug information about the arguments and options passed into amp.", :long => :"debug-opts"
+  page.option :profile, "Profiles the amp process as it runs the requested command. Deprecated and unwise."
+  page.option :R, "The path to the repository to use", :long => "repository", :argument => "repo_dir"
+  page.option :"pure-ruby", "Use only pure ruby (no C-extensions)"
+  page.option :testing, "Running a test. Don't touch this."
+  
+  page.synopsis do |synopsis|
+    synopsis.argument "command"
+  end
+  
+  page.description do |description|
+    description.body = <<-EOF
+  Amp is a revolutionary change in how we approach version control systems. Not only does it re-implement
+Mercurial's core in Ruby, but re-thinks how we interact with version control. It intends to wrap multiple
+VCS systems - git, hg, svn - under the same API, allowing the unique Amp command system to work with all
+repositories in the same manner.
+
+  Amp currently implements Mercurial and a large subset of the Mercurial command-set.
+EOF
+  end
+  
+  page.see_also do |also|
+    also.reference "hg", 1
+    also.reference "git", 1
+    also.reference "ruby", 1
+    also.reference "amprc", 5
+  end
+  
+  page.authors do |authors|
+    authors.add "Michael Edgar", "adgar@carboni.ca"
+    authors.add "Ari Brown", "seydar@carboni.ca"
+  end
+end

data/tasks/stats.rake

@@ -1,12 +1,3 @@
-require 'flay'
-require 'flay_task'
-
-
-FlayTask.new(:flay, 400) do |t|
-  t.dirs = %w(lib/amp)
-  t.verbose = true
-end
-
 desc 'Statistics of Code'
 task :stats do
   MINIMUM_LOC = 15
@@ -24,7 +15,7 @@ task :stats do
   files = FileList['lib/**/*.rb'] +
           FileList["test/**/*.rb"] +
           FileList["ext/**/*.c"]
-  
+  files.reject! {|f| f =~ /maruku/ && f !~ /to_ansi/  }
   puts ScriptLines.headline
   sum = ScriptLines.new("TOTAL (#{files.size} file#{files.size == 1 ? '' : 's'})")
 

data/tasks/yard.rake

@@ -35,7 +35,7 @@ end
 namespace :yard do
   
   desc 'Force a rebuild of the documentation'
-  task :full_doc => [ :todo ] do
+  task :full_doc do
     text_files = ["SCHEDULE.markdown", "AUTHORS", "STYLE", "TODO.markdown", "LICENSE"]
     options    = ["--private", "--protected", "-q", "-r README.md"]
     ruby_files = ["lib/**/**/**/*.rb", "lib/**/**/*.rb", "lib/**/*.rb", "lib/*.rb"]
@@ -54,55 +54,6 @@ namespace :yard do
     undocd.zero? ? 0.0 : (undocd / total)
   end
   
-  desc 'Generate a TODO file by searching for @todo tags'
-  task :todo => [ :doc ] do
-    File.open("TODO.markdown","w") do |out|
-      classes = YARD::Registry.all(:class)
-      classes.each do |klass|
-        need_todo_section = false 
-        klass_todo = []
-        
-        klass.tags.each do |tag| 
-          if tag.tag_name.to_s == "todo"
-            need_todo_section = true
-            klass_todo << tag.text
-          end
-        end
-        
-        method_todo_section = false
-        method_todos = {}
-        klass.meths(:inherited => false).each do |meth|
-          meth.tags.each do |tag|
-            if tag.tag_name.to_s == "todo"
-              need_todo_section = true
-              method_todo_section = true
-              (method_todos[meth] ||= []) << tag.name # @todo puts info in #name, not #text
-            end
-          end
-        end
-        
-        if need_todo_section
-          klassname = klass.path.gsub(/\_/,"\\_")
-          out << klassname << "\n"
-          out << ("=" * klassname.size) << "\n"
-          klass_todo.each {|todo| out << "  - #{todo}\n"}
-          out << "\n"
-          method_todos.each do |meth, todos|
-            methname = meth.path.gsub(/\_/,"\\_")
-            out << methname << "\n"
-            out << ("-" * methname.size) << "\n"
-            todos.each do |todo|
-              out << "  - " << todo << "\n"
-            end
-            out << "\n"
-          end
-          out << "\n"
-        end
-        
-      end
-    end
-  end
-  
   # rake yard:search[ranks]
   desc 'Search the methods for the specified tag'
   task :search => [ :doc ]

data/test/dirstate_tests/test_dir_state.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+require File.join(File.expand_path(File.dirname(__FILE__)), '../testutilities')
 require File.expand_path(File.join(File.dirname(__FILE__), "../../lib/amp"))
 
 # easyness
@@ -7,14 +7,14 @@ class String
 end
 
 
-class TestDirState < Test::Unit::TestCase
+class TestDirState < AmpTestCase
   
   def setup
     f = File.open File.join(File.dirname(__FILE__), "hgrc")
     @config = PythonConfig::ConfigParser.new f
     opener = Amp::Opener.new File.expand_path(File.dirname(__FILE__))
     opener.default = :open_file
-    @state = Amp::Repositories::DirState.new File.expand_path(File.dirname(__FILE__)), @config, opener
+    @state = Amp::Repositories::Mercurial::DirState.new File.expand_path(File.dirname(__FILE__)), @config, opener
     @files = []
   end
   
@@ -33,17 +33,17 @@ class TestDirState < Test::Unit::TestCase
   end
   
   def test_parents_equals
-    @state.parents = ["asdfasdf", Amp::RevlogSupport::Node::NULL_ID]
+    @state.parents = ["asdfasdf", Amp::Mercurial::RevlogSupport::Node::NULL_ID]
     
-    assert_equal ["asdfasdf", Amp::RevlogSupport::Node::NULL_ID], @state.parents
+    assert_equal ["asdfasdf", Amp::Mercurial::RevlogSupport::Node::NULL_ID], @state.parents
     
     @state.parents = "asdfasdf"
     
-    assert_equal ["asdfasdf", Amp::RevlogSupport::Node::NULL_ID], @state.parents
+    assert_equal ["asdfasdf", Amp::Mercurial::RevlogSupport::Node::NULL_ID], @state.parents
   end
   
   def test_dirty?
-    @state.parents = ["asdfasdf", Amp::RevlogSupport::Node::NULL_ID] # something to dirty it up
+    @state.parents = ["asdfasdf", Amp::Mercurial::RevlogSupport::Node::NULL_ID] # something to dirty it up
     
     assert @state.dirty?
   end
@@ -96,6 +96,8 @@ class TestDirState < Test::Unit::TestCase
   # the same quirks
   def test_remove
     add_file "monkey" # make sure it's in @files
+    # pretend the file is normal
+    @state.normal "monkey"
     @state.remove "monkey"
     
     assert @state["monkey"].removed?
@@ -174,7 +176,7 @@ class TestDirState < Test::Unit::TestCase
     
     @state.send :read!
     
-    assert_equal({"oh_nuit" => Amp::Repositories::DirStateEntry.new(:added, 0, -1, -1)}, @state.files)
+    assert_equal({"oh_nuit" => Amp::Repositories::Mercurial::DirStateEntry.new(:added, 0, -1, -1)}, @state.files)
     assert_equal({}, @state.copy_map)
   end
 

data/test/functional_tests/annotate.out

@@ -0,0 +1,31 @@
+medgar 2:  The Amp Commandments Redux:
+tester 0:      1. Thou shalt not useth the "for...in" syntax.
+tester 0:      2. Thou shalt useth only but 80 columns, for those who useth the lord's
+medgar 2:         editors, vim and emacs. (emacs sucks - oh no he didn't)
+tester 0:      3. Thou shalt preface thine variables with _ only when thou needest,
+medgar 2:         lest ye face judgement for this most grave sin. (this isn't python.
+medgar 2:         no __method__ is necessary!)
+medgar 2:      4. Thine variables should have descriptive names, for thine ruby might
+tester 0:         read like the psalms.
+tester 0:      5. Thine variables, longer than 6 letters and composed of two or more
+tester 0:         words, shall separate those words with the lord's underscore, so thine
+tester 0:         code shall flow like the Nile herself.
+tester 0:      6. Thou shalt rake thine yard frequently, to be sure thine code is
+tester 0:         well-documented for thine neighbors.
+tester 0:      7. Thou shalt use alias_method over alias or I shall goeth Chris Brown
+medgar 2:         all over thou. (meh we don't need threats in the commandments.)
+tester 0:      8. Thou shalt use parentheses in thine defintions of methods, for the
+medgar 2:         consistency of the codes in this repository.
+tester 0:      9. Thine comments shall start, when above thine method definitions, with
+tester 0:         2 (two) hashes, and the information, then, beginning on the line below
+tester 0:         it. Thou shalt leave one blank comment line between thine comment info
+tester 0:         and thine yard information.
+medgar 2:      10. Thou shalt make great and grand use of the yard extension. It is
+medgar 2:         pretty sweet.
+seydar 3:      11. Name thine motherfrakking vari
+seydar 3:  
+seydar 3:  
+seydar 3:  VERSION 3
+seydar 3:  
+seydar 3:  VERSION 3
+seydar 3:  ables motherfrakking descriptively.

data/test/functional_tests/test_functional.rb

@@ -1,13 +1,13 @@
-require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), "../test_helper"))
+require 'stringio'
+require File.join(File.expand_path(File.dirname(__FILE__)), '../testutilities')
 require File.expand_path(File.join(File.dirname(__FILE__), "../../lib/amp"))
-
+include Amp::KernelMethods
 # easyness
 class String
   def fun_local; File.join($current_basedir, self); end
 end
 
-class TestFunctional < Test::Unit::TestCase
+class TestFunctional < AmpTestCase
   
   AMP_FILE   = (RUBY_VERSION < "1.9") ? "amp" : "amp1.9"
   AMP_BINARY = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', AMP_FILE))
@@ -27,9 +27,20 @@ class TestFunctional < Test::Unit::TestCase
   # order is followed. So it all goes in one method. Sorry.
   def test_init
     
+    require       "amp/commands/command.rb"
+    require_dir { "amp/commands/*.rb"              }
+    require_dir { "amp/commands/commands/*.rb"     }
+    
+    ENV["HGUSER"] = "tester"
+    
+    assert_command_match(/#{Amp::VERSION_TITLE}/, "version")
+    assert_command_match(/#{Amp::VERSION}/, "version")
+    
+    
     # Create the mainline repository! Woo!
-    run_amp_command "init", "testrepo".fun_local
+    amp "init", "testrepo".fun_local
     
+    File.safe_unlink "testrepo/ampfile.rb".fun_local
     # Make sure we've correctly initialized the repository
     assert_file 'testrepo'
     assert_file 'testrepo/.hg'
@@ -115,7 +126,7 @@ class TestFunctional < Test::Unit::TestCase
     exit_repo
     
     # Clone testrepo to create "newrepo".
-    run_amp_command "clone #{"testrepo".fun_local} #{"newrepo".fun_local}"
+    amp "clone", ["testrepo".fun_local,"newrepo".fun_local]
     # Enter the newrepo repository.
     enter_repo "newrepo"
     
@@ -135,9 +146,11 @@ class TestFunctional < Test::Unit::TestCase
     # Make sure that the custom user is still peachy
     assert_command_match(/user\: +seydar/, "log", nil, :limit => 1)
     
-    # Push upstream to testrepo
-    run_amp_command "push"
+    assert_command_match(/demonic infestation/, amp("outgoing"))
+    assert_command_match(/experimental branch/, amp("outgoing"))
     
+    # Push upstream to testrepo
+    amp "push"
     # Switch to testrepo
     exit_repo
     enter_repo "testrepo"
@@ -168,7 +181,7 @@ class TestFunctional < Test::Unit::TestCase
     # the date. So just hand-parse the input string and see if the result is in the changelog.
     require 'time'
     t = Time.parse("1/1/2009")
-    assert_command_match(/#{t.to_s}/, "log -l 1")
+    assert_command_match(/#{t.to_s}/, "log", ["-l", "1"])
     
     # Over-zealous verification never hurt anyone
     assert_verify
@@ -180,7 +193,7 @@ class TestFunctional < Test::Unit::TestCase
     # Pull! wooooo!
     assert_command_match(/added 1 changesets/, "pull")
     # Update it
-    update_result = run_amp_command "update"
+    update_result = amp "update"
     # And check to see if the 2 things we did were both in the update
     assert_match(/1 files updated/, update_result)
     assert_match(/1 files removed/, update_result)
@@ -191,12 +204,12 @@ class TestFunctional < Test::Unit::TestCase
     # ok, so right now, newrepo is the same as testrepo.
     # now to generate a conflict, so we can test merging. we'll need a second child repo.
     exit_repo
-    run_amp_command "clone #{"testrepo".fun_local} #{"conflictrepo".fun_local}"
+    amp "clone", ["testrepo".fun_local, "conflictrepo".fun_local]
     
     # create one branch in conflictrepo
     enter_repo "conflictrepo"
     replace_resources_with_version "version5_1"
-    run_amp_command "status"
+    amp "status"
     commit :message => "conflict, part 1"
     exit_repo
     
@@ -206,17 +219,19 @@ class TestFunctional < Test::Unit::TestCase
     replace_resources_with_version "version5_2"
     
     # test addremove, while we're at it!
-    addremove_result = run_amp_command "addremove"
+    addremove_result = amp "addremove"
     assert_match(/Adding commands\/newz.rb/, addremove_result)
     assert_match(/Removing commands\/heads.rb/, addremove_result)
-    run_amp_command "status"
+    amp "status"
     commit :message => "conflict, part 2"
     
     # push our conflicting commit to testrepo from the "newrepo" child.
-    push_results = run_amp_command "push"
+    push_results = amp "push"
+    p; puts push_results; p
+    
     assert_match(/1 changeset/, push_results)
-    assert_match(/2 changes/, push_results)
-    assert_match(/2 files/, push_results)
+    assert_match(/3 changes/, push_results)
+    assert_match(/3 files/, push_results)
     
     exit_repo
     
@@ -229,12 +244,12 @@ class TestFunctional < Test::Unit::TestCase
     # pull in newrepo's conflicting commit (it will yell at us for the extra head)
     assert_command_match(/\+1 heads?/, "pull")
     # Try to merge the 2 changesets
-    result = run_amp_command("merge")
+    result = amp "merge"
     
     # Expected results from the merge
     assert_match(/1 files? unresolved/, result)
     assert_match(/1 files? removed/,    result)
-    assert_match(/1 files? updated/,    result)
+    assert_match(/2 files? updated/,    result)
     
     # Ok, so we have one file that conflicts: STYLE.txt. We want to keep conflictrepo's
     # version of the file. So we'll suck out the local portion of the conflicted summary.
@@ -243,7 +258,7 @@ class TestFunctional < Test::Unit::TestCase
     File.open("STYLE.txt","w") {|f| f.write vers1_groups.first}
     
     # mark STYLE.txt as resolved, and make sure it successfully was marked
-    resolve_result = run_amp_command("resolve", ["--mark", "STYLE.txt"])
+    resolve_result = amp("resolve", ["--mark", "STYLE.txt"])
     assert_match(/STYLE.txt marked/, resolve_result)
     assert_match(/resolved/, resolve_result)
     
@@ -251,7 +266,7 @@ class TestFunctional < Test::Unit::TestCase
     commit :message => "conflict resolved!"
     
     # push to testrepo
-    run_amp_command "push"
+    amp "push"
     assert_verify
     # make sure we're still intact in conflictrepo
     
@@ -263,12 +278,12 @@ class TestFunctional < Test::Unit::TestCase
     assert_verify
     
     # Test the copy command
-    run_amp_command("copy", ["-v", "STYLE.txt", "STYLE_copied.txt"])
+    amp("copy", ["-v", "STYLE.txt", "STYLE_copied.txt"])
     assert_file_has_status "STYLE_copied.txt", :added
     assert_equal File.read("STYLE.txt"), File.read("STYLE_copied.txt")
     
     # Test the move command
-    run_amp_command("move", ["command.rb", "command_moved.rb"])
+    amp("move", ["command.rb", "command_moved.rb"])
     assert_false File.exist?("command.rb")
     assert       File.exist?("command_moved.rb")
     assert_file_has_status "command.rb", :removed
@@ -285,16 +300,17 @@ class TestFunctional < Test::Unit::TestCase
     assert_command_match(/newbranch/, "branch")
     
     # Only 1 tag, which is the tip
-    result = run_amp_command("tags").split("\n")
+    result = amp("tags").split("\n")
     result = result.select {|entry| entry =~ /[0-9a-f]{10}/}
     assert_equal 1, result.size
     assert_match(/tip/, result.first)
     
     # Tag revision 3 as "noobsauce", by "medgar", with commit message "silly commit!"
-    run_amp_command("tag", ["noobsauce"], {:rev => 3, :user => "medgar", :message => "silly commit!"})
+    amp("tag", ["noobsauce"], {:rev => 3, :user => "medgar", :message => "silly commit!"})
     
     # Let's make sure our tag went in smoothly.
-    result = run_amp_command("tags").split("\n")
+    result = amp("tags").split("\n")
+    
     result = result.select {|entry| entry =~ /[0-9a-f]{10}/}
     assert_equal 2, result.size
     
@@ -310,7 +326,7 @@ class TestFunctional < Test::Unit::TestCase
     assert_match(/9/, result[tip])
     
     # And we should make sure the options were passed into the commit correctly.
-    head_result = run_amp_command("head")
+    head_result = amp("head")
     assert_match(/medgar/, head_result)
     assert_match(/silly commit!/, head_result)
     
@@ -321,26 +337,51 @@ class TestFunctional < Test::Unit::TestCase
     exit_repo
     enter_repo 'testrepo'
     
+    assert_equal get_resource("command.rb", "version3"), amp("view", ["command.rb"], :rev => 3)
+    
+    annotate_output = amp("annotate", ["STYLE.txt"], :user => true, :number => true).strip
+    correct_annotation = read_supporting_file("annotate.out").strip
+    assert_equal correct_annotation, annotate_output
+    
     # Create a dummy commit
     File.open('used_in_bundle', 'w') {|f| f.write "monkay" }
-    amp "commit", :message => 'monkey'
+    amp "commit", [], :message => 'monkey'
     assert_verify
     
-    # Create and compare bundles of ALL revisions
-    assert_amp_hg_bundle_same 'amp_bundle_all.bundle', :all => true
-    
-    # Now go only up to the 3rd revision.
-    assert_amp_hg_bundle_same 'bundle_up_to_3.bundle', :rev => 3, :all => true
-    
-    # We shall now test types 'none', 'bzip2', and 'gzip'
-    ['none', 'bzip2', 'gzip'].each do |type|
-      assert_amp_hg_bundle_same "bundle_up_to_7_with_type_#{type}.bundle",
-                                :rev => 7, :type => type, :all => true
-    end
-    
-    # Test making bundles with --base
-    assert_amp_hg_bundle_same 'bundle_up_to_3.bundle', :rev => 3, :base => 2
-    assert_amp_hg_bundle_same 'bundle_up_to_3.bundle', :base => 3
+    # test that the commands work if we go into a subdir
+    Dir.chdir("commands")
+    assert_command_runs "status"
+    Dir.chdir("..")
+    
+    assert_command_match(/monkey/, "info", "11")
+    assert_command_match(/conflict resolved/, "info", ["11", "8"])
+    
+    assert_command_match(/10/, "identify", [], :rev => "10", :num => true)
+    
+    diff_out = amp("diff", ["command.rb", "--rev", "2", "--rev", "3", "--no-color"])
+    assert_match(/\+\s+def silly_namespace\(name\)/, diff_out)
+    assert_match(/\-\s+def volt_namespace\(name\)/, diff_out)
+    
+    # needs two args
+    assert_command_fails "move", ["STYLE.txt"]
+    # last argument must be directory if moving multiple files
+    assert_command_fails "move", ["STYLE.txt", "command.rb", "STYLE.txt"]
+    assert_command_fails "c"
+    # # Create and compare bundles of ALL revisions
+    # assert_amp_hg_bundle_same 'bundle_all.bundle', :all => true
+    # 
+    # # Now go only up to the 3rd revision.
+    # assert_amp_hg_bundle_same 'bundle_up_to_3.bundle', :rev => 3, :all => true
+    # 
+    # # We shall now test types 'none', 'bzip2', and 'gzip'
+    # ['none', 'bzip2', 'gzip'].each do |type|
+    #   assert_amp_hg_bundle_same "bundle_up_to_7_with_type_#{type}.bundle",
+    #                             :rev => 7, :type => type, :all => true
+    # end
+    # 
+    # # Test making bundles with --base
+    # assert_amp_hg_bundle_same 'bundle_up_to_3.bundle', :rev => 3, :base => 2
+    # assert_amp_hg_bundle_same 'bundle_up_to_3.bundle', :base => 3
   ensure
     # cleanup
     exit_repo
@@ -351,6 +392,15 @@ class TestFunctional < Test::Unit::TestCase
   
   private ##################################
   
+  def assert_command_runs(command, args=[], opts = {})
+    assert run_amp_command_with_code(command, args, opts)[1]
+  end
+  
+  def assert_command_fails(command, args = [], opts = {})
+    assert_false run_amp_command_with_code(command, args, opts)[1]
+  end
+    
+  
   def assert_amp_hg_bundle_same(fname, opts={})
     amp "bundle", ["amp_#{fname}"], opts
     hg  "bundle", ["hg_#{fname}"],  opts
@@ -369,7 +419,7 @@ class TestFunctional < Test::Unit::TestCase
   ##
   # 
   def confirm_head_is_first_commit
-    heads_result = run_amp_command("heads")
+    heads_result = amp("heads")
     assert_match(/changeset\: +0\:/, heads_result)
     assert_match(/First commit\./, heads_result)
   end
@@ -378,14 +428,14 @@ class TestFunctional < Test::Unit::TestCase
   # Asserts that a) heads returns the most recent revision, b) log -l 1 returns only
   # one revision.
   def confirm_head_equals_log_limit_one
-    assert_equal run_amp_command("heads").strip, run_amp_command("log -l 1").strip
+    assert_equal amp("heads").strip, amp("log", ["-l","1"]).strip
   end
   
   ##
   # Asserts that a) heads returns the most recent revision, b) tip returns the correct
   # revision.
   def confirm_head_equals_tip
-    assert_equal run_amp_command("heads").strip, run_amp_command("tip").strip
+    assert_equal amp("heads").strip, amp("tip").strip
   end
   
   ##########################################
@@ -395,17 +445,17 @@ class TestFunctional < Test::Unit::TestCase
   def add_file_ensure_added(source, dest=source)
     copy_resource(source, dest)
     assert_file "#{@current_repo}/#{dest}"
-    run_amp_command "add", dest
+    amp "add", dest
     
     assert_file_is_added dest
   end
   
   def remove_file(source)
-    run_amp_command "remove", source
+    amp "remove", source
   end
   
   def assert_files_in_manifest(*files)
-    manifest_result = run_amp_command("manifest")
+    manifest_result = amp("manifest")
     [*files].each do |file|
       assert_match(/#{file}/, manifest_result)
     end
@@ -430,23 +480,23 @@ class TestFunctional < Test::Unit::TestCase
   end
   
   def assert_command_match(regex, command, args=[], opts={})
-    result = run_amp_command command, args, opts
+    result = amp command, args, opts
     assert_match regex, result
   end
   
   def assert_command_no_match(regex, command, args=[], opts={})
-    result = run_amp_command command, args, opts
-    assert_no_match regex, result
+    result = amp command, args, opts
+    refute_match regex, result
   end
   
   def assert_hg_command_match(regex, command, args=[], opts={})
-    result = run_hg_command command, args, opts
+    result = hg command, args, opts
     assert_match regex, result
   end
   
   def assert_hg_command_no_match(regex, command, args=[], opts={})
-    result = run_hg_command command, args, opts
-    assert_no_match regex, result
+    result = hg command, args, opts
+    refute_match regex, result
   end
   
   def assert_file_has_status(file, status)
@@ -464,18 +514,23 @@ class TestFunctional < Test::Unit::TestCase
                   when :modified
                     "M"
                   end
-    status_result = run_amp_command "status", nil, status.to_sym => true, :hg => true, :"no-color" => true
-    assert_match(/#{stat_letter} #{file}/, status_result)
+    result = amp("status", nil, status.to_sym => true, :hg => true, :"no-color" => true)
+    
+    assert_match(/#{stat_letter} #{file}/, result)
   end
   
   def commit(options = {})
-    run_amp_command "commit", [], options
+    amp "commit", [], options
   end
   
   ###########################################
   #      OTHER HELPER METHODS
   ##########################################
   
+  def read_supporting_file(filename)
+    File.read(File.join($current_basedir, filename))
+  end
+  
   def get_resource(file_name, version="")
     File.read(File.join($current_basedir, "resources", version, file_name)) 
   end
@@ -496,6 +551,10 @@ class TestFunctional < Test::Unit::TestCase
   end
   
   def options_hash_to_string(options = {})
+    options_hash_to_array(options).join(" ")
+  end
+  
+  def options_hash_to_array(options = {})
     opt_arr = []
     options.each do |k, v|
       case v
@@ -504,10 +563,10 @@ class TestFunctional < Test::Unit::TestCase
       when TrueClass
         opt_arr << "--#{k}"
       else
-        opt_arr << "--#{k}=\"#{v}\""
+        opt_arr << "--#{k}" << v
       end
     end
-    opt_arr.join(" ")
+    opt_arr
   end
   
   ##
@@ -531,7 +590,7 @@ class TestFunctional < Test::Unit::TestCase
   # Executes the given command using the amp binary. Backbone of the functional tests.
   #
   # @example
-  #   run_amp_command(:commit, "STYLE.txt", :user => "seydar", :date => "1/1/2001")
+  #   amp(:commit, "STYLE.txt", :user => "seydar", :date => "1/1/2001")
   #   will run
   #   `amp commit --user="seydar" --date="1/1/2001" STYLE.txt`
   #
@@ -539,9 +598,42 @@ class TestFunctional < Test::Unit::TestCase
   # @param [Array<String>] args the arguments to supply to the command.
   # @param [Hash<#to_s => #to_s>] opts the options to pass to the command, such as :user => "seydar"
   #   for a commit command.
+  def run_amp_command_with_code(command, args = [], opts = {})
+    out = $stdout
+    argv = ARGV.dup
+    ARGV.clear.concat([command])
+    ARGV.concat([*args]) if args
+    ARGV.concat(options_hash_to_array(opts)) if opts
+    s = StringIO.new
+    $display = true
+    $stdout = s
+    result = ""
+    success = false
+    begin
+      success = Amp::Dispatch.run
+    rescue StandardError => err
+      $stdout = out
+      message = ["***** Left engine failure *****",
+                 "***** Ejection system error *****",
+                 "***** Vaccuum in booster engine *****"
+                ][rand(3)]
+      Amp::UI.say message
+      Amp::UI.say err.to_s
+      err.backtrace.each {|e| Amp::UI.say "\tfrom #{e}" }
+      raise
+    ensure
+      ARGV.clear.concat(argv)
+      $stdout = out
+      result = s.string
+    end
+    
+    [result, success]
+  end
+  
   def run_amp_command(command, args = [], opts = {})
-    args = [args] unless args.kind_of?(Array)
-    %x(TESTING='true' && #{AMP_BINARY} #{command} #{options_hash_to_string(opts)} #{args.join(" ")})
+    result, success = *run_amp_command_with_code(command, args, opts)
+    
+    result
   end
   alias_method :amp, :run_amp_command