monk 0.0.7 → 1.0.0.beta0

data/Rakefile

@@ -1,11 +1,15 @@
 task :test do
-  system "cd test && ruby monk_test.rb"
-end
+  begin
+    require "thor"
+    require "cutest"
+  rescue LoadError
+    puts "! You need `thor` and `cutest` to run the test suite."
+    exit
+  end
 
-task :default => :test
+  Cutest.run(Dir["test/monk_*.rb"])
 
-namespace :test do
-  task :integration do
-    system "cd test && ruby integration_test.rb"
-  end
+  `rvm gemset use monk-test && rvm --force gemset delete monk-test`
 end
+
+task :default => :test

data/bin/monk

@@ -2,12 +2,13 @@
 
 require File.join(File.dirname(__FILE__), "..", "lib", "monk")
 
-# A way to extend Monk is to write tasks in a Thorfile in the project's root directory.
-# Monk loads the Thorfile if there is one, and all the tasks that are declared in the
-# class Monk become available.
+# A way to extend Monk is to write tasks in a Thorfile in the project's root
+# directory. Monk loads the Thorfile if there is one, and all the tasks that
+# are declared in the class Monk become available.
 if File.exists?("Thorfile")
   load("Thorfile")
 end
 
 # Start the monk tasks.
 Monk.start
+

data/lib/monk.rb

@@ -10,12 +10,35 @@ class Monk < Thor
     class_options.delete task
   end
 
-  desc "init", "Initialize a Monk application"
+  desc "init NAME [--skeleton SHORTHAND|URL]", "Initialize a Monk application"
   method_option :skeleton, :type => :string, :aliases => "-s"
-  def init(target = ".")
-    clone(source(options[:skeleton] || "default") || options[:skeleton], target) ?
-      cleanup(target) :
-      say_status(:error, clone_error(target))
+  def init(target)
+    ensure_rvm
+    clone(target)
+    cleanup(target)
+    create_rvmrc(target)
+  end
+
+  desc "install --clean", "Install all dependencies."
+  method_option :clean, :type => :boolean
+  def install(manifest = ".gems")
+    run("rvm rvmrc load")
+    run("rvm --force gemset empty") if options.clean?
+
+    IO.popen("rvm gemset import") do |io|
+      say_status :info, io.readline.gsub(/\(.*?\)/, "") until io.eof?
+    end
+  end
+
+  desc "lock", "Lock the current dependencies to the gem manifest file."
+  def lock
+    run("rvm rvmrc load")
+    run("rvm gemset export .gems")
+  end
+
+  desc "unpack", "Freeze the current dependencies."
+  def unpack
+    run("rvm gemset unpack")
   end
 
   desc "show NAME", "Display the repository address for NAME"
@@ -43,13 +66,10 @@ class Monk < Thor
   end
 
 private
-
-  def clone(source, target)
-    if Dir["#{target}/*"].empty?
-      say_status :fetching, source
-      system "git clone -q --depth 1 #{source} #{target}"
-      $?.success?
-    end
+  def clone(target)
+    say_status :fetching, repository
+    system "git clone -q --depth 1 #{repository} #{target}"
+    say_status(:error, clone_error(target)) and exit unless $?.success?
   end
 
   def cleanup(target)
@@ -72,10 +92,10 @@ private
     end
   end
 
-  def write_monk_config_file
+  def write_monk_config_file(default = "http://github.com/monk/experimental.git")
     remove_file(monk_config_file, :verbose => false)
     create_file(monk_config_file, nil, :verbose => false) do
-      config = @monk_config || { "default" => "git://github.com/monkrb/skeleton.git" }
+      config = @monk_config || { "default" => default }
       config.to_yaml
     end
   end
@@ -92,4 +112,38 @@ private
   def monk_home
     ENV["MONK_HOME"] || File.join(Thor::Util.user_home)
   end
+
+  def ensure_rvm
+    begin
+      `rvm`
+    rescue Errno::ENOENT
+      install = "bash < <( curl http://rvm.beginrescueend.com/releases/rvm-install-head )"
+      say_status :error, "Monk requires RVM to be installed."
+      say_status :hint,  "To install it, run: #{install}"
+      exit
+    end
+  end
+
+  def say_indented(str)
+    say str.gsub(/^/, " " * 14)
+  end
+
+  def repository
+    source(options[:skeleton] || "default") or options[:skeleton]
+  end
+
+  def appname(target)
+    target == '.' ? File.basename(Dir.pwd) : target
+  end
+
+  def create_rvmrc(target)
+    target = Dir.pwd if target == "."
+    gemset = File.basename(target)
+    key = [RUBY_VERSION, gemset].join('@')
+
+    inside(target) do
+      run "rvm --rvmrc --create %s && rvm rvmrc trust" % key
+    end
+  end
 end
