amp 0.5.2 → 0.5.3

data/test/test_ui.rb

@@ -0,0 +1,79 @@
+require 'stringio'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require File.join(File.dirname(__FILE__), "../lib/amp/support/amp_ui")
+
+class TestAmpUI < AmpTestCase
+  include Amp
+  def setup
+    @old_stdin = $stdin
+    @old_stdout = $stdout
+    @stdout = $stdout = StringIO.new
+  end
+  
+  def teardown
+    $stdin = @old_stdin
+    $stdout = @old_stdout
+  end
+  
+  def set_stdin(new_in)
+    @stdin = $stdin = StringIO.new(new_in)
+    @stdin.rewind
+  end
+  
+  def test_tell
+    UI::tell "some output"
+    assert_equal "some output", @stdout.string
+  end
+  
+  def test_say
+    UI::say "some output"
+    assert_equal "some output\n", @stdout.string
+  end
+  
+  def test_ask_integer
+    set_stdin("15\n")
+    assert_equal 15, UI::ask("number please? ", Fixnum)
+    set_stdin("15\n")
+    assert_equal 15, UI::ask("number please? ", Integer)
+    set_stdin("15\n")
+    assert_equal 15, UI::ask("number please? ", Bignum)
+    set_stdin("15\n")
+    assert_equal 15, UI::ask("number please? ", Numeric)
+  end
+  
+  def test_ask_float
+    set_stdin("123.45\n")
+    assert_equal 123.45, UI::ask("number please? ", Float)
+  end
+  
+  def test_ask_string
+    set_stdin("Hello, world!\n")
+    assert_equal "Hello, world!", UI::ask("some input", String)
+  end
+  
+  def test_ask_array
+    set_stdin("Hi, There, some, stuff")
+    assert_equal ["Hi", "There", "some", "stuff"], UI::ask("some array: ", Array)
+  end
+  
+  def test_yes_or_no
+    set_stdin("yes\n")
+    assert UI::yes_or_no
+  end
+  
+  def test_yes_or_no_false
+    set_stdin("no\n")
+    assert_false UI::yes_or_no
+  end
+  
+  def test_choose
+    closed_over = nil
+    set_stdin("1\n")
+    UI::choose do |menu|
+      menu.choice("First") {closed_over = 1}
+      menu.choice("Second") {closed_over = 2}
+    end
+    assert_equal closed_over, 1
+  end
+  
+end

data/test/testutilities.rb

@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
+
+class AmpTestCase < MiniTest::Unit::TestCase
+  def setup
+    super
+    tmpdir = nil
+    Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
+    @tempdir = File.join tmpdir, "test_amp_#{$$}"
+    @tempdir.untaint
+  end
+  
+  def tempdir
+    @tempdir
+  end
+  
+  def teardown
+    FileUtils.rm_rf @tempdir if defined?(@tempdir) && @tempdir && File.exist?(@tempdir)
+  end
+
+  
+  # taken from rubygems
+  def write_file(path)
+    path = File.join(@tempdir, path)
+    dir = File.dirname path
+    FileUtils.mkdir_p dir
+
+    open path, 'wb' do |io|
+      yield io
+    end
+
+    path
+  end
+  
+  def assert_regexp_equal(areg, breg)
+    # because regexes, inspected, seems to be killing assert_equal
+    assert areg.inspect == breg.inspect, "#{areg.inspect} is not equal to #{breg.inspect}"
+  end
+  
+  def assert_false(val)
+    assert_equal(false, !!val)
+  end
+
+  def assert_not_nil(val)
+    refute_equal(nil, val)
+  end
+
+  def assert_file_contents(file, contents)
+    File.open(file,"r") do |f|
+      assert_equal f.read, contents
+    end
+  end
+end
+
+MiniTest::Unit.autorun

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: amp
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Michael Edgar
@@ -10,19 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -05:00
+date: 2010-03-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rtfm
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 1
+        version: 0.5.1
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
-    version: 
+  type: :development
+  version_requirements: *id004
 description: ""
 email: 
 - adgar@carboni.ca
@@ -58,7 +109,6 @@ files:
 - ext/amp/bz2/README.txt
 - ext/amp/bz2/bz2.c
 - ext/amp/bz2/extconf.rb
-- ext/amp/bz2/mkmf.log
 - ext/amp/mercurial_patch/extconf.rb
 - ext/amp/mercurial_patch/mpatch.c
 - ext/amp/priority_queue/extconf.rb
