webby 0.8.2 → 0.8.3

data/lib/webby/resources/partial.rb

@@ -1,5 +1,3 @@
-# $Id: partial.rb 167 2008-02-24 00:59:54Z tim_pease $
-
 require Webby.libpath(*%w[webby resources resource])
 
 module Webby::Resources
@@ -10,7 +8,7 @@ module Webby::Resources
 # correspond directly to an output file.
 #
 # Partials can contain YAML meta-data at the top of the file. This
-# information is only used to determin the filters to apply to the
+# information is only used to determine the filters to apply to the
 # partial. If there is no meta-data, then the partial text is used "as is"
 # without any processing by the Webby rendering engine.
 #

data/lib/webby/resources/resource.rb

@@ -1,5 +1,3 @@
-# $Id: resource.rb 198 2008-03-10 15:25:55Z tim_pease $
-
 unless defined? Webby::Resources::Resource
 
 module Webby::Resources
@@ -70,6 +68,16 @@ class Resource
     @path <=> other.path
   end
 
+  # call-seq:
+  #    resource[key]    => value or nil
+  #
+  # Returns the value associated with the given meta-data key. Key is
+  # usually a string.
+  #
+  def []( key )
+    @mdata[key]
+  end
+
   # call-seq:
   #    method_missing( symbol [, *args, &block] )    => result
   #

data/lib/webby/resources/static.rb

@@ -1,5 +1,3 @@
-# $Id: static.rb 167 2008-02-24 00:59:54Z tim_pease $
-
 require Webby.libpath(*%w[webby resources resource])
 
 module Webby::Resources

data/lib/webby/stelan/mktemp.rb

@@ -1,5 +1,3 @@
-# $Id: mktemp.rb 176 2008-02-29 00:00:53Z tim_pease $
-
 # :stopdoc:
 # Skeleton module for the 'mktemp' routine.
 #

data/lib/webby/stelan/spawner.rb

@@ -1,5 +1,3 @@
-# $Id: spawner.rb 157 2008-02-20 17:41:00Z tim_pease $
-
 require 'rbconfig'
 require 'thread'
 require 'tempfile'

data/lib/webby/utils.rb

@@ -1,5 +1,3 @@
-# $Id: utils.rb 157 2008-02-20 17:41:00Z tim_pease $
-
 # :stopdoc:
 module Enumerable
   def injecting( initial )

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# $Id: spec_helper.rb 155 2008-02-17 00:48:30Z tim_pease $
-
 # Equivalent to a header guard in C/C++
 # Used to prevent the spec helper from being loaded more than once
 unless defined? WEBBY_SPEC_HELPER
@@ -9,8 +7,7 @@ require 'rubygems'
 require 'fileutils'
 
 require File.expand_path(
-    File.join(File.dirname(__FILE__), '..', 'lib', 'webby'))
-
+    File.join(File.dirname(__FILE__), %w[.. lib webby]))
 
 end  # unless defined?
 

data/spec/webby/helpers/capture_helper_spec.rb

@@ -0,0 +1,56 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+# ---------------------------------------------------------------------------
+describe Webby::Helpers::CaptureHelper do
+  CFN = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', 'capture_for_yaml.txt'))
+  CLINES = [
+    "--- ",
+    "filter: ",
+    "  - erb ",
+    "--- ",
+    "Hello world!",
+    "<% content_for :sidebar do %>",
+    "I'm sidebar content.",
+    "<% end %>"
+  ]
+
+  before :all do
+    ::File.open(CFN,'w') {|fd| fd.write CLINES.join("\n") }
+  end
+
+  before :each do
+    @renderman = Webby::Renderer.new(
+                 Webby::Resources::Page.new(CFN))
+    @page_content = @renderman.render_page
+  end
+
+  after :all do
+    ::FileUtils.rm_f(CFN)
+  end
+
+  it 'should not "leak" any content to containing page' do
+    @page_content.should_not be_nil
+    @page_content.should eql("Hello world!\n")
+  end
+
+  it "should return the stored content for the given key" do
+    @renderman.content_for(:sidebar).should_not be_nil
+    @renderman.content_for(:sidebar).should eql("\nI'm sidebar content.\n") # Note: Leading newline
+  end
+
+  it "should report if content is associated with a given key" do
+    @renderman.content_for?(:sidebar).should == true
+    @renderman.content_for?(:header).should == false
+  end
+
+  it "should clear content associated with a given key" do
+    @renderman.content_for?(:sidebar).should == true
+    @renderman.delete_content_for(:sidebar)
+    @renderman.content_for?(:sidebar).should == false
+  end
+
+end
+
+# EOF

data/spec/webby/resources/file_spec.rb

@@ -1,4 +1,3 @@
-# $Id: file_spec.rb 167 2008-02-24 00:59:54Z tim_pease $
 
 require ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper])
 

data/tasks/ann.rake