+

data/monk.gemspec

@@ -1,19 +1,18 @@
 Gem::Specification.new do |s|
   s.name              = "monk"
-  s.version           = "0.0.7"
+  s.version           = "1.0.0.beta0"
   s.summary           = "Monk, the glue framework"
-  s.description       = "Monk is a glue framework for web development. It means that instead of installing all the tools you need for your projects, you can rely on a git repository and a list of dependencies, and Monk will care of the rest. By default, it ships with a Sinatra application that includes Contest, Stories, Webrat, Ohm and some other niceties, along with a structure and helpful documentation to get your hands wet in no time."
+  s.description       = "Monk is a glue framework for web development in Ruby. It’s truly modular by relying on the best tool for each job. It’s also pretty fast thanks to Rack and Sinatra."
   s.authors           = ["Damian Janowski", "Michel Martens"]
   s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
   s.homepage          = "http://monkrb.com"
-
-  s.rubyforge_project = "monk"
-
-  s.executables << "monk"
+  s.executables.push("monk")
 
   s.add_dependency("thor", "~> 0.11")
-  s.add_dependency("dependencies", ">= 0.0.7")
-  s.requirements << "git"
+  s.add_development_dependency("cutest", "~> 0.1")
+
+  s.requirements.push("git")
+  s.requirements.push("rvm")
 
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "bin/monk", "lib/monk.rb", "monk.gemspec", "test/commands.rb", "test/integration_test.rb", "test/monk_test.rb", "test/test_helper.rb"]
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "bin/monk", "lib/monk.rb", "monk.gemspec", "test/commands.rb", "test/helper.rb", "test/monk_add_NAME_REPOSITORY.rb", "test/monk_init_NAME.rb", "test/monk_install.rb", "test/monk_list.rb", "test/monk_rm_NAME.rb", "test/monk_show_NAME.rb"]
 end

data/test/commands.rb

@@ -1,11 +1,12 @@
 require "open3"
 require "socket"
 
-module Test::Commands
+module Commands
   def sh(cmd)
     out, err = nil
 
     Open3.popen3(cmd) do |_in, _out, _err|
+      yield _in if block_given?
       out = _out.read
       err = _err.read
     end
@@ -28,35 +29,6 @@ module Test::Commands
     end
   end
 
-  def listening?(host, port)
-    begin
-      socket = TCPSocket.new(host, port)
-      socket.close unless socket.nil?
-      true
-    rescue Errno::ECONNREFUSED,
-      Errno::EBADF,           # Windows
-      Errno::EADDRNOTAVAIL    # Windows
-      false
-    end
-  end
-
-  def wait_for_service(host, port, timeout = 3)
-    start_time = Time.now
-
-    until listening?(host, port)
-      if timeout && (Time.now > (start_time + timeout))
-        raise SocketError.new("Socket #{host}:#{port} did not open within #{timeout} seconds")
-      end
-    end
-
-    true
-  end
-
-  def suspects(port)
-    list = sh("lsof -i :#{port}").first.split("\n")[1..-1] || []
-    list.map {|s| s[/^.+? (\d+)/, 1] }
-  end
-
   def silence_stream(*streams) #:yeild:
     on_hold = streams.collect{ |stream| stream.dup }
     streams.each do |stream|

data/test/helper.rb

@@ -0,0 +1,36 @@
+require "rubygems"
+require "cutest"
+require "fileutils"
+
+ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+$:.unshift ROOT
+
+require "test/commands"
+
+include Commands
+
+TARGET = File.expand_path("tmp/monk-test", File.dirname(__FILE__))
+
+def root(*args)
+  File.join(ROOT, *args)
+end
+
+def monk(args = nil, &block)
+  cmd =
+    "env MONK_HOME=#{root "test/tmp"} " +
+    "ruby -rubygems #{root "bin/monk"} #{args}"
+
+  sh(cmd, &block)
+end
+
+def rvm(args = nil)
+  sh("rvm #{args}")
+end
+
+prepare do
+  dot_monk = File.join(ROOT, "test", "tmp", ".monk")
+
+  FileUtils.rm(dot_monk) if File.exist?(dot_monk)
+  `rvm gemset use monk-test && rvm --force gemset delete monk-test`
+end

data/test/monk_add_NAME_REPOSITORY.rb

