tigefa 1.1.2 → 1.1.3

data/History.markdown

@@ -10,150 +10,6 @@
 
 ### Site Enhancements
 
-## 1.4.3 / 2014-01-13
-
-### Bug Fixes
-
-  * Patch show-stopping security vulnerabilities (#1944)
-
-## 1.4.2 / 2013-12-16
-
-### Bug Fixes
-  * Turn on Maruku fenced code blocks by default (#1830)
-
-## 1.4.1 / 2013-12-09
-
-### Bug Fixes
-  * Don't allow nil entries when loading posts (#1796)
-
-## 1.4.0 / 2013-12-07
-
-### Major Enhancements
-  * Add support for TOML config files (#1765)
-
-### Minor Enhancements
-  * Sort plugins as a way to establish a load order (#1682)
-  * Update Maruku to 0.7.0 (#1775)
-
-### Bug Fixes
-  * Add a space between two words in a Pagination warning message (#1769)
-  * Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 (#1778)
-
-### Development Fixes
-  * Remove some whitespace in the code (#1755)
-  * Remove some duplication in the reading of posts and drafts (#1779)
-
-### Site Enhancements
-  * Fixed case of a word in the Jekyll v1.3.0 release post (#1762)
-  * Fixed the mime type for the favicon (#1772)
-
-## 1.3.1 / 2013-11-26
-
-### Minor Enhancements
-  * Add a `--prefix` option to passthrough for the importers (#1669)
-  * Push the paginator plugin lower in the plugin priority order so
-    other plugins run before it (#1759)
-
-### Bug Fixes
-  * Fix the include tag when ran in a loop (#1726)
-  * Fix errors when using `--watch` on 1.8.7 (#1730)
-  * Specify where the include is called from if an included file is
-    missing (#1746)
-
-### Development Fixes
-  * Extract `Site#filter_entries` into its own object (#1697)
-  * Enable Travis' bundle caching (#1734)
-  * Remove trailing whitespace in some files (#1736)
-  * Fix a duplicate test name (#1754)
-
-### Site Enhancements
-  * Update link to example Rakefile to point to specific commit (#1741)
-  * Fix drafts docs to indicate that draft time is based on file modification
-    time, not `Time.now` (#1695)
-  * Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to
-    list of third-party plugins (#1693)
-  * Add `jekyll-asset-path-plugin` to list of third-party plugins (#1670)
-  * Add `emoji-for-jekyll` to list of third-part plugins (#1708)
-  * Fix previous section link on plugins page to point to pagination page (#1707)
-  * Add `org-mode` converter plugin to third-party plugins (#1711)
-  * Point "Blog migrations" page to http://import.jekyllrb.com (#1732)
-  * Add docs for `post_url` when posts are in subdirectories (#1718)
-  * Update the docs to point to `example.com` (#1448)
-
-## 1.3.0 / 2013-11-04
-
-### Major Enhancements
-  * Add support for adding data as YAML files under a site's `_data`
-    directory (#1003)
-  * Allow variables to be used with `include` tags (#1495)
-  * Allow using gems for plugin management (#1557)
-
-### Minor Enhancements
-  * Decrease the specificity in the site template CSS (#1574)
-  * Add `encoding` configuration option (#1449)
-  * Provide better error handling for Jekyll's custom Liquid tags
-    (#1514)
-  * If an included file causes a Liquid error, add the path to the
-    include file that caused the error to the error message (#1596)
-  * If a layout causes a Liquid error, change the error message so that
-    we know it comes from the layout (#1601)
-  * Update Kramdown dependency to `~> 1.2` (#1610)
-  * Update `safe_yaml` dependency to `~> 0.9.7` (#1602)
-  * Allow layouts to be in subfolders like includes (#1622)
-  * Switch to listen for site watching while serving (#1589)
-  * Add a `json` liquid filter to be used in sites (#1651)
-  * Point people to the migration docs when the `jekyll-import` gem is
-    missing (#1662)
-
-### Bug Fixes
-  * Fix up matching against source and destination when the two
-    locations are similar (#1556)
-  * Fix the missing `pathname` require in certain cases (#1255)
-  * Use `+` instead of `Array#concat` when building `Post` attribute list (#1571)
-  * Print server address when launching a server (#1586)
-  * Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering (#1598)
-  * Fix error with failing include tag when variable was file name (#1613)
-  * Downcase lexers before passing them to pygments (#1615)
-  * Capitalize the short verbose switch because it conflicts with the
-    built-in Commander switch (#1660)
-  * Fix compatibility with 1.8.x (#1665)
-  * Fix an error with the new file watching code due to library version
-    incompatibilities (#1687)
-
-### Development Fixes
-  * Add coverage reporting with Coveralls (#1539)
-  * Refactor the Liquid `include` tag (#1490)
-  * Update launchy dependency to `~> 2.3` (#1608)
-  * Update rr dependency to `~> 1.1` (#1604)
-  * Update cucumber dependency to `~> 1.3` (#1607)
-  * Update coveralls dependency to `~> 0.7.0` (#1606)
-  * Update rake dependency to `~> 10.1` (#1603)
-  * Clean up `site.rb` comments to be more concise/uniform (#1616)
-  * Use the master branch for the build badge in the readme (#1636)
-  * Refactor Site#render (#1638)
-  * Remove duplication in command line options (#1637)
-  * Add tests for all the coderay options (#1543)
-  * Improve some of the cucumber test code (#1493)
-  * Improve comparisons of timestamps by ignoring the seconds (#1582)
-
-### Site Enhancements
-  * Fix params for `JekyllImport::WordPress.process` arguments (#1554)
-  * Add `jekyll-suggested-tweet` to list of third-party plugins (#1555)
-  * Link to Liquid's docs for tags and filters (#1553)
-  * Add note about installing Xcode on the Mac in the Installation docs (#1561)
-  * Simplify/generalize pagination docs (#1577)
-  * Add documentation for the new data sources feature (#1503)
-  * Add more information on how to create generators (#1590, #1592)
-  * Improve the instructions for mimicking GitHub Flavored Markdown
-    (#1614)
-  * Add `jekyll-import` warning note of missing dependencies (#1626)
-  * Fix grammar in the Usage section (#1635)
-  * Add documentation for the use of gems as plugins (#1656)
-  * Document the existence of a few additional plugins (#1405)
-  * Document that the `date_to_string` always returns a two digit day (#1663)
-  * Fix navigation in the "Working with Drafts" page (#1667)
-  * Fix an error with the data documentation (#1691)
-
 ## 1.2.1 / 2013-09-14
 
 ### Minor Enhancements

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2008 Tom Preston-Werner
+Copyright (c) 2008 sugeng tigefa <sugeng@tigefa.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

data/README.markdown

@@ -1,14 +1,10 @@
-# Tigefa Gem
+# tigefa as Jekyll
 
-> This Generator site jekyll powered but command line changed from `jekyll new <site name>` replaced `tigefa new <site name>`
-> Hand from hand, eye from eye.
->> Thanks for visiting.
+[![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll)
 
-[![Gem Version](https://badge.fury.io/rb/tigefa.png)](http://badge.fury.io/rb/tigefa)
-
-[![Build Status](https://secure.travis-ci.org/tigefa4u/tigefa-gem.png?branch=master)](https://travis-ci.org/tigefa4u/tigefa-gem)
-[![Code Climate](https://codeclimate.com/github/tigefa4u/tigefa-gem.png)](https://codeclimate.com/github/tigefa4u/tigefa-gem)
-[![Coverage Status](https://coveralls.io/repos/tigefa4u/tigefa-gem/badge.png)](https://coveralls.io/r/tigefa4u/tigefa-gem)
+[![Build Status](https://secure.travis-ci.org/mojombo/jekyll.png)](https://travis-ci.org/mojombo/jekyll)
+[![Code Climate](https://codeclimate.com/github/mojombo/jekyll.png)](https://codeclimate.com/github/mojombo/jekyll)
+[![Dependency Status](https://gemnasium.com/mojombo/jekyll.png)](https://gemnasium.com/mojombo/jekyll)
 
 By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
 
@@ -20,7 +16,7 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc
 * Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
 * Take a gander at some existing [Sites](http://wiki.github.com/mojombo/jekyll/sites)
 * Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
-* Have questions? Check out `#jekyll` on irc.freenode.net.
+* Have questions? Check out `#tigefa` on irc.freenode.net.
 
 ## Diving In
 

data/Rakefile

@@ -84,14 +84,7 @@ end
 #
 #############################################################################
 
-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
+task :default => [:test, :features]
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -150,7 +143,7 @@ namespace :site do
     # Generate the site in server mode.
     puts "Running Jekyll..."
     Dir.chdir("site") do
-      sh "#{File.expand_path('bin/jekyll', File.dirname(__FILE__))} serve --watch"
+      sh "#{File.expand_path('bin/tigefa', File.dirname(__FILE__))} serve --watch"
     end
   end
 
@@ -218,7 +211,7 @@ namespace :site do
       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|
@@ -233,7 +226,7 @@ namespace :site do
         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: #{release}")
+        post.puts("version: #{version}")
         post.puts("categories: [release]")
         post.puts("---")
         post.puts
@@ -252,8 +245,8 @@ end
 #############################################################################
 
 task :release => :build do
-  unless `git branch` =~ /^(\* master|\* v1-stable)$/
-    puts "You must be on the master branch or the v1-stable branch to release!"
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
     exit!
   end
   sh "git commit --allow-empty -m 'Release #{version}'"

data/bin/tigefa

@@ -10,7 +10,7 @@ Tigefa::Deprecator.process(ARGV)
 
 program :name, 'tigefa'
 program :version, Tigefa::VERSION
-program :description, 'tigefa is a blog-aware, static site generator in Ruby'
+program :description, 'Tigefa is a blog-aware, static site generator in Ruby'
 
 default_command :default
 
@@ -20,12 +20,6 @@ global_option '--safe', 'Safe mode (defaults to false)'
 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 Jekyll configuration expects.
-#
-# options - The Hash of options from Commander.
-#
-# Returns the normalized Hash.
 def normalize_options(options)
   if drafts_state = options.delete(:drafts)
     options[:show_drafts] = drafts_state
@@ -33,16 +27,6 @@ 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?
@@ -54,8 +38,8 @@ command :default do |c|
 end
 
 command :new do |c|
-  c.syntax = tigefa new PATH'
-  c.description = 'Creates a new tigefa site scaffold in PATH'
+  c.syntax = 'tigefa new PATH'
+  c.description = 'Creates a new Tigefa site scaffold in PATH'
 
   c.option '--force', 'Force creation even if PATH already exists'
   c.option '--blank', 'Creates scaffolding but with empty files'
@@ -69,7 +53,13 @@ command :build do |c|
   c.syntax = 'tigefa build [options]'
   c.description = 'Build your site'
 
-  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.'
 
   c.action do |args, options|
     options = normalize_options(options.__hash__)
@@ -82,9 +72,15 @@ command :serve do |c|
   c.syntax = 'tigefa serve [options]'
   c.description = 'Serve your site locally'
 
-  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 '-B', '--detach', 'Run the server in the background (detach)'
+  c.option '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option '-v', '--verbose', 'Print verbose output.'
+
   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'
@@ -116,7 +112,7 @@ alias_command :hyde, :doctor
 
 command :docs do |c|
   c.syntax = 'tigefa docs'
-  c.description = "Launch local server with docs for Jekyll v#{Tigefa::VERSION}"
+  c.description = "Launch local server with docs for Tigefa v#{Tigefa::VERSION}"
 
   c.option '-p', '--port [PORT]', 'Port to listen on'
   c.option '-u', '--host [HOST]', 'Host to bind to'
@@ -135,7 +131,7 @@ end
 
 command :import do |c|
   c.syntax = 'tigefa import <platform> [options]'
-  c.description = 'Import your old blog to Tigefa'
+  c.description = 'Import your old blog to Jekyll'
 
   c.option '--source STRING', 'Source file or URL to migrate from'
   c.option '--file STRING', 'File to migrate from'
@@ -143,14 +139,14 @@ command :import do |c|
   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.option '--prefix STRING', 'Database table prefix 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 += "* Please see the documentation at http://jekyllrb.com/docs/migrations/ for instructions.\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
     Tigefa::Commands::Import.process(args.first, options)

data/features/create_sites.feature

@@ -44,17 +44,6 @@ Feature: Create sites
     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"
-
   Scenario: Basic site with layouts, pages, posts and files
     Given I have a _layouts directory
     And I have a page layout that contains "Page {{ page.title }}: {{ content }}"

data/features/include_tag.feature

@@ -33,25 +33,3 @@ Feature: Include tags
     And I should see "<li>param1_or_2 = value</li>" in "_site/2013/04/12/parameter-syntax.html"
     And I should see "<li>local = some text</li>" in "_site/2013/06/22/pass-a-variable.html"
     And I should see "<li>layout = default</li>" in "_site/2013/06/22/pass-a-variable.html"
-
-  Scenario: Include a file from a variable
-    Given I have an _includes directory
-    And I have an "_includes/snippet.html" file that contains "a snippet"
-    And I have an "_includes/parametrized.html" file that contains "works with {{include.what}}"
-    And I have a configuration file with:
-    | key           | value             |
-    | include_file1 | snippet.html      |
-    | include_file2 | parametrized.html |
-    And I have an "index.html" page that contains "{% include {{site.include_file1}} %} that {% include {{site.include_file2}} what='parameters' %}"
-    When I run jekyll
-    Then the _site directory should exist
-    And I should see "a snippet that works with parameters" in "_site/index.html"
-
-  Scenario: Include a variable file in a loop
-    Given I have an _includes directory
-    And I have an "_includes/one.html" file that contains "one"
-    And I have an "_includes/two.html" file that contains "two"
-    And I have an "index.html" page with files "[one.html, two.html]" that contains "{% for file in page.files %}{% include {{file}} %} {% endfor %}"
-    When I run jekyll
-    Then the _site directory should exist
-    And I should see "one two" in "_site/index.html"

data/features/markdown.feature

@@ -13,8 +13,8 @@ Feature: Markdown
     When I run jekyll
     Then the _site directory should exist
     And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/2009/03/27/hackers.html"
-    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
+    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/2009/03/27/hackers.html"
+    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/index.html"
 
   Scenario: Markdown in pagination on index
     Given I have a configuration file with "paginate" set to "5"
@@ -26,42 +26,5 @@ Feature: Markdown
     When I run jekyll
     Then the _site directory should exist
     And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
-    
-  Scenario: Maruku fenced codeblocks
-    Given I have a configuration file with "markdown" set to "maruku"
-    And I have an "index.markdown" file with content:
-       """
-       ---
-       title: My title
-       ---
-
-       # My title
-
-       ```
-       My awesome code
-       ```
-       """
-    When I run jekyll
-    Then the _site directory should exist
-    And I should see "My awesome code" in "_site/index.html"
-    And I should see "<pre><code>\nMy awesome code\n</code></pre>" in "_site/index.html"
-    
-  Scenario: Maruku fenced codeblocks
-    Given I have a configuration file with "markdown" set to "maruku"
-    And I have an "index.markdown" file with content:
-       """
-       ---
-       title: My title
-       ---
-
-       # My title
-
-       ```ruby
-       puts "My awesome string"
-       ```
-       """
-    When I run jekyll
-    Then the _site directory should exist
-    And I should see "My awesome string" in "_site/index.html"
-    And I should see "<pre class="ruby"><code class="ruby">\nputs &quot;My awesome string&quot;\n</code></pre>" in "_site/index.html"
+    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/index.html"
+