aerial 0.1.1 → 0.1.2

data/.gitignore

@@ -2,3 +2,4 @@ spec/repo
 coverage
 content
 pkg
+tmp/

data/aerial.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aerial}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Sears"]
@@ -52,10 +52,10 @@ Gem::Specification.new do |s|
      "features/support/env.rb",
      "features/support/pages/article.rb",
      "features/support/pages/homepage.rb",
-     "index.html",
      "lib/aerial.rb",
      "lib/aerial/app.rb",
      "lib/aerial/article.rb",
+     "lib/aerial/build.rb",
      "lib/aerial/base.rb",
      "lib/aerial/comment.rb",
      "lib/aerial/config.rb",

data/bin/aerial

@@ -2,4 +2,6 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 require 'rubygems'
 require File.dirname(__FILE__) + "/../lib/aerial/installer"
-Aerial::Installer.start
+require File.dirname(__FILE__) + "/../lib/aerial/build"
+#Aerial::Installer.start
+Aerial::Build.start

data/lib/aerial.rb

@@ -24,7 +24,7 @@ module Aerial
 
   # Make sure git is added to the env path
   ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin"
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   class << self
     attr_accessor :debug, :logger, :repo, :config
@@ -34,14 +34,19 @@ module Aerial
     @root   ||= root
     @logger ||= ::Logger.new(STDOUT)
     @debug  ||= false
-    @repo   ||= Grit::Repo.new(@root)
-    config  = File.join(root, config_name)
 
-    if config.is_a?(String) && File.file?(config)
-      @config = Aerial::Config.new(YAML.load_file(config))
-    elsif config.is_a?(Hash)
-      @config = Aerial::Config.new(config)
+    begin
+      @repo   ||= Grit::Repo.new(@root)
+      config  = File.join(root, config_name)
+      if config.is_a?(String) && File.file?(config)
+        @config = Aerial::Config.new(YAML.load_file(config))
+      elsif config.is_a?(Hash)
+        @config = Aerial::Config.new(config)
+      end
+    rescue Exception => e
+      # TODO: Display an error
     end
+
   end
 
   def self.log(str)

data/lib/aerial/app.rb

@@ -73,7 +73,6 @@ module Aerial
     post '/article/:id/comments' do
       @article = Aerial::Article.find(params[:id])
       throw :halt, [404, not_found ] unless @article
