Permalink
Browse files

Fixing a bug where configuration settings were being clobbered.

  • Loading branch information...
1 parent ab7665a commit bcae2c47ba9860296a70440399f42dfe0daa5e88 @TwP committed Apr 6, 2009
Showing with 15 additions and 13 deletions.
  1. +6 −0 History.txt
  2. +0 −5 examples/blog/tasks/blog.rake
  3. +0 −5 examples/tumblog/tasks/tumblog.rake
  4. +1 −1 lib/webby.rb
  5. +6 −0 lib/webby/config.rb
  6. +2 −2 webby.gemspec
View
@@ -1,3 +1,9 @@
+== 0.9.5 / 2009-
+
+* 1 bug fix
+ - The configuration from the blog.rake file was clobbering settings
+ from the Sitefile
+
== 0.9.4 / 2009-04-05
* 6 minor enhancements
@@ -1,8 +1,3 @@
-Loquacious.configuration_for(:webby) {
- desc "The default directory where new blog posts will be created."
- blog_dir 'blog'
-}
-
namespace :blog do
# iterate over all the files in the "templates/blog" folder and create a
@@ -1,8 +1,3 @@
-Loquacious.configuration_for(:webby) {
- desc "The default directory where new tumblog posts will be created."
- tumblog_dir 'blog'
-}
-
namespace :tumblog do
# iterate over all the files in the "templates/tumblog" folder and create a
View
@@ -14,7 +14,7 @@
module Webby
# :stopdoc:
- VERSION = '0.9.4' # :nodoc:
+ VERSION = '0.9.4.1' # :nodoc:
LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
YAML_SEP = '---'
View
@@ -167,6 +167,12 @@
# /html/body//object[@usemap]
# /html/body//img[@usemap]
# /html/body//input[@usemap]
+
+ desc "The default directory where new blog posts will be created."
+ blog_dir 'blog'
+
+ desc "The default directory where new tumblog posts will be created."
+ tumblog_dir 'blog'
}
# EOF
View
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = %q{webby}
- s.version = "0.9.4"
+ s.version = "0.9.4.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Tim Pease"]
- s.date = %q{2009-04-05}
+ s.date = %q{2009-04-06}
s.description = %q{*Webby* is a fantastic little website management system. It would be called a *content management system* if it were a bigger kid. But, it's just a runt with a special knack for transforming text. And that's really all it does - manages the legwork of turning text into something else, an *ASCII Alchemist* if you will. Webby works by combining the contents of a *page* with a *layout* to produce HTML. The layout contains everything common to all the pages - HTML headers, navigation menu, footer, etc. - and the page contains just the information for that page. You can use your favorite markup language to write your pages; Webby supports quite a few. Install Webby and try it out!}
s.email = %q{tim.pease@gmail.com}
s.executables = ["webby", "webby-gen"]

0 comments on commit bcae2c4

Please sign in to comment.