monk 0.0.6 → 0.0.7

data/lib/monk.rb

@@ -6,10 +6,14 @@ require "yaml"
 class Monk < Thor
   include Thor::Actions
 
+  [:skip, :pretend, :force, :quiet].each do |task|
+    class_options.delete task
+  end
+
   desc "init", "Initialize a Monk application"
   method_option :skeleton, :type => :string, :aliases => "-s"
   def init(target = ".")
-    clone(source(options[:skeleton] || "default"), target) ?
+    clone(source(options[:skeleton] || "default") || options[:skeleton], target) ?
       cleanup(target) :
       say_status(:error, clone_error(target))
   end
@@ -64,13 +68,13 @@ private
   def monk_config
     @monk_config ||= begin
       write_monk_config_file unless File.exists?(monk_config_file)
-      @monk_config = YAML.load_file(monk_config_file)
+      YAML.load_file(monk_config_file)
     end
   end
 
   def write_monk_config_file
-    remove_file monk_config_file
-    create_file monk_config_file do
+    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.to_yaml
     end

data/monk.gemspec

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

@@ -24,6 +24,14 @@ class TestMonk < Test::Unit::TestCase
         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

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "contest"
 require "hpricot"
+require "fileutils"
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -03:00
+date: 2009-09-17 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,8 @@ files:
 - test/integration_test.rb
 - test/monk_test.rb
 - test/test_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://monkrb.com
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -78,9 +76,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - git
 rubyforge_project: monk
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Monk, the glue framework
 test_files: []