monk 0.0.4 → 0.0.5

data/lib/monk.rb

@@ -6,9 +6,9 @@ class Monk < Thor
   include Thor::Actions
 
   desc "init", "Initialize a Monk application"
-  method_options(:source => :string)
+  method_option :skeleton, :type => :string, :aliases => "-s"
   def init(target = ".")
-    clone(source(options[:source] || "default"), target) ?
+    clone(source(options[:skeleton] || "default"), target) ?
       cleanup(target) :
       say_status(:error, clone_error(target))
   end

data/monk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "monk"
-  s.version           = "0.0.4"
+  s.version           = "0.0.5"
   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"]

data/test/monk_test.rb

@@ -79,7 +79,7 @@ class TestMonk < Test::Unit::TestCase
         monk("add foobar git://github.com/monkrb/skeleton.git")
 
         Dir.chdir("monk-test") do
-          out, err = monk("init -s foo")
+          out, err = monk("init -s foobar")
           assert_match /initialized/, out
         end
       end
@@ -114,6 +114,32 @@ class TestMonk < Test::Unit::TestCase
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Damian Janowski