monk 0.0.5 → 0.0.6

data/bin/monk

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#! /usr/bin/env ruby -rubygems
 
 require File.join(File.dirname(__FILE__), "..", "lib", "monk")
 

data/lib/monk.rb

@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 
 require "thor"
+require "yaml"
 
 class Monk < Thor
   include Thor::Actions
@@ -57,7 +58,7 @@ private
   end
 
   def monk_config_file
-    @monk_config_file ||= File.join(Thor::Util.user_home, ".monk")
+    @monk_config_file ||= File.join(monk_home, ".monk")
   end
 
   def monk_config
@@ -83,4 +84,8 @@ private
     "Couldn't clone repository into target directory '#{target}'. " +
     "You must have git installed and the target directory must be empty."
   end
+
+  def monk_home
+    ENV["MONK_HOME"] || File.join(Thor::Util.user_home)
+  end
 end

data/monk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "monk"
-  s.version           = "0.0.5"
+  s.version           = "0.0.6"
   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"]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.executables << "monk"
 
   s.add_dependency("thor", "~> 0.11")
-  s.add_dependency("dependencies", ">= 0.0.6")
+  s.add_dependency("dependencies", ">= 0.0.7")
   s.requirements << "git"
 
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "bin/monk", "lib/monk.rb", "monk.gemspec", "test/commands.rb", "test/integration_test.rb", "test/monk_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", "test/test_helper.rb"]
 end

data/test/commands.rb

@@ -13,11 +13,18 @@ module Test::Commands
     [out, err]
   end
 
+  # Runs a command in the background, silencing all output.
+  # For debugging purposes, set the environment variable VERBOSE.
   def sh_bg(cmd)
-    silence_stream($stdout) do
-      silence_stream($stderr) do
-        (pid = fork) ? Process.detach(pid) : exec("#{cmd} 2>&1>/dev/null")
-      end
+    if ENV["VERBOSE"]
+      streams_to_silence = []
+    else
+      streams_to_silence = [$stdout, $stderr]
+      cmd = "#{cmd} 2>&1>/dev/null"
+    end
+
+    silence_stream(*streams_to_silence) do
+      (pid = fork) ? Process.detach(pid) : exec(cmd)
     end
   end
 
@@ -50,12 +57,16 @@ module Test::Commands
     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
+  def silence_stream(*streams) #:yeild:
+    on_hold = streams.collect{ |stream| stream.dup }
+    streams.each do |stream|
+      stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+      stream.sync = true
+    end
     yield
   ensure
-    stream.reopen(old_stream)
+    streams.each_with_index do |stream, i|
+      stream.reopen(on_hold[i])
+    end
   end
 end

data/test/integration_test.rb

@@ -1,24 +1,6 @@
-require "rubygems"
-require "contest"
-require "hpricot"
-
-ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
-$:.unshift ROOT
-
-require "test/commands"
+require File.join(File.dirname(__FILE__), "test_helper")
 
 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
     setup do
       @ports_to_close = []
@@ -77,8 +59,8 @@ class TestMonk < Test::Unit::TestCase
           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."
+          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
@@ -87,6 +69,9 @@ class TestMonk < Test::Unit::TestCase
           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
@@ -96,6 +81,11 @@ class TestMonk < Test::Unit::TestCase
         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)

data/test/monk_test.rb

@@ -1,24 +1,6 @@
-require "rubygems"
-require "contest"
-require "hpricot"
-
-ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
-$:.unshift ROOT
-
-require "test/commands"
+require File.join(File.dirname(__FILE__), "test_helper")
 
 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

data/test/test_helper.rb

@@ -0,0 +1,27 @@
+require "rubygems"
+require "contest"
+require "hpricot"
+
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 -03:00
+date: 2009-09-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        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.
 email: 
@@ -53,6 +53,7 @@ files:
 - test/commands.rb
 - test/integration_test.rb
 - test/monk_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://monkrb.com
 licenses: []