@@ -0,0 +1,32 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+prepare do
+  FileUtils.rm_rf(TARGET)
+end
+
+# monk add NAME REPOSITORY
+scope do
+  test "add the named repository to the configuration" do
+    monk("add foobar http://github.com/monkrb/foo.git")
+    out, _ = monk("show foobar")
+    assert out["foobar"]
+    assert out["http://github.com/monkrb/foo.git"]
+    monk("rm foobar")
+  end
+
+  test "allow to fetch from the added repository with --skeleton parameter" do
+    monk("add glue http://github.com/monkrb/glue.git")
+
+    out, _ = monk("init #{TARGET} --skeleton glue")
+    assert out.match(/initialized/)
+    assert out.match(/glue.git/)
+  end
+
+  test "allow to fetch from the added repository with the -s parameter" do
+    monk("add glue http://github.com/monkrb/glue.git")
+
+    out, _ = monk("init #{TARGET} -s glue")
+    assert out.match(/initialized/)
+    assert out.match(/glue.git/)
+  end
+end

data/test/monk_init_NAME.rb

@@ -0,0 +1,44 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+prepare do
+  FileUtils.rm_rf(TARGET)
+end
+
+# monk init NAME
+scope do
+  test "fail if the target working directory is not empty" do
+    FileUtils.mkdir(TARGET)
+    FileUtils.touch(TARGET + "/foo")
+
+    out, err = monk("init #{TARGET}")
+    assert out.match(/error/)
+  end
+
+  test "create a skeleton app in the target directory" do
+    out, err = monk("init #{TARGET}")
+    assert out.match(/initialized.* #{TARGET}/)
+  end
+
+  test "be able to pull from a url instead of a known skeleton" do
+    out, err = monk("init #{TARGET} --skeleton http://github.com/monkrb/skeleton.git")
+    assert out.match(/initialized.* #{TARGET}/)
+  end
+
+  test "create a correct rvmrc given a directory" do
+    monk("init #{TARGET}")
+
+    rvmrc = File.read(File.join(TARGET, ".rvmrc"))
+    assert rvmrc[RUBY_VERSION]
+    assert rvmrc[File.basename(TARGET)]
+  end
+
+  test "create a correct rvmrc given the current directory" do
+    FileUtils.mkdir(TARGET)
+    FileUtils.cd(TARGET) { monk("init .") }
+
+    rvmrc = File.read(File.join(TARGET, ".rvmrc"))
+    assert rvmrc[RUBY_VERSION]
+    assert rvmrc[File.basename(TARGET)]
+  end
+end
+

data/test/monk_install.rb

@@ -0,0 +1,16 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+prepare do
+  FileUtils.rm_rf(TARGET)
+end
+
+test "installs the gems listed in the manifest" do
+  monk("init #{TARGET} --skeleton git://github.com/cyx/empty.git")
+
+  FileUtils.cd(TARGET) do
+    monk("install")
+
+    assert `gem list` =~ /batch/
+    assert `gem list` =~ /cutest/
+  end
+end

data/test/monk_list.rb

@@ -0,0 +1,10 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+# monk list
+scope do
+  test "display the configured repositories" do
+    out, err = monk("list")
+    assert out["default"]
+    assert out["http://github.com/monk/experimental.git"]
+  end
+end

data/test/monk_rm_NAME.rb

@@ -0,0 +1,11 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+# monk rm NAME
+scope do
+  test "remove the named repository from the configuration" do
+    monk("add foobar http://github.com/monkrb/foo.git")
+    monk("rm foobar")
+    out, err = monk("show foobar")
+    assert out["repository not found"]
+  end
+end

data/test/monk_show_NAME.rb

@@ -0,0 +1,14 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+# monk show NAME
+scope do
+  test "display the repository for NAME" do
+    out, err = monk("show default")
+    assert out["http://github.com/monk/experimental.git"]
+  end
+
+  test "display nothing if NAME is not set" do
+    out, err = monk("show foobar")
+    assert out["repository not found"]
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - beta0
+  version: 1.0.0.beta0
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,30 +16,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -03:00
+date: 2010-10-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 11
         version: "0.11"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dependencies
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cutest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.7
-    version: 
-description: Monk is a glue framework for web development. It means that instead of installing all the tools you need for your projects, you can rely on a git repository and a list of dependencies, and Monk will care of the rest. By default, it ships with a Sinatra application that includes Contest, Stories, Webrat, Ohm and some other niceties, along with a structure and helpful documentation to get your hands wet in no time.
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :development
+  version_requirements: *id002
+description: "Monk is a glue framework for web development in Ruby. It\xE2\x80\x99s truly modular by relying on the best tool for each job. It\xE2\x80\x99s also pretty fast thanks to Rack and Sinatra."
 email: 
 - djanowski@dimaion.com
 - michel@soveran.com
@@ -51,34 +65,47 @@ files:
 - lib/monk.rb
 - monk.gemspec
 - test/commands.rb
-- test/integration_test.rb
-- test/monk_test.rb
-- test/test_helper.rb
-has_rdoc: false
+- test/helper.rb
+- test/monk_add_NAME_REPOSITORY.rb
+- test/monk_init_NAME.rb
+- test/monk_install.rb
+- test/monk_list.rb
+- test/monk_rm_NAME.rb
+- test/monk_show_NAME.rb
+has_rdoc: true
 homepage: http://monkrb.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - git
-rubyforge_project: monk
-rubygems_version: 1.3.1
+- rvm
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Monk, the glue framework
 test_files: []
 

data/test/integration_test.rb

@@ -1,115 +0,0 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-
-class TestMonk < Test::Unit::TestCase
-  context "monk init NAME" do
-    setup do
-      @ports_to_close = []
-    end
-
-    def assert_url(url)
-      assert_match /200 OK/, sh("curl -I 0.0.0.0:4567#{url}").first.split("\n").first
-    end
-
-    def try_server(cmd, port)
-      binary = cmd[/^(.+?)( |$)/, 1]
-
-      flunk "Can't find `#{binary}`." unless system("which #{binary} > /dev/null")
-
-      kill_suspects(port)
-      sh_bg(cmd)
-
-      # Mark the port for closing on teardown, just in case the build fails.
-      @ports_to_close << port if wait_for_service("0.0.0.0", port)
-
-      doc = Hpricot(sh("curl 0.0.0.0:#{port}").first)
-
-      assert_match /Hello, world/, doc.at("body").inner_text
-
-      # Make sure all referenced URLs in the layout respond correctly.
-      doc.search("//*[@href]").each do |node|
-        assert_url node.attributes["href"]
-      end
-
-      doc.search("//*[@src]").each do |node|
-        assert_url node.attributes["src"]
-      end
-    end
-
-    should "create a skeleton app with all tests passing" do
-      flunk "There is another server running on 0.0.0.0:4567. Suspect PIDs: #{suspects(4567).join(", ")}" if listening?("0.0.0.0", 4567)
-      flunk "There is another server running on 0.0.0.0:9292. Suspect PIDs: #{suspects(9292).join(", ")}" if listening?("0.0.0.0", 9292)
-
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-
-        out, err = monk("init monk-test")
-        assert_match /initialized.* monk-test/, out
-
-        Dir.chdir("monk-test") do
-          assert !File.directory?(".git")
-
-          FileUtils.cp("config/settings.example.yml", "config/settings.yml")
-          FileUtils.cp("config/redis/development.example.conf", "config/redis/development.conf")
-          FileUtils.cp("config/redis/test.example.conf", "config/redis/test.conf")
-
-          # Load Redis.
-          sh "redis-server config/redis/test.conf"
-          wait_for_service("0.0.0.0", 6380)
-
-          sh "redis-server config/redis/development.conf"
-          wait_for_service("0.0.0.0", 6379)
-
-          assert system("rake >/dev/null"), "the build didn't pass"
-          assert system("rake1.9 >/dev/null"), "the build didn't pass (1.9)"
-
-          try_server "ruby init.rb", 4567
-          try_reloading
-          try_server "rackup", 9292
-
-          try_server "ruby1.9 init.rb", 4567
-          try_reloading
-          try_server "rackup1.9", 9292
-
-          try_server "jruby init.rb", 4567
-          try_reloading
-        end
-      end
-    end
-
-    def try_reloading
-      gsub_file("app/routes/home.rb", "haml :home", "'Goodbye'") do
-        sleep 0.2
-        assert_match /Goodbye/, sh("curl 0.0.0.0:4567").first
-      end
-
-      gsub_file("init.rb", "Main.run!", %Q(Main.get "/test" { 'test' }\n Main.run!)) do
-        sleep 0.2
-        assert_match /test/, sh("curl 0.0.0.0:4567/test").first
-      end
-    end
-
-    def gsub_file(file, *args)
-      old = File.read(file)
-
-      begin
-        new = old.gsub(*args)
-        File.open(file, "w") {|f| f.write(new) }
-        yield
-      ensure
-        File.open(file, "w") {|f| f.write(old) }
-      end
-    end
-
-    def kill_suspects(port)
-      list = suspects(port)
-
-      sh "kill -9 #{list.join(" ")}" unless list.empty?
-    end
-
-    teardown do
-      @ports_to_close.each do |port|
-        kill_suspects port
-      end
-    end
-  end
-end

data/test/monk_test.rb

@@ -1,143 +0,0 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-
-class TestMonk < Test::Unit::TestCase
-  context "monk init NAME" do
-    should "fail if the target working directory is not empty" do
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-        FileUtils.mkdir("monk-test")
-
-        Dir.chdir("monk-test") do
-          FileUtils.touch("foobar")
-        end
-
-        out, err = monk("init monk-test")
-        assert_match /error/, out
-      end
-    end
-
-    should "create a skeleton app in the target directory" do
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-
-        out, err = monk("init monk-test")
-        assert_match /initialized.* monk-test/, out
-      end
-    end
-
-    should "be able to pull from a url instead of a known skeleton" do
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf "monk-test"
-        out, err = monk("init monk-test --skeleton git://github.com/monkrb/skeleton.git")
-        assert_match /initialized.* monk-test/, out
-      end
-    end
-  end
-
-  context "monk init" do
-    should "fail if the current working directory is not empty" do
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-        FileUtils.mkdir("monk-test")
-
-
-        Dir.chdir("monk-test") do
-          FileUtils.touch("foobar")
-          out, err = monk("init")
-          assert_match /error/, out
-        end
-      end
-    end
-
-    should "create a skeleton app in the working directory" do
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-        FileUtils.mkdir("monk-test")
-
-        Dir.chdir("monk-test") do
-          out, err = monk("init")
-          assert_match /initialized/, out
-        end
-      end
-    end
-
-    should "use an alternative skeleton if the option is provided" do
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-        FileUtils.mkdir("monk-test")
-
-        monk("add foobar git://github.com/monkrb/skeleton.git")
-
-        Dir.chdir("monk-test") do
-          out, err = monk("init -s foobar")
-          assert_match /initialized/, out
-        end
-      end
-    end
-  end
-
-  context "monk show NAME" do
-    should "display the repository for NAME" do
-      out, err = monk("show default")
-      assert out["git://github.com/monkrb/skeleton.git"]
-    end
-
-    should "display nothing if NAME is not set" do
-      out, err = monk("show foobar")
-      assert out["repository not found"]
-    end
-  end
-
-  context "monk list" do
-    should "display the configured repositories" do
-      out, err = monk("list")
-      assert out["default"]
-      assert out["git://github.com/monkrb/skeleton.git"]
-    end
-  end
-
-  context "monk add NAME REPOSITORY" do
-    should "add the named repository to the configuration" do
-      monk("add foobar git://github.com/monkrb/foo.git")
-      out, err = monk("show foobar")
-      assert out["foobar"]
-      assert out["git://github.com/monkrb/foo.git"]
-      monk("rm foobar")
-    end
-
-    should "allow to fetch from the added repository when using the skeleton parameter" do
-      monk("add glue git://github.com/monkrb/glue.git")
-
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-        FileUtils.mkdir("monk-test")
-
-        out, err = monk("init monk-test --skeleton glue")
-        assert_match /initialized/, out
-        assert_match /glue.git/, out
-      end
-    end
-
-    should "allow to fetch from the added repository when using the s parameter" do
-      monk("add glue git://github.com/monkrb/glue.git")
-
-      Dir.chdir(root("test", "tmp")) do
-        FileUtils.rm_rf("monk-test")
-        FileUtils.mkdir("monk-test")
-
-        out, err = monk("init monk-test -s glue")
-        assert_match /initialized/, out
-        assert_match /glue.git/, out
-      end
-    end
-  end
-
-  context "monk rm NAME" do
-    should "remove the named repository from the configuration" do
-      monk("add foobar git://github.com/monkrb/foo.git")
-      monk("rm foobar")
-      out, err = monk("show foobar")
-      assert out["repository not found"]
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,28 +0,0 @@
-require "rubygems"
-require "contest"
-require "hpricot"
-require "fileutils"
-
-ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
-$:.unshift ROOT
-
-require "test/commands"
-
-class Test::Unit::TestCase
-  include Test::Commands
-
-  def root(*args)
-    File.join(ROOT, *args)
-  end
-
-  def setup
-    dot_monk = File.join(ROOT, "test", "tmp", ".monk")
-
-    FileUtils.rm(dot_monk) if File.exist?(dot_monk)
-  end
-
-  def monk(args = nil)
-    sh("env MONK_HOME=#{File.join(ROOT, "test", "tmp")} ruby -rubygems #{root "bin/monk"} #{args}")
-  end
-end