@@ -82,6 +132,7 @@ files:
 - lib/amp/commands/commands/workflows/hg/addremove.rb
 - lib/amp/commands/commands/workflows/hg/annotate.rb
 - lib/amp/commands/commands/workflows/hg/archive.rb
+- lib/amp/commands/commands/workflows/hg/bisect.rb
 - lib/amp/commands/commands/workflows/hg/branch.rb
 - lib/amp/commands/commands/workflows/hg/branches.rb
 - lib/amp/commands/commands/workflows/hg/bundle.rb
@@ -114,13 +165,43 @@ files:
 - lib/amp/commands/commands/workflows/hg/tag.rb
 - lib/amp/commands/commands/workflows/hg/tags.rb
 - lib/amp/commands/commands/workflows/hg/tip.rb
+- lib/amp/commands/commands/workflows/hg/untrack.rb
 - lib/amp/commands/commands/workflows/hg/update.rb
 - lib/amp/commands/commands/workflows/hg/verify.rb
 - lib/amp/commands/commands/workflows/hg/view.rb
+- lib/amp/commands/commands/workflows/hg/what_changed.rb
 - lib/amp/commands/dispatch.rb
 - lib/amp/commands/hooks.rb
 - lib/amp/dependencies/amp_support.rb
 - lib/amp/dependencies/amp_support/ruby_amp_support.rb
+- lib/amp/dependencies/maruku.rb
+- lib/amp/dependencies/maruku/attributes.rb
+- lib/amp/dependencies/maruku/defaults.rb
+- lib/amp/dependencies/maruku/errors_management.rb
+- lib/amp/dependencies/maruku/helpers.rb
+- lib/amp/dependencies/maruku/input/charsource.rb
+- lib/amp/dependencies/maruku/input/extensions.rb
+- lib/amp/dependencies/maruku/input/html_helper.rb
+- lib/amp/dependencies/maruku/input/linesource.rb
+- lib/amp/dependencies/maruku/input/parse_block.rb
+- lib/amp/dependencies/maruku/input/parse_doc.rb
+- lib/amp/dependencies/maruku/input/parse_span_better.rb
+- lib/amp/dependencies/maruku/input/rubypants.rb
+- lib/amp/dependencies/maruku/input/type_detection.rb
+- lib/amp/dependencies/maruku/input_textile2/t2_parser.rb
+- lib/amp/dependencies/maruku/maruku.rb
+- lib/amp/dependencies/maruku/output/to_ansi.rb
+- lib/amp/dependencies/maruku/output/to_html.rb
+- lib/amp/dependencies/maruku/output/to_markdown.rb
+- lib/amp/dependencies/maruku/output/to_s.rb
+- lib/amp/dependencies/maruku/string_utils.rb
+- lib/amp/dependencies/maruku/structures.rb
+- lib/amp/dependencies/maruku/structures_inspect.rb
+- lib/amp/dependencies/maruku/structures_iterators.rb
+- lib/amp/dependencies/maruku/textile2.rb
+- lib/amp/dependencies/maruku/toc.rb
+- lib/amp/dependencies/maruku/usage/example1.rb
+- lib/amp/dependencies/maruku/version.rb
 - lib/amp/dependencies/minitar.rb
 - lib/amp/dependencies/priority_queue.rb
 - lib/amp/dependencies/priority_queue/c_priority_queue.rb
@@ -137,41 +218,63 @@ files:
 - lib/amp/encoding/base85.rb
 - lib/amp/encoding/binary_diff.rb
 - lib/amp/encoding/difflib.rb
-- lib/amp/encoding/mercurial_diff.rb
-- lib/amp/encoding/mercurial_patch.rb
-- lib/amp/encoding/patch.rb
-- lib/amp/encoding/pure_ruby/ruby_mercurial_patch.rb
 - lib/amp/extensions/ditz.rb
 - lib/amp/extensions/lighthouse.rb
 - lib/amp/graphs/ancestor.rb
 - lib/amp/graphs/copies.rb
-- lib/amp/merges/merge_state.rb
-- lib/amp/merges/merge_ui.rb
-- lib/amp/merges/simple_merge.rb
+- lib/amp/help/entries/__default__.erb
+- lib/amp/help/entries/commands.erb
+- lib/amp/help/entries/mdtest.md
+- lib/amp/help/entries/silly
+- lib/amp/help/help.rb
 - lib/amp/profiling_hacks.rb
