webby 0.9.2 → 0.9.3

data/spec/webby/resources/db_spec.rb

@@ -7,7 +7,7 @@ describe Webby::Resources::DB do
 
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts tumblog default.txt])
+             new(Webby.datapath %w[site layouts tumblog default.txt])
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @db = Webby::Resources::DB.new

data/spec/webby/resources/layout_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(
 describe Webby::Resources::Layout do
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts tumblog default.txt])
+             new(Webby.datapath %w[site layouts tumblog default.txt])
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @default = File.join %w[layouts tumblog default.txt]

data/spec/webby/resources/meta_file_spec.rb

@@ -11,29 +11,43 @@ describe Webby::Resources::MetaFile do
   end
 
   it 'returns the number of meta-data blocks at the top of a file' do
-    fn = Webby.datapath %w[content css coderay.css]
+    fn = Webby.datapath %w[site content css coderay.css]
     File.open(fn, 'r') do |fd|
       mf = Webby::Resources::MetaFile.new(fd)
       mf.meta_count.should == 0
     end
 
-    fn = Webby.datapath %w[content index.txt]
+    fn = Webby.datapath %w[site content index.txt]
     File.open(fn, 'r') do |fd|
       mf = Webby::Resources::MetaFile.new(fd)
       mf.meta_count.should == 1
     end
 
-    fn = Webby.datapath %w[content photos.txt]
+    fn = Webby.datapath %w[site content photos.txt]
     File.open(fn, 'r') do |fd|
       mf = Webby::Resources::MetaFile.new(fd)
       mf.meta_count.should == 3
     end
   end
 
+  it 'determines the end of the final meta-data block' do
+    fn = Webby.datapath %w[site content index.txt]
+    File.open(fn, 'r') do |fd|
+      mf = Webby::Resources::MetaFile.new(fd)
+      mf.meta_end.should == 7
+    end
+
+    fn = Webby.datapath %w[site content photos.txt]
+    File.open(fn, 'r') do |fd|
+      mf = Webby::Resources::MetaFile.new(fd)
+      mf.meta_end.should == 18
+    end
+  end
+
   # -----------------------------------------------------------------------
   describe '.each' do
     it 'yields each meta-data block' do
-      fn = Webby.datapath %w[content photos.txt]
+      fn = Webby.datapath %w[site content photos.txt]
       output = []
       File.open(fn, 'r') do |fd|
         mf = Webby::Resources::MetaFile.new(fd)
@@ -51,7 +65,7 @@ describe Webby::Resources::MetaFile do
     end
 
     it 'yields a single meta-data block' do
-      fn = Webby.datapath %w[content index.txt]
+      fn = Webby.datapath %w[site content index.txt]
       output = []
       File.open(fn, 'r') do |fd|
         mf = Webby::Resources::MetaFile.new(fd)
@@ -91,12 +105,12 @@ describe Webby::Resources::MetaFile do
   # -----------------------------------------------------------------------
   describe '#meta_data' do
     it 'returns nil for regular files' do
-      fn = Webby.datapath %w[content css coderay.css]
+      fn = Webby.datapath %w[site content css coderay.css]
       Webby::Resources::MetaFile.meta_data(fn).should be_nil
     end
 
     it 'returns a hash for pages' do
-      fn = Webby.datapath %w[content index.txt]
+      fn = Webby.datapath %w[site content index.txt]
       h = Webby::Resources::MetaFile.meta_data(fn)
 
       h.should be_instance_of(Hash)
@@ -104,7 +118,7 @@ describe Webby::Resources::MetaFile do
     end
 
     it 'returns a hash for layouts' do
-      fn = Webby.datapath %w[layouts default.txt]
+      fn = Webby.datapath %w[site layouts default.txt]
       h = Webby::Resources::MetaFile.meta_data(fn)
 
       h.should be_instance_of(Hash)
