monk 0.0.3 → 0.0.4

data/Rakefile

@@ -1,5 +1,11 @@
 task :test do
-  system "cd test && ruby integration_test.rb"
+  system "cd test && ruby monk_test.rb"
 end
 
 task :default => :test
+
+namespace :test do
+  task :integration do
+    system "cd test && ruby integration_test.rb"
+  end
+end

data/lib/monk.rb

@@ -6,25 +6,54 @@ class Monk < Thor
   include Thor::Actions
 
   desc "init", "Initialize a Monk application"
-  def init(target)
-    clone(source, target)
-    cleanup(target)
+  method_options(:source => :string)
+  def init(target = ".")
+    clone(source(options[:source] || "default"), target) ?
+      cleanup(target) :
+      say_status(:error, clone_error(target))
+  end
+
+  desc "show NAME", "Display the repository address for NAME"
+  def show(name)
+    say_status name, source(name) || "repository not found"
+  end
+
+  desc "list", "Lists the configured repositories"
+  def list
+    monk_config.keys.sort.each do |key|
+      show(key)
+    end
+  end
+
+  desc "add NAME REPOSITORY", "Add the repository to the configuration file"
+  def add(name, repository)
+    monk_config[name] = repository
+    write_monk_config_file
+  end
+
+  desc "rm NAME", "Remove the repository from the configuration file"
+  def rm(name)
+    monk_config.delete(name)
+    write_monk_config_file
   end
 
 private
 
   def clone(source, target)
-    say_status :fetching, source
-    system "git clone -q --depth 1 #{source} #{target}"
+    if Dir["#{target}/*"].empty?
+      say_status :fetching, source
+      system "git clone -q --depth 1 #{source} #{target}"
+      $?.success?
+    end
   end
 
   def cleanup(target)
     inside(target) { remove_file ".git" }
-    say_status :create, target
+    say_status :initialized, target
   end
 
-  def source
-    monk_config["default"]
+  def source(name = "default")
+    monk_config[name]
   end
 
   def monk_config_file
@@ -39,8 +68,9 @@ private
   end
 
   def write_monk_config_file
+    remove_file monk_config_file
     create_file monk_config_file do
-      config = { "default" => "git://github.com/monkrb/skeleton.git" }
+      config = @monk_config || { "default" => "git://github.com/monkrb/skeleton.git" }
       config.to_yaml
     end
   end
@@ -48,4 +78,9 @@ private
   def self.source_root
     "."
   end
+
+  def clone_error(target)
+    "Couldn't clone repository into target directory '#{target}'. " +
+    "You must have git installed and the target directory must be empty."
+  end
 end

data/monk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "monk"
-  s.version           = "0.0.3"
+  s.version           = "0.0.4"
   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.authors           = ["Damian Janowski", "Michel Martens"]
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
 
   s.executables << "monk"
 
-  s.add_dependency("wycats-thor", "~> 0.11")
-  s.add_dependency("dependencies", ">= 0.0.5")
+  s.add_dependency("thor", "~> 0.11")
+  s.add_dependency("dependencies", ">= 0.0.6")
   s.requirements << "git"
 
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "bin/monk", "lib/monk.rb", "monk.gemspec", "test/integration_test.rb", "test/sinatra_test.rb"]
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "bin/monk", "lib/monk.rb", "monk.gemspec", "test/commands.rb", "test/integration_test.rb", "test/monk_test.rb"]
 end

data/test/commands.rb

@@ -0,0 +1,61 @@
+require "open3"
+require "socket"
+
+module Test::Commands
+  def sh(cmd)
+    out, err = nil
+
+    Open3.popen3(cmd) do |_in, _out, _err|
+      out = _out.read
+      err = _err.read
+    end
+
+    [out, err]
+  end
+
+  def sh_bg(cmd)
+    silence_stream($stdout) do
+      silence_stream($stderr) do
+        (pid = fork) ? Process.detach(pid) : exec("#{cmd} 2>&1>/dev/null")
+      end
+    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(stream)
+    old_stream = stream.dup
+    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+  end
+end

data/test/integration_test.rb

@@ -1,29 +1,124 @@
 require "rubygems"
 require "contest"
-require "open3"
+require "hpricot"
 
-BINARY = File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "monk"))
+ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+$:.unshift ROOT
+
+require "test/commands"
 
 class TestMonk < Test::Unit::TestCase
-  context "monk init" do
-    def monk(args = nil)
-      out, err = nil
+  include Test::Commands
+
+  def root(*args)
+    File.join(ROOT, *args)
+  end
+
+  def monk(args = nil)
+    sh("ruby -rubygems #{root "bin/monk"} #{args}")
+  end
+
+  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
 
-      Open3.popen3("ruby -rubygems #{BINARY} #{args}") do |stdin, stdout, stderr|
-        out = stdout.read
-        err = stderr.read
+    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
 
-      [out, err]
+      doc.search("//*[@src]").each do |node|
+        assert_url node.attributes["src"]
+      end
     end
 
     should "create a skeleton app with all tests passing" do
-      Dir.chdir("/tmp") 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 out[/create.* monk-test/]
-        assert !File.directory?("monk-test/.git")
+        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 sh("rake"), "the build didn't pass."
+          assert sh("rake1.9"), "the build didn't pass under Ruby 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
+        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
+    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

data/test/monk_test.rb

@@ -0,0 +1,127 @@
+require "rubygems"
+require "contest"
+require "hpricot"
+
+ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+$:.unshift ROOT
+
+require "test/commands"
+
+class TestMonk < Test::Unit::TestCase
+  include Test::Commands
+
+  def root(*args)
+    File.join(ROOT, *args)
+  end
+
+  def monk(args = nil)
+    sh("ruby -rubygems #{root "bin/monk"} #{args}")
+  end
+
+  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
+  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 foo")
+          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
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -03:00
+date: 2009-08-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: wycats-thor
+  name: thor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.5
+        version: 0.0.6
     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.
 email: 
@@ -50,8 +50,9 @@ files:
 - bin/monk
 - lib/monk.rb
 - monk.gemspec
+- test/commands.rb
 - test/integration_test.rb
-- test/sinatra_test.rb
+- test/monk_test.rb
 has_rdoc: true
 homepage: http://monkrb.com
 licenses: []

data/test/sinatra_test.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-class SinatraTest < Test::Unit::TestCase
-  it 'creates a new Sinatra::Base subclass on new' do
-    app =
-      Sinatra.new do
-        get '/' do
-          'Hello World'
-        end
-      end
-    assert_same Sinatra::Base, app.superclass
-  end
-end