webby 0.9.3 → 0.9.4

data/examples/website/content/css/blueprint/src/typography.css

@@ -0,0 +1,105 @@
+/* -------------------------------------------------------------- 
+   
+   typography.css
+   * Sets up some sensible default typography.
+   
+-------------------------------------------------------------- */
+
+/* Default font settings. 
+   The font-size percentage is of 16px. (0.75 * 16px = 12px) */
+body { 
+  font-size: 75%;
+  color: #222; 
+  background: #fff;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+
+/* Headings
+-------------------------------------------------------------- */
+
+h1,h2,h3,h4,h5,h6 { font-weight: normal; color: #111; }
+
+h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; }
+h2 { font-size: 2em; margin-bottom: 0.75em; }
+h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; }
+h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
+h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
+h6 { font-size: 1em; font-weight: bold; }
+
+h1 img, h2 img, h3 img, 
+h4 img, h5 img, h6 img {
+  margin: 0;
+}
+
+
+/* Text elements
+-------------------------------------------------------------- */
+
+p           { margin: 0 0 1.5em; }
+p img.left  { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
+p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; }
+
+a:focus, 
+a:hover     { color: #000; }
+a           { color: #009; text-decoration: underline; }
+
+blockquote  { margin: 1.5em; color: #666; font-style: italic; }
+strong      { font-weight: bold; }
+em,dfn      { font-style: italic; }
+dfn         { font-weight: bold; }
+sup, sub    { line-height: 0; }
+
+abbr, 
+acronym     { border-bottom: 1px dotted #666; }
+address     { margin: 0 0 1.5em; font-style: italic; }
+del         { color:#666; }
+
+pre 				{ margin: 1.5em 0; white-space: pre; }
+pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
+
+
+/* Lists
+-------------------------------------------------------------- */
+
+li ul, 
+li ol       { margin:0 1.5em; }
+ul, ol      { margin: 0 1.5em 1.5em 1.5em; }
+
+ul          { list-style-type: disc; }
+ol          { list-style-type: decimal; }
+
+dl          { margin: 0 0 1.5em 0; }
+dl dt       { font-weight: bold; }
+dd          { margin-left: 1.5em;}
+
+
+/* Tables
+-------------------------------------------------------------- */
+
+table       { margin-bottom: 1.4em; width:100%; }
+th          { font-weight: bold; }
+thead th 		{ background: #c3d9ff; }
+th,td,caption { padding: 4px 10px 4px 5px; }
+tr.even td  { background: #e5ecf9; }
+tfoot       { font-style: italic; }
+caption     { background: #eee; }
+
+
+/* Misc classes
+-------------------------------------------------------------- */
+
+.small      { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
+.large      { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; }
+.hide       { display: none; }
+
+.quiet      { color: #666; }
+.loud       { color: #000; }
+.highlight  { background:#ff0; }
+.added      { background:#060; color: #fff; }
+.removed    { background:#900; color: #fff; }
+
+.first      { margin-left:0; padding-left:0; }
+.last       { margin-right:0; padding-right:0; }
+.top        { margin-top:0; padding-top:0; }
+.bottom     { margin-bottom:0; padding-bottom:0; }

data/examples/website/layouts/default.txt

@@ -12,8 +12,11 @@ filter:    erb
    <meta name="author" content="<%= @page.author %>" />
 
    <!--- Blueprint CSS Framework -->
-   <link rel="stylesheet" href="/css/blueprint/screen.css" type="text/css" media="screen, projection" />
-   <link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print" />
+   <link rel="stylesheet" href="/css/blueprint/screen.css" type="text/css" media="screen, projection">
+   <link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
+   <!--[if IE]>
+      <link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
+   <![endif]-->
 
    <!-- CodeRay syntax highlighting CSS -->
    <link rel="stylesheet" href="/css/coderay.css" type="text/css" />

data/lib/webby.rb

@@ -2,15 +2,19 @@
 # Used to prevent the spec helper from being loaded more than once
 unless defined? ::Webby
 
-require 'rubygems'
-require 'logging'
-require 'ostruct'
+begin
+  require 'logging'
+  require 'loquacious'
+rescue LoadError
+  retry if require 'rubygems'
+  raise
+end
 require 'date'
 
 module Webby
 
   # :stopdoc:
-  VERSION = '0.9.3'   # :nodoc:
+  VERSION = '0.9.4'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   YAML_SEP = '---'
@@ -19,99 +23,13 @@ module Webby
   class Error < StandardError; end  # :nodoc:
 
   # call-seq:
-  #    Webby.site    => struct
+  #    Webby.site    => configuration
   #
-  # Returns a struct containing the configuration parameters for the 
-  # Webby site. These defaults should be overridden as needed in the
-  # site specific Rakefile.
+  # Returns the configuration parameters for the Webby site. These defaults
+  # should be overridden as needed in the site specific Rakefile.
   #
   def self.site
-    return @site if defined? @site
-    @site = OpenStruct.new(
-      :output_dir    => 'output',
-      :content_dir   => 'content',
-      :layout_dir    => 'layouts',
-      :template_dir  => 'templates',
-      :exclude       => %w(tmp$ bak$ ~$ CVS \.svn),
-      :page_defaults => {
-        'layout'     => 'default'
-      },
-      :find_by       => 'title',
-      :base          => nil,
-      :create_mode   => 'page',
-      :blog_dir      => 'blog',
-      :tumblog_dir   => 'tumblog',
-
-      # Items for running the heel webserver
-      :use_web_server => true,
-      :heel_port      => 4331,
-
-      # Items used to deploy the website
-      :user       => ENV['USER'] || ENV['USERNAME'],
-      :host       => 'example.com',
-      :remote_dir => '/not/a/valid/dir',
-      :rsync_args => %w(-av),
-
-      # Global options for HAML and SASS
-      :haml_options => {},
-      :sass_options => {},
-
-      # Options passed to the 'tidy' program when the tidy filter is used
-      :tidy_options => '-indent -wrap 80',
-
-      # List of valid URIs (these automatically pass validation)
-      :valid_uris => [],
-
-      # Options for coderay processing
-      :coderay => {
-        :lang => :ruby,
-        :line_numbers => nil,
-        :line_number_start => 1,
-        :bold_every => 10,
-        :tab_width => 8
-      },
-
-      # Options for graphviz processing
-      :graphviz => {
-        :path => nil,
-        :cmd => 'dot',
-        :type => 'png'
-      },
-
-      # Options for tex2img processing
-      :tex2img => {
-        :path => nil,
-        :type => 'png',
-        :bg => 'white',
-        :fg => 'black',
-        :resolution => '150x150'
-      },
-
-      # Options for ultraviolet syntax highlighting
-      :uv => {
-        :lang => 'ruby',
-        :line_numbers => false,
-        :theme => 'mac_classic'
-      },
-
-      # XPath identifiers used by the basepath filter
-      :xpaths => %w(
-          /html/head//base[@href]
-          /html/head//link[@href]
-          //script[@src]
-          /html/body[@background]
-          /html/body//a[@href]
-          /html/body//object[@data]
-          /html/body//img[@src]
-          /html/body//area[@href]
-          /html/body//form[@action]
-          /html/body//input[@src]
-      )
-      # other possible XPaths to include for base path substitution
-      #   /html/body//object[@usemap]
-      #   /html/body//img[@usemap]
-      #   /html/body//input[@usemap]
-    )
+    Loquacious.configuration_for :webby
   end
 
   # call-seq
@@ -126,16 +44,21 @@ module Webby
   end
 
   # call-seq:
-  #    Webby.editor    => string or nil
+  #    Webby.exec_editor( *args )
   #
-  # Returns the default editor to use when creating new pages. This editor
-  # will be spawned to allow the user to edit the newly created page.
+  # Calls the editor set in the Sitefile or in the environment variables
+  # WEBBY_EDITOR or EDITOR (in that order). This method will do nothing if
+  # the editor has not been set.
   #
-  def self.editor
-    return @editor if defined? @editor
-
-    @editor = if ENV['EDITOR'].nil? or ENV['EDITOR'].empty? then nil
-              else ENV['EDITOR'] end
+  def self.exec_editor( *args )
+    unless defined? @editor
+      @editor = (site.editor.nil? or site.editor.empty?) ? nil : site.editor
+      @editor = @editor.split if @editor
+    end
+    return if @editor.nil?
+
+    args = [@editor, args].flatten
+    exec(*args)
   end
 
   # call-seq:
@@ -192,6 +115,17 @@ module Webby
     Logging::Logger['Webby'].warn msg
   end
 
+  # Scan the <code>layouts/</code> folder and the <code>content/</code>
+  # folder and create a new Resource object for each file found there.
+  #
+  def self.load_files
+    ::Find.find(site.layout_dir, site.content_dir) do |path|
+      next unless test ?f, path
+      next if path =~ ::Webby.exclude
+      Resources.new path
+    end
+  end
+
 end  # module Webby
 
 

data/lib/webby/apps/generator.rb

@@ -190,7 +190,7 @@ class Generator
     src = template / file
     dst = site / file
 
-    if test(?e, dst) 
+    if test(?e, dst)
       if identical?(src, dst)
         identical(dst)
         return
@@ -229,7 +229,7 @@ class Generator
   def site_files
     exclude = %r/tmp$|bak$|~$|CVS|\.svn/o
 
-    rgxp = %r/\A#{template}\/?/o
+    rgxp = %r/\A#{template}\/?/
     paths = Hash.new {|h,k| h[k] = []}
 
     Find.find(template) do |p|

data/lib/webby/apps/main.rb

@@ -19,6 +19,7 @@ class Main
   def initialize
     @stdout = $stdout
     @cmd_line_options = {}
+    @command = %w[rake]
   end
 
   # Runs the main webby application. The command line arguments are passed
@@ -30,7 +31,7 @@ class Main
 
     parse args
     init args
-    rake
+    self.__send__(*@command)
   end
 
   # Parse the command line _args_ for options and commands to invoke.
@@ -46,6 +47,10 @@ class Main
       next unless desired_opts.include?(options.first)
       opts.on(*options)
     end
+    opts.on('-o', '--options [PATTERN]',
+            'Show configuration options (matching optional pattern), then exit.') { |value|
+      @command = [:show_options, value]
+    }
 
     opts.separator ''
     opts.separator 'autobuild options:'
@@ -115,6 +120,32 @@ class Main
     app.top_level
   end
 
+  # Print the available configuration options.
+  #
+  def show_options( attribute = nil )
+    app.init 'webby'
+    app.load_rakefile
+
+    desc = <<-__
+      The following options can be used to control Webby functionality.
+      Options are configured in the 'Sitefile'. A few examples are shown below:
+      |
+      |   SITE.create_mode = 'directory'
+      |   SITE.base        = 'http://www.example.com'
+      |   SITE.uv.theme    = 'twilight'
+      |
+      =======< OPTIONS >=======
+      |
+    __
+    
+    @stdout.puts desc.gutter!
+    help = Loquacious.help_for(
+      :webby, :io => @stdout, :colorize => ENV.key?('TERM')
+    )
+    help.show attribute, :values => true
+    @stdout.puts
+  end
+
   # Return the Rake application object.
   #
   def app
@@ -155,7 +186,10 @@ class Main
   end
 
   def capture_command_line_args(args)
-    args = OpenStruct.new(:raw => args)
+    args = OpenStruct.new(
+      :raw  => args,
+      :rake => ARGV.dup
+    )
 
     if args.raw.size > 1
       ::Webby.deprecated "multiple arguments used for page title",
@@ -192,64 +226,4 @@ class Main
 end  # class Main
 end  # module Webby::Apps
 
-# :stopdoc:
-# Monkey patches so that rake displays the correct application name in the
-# help messages.
-#
-class Rake::Application
-  def display_prerequisites
-    tasks.each do |t|
-      puts "#{name} #{t.name}"
-      t.prerequisites.each { |pre| puts "    #{pre}" }
-    end
-  end
-
-  def display_tasks_and_comments
-    displayable_tasks = tasks.select { |t|
-      t.comment && t.name =~ options.show_task_pattern
-    }
-    if options.full_description
-      displayable_tasks.each do |t|
-        puts "#{name} #{t.name_with_args}"
-        t.full_comment.split("\n").each do |line|
-          puts "    #{line}"
-        end
-        puts
-      end
-    else
-      width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
-      max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
-      displayable_tasks.each do |t|
-        printf "#{name} %-#{width}s  # %s\n",
-          t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
-      end
-    end
-  end
-
-  # Provide standard execption handling for the given block.
-  def standard_exception_handling
-    begin
-      yield
-    rescue SystemExit => ex
-      # Exit silently with current status
-      exit(ex.status)
-    rescue SystemExit, OptionParser::InvalidOption => ex
-      # Exit silently
-      exit(1)
-    rescue Exception => ex
-      # Exit with error message
-      $stderr.puts "#{name} aborted!"
-      $stderr.puts ex.message
-      if options.trace
-        $stderr.puts ex.backtrace.join("\n")
-      else
-        $stderr.puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
-        $stderr.puts "(See full trace by running task with --trace)"
-      end
-      exit(1)
-    end
-  end
-end  # class Rake::Application
-# :startdoc:
-
 # EOF

data/lib/webby/auto_builder.rb

@@ -34,7 +34,7 @@ class AutoBuilder
     @logger = Logging::Logger[self]
 
     @builder = Builder.new
-    @builder.load_files
+    ::Webby.load_files
 
     @watcher = DirectoryWatcher.new '.', :interval => 2
     @watcher.add_observer self
@@ -89,7 +89,7 @@ class AutoBuilder
     if @web_server
       @web_server.start
       sleep 0.25
-      Launchy.open("http://localhost:#{::Webby.site.heel_port}")
+      Launchy.open("http://localhost:#{::Webby.site.web_port}")
     end
 
     @watcher.join
@@ -111,7 +111,7 @@ class AutoBuilder
       @running = false
       @server = WEBrick::HTTPServer.new(
         :BindAddress   => 'localhost',
-        :Port          => ::Webby.site.heel_port,
+        :Port          => ::Webby.site.web_port,
         :DocumentRoot  => ::Webby.site.output_dir,
         :FancyIndexing => true,
         :Logger        => logger,