-
       comment = Aerial::Comment.new(params.merge!({:referrer    => request.referrer,
                                                    :user_agent  => request.user_agent,
                                                    :ip          => request.ip

data/lib/aerial/build.rb

@@ -0,0 +1,82 @@
+require "thor"
+require File.dirname(__FILE__) + "/../aerial"
+
+module Aerial
+
+  class Build < Thor
+    attr_reader :root
+    include FileUtils
+    include Thor::Actions
+
+    desc "build", "Build alls static files."
+    def build
+      # TODO: Need a better way to find the root
+      # @root = Pathname(File.dirname(__FILE__) + "/../../").expand_path
+      @root = Pathname(File.dirname('.')).expand_path
+      @site_path = "#{@root}/public/site"
+      Aerial.new(@root, "/config/config.yml")
+      Aerial::App.set :root, @root
+      @articles = Aerial::Article.all
+      @request = Rack::MockRequest.new(Aerial::App)
+      build_style_css
+      build_pages_html
+      build_articles_html
+      build_tags_html
+      build_archives_html
+      build_feed_xml
+    end
+
+    desc "build_style_css", "Build all css files."
+    def build_style_css
+      create_file "#{@site_path}/style.css" do
+        @request.request('get', '/style.css').body
+      end
+    end
+
+    desc "build_html", "Build all html files."
+    def build_pages_html
+
+      create_file "#{@site_path}/index.html" do
+        @request.request('get', '/').body
+      end
+
+      create_file "#{@site_path}/articles.html" do
+        @request.request('get', '/articles').body
+      end
+    end
+
+    desc "build_articles_html", "Build all the single article pages."
+    def build_articles_html
+      @articles.each do |article|
+        create_file "#{@site_path}/#{article.permalink}.html" do
+          @request.request('get', "#{article.permalink}").body
+        end
+      end
+    end
+
+    desc "build_tags_html", "Build all the tag pages"
+    def build_tags_html
+      Aerial::Article.tags.each do |tag|
+        create_file "#{@site_path}/tags/#{tag}.html" do
+          @request.request('get', "/tags/#{tag}").body
+        end
+      end
+    end
+
+    desc "build_archives_html", "Build all the archive pages"
+    def build_archives_html
+      Aerial::Article.archives.each do |archive|
+        create_file "#{@site_path}/archives/#{archive.first.first}.html" do
+          @request.request('get', "/archives/#{archive.first.first}").body
+        end
+      end
+    end
+
+    desc "build_feed_xml", "Build the feed rss xml"
+    def build_feed_xml
+      create_file "#{@site_path}/feed.xml" do
+        @request.request('get', "/feed.xml").body
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matt Sears
@@ -61,10 +61,10 @@ files:
 - features/support/env.rb
 - features/support/pages/article.rb
 - features/support/pages/homepage.rb
-- index.html
 - lib/aerial.rb
 - lib/aerial/app.rb
 - lib/aerial/article.rb
+- lib/aerial/build.rb
 - lib/aerial/base.rb
 - lib/aerial/comment.rb
 - lib/aerial/config.rb

data/index.html

@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html;charset=UTF-8"  />
-    <title>aerial</title>
-    <style type="text/css">
-      /* reset */
-      html, body, div, span, applet, object, iframe,
-      h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-      a, abbr, acronym, address, big, cite, code,
-      del, dfn, em, font, img, ins, kbd, q, s, samp,
-      small, strike, strong, sub, sup, tt, var,
-      dl, dt, dd, ul, li,
-      form, label, legend,
-      table, caption, tbody, tfoot, thead, tr, th, td {
-         margin: 0;
-         padding: 0;
-         border: 0;
-         outline: 0;
-         font-weight: inherit;
-         font-style: normal;
-         font-size: 100%;
-         font-family: inherit;
-         vertical-align: baseline;
-      }
-      :focus {
-         outline: 0;
-      }
-      body {
-         line-height: 1;
-            color: black;
-      background: white;
-      }
-      ul {
-         list-style: none;
-      }
-         table {
-         border-collapse: collapse;
-         border-spacing: 0;
-      }
-         caption, th, td {
-         text-align: left;
-         font-weight: normal;
-      }
-      blockquote:before, blockquote:after,
-         q:before, q:after {
-         content: "";
-      }
-      blockquote, q {
-         quotes: "" "";
-      }
-
-      /* styles */
-      body {
-         font-family: Verdana,Arial,sans-serif;
-         background: #f0f0f0;
-         color: #333;
-      }
-      #inset {
-         margin: 0 auto;
-         width: 860px;
-      }
-      #container {
-         background-color: #fff;
-         color: #000;
-         padding: 50px 100px;
-      }
-      p, h2 {
-         margin: 20px 0;
-      }
-      p {
-         line-height: 20px;
-      }
-      a {
-      color: #000;
-         text-decoration: none;
-         font-weight: bold;
-      }
-      a:hover {
-         color: #26B3CF;
-      }
-      h1 {
-         /* Hide generated title */
-         display: none;
-      }
-      h1.title {
-         display: block;
-         font-size: 3.8em;
-         margin-bottom: 3px;
-      }
-      h1.title .small {
-         font-size: 0.4em;
-      }
-      h1 a {
-         font-weight: normal;
-      }
-      h2 {
-         font-size: 1.5em;
-      }
-      li {
-         padding-bottom: 10px;
-      }
-      .ribbon {
-         float: right;
-      }
-      .description {
-         font-size: 1.2em;
-         margin-bottom: 30px;
-         margin-top: 30px;
-         font-style: italic;
-      }
-      pre {
-         background: #444;
-         color: #fff;
-         font-family:'Bitstream Vera Sans Mono','Courier',monospace;
-         padding: 15px;
-         -moz-border-radius: 5px;
-         -webkit-border-radius: 5px;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="inset">
-      <a href="http://github.com/mattsears/aerial">
-        <img class="ribbon" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
-      </a>
-      <div id="container">
-        <div class="description">
-          Aerial uses Git to store articles and pages.
-        </div>
-        <h1>Aerial</h1>
-        <p>Designed for Ruby developers, there is no admin interface and no SQL database. Articles are written in your favorite text editor and versioned with Git. Comments are also stored as plain-text files and pushed to the remote repository when created. It uses Grit (http://github.com/mojombo/grit) to interface with local and remote Git repositories.</p>
-        <h2>Installation</h2>
-
-        <p>via Rubygems:</p>
-        <pre><code>$ gem install aerial
-$ aerial install /home/user/myblog</code></pre>
-        <p>This will create a couple files and directories. Mainly, the views, public, and configuration files.  You may edit config.yml to your liking</p>
-        <p>The installer provides special configuration files for Thin and Passenger.</p>
-        <p>via Clone:</p>
-        <pre><code>$ git clone git://github.com/mattsears/aerial</code></pre>
-
-        <h2>Pasenger</h2>
-        <pre><code>$ aerial install /home/user/myblog --passenger
-$ cd /home/user/myblog</code></pre>
-        <p>Then, restart Passenger <b>$ touch tmp/restart.txt</b></p>
-        <h2>Thin</h2>
-        <p>Install Thin:</p>
-        <pre><code>$ gem install thin</code></pre>
-        <p>Run the installer:</p>
-        <pre><code>$ aerial install /home/user/myblog --thin
-$ cd /home/user/myblog</code></pre>
-        <p>Tweak the thin.yml</p>
-        <p>Start the thin server</p>
-        <pre><code>$ thin -C thin.yml -R config.ru start</code></pre>
-        <h2>Issues</h2>
-        <p>Find a bug? Want a feature? Submit an <a href="http://github.com/mattsears/aerial/issues">issue here</a>. Patches welcome!
-        </p
-      </div>
-    </div>
-  </body>
-</html>