@@ -118,12 +132,12 @@ describe Webby::Resources::MetaFile do
   # -----------------------------------------------------------------------
   describe "#meta_data?" do
     it 'returns true for files with meta-data' do
-      fn = Webby.datapath %w[content index.txt]
+      fn = Webby.datapath %w[site content index.txt]
       Webby::Resources::MetaFile.meta_data?(fn).should == true
     end
 
     it 'returns false for files without meta-data' do
-      fn = Webby.datapath %w[content css coderay.css]
+      fn = Webby.datapath %w[site content css coderay.css]
       Webby::Resources::MetaFile.meta_data?(fn).should == false
     end
   end
@@ -131,12 +145,12 @@ describe Webby::Resources::MetaFile do
   # -----------------------------------------------------------------------
   describe "#read" do
     it 'behaves the same as File#read for regular files' do
-      fn = Webby.datapath %w[content css coderay.css]
+      fn = Webby.datapath %w[site content css coderay.css]
       Webby::Resources::MetaFile.read(fn).should == ::File.read(fn)
     end
 
     it 'returns only the content for pages' do
-      fn = Webby.datapath %w[content index.txt]
+      fn = Webby.datapath %w[site content index.txt]
       lines = File.readlines(fn)
       lines = lines[7..-1].join
 
@@ -144,7 +158,7 @@ describe Webby::Resources::MetaFile do
     end
 
     it 'returns only the content for layouts' do
-      fn = Webby.datapath %w[layouts default.txt]
+      fn = Webby.datapath %w[site layouts default.txt]
       lines = File.readlines(fn)
       lines = lines[4..-1].join
 

data/spec/webby/resources/page_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(
 describe Webby::Resources::Page do
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts default.txt])
+             new(Webby.datapath %w[site layouts default.txt])
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @filename = File.join %w[content index.txt]

data/spec/webby/resources/resource_spec.rb

@@ -7,7 +7,7 @@ describe Webby::Resources::Resource do
 
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts default.txt])
+             new(Webby.datapath %w[site layouts default.txt])
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @filename = File.join %w[content index.txt]

data/spec/webby/resources_spec.rb

@@ -47,7 +47,7 @@ describe Webby::Resources do
   describe "#new" do
     before :each do
       layout = Webby::Resources::Layout.
-               new(Webby.datapath %w[layouts default.txt])
+               new(Webby.datapath %w[site layouts default.txt])
       Webby::Resources.stub!(:find_layout).and_return(layout)
     end
 

data/tasks/gem.rake

@@ -1,6 +1,63 @@
-# $Id$
 
-require 'rake/gempackagetask'
+require 'find'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+class Bones::GemPackageTask < Rake::PackageTask
+  # Ruby GEM spec containing the metadata for this package.  The
+  # name, version and package_files are automatically determined
+  # from the GEM spec and don't need to be explicitly provided.
+  #
+  attr_accessor :gem_spec
+
+  # Create a GEM Package task library.  Automatically define the gem
+  # if a block is given.  If no block is supplied, then +define+
+  # needs to be called to define the task.
+  #
+  def initialize(gem_spec)
+    init(gem_spec)
+    yield self if block_given?
+    define if block_given?
+  end
+
+  # Initialization tasks without the "yield self" or define
+  # operations.
+  #
+  def init(gem)
+    super(gem.name, gem.version)
+    @gem_spec = gem
+    @package_files += gem_spec.files if gem_spec.files
+  end
+
+  # Create the Rake tasks and actions specified by this
+  # GemPackageTask.  (+define+ is automatically called if a block is
+  # given to +new+).
+  #
+  def define
+    super
+    task :prereqs
+    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files do
+      when_writing("Creating GEM") {
+        chdir(package_dir_path) do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "../#{gem_file}"
+          }
+        end
+      }
+    end
+  end
+  
+  def gem_file
+    if @gem_spec.platform == Gem::Platform::RUBY
+      "#{package_name}.gem"
+    else
+      "#{package_name}-#{@gem_spec.platform}.gem"
+    end
+  end
+end  # class Bones::GemPackageTask
 
 namespace :gem do
 