-- lib/amp/repository/branch_manager.rb
-- lib/amp/repository/dir_state.rb
-- lib/amp/repository/journal.rb
-- lib/amp/repository/lock.rb
-- lib/amp/repository/repositories/bundle_repository.rb
-- lib/amp/repository/repositories/http_repository.rb
-- lib/amp/repository/repositories/local_repository.rb
+- lib/amp/repository/abstract/abstract_changeset.rb
+- lib/amp/repository/abstract/abstract_local_repo.rb
+- lib/amp/repository/abstract/abstract_staging_area.rb
+- lib/amp/repository/abstract/abstract_versioned_file.rb
+- lib/amp/repository/abstract/common_methods/changeset.rb
+- lib/amp/repository/abstract/common_methods/local_repo.rb
+- lib/amp/repository/abstract/common_methods/staging_area.rb
+- lib/amp/repository/abstract/common_methods/versioned_file.rb
+- lib/amp/repository/generic_repo_picker.rb
+- lib/amp/repository/git/repo_format/changeset.rb
+- lib/amp/repository/git/repo_format/staging_area.rb
+- lib/amp/repository/git/repo_format/versioned_file.rb
+- lib/amp/repository/git/repositories/local_repository.rb
+- lib/amp/repository/git/repository.rb
+- lib/amp/repository/mercurial/encoding/mercurial_diff.rb
+- lib/amp/repository/mercurial/encoding/mercurial_patch.rb
+- lib/amp/repository/mercurial/encoding/patch.rb
+- lib/amp/repository/mercurial/encoding/pure_ruby/ruby_mercurial_patch.rb
+- lib/amp/repository/mercurial/merging/merge_ui.rb
+- lib/amp/repository/mercurial/merging/simple_merge.rb
+- lib/amp/repository/mercurial/repo_format/branch_manager.rb
+- lib/amp/repository/mercurial/repo_format/changeset.rb
+- lib/amp/repository/mercurial/repo_format/dir_state.rb
+- lib/amp/repository/mercurial/repo_format/journal.rb
+- lib/amp/repository/mercurial/repo_format/lock.rb
+- lib/amp/repository/mercurial/repo_format/merge_state.rb
+- lib/amp/repository/mercurial/repo_format/staging_area.rb
+- lib/amp/repository/mercurial/repo_format/store.rb
+- lib/amp/repository/mercurial/repo_format/tag_manager.rb
+- lib/amp/repository/mercurial/repo_format/updatable.rb
+- lib/amp/repository/mercurial/repo_format/updater.rb
+- lib/amp/repository/mercurial/repo_format/verification.rb
+- lib/amp/repository/mercurial/repositories/bundle_repository.rb
+- lib/amp/repository/mercurial/repositories/http_repository.rb
+- lib/amp/repository/mercurial/repositories/local_repository.rb
+- lib/amp/repository/mercurial/repository.rb
+- lib/amp/repository/mercurial/revlogs/bundle_revlogs.rb
+- lib/amp/repository/mercurial/revlogs/changegroup.rb
+- lib/amp/repository/mercurial/revlogs/changelog.rb
+- lib/amp/repository/mercurial/revlogs/file_log.rb
+- lib/amp/repository/mercurial/revlogs/index.rb
+- lib/amp/repository/mercurial/revlogs/manifest.rb
+- lib/amp/repository/mercurial/revlogs/node.rb
+- lib/amp/repository/mercurial/revlogs/revlog.rb
+- lib/amp/repository/mercurial/revlogs/revlog_support.rb
+- lib/amp/repository/mercurial/revlogs/versioned_file.rb
 - lib/amp/repository/repository.rb
-- lib/amp/repository/store.rb
-- lib/amp/repository/tag_manager.rb
-- lib/amp/repository/updatable.rb
-- lib/amp/repository/verification.rb
-- lib/amp/repository/versioned_file.rb
-- lib/amp/revlogs/bundle_revlogs.rb
-- lib/amp/revlogs/changegroup.rb
-- lib/amp/revlogs/changelog.rb
-- lib/amp/revlogs/changeset.rb
-- lib/amp/revlogs/file_log.rb
-- lib/amp/revlogs/index.rb
-- lib/amp/revlogs/manifest.rb
-- lib/amp/revlogs/node.rb
-- lib/amp/revlogs/revlog.rb
-- lib/amp/revlogs/revlog_support.rb
 - lib/amp/server/amp_user.rb
 - lib/amp/server/extension/amp_extension.rb
 - lib/amp/server/extension/authorization.rb
