aerial 0.0.0 → 0.1.0

data/.gitignore

@@ -1 +1,4 @@
-lib/spec/repo
+spec/repo
+coverage
+content
+pkg

data/README.md

@@ -23,52 +23,47 @@ Aerial is still in active development.
 * YAML configuration
 * 100% code coverage
 
-## Requirements #############################################################
+## Installation #############################################################
 
-* sinatra (for awesomeness)
-* git (http://git-scm.com)
-* grit (interface to git)
-* yaml (for configuration)
-* rdiscount (markdown-to-html)
-* Haml (can easily be switch to erb, or whatever)
-* jQuery (http://jquery.com)
+    $ gem install aerial
+    $ aerial install /home/user/myblog
+    # Navigate to <http://0.0.0.0:4567>
+
+This will create a new directory and a few files, mainly the views, config files, and a sample article to get you started. Then, edit config.yml to your liking.
 
-## Source ###################################################################
+## From Source ##############################################################
 
-Grit's Git repo is available on GitHub, which can be browsed at:
+Aerial's Git repo is available on GitHub, which can be browsed at:
 
     http://github.com/mattsears/aerial
 
 and cloned with:
 
-    git clone git://github.com/mattsears/aerial.git
-
-## Getting Started ###########################################################
-
-Install the following Rubygems:
-
-    sudo gem install sinatra rack thin rdiscount grit haml
+    $ git clone git://github.com/mattsears/aerial.git
+    $ rake launch
+    # Navigate to <http://0.0.0.0:4567>
 
-Add your custom settings to the configuration file:
-
-    config/config.yml
-
-Run the bootstrap Rake task to get started with a sample article
-
-    rake bootstrap
-
-Now open your browser to:
+## Requirements #############################################################
 
-    http://localhost:4567
+* sinatra (for awesomeness)
+* git (http://git-scm.com)
+* grit (interface to git)
+* yaml (for configuration)
+* rdiscount (markdown-to-html)
+* Haml (can easily be switch to erb, or whatever)
+* jQuery (http://jquery.com)
 
 ## Todo  #####################################################################
 
 * Enable/disable comments for an article.
 * Limit the number of comments for an article.
 * Improve bootstrap tasks
+* Add article limit setting to config.yml
+* Support atom feeds
+* Add support for including non article content (pages)
 * Add more details to this README
 
 ## License ###################################################################
 
 Aerial is Copyright © 2009 Matt Sears, Littlelines. It is free software,
-and may be redistributed under the terms specified in the MIT-LICENSE file.
+and may be redistributed under the terms specified in the MIT-LICENSE file.

data/Rakefile

@@ -1,73 +1,31 @@
-# $:.unshift(File.dirname(__FILE__) + '/../../../lib')
-
 require 'rubygems'
 require 'spec/version'
 require 'spec/rake/spectask'
-require 'cucumber/rake/task'
-
-AERIAL_ROOT = "."
-require File.join(AERIAL_ROOT, 'lib', 'aerial')
+require 'git'
+require 'grit'
+# TODO: refactor config file loading in base.rb
+require 'lib/aerial/config'
 
 # Rspec setup
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['lib/spec/**/*_spec.rb']
+  t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
 namespace :spec do
   desc "Run all specs with rcov"
   Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = FileList['lib/spec/**/*_spec.rb']
+    t.spec_files = FileList['spec/**/*_spec.rb']
     t.rcov = true
     t.rcov_dir = 'coverage'
     t.rcov_opts = ['--exclude',
-                   "lib/spec.rb,spec\/spec,bin\/spec,examples,\.autotest,#{ENV['GEM_HOME']}"]
-  end
-end
-
-desc "Setup the directory structure"
-task :bootstrap do
-  Rake::Task['setup:articles_directory'].invoke
-  Rake::Task['setup:views_directory'].invoke
-  Rake::Task['setup:public_directory'].invoke
-  Rake::Task['run'].invoke
-end
-
-desc 'Run Aerial in development mode'
-task :run do
-  exec "ruby lib/aerial.rb"
-end
-
-namespace :setup do
-
-  desc "Copy over a sample article"
-  task :articles_directory do
-    puts "* Creating article directory in " + Aerial.config.views.dir
-    article_dir = File.join(AERIAL_ROOT, 'lib','spec','fixtures',
-                            'articles', 'sample-article')
-    FileUtils.mkdir_p( Aerial.config.articles.dir )
-    FileUtils.cp_r(article_dir, Aerial.config.articles.dir )
-    Aerial::Git.commit(Aerial.config.articles.dir, "Initial import of first article")
-  end
-
-  task :public_directory do
-    puts "* Creating public directory in " + Aerial.config.public.dir
-    FileUtils.cp_r(File.join(AERIAL_ROOT, 'lib', 'spec',
-                             'fixtures', 'public'),
-                   Aerial.config.public.dir )
-  end
-
-  task :views_directory do
-    puts "* Creating views directory in " + Aerial.config.views.dir
-    FileUtils.cp_r(File.join(AERIAL_ROOT, 'lib', 'spec',
-                             'fixtures',  'views'),
-                   Aerial.config.views.dir )
+                   "lib/spec.rb,spec\/spec,bin\/spec,examples,\.autotest,#{Gem.path.join(',')}"]
   end
 end
 
-# Cucumber setup
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
+desc "Launch Aerial cartwheel"
+task :launch do
+  ruby "bin/aerial launch"
 end
 
 # Vlad setup
@@ -78,6 +36,17 @@ rescue LoadError
   # do nothing
 end
 
+desc "Build a gem"
+task :gem => [ :gemspec, :build ] do
+  command = "gem install --local ./pkg/aerial-0.1.0.gem"
+  sh command
+end
+
+desc "Build a gem"
+task :rdoc do
+  sh 'mkdir rdoc'
+  sh 'echo documentation is at http://github.com/mattsears/aerial > rdoc/README.rdoc'
+end
 
 begin
   require 'jeweler'
@@ -89,8 +58,14 @@ begin
     gemspec.homepage = "http://github.com/mattsears/aerial"
     gemspec.description = "A simple, blogish software build with Sinatra, jQuery, and uses Git for data storage"
     gemspec.authors = ["Matt Sears"]
+    gemspec.rubyforge_project = 'aerial'
+  end
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
+
+

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/aerial.gemspec

@@ -0,0 +1,134 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{aerial}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matt Sears"]
+  s.date = %q{2009-10-21}
+  s.default_executable = %q{aerial}
+  s.description = %q{A simple, blogish software build with Sinatra, jQuery, and uses Git for data storage}
+  s.email = %q{matt@mattsears.com}
+  s.executables = ["aerial"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "MIT-LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "aerial.gemspec",
+     "articles/congratulations/congratulations-aerial-is-configured-correctly.article",
+     "bin/aerial",
+     "config/config.sample.ru",
+     "config/config.sample.yml",
+     "config/config.test.yml",
+     "config/config.yml",
+     "config/deploy.rb",
+     "config/thin.sample.yml",
+     "examples/articles/congratulations/congratulations-aerial-is-configured-correctly.article",
+     "examples/public/javascripts/application.js",
+     "examples/public/javascripts/jquery-1.3.1.min.js",
+     "examples/public/javascripts/jquery.template.js",
+     "examples/views/article.haml",
+     "examples/views/articles.haml",
+     "examples/views/comment.haml",
+     "examples/views/home.haml",
+     "examples/views/layout.haml",
+     "examples/views/not_found.haml",
+     "examples/views/post.haml",
+     "examples/views/rss.haml",
+     "examples/views/sidebar.haml",
+     "examples/views/style.sass",
+     "features/article.feature",
+     "features/home.feature",
+     "features/step_definitions/article_steps.rb",
+     "features/step_definitions/home_steps.rb",
+     "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/base.rb",
+     "lib/aerial/comment.rb",
+     "lib/aerial/config.rb",
+     "lib/aerial/content.rb",
+     "lib/aerial/installer.rb",
+     "lib/aerial/vendor/akismetor.rb",
+     "lib/aerial/vendor/cache.rb",
+     "public/javascripts/application.js",
+     "public/javascripts/jquery-1.3.1.min.js",
+     "public/javascripts/jquery.template.js",
+     "spec/aerial_spec.rb",
+     "spec/app_spec.rb",
+     "spec/article_spec.rb",
+     "spec/base_spec.rb",
+     "spec/comment_spec.rb",
+     "spec/config_spec.rb",
+     "spec/fixtures/articles/congratulations-aerial-is-configured-correctly/congratulations-aerial-is-configured-correctly.article",
+     "spec/fixtures/articles/sample-article/sample-article.article",
+     "spec/fixtures/articles/test-article-one/test-article.article",
+     "spec/fixtures/articles/test-article-three/test-article.article",
+     "spec/fixtures/articles/test-article-two/comment-missing-fields.comment",
+     "spec/fixtures/articles/test-article-two/test-article.article",
+     "spec/fixtures/articles/test-article-two/test-comment.comment",
+     "spec/fixtures/config.yml",
+     "spec/fixtures/public/javascripts/application.js",
+     "spec/fixtures/public/javascripts/jquery-1.3.1.min.js",
+     "spec/fixtures/public/javascripts/jquery.template.js",
+     "spec/fixtures/views/article.haml",
+     "spec/fixtures/views/articles.haml",
+     "spec/fixtures/views/comment.haml",
+     "spec/fixtures/views/home.haml",
+     "spec/fixtures/views/layout.haml",
+     "spec/fixtures/views/not_found.haml",
+     "spec/fixtures/views/post.haml",
+     "spec/fixtures/views/rss.haml",
+     "spec/fixtures/views/sidebar.haml",
+     "spec/fixtures/views/style.sass",
+     "spec/spec_helper.rb",
+     "views/article.haml",
+     "views/articles.haml",
+     "views/comment.haml",
+     "views/home.haml",
+     "views/layout.haml",
+     "views/not_found.haml",
+     "views/post.haml",
+     "views/rss.haml",
+     "views/sidebar.haml",
+     "views/style.sass"
+  ]
+  s.homepage = %q{http://github.com/mattsears/aerial}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{aerial}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A simple, blogish software build with Sinatra, jQuery, and uses Git for data storage}
+  s.test_files = [
+    "spec/aerial_spec.rb",
+     "spec/app_spec.rb",
+     "spec/article_spec.rb",
+     "spec/base_spec.rb",
+     "spec/comment_spec.rb",
+     "spec/config_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/articles/congratulations/congratulations-aerial-is-configured-correctly.article

@@ -0,0 +1,6 @@
+Title           : Congratulations! Aerial is configured correctly
+Tags            : ruby, sinatra, git, aerial
+Publish Date    : 03/31/2009
+Author          : Aerial
+
+Congratulations! Aerial appears to be up and running. This is a sample article created during the bootstrap process.  You may overwrite this article or create a new one.

data/bin/aerial

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..')
+require 'rubygems'
+require File.dirname(__FILE__) + "/../lib/aerial/installer"
+Aerial::Installer.start

data/config/config.sample.ru

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "aerial"
+
+env  = ENV['RACK_ENV'].to_sym
+root = File.dirname(__FILE__)
+
+# Load configuration and initialize Aerial
+Aerial.new(root, "/config.yml")
+
+# You probably don't want to edit anything below
+Aerial::App.set :environment, ENV["RACK_ENV"] || :production
+Aerial::App.set :port, 4567
+Aerial::App.set :cache_enabled, env == :production ? true : false
+Aerial::App.set :cache_page_extension, '.html'
+Aerial::App.set :cache_output_dir, ''
+Aerial::App.set :root, root
+
+run Aerial::App

data/config/config.sample.yml

@@ -0,0 +1,29 @@
+# Title and Subtitle of the Site Aerail will be running
+title: "Aerial"
+subtitle: "Friendly "
+
+# Information about you
+name:  "Awesome Ruby Developer"
+author: "Not sure what this is for?"
+email:  "aerial@example.com"
+
+# This is where you articles are stored
+articles:
+  dir: "articles"
+
+# Images, stylesheets, javascripts, etc
+public:
+  dir: "public"
+
+# Pages
+views:
+  dir: "app/views"
+  default: "home"
+
+# Check for span when folks add comments to your blog
+akismet:
+  key: ""
+  url: ""
+
+# Path to the Aerial log file
+:log: /var/log/aerial.log

data/config/config.test.yml

@@ -0,0 +1,49 @@
+title: "Aerial"
+subtitle: "Articles, Pages, and Such"
+name:  "Aerial"
+author: "Awesome Ruby Developer"
+email:  "aerial@example.com"
+
+# You can add any meta element pairs here
+# name => content 
+meta:
+  description: "describe this site"
+  keywords: "aerial,git,sinatra,jquery"
+
+public:
+  dir: "public"
+
+views:
+  dir: "app/views"
+  default: "home"
+
+# Content repository
+git:
+  url: "git://github.com/jrobeson/aerial-sample-content.git"
+  path: "spec/repo"
+  name: "origin"
+  branch: "master"
+
+# If you want to add synchronizing via Github post-receive hooks,
+# insert some secure password here. Then set a "Post-Receive URL"
+# in Github administration to http://{YOUR SERVER}/sync?token={WHAT YOU SET BELOW}
+github_token: ~
+
+# Akismet spam protection. Get your key at http://akismet.com 
+akismet:
+  key: ""
+  url: ""
+
+# http://antispam.typepad.com/info/developers.html
+typekey_antispam:
+  key: ""
+  url: ""
+
+# You should not need to modify anything below this line
+
+# Directory where articles are stored inside your content repository
+articles:
+  dir: "articles"
+env:
+  # Path to git or other required executables (separated by colons)
+  path: ""