monad 0.0.2 → 0.0.3

data/{README.md → README.markdown}

@@ -12,6 +12,9 @@ The main feature it adds is as follows:
 Data Source enables you to load data from external sources, such as web, file system,
 databases and then use them inside views.
 
+Note that Jekyll now automatically load yaml files under `_data` directory.
+You're recommended to use that [feature](https://github.com/mojombo/jekyll/pull/1003)) unless it can't fulfill your requirements.
+
 Monad supports two built-in data sources:
 
 - `YAML` from local file system
@@ -44,7 +47,7 @@ To define a yaml data source, set following in `_config.yml` file:
 data_sources:
   - name: products # will be used as site.products to access data, no spaces allowed
     type: yaml
-    path: _data/products.yml # must be on local file system
+    path: _database/products.yml # must be on local file system
 ```
 
 Then, inside html you can access the data as following:
@@ -58,7 +61,7 @@ Then, inside html you can access the data as following:
 The skeleton of your driver should be as follows:
 
 ``` ruby
-module Monad
+module Jekyll
   module Drivers
     class XxxDriver
       # source options are passed in as an Hash

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rdoc'
 require 'date'
+require 'yaml'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
 
@@ -24,6 +25,10 @@ def date
   Date.today.to_s
 end
 
+def file_date
+  Date.today.strftime("%F")
+end
+
 def rubyforge_project
   name
 end
