Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating to the latest version of Mr Bones

  • Loading branch information...
commit 714050fbddd4ebe5677c8aa850145a6a178cded5 1 parent 290defb
@TwP authored
View
77 Rakefile
@@ -1,13 +1,8 @@
begin
require 'bones'
- Bones.setup
rescue LoadError
- begin
- load 'tasks/setup.rb'
- rescue LoadError
- raise RuntimeError, '### please install the "bones" gem ###'
- end
+ abort '### please install the "bones" gem ###'
end
ensure_in_path 'lib'
@@ -15,33 +10,30 @@ require 'webby'
task :default => 'spec:specdoc'
-PROJ.name = 'webby'
-PROJ.summary = 'Awesome static website creation and management!'
-PROJ.authors = 'Tim Pease'
-PROJ.email = 'tim.pease@gmail.com'
-PROJ.url = 'http://webby.rubyforge.org/'
-PROJ.rubyforge.name = 'webby'
-PROJ.version = Webby::VERSION
-PROJ.release_name = 'Supertaculous'
-PROJ.readme_file = 'README.rdoc'
-PROJ.ignore_file = '.gitignore'
-
-PROJ.ruby_opts = %w[-W0]
-PROJ.exclude << %w(^webby.gemspec$)
-
-PROJ.rdoc.dir = 'doc/rdoc'
-PROJ.rdoc.remote_dir = 'rdoc'
-PROJ.rdoc.exclude << %w(^examples)
-PROJ.rdoc.include << PROJ.readme_file
-
-PROJ.spec.opts << '--color'
-
-PROJ.ann.email[:to] << 'webby-forum@googlegroups.com'
-PROJ.ann.email[:server] = 'smtp.gmail.com'
-PROJ.ann.email[:port] = 587
-PROJ.ann.email[:from] = 'Tim Pease'
-
-PROJ.ann.text = <<-ANN
+Bones {
+ name 'webby'
+ summary 'Awesome static website creation and management!'
+ authors 'Tim Pease'
+ email 'tim.pease@gmail.com'
+ url 'http://webby.rubyforge.org/'
+ version Webby::VERSION
+ readme_file 'README.rdoc'
+ ignore_file '.gitignore'
+ rubyforge.name 'webby'
+
+ ruby_opts %w[-W0]
+ exclude << %w(^webby.gemspec$)
+
+ rdoc.dir 'doc/rdoc'
+ rdoc.remote_dir 'rdoc'
+ rdoc.exclude << %w(^examples)
+ rdoc.include << readme_file
+
+ spec.opts << '--color'
+
+ use_gmail
+ ann.email.to << 'webby-forum@googlegroups.com'
+ ann.text = <<-ANN
== POST SCRIPT
Visit the Webby forum to chat with other Webby-Heads:
@@ -51,12 +43,15 @@ Blessings,
TwP
ANN
-depend_on 'directory_watcher'
-depend_on 'hpricot', '>= 0.6.0'
-depend_on 'launchy'
-depend_on 'logging'
-depend_on 'loquacious'
-depend_on 'rake'
-depend_on 'rspec'
+ depend_on 'directory_watcher'
+ depend_on 'hpricot', '>= 0.6.0'
+ depend_on 'launchy'
+ depend_on 'logging'
+ depend_on 'loquacious'
+ depend_on 'rake'
+
+ depend_on 'rspec', :development => true
+ depend_on 'bones-git', :development => true
+ depend_on 'bones-extras', :development => true
+}
-# EOF
View
10 lib/webby/renderer.rb
@@ -49,7 +49,7 @@ def self.write( page )
}
end
- attr_reader :logger
+ attr_reader :page, :pages, :partials, :content, :config
# call-seq:
# Renderer.new( page )
@@ -235,12 +235,12 @@ def _layout_page
@content
rescue ::Webby::Error => err
- logger.error "while rendering page '#{@page.path}'"
- logger.error err.message
+ @logger.error "while rendering page '#{@page.path}'"
+ @logger.error err.message
return nil
rescue Exception => err
- logger.error "while rendering page '#{@page.path}'"
- logger.fatal err
+ @logger.error "while rendering page '#{@page.path}'"
+ @logger.fatal err
ensure
@content = nil
@@stack.clear
View
14 tasks/mswin32.rake
@@ -3,9 +3,9 @@ require 'find'
namespace 'gem:mswin32' do
- win32_spec = PROJ.gem._spec.dup
+ win32_spec = Bones.config.gem._spec.dup
win32_spec.platform = 'x86-mswin32'
- win32_spec.files = PROJ.gem.files
+ win32_spec.files = Bones.config.gem.files
pkg = Bones::GemPackageTask.new(win32_spec)
class << pkg
@@ -29,10 +29,10 @@ end # namespace 'gem:mswin32'
task :gem => 'gem:mswin32:package'
task :clobber => 'gem:mswin32:clobber_package'
-remove_desc_for_task(%w[
- gem:mswin32:clobber_package
- gem:mswin32:package
- gem:mswin32:repackage
-])
+# remove_desc_for_task(%w[
+# gem:mswin32:clobber_package
+# gem:mswin32:package
+# gem:mswin32:repackage
+# ])
# EOF
View
2  tasks/website.rake
@@ -25,7 +25,7 @@ namespace :website do
)
host = "#{config['username']}@rubyforge.org"
- remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge.name}/"
+ remote_dir = "/var/www/gforge-projects/#{Bones.config.rubyforge.name}/"
sh "rsync --delete -rulptzCF doc/ #{host}:#{remote_dir}"
end
Please sign in to comment.
Something went wrong with that request. Please try again.