@@ -193,20 +296,20 @@ files:
 - lib/amp/support/amp_ui.rb
 - lib/amp/support/docs.rb
 - lib/amp/support/generator.rb
-- lib/amp/support/ignore.rb
 - lib/amp/support/loaders.rb
 - lib/amp/support/logger.rb
 - lib/amp/support/match.rb
+- lib/amp/support/mercurial/ignore.rb
 - lib/amp/support/multi_io.rb
 - lib/amp/support/openers.rb
 - lib/amp/support/ruby_19_compatibility.rb
 - lib/amp/support/support.rb
-- lib/amp/templates/blank.commit.erb
-- lib/amp/templates/blank.log.erb
-- lib/amp/templates/default.commit.erb
-- lib/amp/templates/default.log.erb
+- lib/amp/templates/mercurial/blank.commit.erb
+- lib/amp/templates/mercurial/blank.log.erb
+- lib/amp/templates/mercurial/default.commit.erb
+- lib/amp/templates/mercurial/default.log.erb
 - lib/amp/templates/template.rb
-- site/Rakefile
+- man/amp.1
 - site/src/about/ampfile.haml
 - site/src/about/commands.haml
 - site/src/about/index.haml
@@ -253,11 +356,13 @@ files:
 - site/src/learn/index.haml
 - site/src/scripts/jquery-1.3.2.min.js
 - site/src/scripts/jquery.cookie.js
+- tasks/man.rake
 - tasks/stats.rake
 - tasks/yard.rake
 - test/dirstate_tests/dirstate
 - test/dirstate_tests/hgrc
 - test/dirstate_tests/test_dir_state.rb
+- test/functional_tests/annotate.out
 - test/functional_tests/resources/.hgignore
 - test/functional_tests/resources/STYLE.txt
 - test/functional_tests/resources/command.rb
@@ -307,6 +412,7 @@ files:
 - test/functional_tests/resources/version5_2/commands/stats.rb
 - test/functional_tests/resources/version5_2/commands/status.rb
 - test/functional_tests/test_functional.rb
+- test/localrepo_tests/ampfile.rb
 - test/localrepo_tests/test_local_repo.rb
 - test/localrepo_tests/testrepo.tar.gz
 - test/manifest_tests/00manifest.i
@@ -323,17 +429,23 @@ files:
 - test/revlog_tests/testindex.i
 - test/store_tests/store.tar.gz
 - test/store_tests/test_fncache_store.rb
-- test/test_amp.rb
+- test/test_19_compatibility.rb
 - test/test_base85.rb
 - test/test_bdiff.rb
+- test/test_changegroup.rb
 - test/test_commands.rb
 - test/test_difflib.rb
-- test/test_helper.rb
+- test/test_generator.rb
+- test/test_ignore.rb
 - test/test_journal.rb
 - test/test_match.rb
 - test/test_mdiff.rb
 - test/test_mpatch.rb
+- test/test_multi_io.rb
 - test/test_support.rb
+- test/test_templates.rb
+- test/test_ui.rb
+- test/testutilities.rb
 has_rdoc: true
 homepage: http://amp.carboni.ca/
 licenses: []
@@ -349,18 +461,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: amp
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Version Control in Ruby. Mercurial Compatible. Big Ideas.
@@ -372,14 +486,19 @@ test_files:
 - test/merge_tests/test_merge.rb
 - test/revlog_tests/test_revlog.rb
 - test/store_tests/test_fncache_store.rb
-- test/test_amp.rb
+- test/test_19_compatibility.rb
 - test/test_base85.rb
 - test/test_bdiff.rb
+- test/test_changegroup.rb
 - test/test_commands.rb
 - test/test_difflib.rb
-- test/test_helper.rb
+- test/test_generator.rb
+- test/test_ignore.rb
 - test/test_journal.rb
 - test/test_match.rb
 - test/test_mdiff.rb
 - test/test_mpatch.rb
+- test/test_multi_io.rb
 - test/test_support.rb
+- test/test_templates.rb
+- test/test_ui.rb