@@ -57,37 +114,14 @@ namespace :gem do
     end
   end  # Gem::Specification.new
 
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  desc 'Show information about the gem'
-  task :debug => 'gem:prereqs' do
-    puts PROJ.gem._spec.to_ruby
-  end
-
-  pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
+  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
     pkg.need_tar = PROJ.gem.need_tar
     pkg.need_zip = PROJ.gem.need_zip
-    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
-      "#{pkg.package_name}.gem"
-    else
-      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
-    end
-
-  desc "Build the gem file #{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
-    when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.gem._spec).build
-      verbose(true) {
-        mv gem_file, "#{pkg.package_dir}/#{gem_file}"
-      }
-    }
+  desc 'Show information about the gem'
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
   end
 
   desc 'Install the gem'
@@ -114,13 +148,40 @@ namespace :gem do
     sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
   end
 
+  namespace :mswin32 do
+    win32_spec = PROJ.gem._spec.dup
+    win32_spec.platform = 'x86-mswin32'
+
+    pkg = Bones::GemPackageTask.new(win32_spec)
+    class << pkg
+      def package_dir_path() "#{package_dir}/#{package_name}-x86-mswin32"; end
+    end
+    pkg.define
+
+    file "#{pkg.package_dir_path}/#{pkg.gem_file}" => :unix2dos
+
+    task :unix2dos do
+      reject = %w[.gif .jpg .jpeg]
+      Find.find(File.join(pkg.package_dir_path, 'examples')) do |fn|
+        next unless test(?f, fn)
+        next if reject.include?(File.extname(fn))
+        sh %{unix2dos #{fn}}
+      end
+    end
+  end  # namespace :mswin32
 end  # namespace :gem
 
+
 desc 'Alias to gem:package'
-task :gem => 'gem:package'
+task :gem => ['gem:package', 'gem:mswin32:package']
 
-task :clobber => 'gem:clobber_package'
+task :clobber => ['gem:clobber_package', 'gem:mswin32:clobber_package']
 
-remove_desc_for_task %w(gem:clobber_package)
+%w[
+  gem:clobber_package
+  gem:mswin32:clobber_package
+  gem:mswin32:package
+  gem:mswin32:repackage
+].each {|name| remove_desc_for_task name}
 
 # EOF

data/tasks/manifest.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'find'
 
@@ -15,9 +14,9 @@ namespace :manifest do
       lines.map! do |line|
         case line
         when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; Console::ANSICode.blue line
-        when %r/^\+/; Console::ANSICode.green line
-        when %r/^\-/; Console::ANSICode.red line
+        when %r/^@/; ANSICode.blue line
+        when %r/^\+/; ANSICode.green line
+        when %r/^\-/; ANSICode.red line
         else line end
       end
     end

data/tasks/rubyforge.rake

@@ -6,7 +6,7 @@ require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, 'gem:package'] do |t|
+  task :release => [:clobber, 'gem'] 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}"
@@ -26,9 +26,7 @@ namespace :gem do
     c['release_changes'] = PROJ.changes if PROJ.changes
     c['preformatted'] = true
 
-    files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil),
-             (PROJ.gem.need_zip ? "#{pkg}.zip" : nil),
-             "#{pkg}.gem"].compact
+    files = Dir.glob("#{pkg}*.*")
 
     puts "Releasing #{PROJ.name} v. #{PROJ.version}"
     rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-11 00:00:00 -06:00
+date: 2008-10-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,24 +23,24 @@ dependencies:
         version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: heel
+  name: hpricot
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: launchy
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.3.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: logging
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -88,23 +88,23 @@ extra_rdoc_files:
 - lib/webby/tasks/create.rake
 - lib/webby/tasks/deploy.rake
 - lib/webby/tasks/growl.rake