@@ -1,4 +1,4 @@
-# $Id: ann.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 begin
   require 'bones/smtp_tls'
@@ -9,13 +9,16 @@ require 'time'
 
 namespace :ann do
 
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
   file PROJ.ann.file do
     ann = PROJ.ann
     puts "Generating #{ann.file}"
     File.open(ann.file,'w') do |fd|
       fd.puts("#{PROJ.name} version #{PROJ.version}")
       fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
       fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
       fd.puts
       fd.puts("== DESCRIPTION")
@@ -35,10 +38,10 @@ namespace :ann do
   end
 
   desc "Create an announcement file"
-  task :announcement => PROJ.ann.file
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
 
   desc "Send an email announcement"
-  task :email => PROJ.ann.file do
+  task :email => ['ann:prereqs', PROJ.ann.file] do
     ann = PROJ.ann
     from = ann.email[:from] || PROJ.email
     to   = Array(ann.email[:to])

data/tasks/bones.rake

@@ -1,4 +1,4 @@
-# $Id: bones.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 if HAVE_BONES
 
@@ -6,7 +6,7 @@ namespace :bones do
 
   desc 'Show the PROJ open struct'
   task :debug do |t|
-    atr = if ARGV.length == 2
+    atr = if t.application.top_level_tasks.length == 2
       t.application.top_level_tasks.pop
     end
 

data/tasks/gem.rake

@@ -1,10 +1,10 @@
-# $Id: gem.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 require 'rake/gempackagetask'
 
 namespace :gem do
 
-  PROJ.gem.spec = Gem::Specification.new do |s|
+  PROJ.gem._spec = Gem::Specification.new do |s|
     s.name = PROJ.name
     s.version = PROJ.version
     s.summary = PROJ.summary
@@ -12,7 +12,6 @@ namespace :gem do
     s.email = PROJ.email
     s.homepage = Array(PROJ.url).first
     s.rubyforge_project = PROJ.rubyforge.name
-    s.post_install_message = PROJ.gem.post_install_message
 
     s.description = PROJ.description
 
@@ -46,32 +45,45 @@ namespace :gem do
     else
       s.test_files = PROJ.test.files.to_a
     end
-  end
+
+    # Do any extra stuff the user wants
+    PROJ.gem.extras.each do |msg, val|
+      case val
+      when Proc
+        val.call(s.send(msg))
+      else
+        s.send "#{msg}=", val
+      end
+    end
+  end  # Gem::Specification.new
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
 
   desc 'Show information about the gem'
-  task :debug do
-    puts PROJ.gem.spec.to_ruby
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
   end
 
   pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
     pkg.need_tar = PROJ.gem.need_tar
     pkg.need_zip = PROJ.gem.need_zip
-    pkg.package_files += PROJ.gem.spec.files
+    pkg.package_files += PROJ.gem._spec.files
   end
   Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil)
 
-  gem_file = if PROJ.gem.spec.platform == Gem::Platform::RUBY
+  gem_file = if PROJ.gem._spec.platform == Gem::Platform::RUBY
       "#{pkg.package_name}.gem"
     else
-      "#{pkg.package_name}-#{PROJ.gem.spec.platform}.gem"
+      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
     end
 
   desc "Build the gem file #{gem_file}"
-  task :package => "#{pkg.package_dir}/#{gem_file}"
+  task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"]
 
-  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem.spec.files do
+  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do
     when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.gem.spec).build
+      Gem::Builder.new(PROJ.gem._spec).build
       verbose(true) {
         mv gem_file, "#{pkg.package_dir}/#{gem_file}"
       }
@@ -80,14 +92,14 @@ namespace :gem do
 
   desc 'Install the gem'
   task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install pkg/#{PROJ.gem.spec.full_name}"
+    sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
   end
 
   desc 'Uninstall the gem'
   task :uninstall do
     installed_list = Gem.source_index.find_name(PROJ.name)
     if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
-      sh "#{SUDO} #{GEM} uninstall -v '#{PROJ.version}' -i -x #{PROJ.name}"
+      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
     end
   end
 

data/tasks/notes.rake

@@ -1,18 +1,24 @@
-# $Id: notes.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 if HAVE_BONES
 
 desc "Enumerate all annotations"
-task :notes do
+task :notes do |t|
+  id = if t.application.top_level_tasks.length > 1
+    t.application.top_level_tasks.slice!(1..-1).join(' ')
+  end
   Bones::AnnotationExtractor.enumerate(
-      PROJ, PROJ.notes.tags.join('|'), :tag => true)
+      PROJ, PROJ.notes.tags.join('|'), id, :tag => true)
 end
 
 namespace :notes do
   PROJ.notes.tags.each do |tag|
     desc "Enumerate all #{tag} annotations"
