rkh-monk 0.0.6 → 0.0.6.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Michel Martens and Damian Janowski
+Copyright (c) 2008 Michel Martens, Damian Janowski and Konstantin Haase
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/monk

@@ -1,13 +1,12 @@
 #! /usr/bin/env ruby -rubygems
 
-require File.join(File.dirname(__FILE__), "..", "lib", "monk")
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+require "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
+# A way to extend Monk is to write tasks in a Monkfile in the project's root directory.
+# Monk loads the Monkfile if there is one, and all the tasks that are declared in the
 # class Monk become available.
-if File.exists?("Thorfile")
-  load("Thorfile")
-end
+Dir.glob("{Thor,Monk}file") { |f| load f }
 
 # Start the monk tasks.
 Monk.start

data/lib/monk.rb

@@ -1,7 +1,5 @@
 #! /usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-
 require "thor"
 require "yaml"
 
@@ -10,7 +8,7 @@ require "monk/skeleton"
 class Monk < Thor
   include Thor::Actions
   
-  class_options[:skip].aliases.delete "-s"
+  class_options[:skip].aliases.delete "-s" if class_options.include? :skip
   
   def self.git_option(name, options = {})
     class_option name, options.merge(:group => :git)

data/monk.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name              = "monk"
-  s.version           = "0.0.6"
+  s.version           = "0.0.6.1"
   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"]
-  s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
+  s.authors           = ["Damian Janowski", "Michel Martens", "Konstantin Haase"]
+  s.email             = ["djanowski@dimaion.com", "michel@soveran.com", "konstantin.mailinglists@googlemail.com"]
   s.homepage          = "http://monkrb.com"
 
   s.rubyforge_project = "monk"

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rkh-monk
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.6.1
 platform: ruby
 authors: 
 - Damian Janowski
 - Michel Martens
+- Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -37,6 +38,7 @@ description: Monk is a glue framework for web development. It means that instead
 email: 
 - djanowski@dimaion.com
 - michel@soveran.com
+- konstantin.mailinglists@googlemail.com
 executables: 
 - monk
 extensions: []
@@ -57,6 +59,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://monkrb.com
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -77,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - git
 rubyforge_project: monk
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Monk, the glue framework