-- lib/webby/tasks/heel.rake
 - lib/webby/tasks/validate.rake
-- spec/data/content/_partial.txt
-- spec/data/content/index.txt
-- spec/data/content/photos.txt
-- spec/data/content/tumblog/200806/the-noble-chicken/index.txt
-- spec/data/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
-- spec/data/content/tumblog/200807/mad-city-chickens/index.txt
-- spec/data/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
-- spec/data/content/tumblog/200807/up-a-tree/index.txt
-- spec/data/content/tumblog/index.txt
-- spec/data/content/tumblog/rss.txt
 - spec/data/hooligans/bad_meta_data_1.txt
 - spec/data/hooligans/bad_meta_data_2.txt
-- spec/data/layouts/default.txt
-- spec/data/layouts/tumblog/default.txt
-- spec/data/layouts/tumblog/post.txt
+- spec/data/outline/basic.txt
+- spec/data/site/content/_partial.txt
+- spec/data/site/content/index.txt
+- spec/data/site/content/photos.txt
+- spec/data/site/content/tumblog/200806/the-noble-chicken/index.txt
+- spec/data/site/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
+- spec/data/site/content/tumblog/200807/mad-city-chickens/index.txt
+- spec/data/site/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
+- spec/data/site/content/tumblog/200807/up-a-tree/index.txt
+- spec/data/site/content/tumblog/index.txt
+- spec/data/site/content/tumblog/rss.txt
+- spec/data/site/layouts/default.txt
+- spec/data/site/layouts/tumblog/default.txt
+- spec/data/site/layouts/tumblog/post.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -172,6 +172,7 @@ files:
 - examples/webby/content/release-notes/rel-0-9-0/index.txt
 - examples/webby/content/release-notes/rel-0-9-1/index.txt
 - examples/webby/content/release-notes/rel-0-9-2/index.txt
+- examples/webby/content/release-notes/rel-0-9-3/index.txt
 - examples/webby/content/robots.txt
 - examples/webby/content/script/jquery.corner.js
 - examples/webby/content/script/jquery.js
@@ -211,7 +212,6 @@ files:
 - examples/website/lib/breadcrumbs.rb
 - examples/website/templates/_partial.erb
 - examples/website/templates/page.erb
-- examples/website/templates/presentation.erb
 - lib/webby.rb
 - lib/webby/apps.rb
 - lib/webby/apps/generator.rb
@@ -233,6 +233,7 @@ files:
 - lib/webby/filters/slides.rb
 - lib/webby/filters/textile.rb
 - lib/webby/filters/tidy.rb
+- lib/webby/filters/wiki_words.rb
 - lib/webby/helpers.rb
 - lib/webby/helpers/capture_helper.rb
 - lib/webby/helpers/coderay_helper.rb
@@ -241,6 +242,7 @@ files:
 - lib/webby/helpers/tex_img_helper.rb
 - lib/webby/helpers/ultraviolet_helper.rb
 - lib/webby/helpers/url_helper.rb
+- lib/webby/journal.rb
 - lib/webby/link_validator.rb
 - lib/webby/renderer.rb
 - lib/webby/resources.rb
@@ -258,48 +260,57 @@ files:
 - lib/webby/tasks/create.rake
 - lib/webby/tasks/deploy.rake
 - lib/webby/tasks/growl.rake
-- lib/webby/tasks/heel.rake
 - lib/webby/tasks/validate.rake
 - spec/core_ext/hash_spec.rb
 - spec/core_ext/string_spec.rb
 - spec/core_ext/time_spec.rb
