monk 0.0.2 → 0.0.3

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2008 Michel Martens and Damian Janowski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.markdown

@@ -8,7 +8,7 @@ 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
+git repository and a list of dependencies, and Monk takes 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.
@@ -28,7 +28,7 @@ Install the monk gem and create your project:
     $ cd myapp
     $ rake
 
-If the tests pass, it means that you can start hacking righ away. If
+If the tests pass, it means that you can start hacking right away. If
 they don't, just follow the instructions. As the default skeleton
 is very opinionated, you will probably need to install and run
 [Redis](http://code.google.com/p/redis/), a key-value database.

data/bin/monk

@@ -1,51 +1,13 @@
 #! /usr/bin/env ruby
 
-require "thor"
-
-class MonkTasks < Thor
-  namespace :monk
-
-  include Thor::Actions
-
-  desc "init", "Initialize a Monk application"
-  def init(target)
-    say_status :fetching, source
-    system "git clone -q --depth 1 #{source} #{target}"
-    inside(target) { remove_file ".git" }
-    say_status :create, target
-  end
-
-private
-
-  def source
-    monk_config["default"]
-  end
-
-  def monk_config_file
-    @monk_config_file ||= File.join(Thor::Util.user_home, ".monk")
-  end
-
-  def monk_config
-    @monk_config ||= begin
-      write_monk_config_file unless File.exists?(monk_config_file)
-      @monk_config = YAML.load_file(monk_config_file)
-    end
-  end
-
-  def write_monk_config_file
-    create_file monk_config_file do
-      config = { "default" => "git://github.com/monkrb/skeleton.git" }
-      config.to_yaml
-    end
-  end
-
-  def self.source_root
-    "."
-  end
-end
+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.
 if File.exists?("Thorfile")
   load("Thorfile")
 end
 
-MonkTasks.start
+# Start the monk tasks.
+Monk.start

data/lib/monk.rb

@@ -1,56 +1,51 @@
-# This file contains the bootstraping code for a Monk application.
-RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
-
-# Helper method for file references.
-#
-# @param args [Array] Path components relative to ROOT_DIR.
-# @example Referencing a file in config called settings.yml:
-#   root_path("config", "settings.yml")
-def root_path(*args)
-  File.join(ROOT_DIR, *args)
-end
+#! /usr/bin/env ruby
+
+require "thor"
 
-require "sinatra/base"
-require "haml"
-require "sass"
+class Monk < Thor
+  include Thor::Actions
 
-# TODO Add documentation.
-class Monk < Sinatra::Base
-  set :dump_errors, true
-  set :logging, true
-  set :methodoverride, true
-  set :raise_errors, Proc.new { test? }
-  set :root, root_path
-  set :run, Proc.new { $0 == app_file }
-  set :show_exceptions, Proc.new { development? }
-  set :static, true
-  set :views, root_path("app", "views")
+  desc "init", "Initialize a Monk application"
+  def init(target)
+    clone(source, target)
+    cleanup(target)
+  end
 
-  use Rack::Session::Cookie
+private
+
+  def clone(source, target)
+    say_status :fetching, source
+    system "git clone -q --depth 1 #{source} #{target}"
+  end
 
-  configure :development do
-    use Sinatra::Reloader
+  def cleanup(target)
+    inside(target) { remove_file ".git" }
+    say_status :create, target
   end
 
-  configure :development, :test do
-    require "ruby-debug" rescue LoadError
+  def source
+    monk_config["default"]
   end
 
-  helpers do
+  def monk_config_file
+    @monk_config_file ||= File.join(Thor::Util.user_home, ".monk")
+  end
 
-    # TODO Add documentation.
-    def haml(template, options = {}, locals = {})
-      options[:escape_html] = true unless options.include?(:escape_html)
-      super(template, options, locals)
+  def monk_config
+    @monk_config ||= begin
+      write_monk_config_file unless File.exists?(monk_config_file)
+      @monk_config = YAML.load_file(monk_config_file)
     end
+  end
 
-    # TODO Add documentation.
-    def partial(template, locals = {})
-      haml(template, {:layout => false}, locals)
+  def write_monk_config_file
+    create_file monk_config_file do
+      config = { "default" => "git://github.com/monkrb/skeleton.git" }
+      config.to_yaml
     end
   end
-end
 
-require "monk/reloader"
-require "monk/logger"
-require "monk/settings"
+  def self.source_root
+    "."
+  end
+end

data/monk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "monk"
-  s.version           = "0.0.2"
+  s.version           = "0.0.3"
   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"]
@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency("dependencies", ">= 0.0.5")
   s.requirements << "git"
 
-  s.files = ["README.markdown", "Rakefile", "bin/monk", "lib/monk/logger.rb", "lib/monk/reloader.rb", "lib/monk/settings.rb", "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/integration_test.rb", "test/sinatra_test.rb"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -03:00
+date: 2009-07-23 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- LICENSE
 - README.markdown
 - Rakefile
 - bin/monk
-- lib/monk/logger.rb
-- lib/monk/reloader.rb
-- lib/monk/settings.rb
 - lib/monk.rb
 - monk.gemspec
 - test/integration_test.rb

data/lib/monk/logger.rb

@@ -1,11 +0,0 @@
-require 'logger'
-
-# TODO Add documentation.
-def logger
-  $logger ||= begin
-    $logger = ::Logger.new(root_path("log", "#{RACK_ENV}.log"))
-    $logger.level = ::Logger.const_get((settings(:log_level) || :warn).to_s.upcase)
-    $logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-    $logger
-  end
-end

data/lib/monk/reloader.rb

@@ -1,10 +0,0 @@
-require "rack/reloader"
-
-# TODO Add documentation.
-class Monk::Reloader < Rack::Reloader
-  def safe_load(file, mtime, stderr = $stderr)
-    super
-    Monk.reset!
-    super(Monk.app_file, mtime, stderr)
-  end
-end

data/lib/monk/settings.rb

@@ -1,14 +0,0 @@
-require 'yaml'
-
-# TODO Add documentation.
-def settings(key)
-  $settings ||= YAML.load_file(root_path("config", "settings.yml"))[RACK_ENV.to_sym]
-
-  unless $settings.include?(key)
-    message = "No setting defined for #{key.inspect}."
-    defined?(logger) ? logger.warn(message) : $stderr.puts(message)
-  end
-
-  $settings[key]
-end
-