Rjb fix master for modern ruby

lib/webby/apps/main.rb

@@ -174,15 +174,15 @@ def find_sitefile
   end
 
   def import_default_tasks
-    Dir.glob(::Webby.libpath(%w[webby tasks *.rake])).sort.each {|fn| import fn}
+    Dir.glob(::Webby.libpath(%w[webby tasks *.rake])).sort.each {|fn| app.add_import fn}
   end
 
   def import_website_tasks
-    Dir.glob(::File.join(%w[tasks *.rake])).sort.each {|fn| import fn}
+    Dir.glob(::File.join(%w[tasks *.rake])).sort.each {|fn| app.add_import fn}
   end
 
   def require_lib_files
-    Dir.glob(::File.join(%w[lib ** *.rb])).sort.each {|fn| require fn}
+    Dir.glob(::File.join(%w[lib ** *.rb])).sort.each {|fn| require File.expand_path fn}
   end
 
   def capture_command_line_args(args)

lib/webby/resources/meta_file.rb

@@ -135,7 +135,14 @@ def each
         buffer << line
       end
 
-      h = YAML.load(buffer)
+      begin
+        h = YAML.load(buffer)
+      rescue Psych::SyntaxError => err
+        msg = ERR_MSG.dup << "\n\t-- " << err.message
+        msg << "\n Buffer:\n#{buffer}"
+        raise Error, msg
+      end
+
       raise Error, ERR_MSG unless h.instance_of?(Hash)
 
       if first then h = first.merge(h)

lib/webby/resources/resource.rb

@@ -10,7 +10,8 @@ class Resource
 
   instance_methods.each do |m|
       undef_method(m) unless m =~ %r/\A__|\?$/ ||
-                             m == 'class'
+                             m == :class ||
+                             m == :object_id
   end
 
   # The full path to the resource file

spec/spec_helper.rb

@@ -12,7 +12,6 @@
 end
 
 require 'fileutils'
-require 'spec'
 require 'spec/logging_helper'
 
 dir = File.expand_path(File.dirname(__FILE__))