-- spec/data/Sitefile
-- spec/data/content/_partial.txt
-- spec/data/content/css/coderay.css
-- spec/data/content/css/site.css
-- spec/data/content/css/tumblog.css
-- spec/data/content/images/tumblog/permalink.gif
-- spec/data/content/images/tumblog/rss.gif
-- spec/data/content/index.txt
-- spec/data/content/photos.txt
-- spec/data/content/tumblog/200806/the-noble-chicken/index.txt
-- spec/data/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
-- spec/data/content/tumblog/200807/mad-city-chickens/index.txt
-- spec/data/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
-- spec/data/content/tumblog/200807/up-a-tree/index.txt
-- spec/data/content/tumblog/index.txt
-- spec/data/content/tumblog/rss.txt
 - spec/data/hooligans/bad_meta_data_1.txt
 - spec/data/hooligans/bad_meta_data_2.txt
-- spec/data/layouts/default.txt
-- spec/data/layouts/tumblog/default.txt
-- spec/data/layouts/tumblog/post.txt
-- spec/data/lib/breadcrumbs.rb
-- spec/data/lib/tumblog_helper.rb
-- spec/data/tasks/tumblog.rake
-- spec/data/templates/_partial.erb
-- spec/data/templates/atom_feed.erb
-- spec/data/templates/page.erb
-- spec/data/templates/presentation.erb
-- spec/data/templates/tumblog/conversation.erb
-- spec/data/templates/tumblog/link.erb
-- spec/data/templates/tumblog/photo.erb
-- spec/data/templates/tumblog/post.erb
-- spec/data/templates/tumblog/quote.erb
+- spec/data/outline/basic.out
+- spec/data/outline/basic.txt
+- spec/data/outline/no_clobber.out
+- spec/data/outline/numbering.out
+- spec/data/outline/numbering_only.out
+- spec/data/outline/toc_range_1.out
+- spec/data/outline/toc_range_2.out
+- spec/data/outline/toc_style.out
+- spec/data/site/Sitefile
+- spec/data/site/content/_partial.txt
+- spec/data/site/content/css/coderay.css
+- spec/data/site/content/css/site.css
+- spec/data/site/content/css/tumblog.css
+- spec/data/site/content/images/tumblog/permalink.gif
+- spec/data/site/content/images/tumblog/rss.gif
+- spec/data/site/content/index.txt
+- spec/data/site/content/photos.txt
+- spec/data/site/content/tumblog/200806/the-noble-chicken/index.txt
+- spec/data/site/content/tumblog/200807/historical-perspectives-on-the-classic-chicken-joke/index.txt
+- spec/data/site/content/tumblog/200807/mad-city-chickens/index.txt
+- spec/data/site/content/tumblog/200807/the-wisdom-of-the-dutch/index.txt
+- spec/data/site/content/tumblog/200807/up-a-tree/index.txt
+- spec/data/site/content/tumblog/index.txt
+- spec/data/site/content/tumblog/rss.txt
+- spec/data/site/layouts/default.txt
+- spec/data/site/layouts/tumblog/default.txt
+- spec/data/site/layouts/tumblog/post.txt
+- spec/data/site/lib/breadcrumbs.rb
+- spec/data/site/lib/tumblog_helper.rb
+- spec/data/site/tasks/tumblog.rake
+- spec/data/site/templates/_partial.erb
+- spec/data/site/templates/atom_feed.erb
+- spec/data/site/templates/page.erb
+- spec/data/site/templates/presentation.erb
+- spec/data/site/templates/tumblog/conversation.erb
+- spec/data/site/templates/tumblog/link.erb
+- spec/data/site/templates/tumblog/photo.erb
+- spec/data/site/templates/tumblog/post.erb
+- spec/data/site/templates/tumblog/quote.erb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/webby/apps/generator_spec.rb
 - spec/webby/apps/main_spec.rb
+- spec/webby/filters/basepath_spec.rb
+- spec/webby/filters/outline_spec.rb
 - spec/webby/filters/textile_spec.rb
 - spec/webby/helpers/capture_helper_spec.rb
 - spec/webby/renderer_spec.rb