@@ -40,13 +45,53 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
+def normalize_bullets(markdown)
+  markdown.gsub(/\s{2}\*{1}/, "-")
+end
+
+def linkify_prs(markdown)
+  markdown.gsub(/#(\d+)/) do |word|
+    "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
+  end
+end
+
+def linkify_users(markdown)
+  markdown.gsub(/(@\w+)/) do |username|
+    "[#{username}](https://github.com/#{username.delete("@")})"
+  end
+end
+
+def linkify(markdown)
+  linkify_users(linkify_prs(markdown))
+end
+
+def liquid_escape(markdown)
+  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
+end
+
+def remove_head_from_history(markdown)
+  index = markdown =~ /^##\s+\d+\.\d+\.\d+/
+  markdown[index..-1]
+end
+
+def converted_history(markdown)
+  remove_head_from_history(liquid_escape(linkify(normalize_bullets(markdown))))
+end
+
 #############################################################################
 #
 # Standard tasks
 #
 #############################################################################
 
-task :default => [:test, :features]
+if RUBY_VERSION > '1.9' && ENV["TRAVIS"] == "true"
+  require 'coveralls/rake/task'
+  Coveralls::RakeTask.new
+
+  task :default => [:test, :features, 'coveralls:push']
+else
+  task :default => [:test, :features]
+end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -83,6 +128,123 @@ task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"
 end
 
+#############################################################################
+#
+# Site tasks - http://jekyllrb.com
+#
+#############################################################################
+
+namespace :site do
+  desc "Generate and view the site locally"
+  task :preview do
+    require "launchy"
+
+    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
+    # then open it in a browser. Someday we can do better than this, I hope.
+    Thread.new do
+      sleep 4
+      puts "Opening in browser..."
+      Launchy.open("http://localhost:4000")
+    end
+
+    # Generate the site in server mode.
+    puts "Running Jekyll..."
+    Dir.chdir("site") do
+      sh "#{File.expand_path('bin/jekyll', File.dirname(__FILE__))} serve --watch"
+    end
+  end
+
+  desc "Update normalize.css library to the latest version and minify"
+  task :update_normalize_css do
+    Dir.chdir("site/css") do
+      sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
+      sh 'sass "normalize.scss":"normalize.css" --style compressed'
+      sh 'rm "normalize.scss"'
+    end
+  end
+
+  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+  task :publish => [:history] do
+    # Ensure the gh-pages dir exists so we can generate into it.
+    puts "Checking for gh-pages dir..."
+    unless File.exist?("./gh-pages")
+      puts "No gh-pages directory found. Run the following commands first:"
+      puts "  `git clone git@github.com:mojombo/jekyll gh-pages"
+      puts "  `cd gh-pages"
+      puts "  `git checkout gh-pages`"
+      exit(1)
+    end
+
+    # Ensure gh-pages branch is up to date.
+    Dir.chdir('gh-pages') do
+      sh "git pull origin gh-pages"
+    end
+
+    # Copy to gh-pages dir.
+    puts "Copying site to gh-pages branch..."
+    Dir.glob("site/*") do |path|
+      next if path.include? "_site"
+      sh "cp -R #{path} gh-pages/"
+    end
+
+    # Commit and push.
+    puts "Committing and pushing to GitHub Pages..."
+    sha = `git log`.match(/[a-z0-9]{40}/)[0]
+    Dir.chdir('gh-pages') do
+      sh "git add ."
+      sh "git commit -m 'Updating to #{sha}.'"
+      sh "git push origin gh-pages"
+    end
+    puts 'Done.'
+  end
+
+  desc "Create a nicely formatted history page for the jekyll site based on the repo history."
+  task :history do
+    if File.exist?("History.markdown")
+      history_file = File.read("History.markdown")
+      front_matter = {
+        "layout" => "docs",
+        "title" => "History",
+        "permalink" => "/docs/history/",
+        "prev_section" => "contributing"
+      }
+      Dir.chdir('site/docs/') do
+        File.open("history.md", "w") do |file|
+          file.write("#{front_matter.to_yaml}---\n\n")
+          file.write(converted_history(history_file))
+        end
+      end
+    else
+      abort "You seem to have misplaced your History.markdown file. I can haz?"
+    end
+  end
+  
+  namespace :releases do
+    desc "Create new release post"
+    task :new, :version do |t, args|
+      raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
+      today = Time.new.strftime('%Y-%m-%d')
+      release = args.version.to_s
+      filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
+
+      File.open(filename, "wb") do |post|
+        post.puts("---")
+        post.puts("layout: news_item")
+        post.puts("title: 'Jekyll #{release} Released'")
+        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
+        post.puts("author: ")
+        post.puts("version: #{version}")
+        post.puts("categories: [release]")
+        post.puts("---")
+        post.puts
+        post.puts
+      end
+
+      puts "Created #{filename}"
+    end
+  end
+end
+
 #############################################################################
 #
 # Packaging tasks

data/bin/monad

@@ -4,24 +4,24 @@ STDOUT.sync = true
 $:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
 
 require 'commander/import'
-require 'monad'
+require 'jekyll'
 
-Monad::Deprecator.process(ARGV)
+Jekyll::Deprecator.process(ARGV)
 
 program :name, 'monad'
-program :version, Monad::VERSION
-program :description, 'Monad is a blog-aware, static site generator in Ruby based on jekyll'
+program :version, Jekyll::VERSION
+program :description, 'Monad is a simple, blog aware, static site generator based on Jekyll'
 
-default_command :help
+default_command :default
 
 global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
 global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
 global_option '--safe', 'Safe mode (defaults to false)'
-global_option '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
-global_option '--layouts', 'Layouts directory (defaults to ./_layouts)'
+global_option '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
+global_option '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
 
 # Option names don't always directly match the configuration value we'd like.
-# This method will rename options to match what Monad configuration expects.
+# This method will rename options to match what Jekyll configuration expects.
 #
 # options - The Hash of options from Commander.
 #
@@ -33,12 +33,35 @@ def normalize_options(options)
   options
 end
 
+def add_build_options(c)
+  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+  c.option '--future', 'Publishes posts with a future date'
+  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
+  c.option '-w', '--watch', 'Watch for changes and rebuild'
+  c.option '--lsi', 'Use LSI for improved related posts'
+  c.option '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option '-v', '--verbose', 'Print verbose output.'
+end
+
+command :default do |c|
+  c.action do |args, options|
+    if args.empty?
+      command(:help).run
+    else
+      Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+    end
+  end
+end
+
 command :new do |c|
   c.syntax = 'monad new PATH'
   c.description = 'Creates a new Monad site scaffold in PATH'
 
+  c.option '--force', 'Force creation even if PATH already exists'
+  c.option '--blank', 'Creates scaffolding but with empty files'
+
   c.action do |args, options|
-    Monad::Commands::New.process(args)
+    Jekyll::Commands::New.process(args, options.__hash__)
   end
 end
 
@@ -46,17 +69,12 @@ command :build do |c|
   c.syntax = 'monad build [options]'
   c.description = 'Build your site'
 
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-  c.option '--future', 'Publishes posts with a future date'
-  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-  c.option '-w', '--watch', 'Watch for changes and rebuild'
-  c.option '--lsi', 'Use LSI for improved related posts'
-  c.option '--drafts', 'Render posts in the _drafts folder'
+  add_build_options(c)
 
   c.action do |args, options|
     options = normalize_options(options.__hash__)
-    options = Monad.configuration(options)
-    Monad::Commands::Build.process(options)
+    options = Jekyll.configuration(options)
+    Jekyll::Commands::Build.process(options)
   end
 end
 
@@ -64,24 +82,20 @@ command :serve do |c|
   c.syntax = 'monad serve [options]'
   c.description = 'Serve your site locally'
 
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-  c.option '--future', 'Publishes posts with a future date'
-  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-  c.option '-w', '--watch', 'Watch for changes and rebuild'
-  c.option '--lsi', 'Use LSI for improved related posts'
-  c.option '--drafts', 'Render posts in the _drafts folder'
+  add_build_options(c)
 
-  c.option '-p', '--port [PORT]', 'Port to listen on'
-  c.option '-h', '--host [HOST]', 'Host to bind to'
+  c.option '-B', '--detach', 'Run the server in the background (detach)'
+  c.option '-P', '--port [PORT]', 'Port to listen on'
+  c.option '-H', '--host [HOST]', 'Host to bind to'
   c.option '-b', '--baseurl [URL]', 'Base URL'
 
   c.action do |args, options|
     options.default :serving => true
 
     options = normalize_options(options.__hash__)
-    options = Monad.configuration(options)
-    Monad::Commands::Build.process(options)
-    Monad::Commands::Serve.process(options)
+    options = Jekyll.configuration(options)
+    Jekyll::Commands::Build.process(options)
+    Jekyll::Commands::Serve.process(options)
   end
 end
 alias_command :server, :serve
@@ -94,9 +108,51 @@ command :doctor do |c|
 
   c.action do |args, options|
     options = normalize_options(options.__hash__)
-    options = Monad.configuration(options)
-    Monad::Commands::Doctor.process(options)
+    options = Jekyll.configuration(options)
+    Jekyll::Commands::Doctor.process(options)
   end
 end
 alias_command :hyde, :doctor
 
+command :docs do |c|
+  c.syntax = 'monad docs'
+  c.description = "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
+
+  c.option '-p', '--port [PORT]', 'Port to listen on'
+  c.option '-u', '--host [HOST]', 'Host to bind to'
+
+  c.action do |args, options|
+    options = normalize_options(options.__hash__)
+    options = Jekyll.configuration(options.merge!({
+      'source' => File.expand_path("../site", File.dirname(__FILE__)),
+      'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
+    }))
+    puts options
+    Jekyll::Commands::Build.process(options)
+    Jekyll::Commands::Serve.process(options)
+  end
+end
+
+command :import do |c|
+  c.syntax = 'monad import <platform> [options]'
+  c.description = 'Import your old blog to Monad'
+
+  c.option '--source STRING', 'Source file or URL to migrate from'
+  c.option '--file STRING', 'File to migrate from'
+  c.option '--dbname STRING', 'Database name to migrate from'
+  c.option '--user STRING', 'Username to use when migrating'
+  c.option '--pass STRING', 'Password to use when migrating'
+  c.option '--host STRING', 'Host address to use when migrating'
+
+  c.action do |args, options|
+    begin
+      require 'jekyll-import'
+    rescue LoadError
+      msg  = "You must install the 'jekyll-import' gem before continuing.\n"
+      msg += "* Do this by running `gem install jekyll-import`.\n"
+      msg += "* Or if you need root privileges, run `sudo gem install jekyll-import`."
+      abort msg
+    end
+    Jekyll::Commands::Import.process(args.first, options)
+  end
+end

data/features/create_sites.feature

@@ -3,9 +3,16 @@ Feature: Create sites
   I want to be able to make a static site
   In order to share my awesome ideas with the interwebs
 
+  Scenario: Blank site
+    Given I do not have a "test_blank" directory
+    When I call jekyll new with test_blank --blank
+    Then the test_blank/_layouts directory should exist
+    And the test_blank/_posts directory should exist
+    And the "test_blank/index.html" file should exist
+
   Scenario: Basic site
     Given I have an "index.html" file that contains "Basic Site"
-    When I run monad
+    When I run jekyll
     Then the _site directory should exist
     And I should see "Basic Site" in "_site/index.html"
 
@@ -13,8 +20,8 @@ Feature: Create sites
     Given I have a _posts directory
     And I have the following post:
       | title   | date      | content          |
-      | Hackers | 3/27/2009 | My First Exploit |
-    When I run monad
+      | Hackers | 2009-03-27 | My First Exploit |
+    When I run jekyll
     Then the _site directory should exist
     And I should see "My First Exploit" in "_site/2009/03/27/hackers.html"
 
@@ -22,7 +29,7 @@ Feature: Create sites
     Given I have a _layouts directory
     And I have an "index.html" page with layout "default" that contains "Basic Site with Layout"
     And I have a default layout that contains "Page Layout: {{ content }}"
-    When I run monad
+    When I run jekyll
     Then the _site directory should exist
     And I should see "Page Layout: Basic Site with Layout" in "_site/index.html"
 
@@ -31,9 +38,20 @@ Feature: Create sites
     And I have a _posts directory
     And I have the following posts:
       | title    | date      | layout  | content                               |
-      | Wargames | 3/27/2009 | default | The only winning move is not to play. |
+      | Wargames | 2009-03-27 | default | The only winning move is not to play. |
     And I have a default layout that contains "Post Layout: {{ content }}"
-    When I run monad
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
+
+  Scenario: Basic site with layout inside a subfolder and a post
+    Given I have a _layouts directory
+    And I have a _posts directory
+    And I have the following posts:
+      | title    | date      | layout  | content                               |
+      | Wargames | 2009-03-27 | post/simple | The only winning move is not to play. |
+    And I have a post/simple layout that contains "Post Layout: {{ content }}"
+    When I run jekyll
     Then the _site directory should exist
     And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
 
@@ -49,14 +67,14 @@ Feature: Create sites
     And I have a _posts directory
     And I have the following posts:
       | title     | date      | layout  | content                                |
-      | entry1    | 3/27/2009 | post    | content for entry1.                    |
-      | entry2    | 4/27/2009 | post    | content for entry2.                    |
+      | entry1    | 2009-03-27 | post    | content for entry1.                    |
+      | entry2    | 2009-04-27 | post    | content for entry2.                    |
     And I have a category/_posts directory
     And I have the following posts in "category":
       | title     | date      | layout  | content                                |
-      | entry3    | 5/27/2009 | post    | content for entry3.                    |
-      | entry4    | 6/27/2009 | post    | content for entry4.                    |
-    When I run monad
+      | entry3    | 2009-05-27 | post    | content for entry3.                    |
+      | entry4    | 2009-06-27 | post    | content for entry4.                    |
+    When I run jekyll
     Then the _site directory should exist
     And I should see "Page : Site contains 2 pages and 4 posts" in "_site/index.html"
     And I should see "No replacement \{\{ site.posts.size \}\}" in "_site/about.html"
@@ -70,28 +88,28 @@ Feature: Create sites
   Scenario: Basic site with include tag
     Given I have a _includes directory
     And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
-    And I have an "_includes/about.textile" file that contains "Generated by Monad"
-    When I run monad
+    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
+    When I run jekyll
     Then the _site directory should exist
-    And I should see "Basic Site with include tag: Generated by Monad" in "_site/index.html"
+    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
 
   Scenario: Basic site with subdir include tag
     Given I have a _includes directory
-    And I have an "_includes/about.textile" file that contains "Generated by Monad"
+    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
     And I have an info directory
     And I have an "info/index.html" page that contains "Basic Site with subdir include tag: {% include about.textile %}"
-    When I run monad
+    When I run jekyll
     Then the _site directory should exist
-    And I should see "Basic Site with subdir include tag: Generated by Monad" in "_site/info/index.html"
+    And I should see "Basic Site with subdir include tag: Generated by Jekyll" in "_site/info/index.html"
 
   Scenario: Basic site with nested include tag
     Given I have a _includes directory
-    And I have an "_includes/about.textile" file that contains "Generated by {% include monad.textile %}"
-    And I have an "_includes/monad.textile" file that contains "Monad"
+    And I have an "_includes/about.textile" file that contains "Generated by {% include jekyll.textile %}"
+    And I have an "_includes/jekyll.textile" file that contains "Jekyll"
     And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
-    When I run monad
+    When I run jekyll
     Then the _site directory should exist
-    And I should see "Basic Site with include tag: Generated by Monad" in "_site/index.html"
+    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
 
   Scenario: Basic site with internal post linking
     Given I have an "index.html" page that contains "URL: {% post_url 2020-01-31-entry2 %}"
@@ -99,14 +117,25 @@ Feature: Create sites
     And I have a _posts directory
     And I have the following posts:
       | title     | date       | layout  | content                                |
-      | entry1    | 12/31/2007 | post    | content for entry1.                    |
-      | entry2    | 01/31/2020 | post    | content for entry2.                    |
-    When I run monad
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+      | entry2    | 2020-01-31 | post    | content for entry2.                    |
+    When I run jekyll
     Then the _site directory should exist
     And I should see "URL: /2020/01/31/entry2/" in "_site/index.html"
 
   Scenario: Basic site with whitelisted dotfile
     Given I have an ".htaccess" file that contains "SomeDirective"
-    When I run monad
+    When I run jekyll
     Then the _site directory should exist
     And I should see "SomeDirective" in "_site/.htaccess"
+
+  Scenario: File was replaced by a directory
+    Given I have a "test" file that contains "some stuff"
+    When I run jekyll
+    Then the _site directory should exist
+    When I delete the file "test"
+    Given I have a test directory
+    And I have a "test/index.html" file that contains "some other stuff"
+    When I run jekyll
+    Then the _site/test directory should exist
+    And I should see "some other stuff" in "_site/test/index.html"