-    task tag.downcase.to_sym do
-      Bones::AnnotationExtractor.enumerate(PROJ, tag)
+    task tag.downcase.to_sym do |t|
+      id = if t.application.top_level_tasks.length > 1
+        t.application.top_level_tasks.slice!(1..-1).join(' ')
+      end
+      Bones::AnnotationExtractor.enumerate(PROJ, tag, id)
     end
   end
 end

data/tasks/post_load.rake

@@ -1,10 +1,12 @@
-# $Id: post_load.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
 PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
-PROJ.exclude << "^#{Regexp.escape(PROJ.ann.file)}$"
+PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
+                 "^#{Regexp.escape(PROJ.rdoc.dir)}/",
+                 "^#{Regexp.escape(PROJ.rcov.dir)}/"]
 
 flatten_arrays = lambda do |this,os|
     os.instance_variable_get(:@table).each do |key,val|

data/tasks/rdoc.rake

@@ -1,4 +1,4 @@
-# $Id: rdoc.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 require 'rake/rdoctask'
 
@@ -21,7 +21,9 @@ namespace :doc do
     rd.rdoc_files.push(*files)
 
     title = "#{PROJ.name}-#{PROJ.version} Documentation"
-    title = "#{PROJ.rubyforge.name}'s " + title if PROJ.rubyforge.name != title
+
+    rf_name = PROJ.rubyforge.name
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/rubyforge.rake

@@ -1,6 +1,6 @@
-# $Id: rubyforge.rake 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
-if PROJ.rubyforge.name && HAVE_RUBYFORGE
+if PROJ.rubyforge.name.valid? && HAVE_RUBYFORGE
 
 require 'rubyforge'
 require 'rake/contrib/sshpublisher'
@@ -10,7 +10,7 @@ namespace :gem do
   task :release => [:clobber, :package] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
-    pkg = "pkg/#{PROJ.gem.spec.full_name}"
+    pkg = "pkg/#{PROJ.gem._spec.full_name}"
 
     if $DEBUG then
       puts "release_id = rf.add_release #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""

data/tasks/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 200 2008-03-12 16:05:17Z tim_pease $
+# $Id$
 
 require 'rubygems'
 require 'rake'
@@ -16,9 +16,9 @@ PROJ = OpenStruct.new(
   :changes => nil,
   :authors => nil,
   :email => nil,
-  :url => nil,
+  :url => "\000",
   :version => ENV['VERSION'] || '0.0.0',
-  :exclude => %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/),
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
   :release_name => ENV['RELEASE'],
 
   # System Defaults
@@ -53,12 +53,12 @@ PROJ = OpenStruct.new(
     :files => nil,
     :need_tar => true,
     :need_zip => false,
-    :post_install_message => nil
+    :extras => {}
   ),
 
   # File Annotations
   :notes => OpenStruct.new(
-    :exclude => %w(^tasks/setup.rb$),
+    :exclude => %w(^tasks/setup\.rb$),
     :extensions => %w(.txt .rb .erb) << '',
     :tags => %w(FIXME OPTIMIZE TODO)
   ),
@@ -74,8 +74,8 @@ PROJ = OpenStruct.new(
   # Rdoc
   :rdoc => OpenStruct.new(
     :opts => [],
-    :include => %w(^lib/ ^bin/ ^ext/ .txt$),
-    :exclude => %w(extconf.rb$),
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :exclude => %w(extconf\.rb$),
     :main => nil,
     :dir => 'doc',
     :remote_dir => nil
@@ -83,7 +83,7 @@ PROJ = OpenStruct.new(
 
   # Rubyforge
   :rubyforge => OpenStruct.new(
-    :name => nil
+    :name => "\000"
   ),
 
   # Rspec
@@ -95,7 +95,7 @@ PROJ = OpenStruct.new(
   # Subversion Repository
   :svn => OpenStruct.new(
     :root => nil,
-    :path => nil,
+    :path => '',
     :trunk => 'trunk',
     :tags => 'tags',
     :branches => 'branches'
@@ -130,6 +130,7 @@ def quiet( &block )
 ensure
   STDOUT.reopen io.first
   STDERR.reopen io.last
+  $stdout, $stderr = STDOUT, STDERR
 end
 
 DIFF = if WIN32 then 'diff.exe'
@@ -156,6 +157,10 @@ GEM  = WIN32 ? 'gem.bat'  : 'gem'
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
   end
 end
+HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
+            system("svn --version 2>&1 > #{DEV_NULL}"))
+HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
+            system("git --version 2>&1 > #{DEV_NULL}"))
 
 # Reads a file at +path+ and spits out an array of the +paragraphs+
 # specified.
@@ -250,4 +255,14 @@ def manifest_files
   files.sort!
 end
 
+# We need a "valid" method thtat determines if a string is suitable for use
+# in the gem specification.
+#
+class Object
+  def valid?
+    return !(self.empty? or self == "\000") if self.respond_to?(:to_str)
+    return false
+  end
+end
+
 # EOF