tigefa 1.1.2 → 1.1.3

data/features/site_configuration.feature

@@ -18,27 +18,6 @@ Feature: Site configuration
     Then the _mysite directory should exist
     And I should see "Changing destination directory" in "_mysite/index.html"
 
-  Scenario Outline: Similarly named source and destination
-    Given I have a blank site in "<source>"
-    And I have an "<source>/index.md" page that contains "markdown"
-    And I have a configuration file with:
-    | key         | value    |
-    | source      | <source> |
-    | destination | <dest>   |
-    When I run jekyll
-    Then the <source> directory should exist
-    And the "<dest>/index.html" file should <file_exist> exist
-    And I should see "markdown" in "<source>/index.md"
-
-    Examples:
-      | source        | dest        | file_exist |
-      | mysite_source | mysite      |            |
-      | mysite        | mysite_dest |            |
-      | mysite/       | mysite      | not        |
-      | mysite        | ./mysite    | not        |
-      | mysite/source | mysite      | not        |
-      | mysite        | mysite/dest |            |
-
   Scenario: Exclude files inline
     Given I have an "Rakefile" file that contains "I want to be excluded"
     And I have an "README" file that contains "I want to be excluded"
@@ -67,28 +46,28 @@ Feature: Site configuration
     And I have a configuration file with "markdown" set to "rdiscount"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
 
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "kramdown"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
 
   Scenario: Use Redcarpet for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "redcarpet"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
 
   Scenario: Use Maruku for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "maruku"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href='http://google.com'>Google</a>" in "_site/index.html"
 
   Scenario: Highlight code with pygments
     Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
@@ -225,11 +204,3 @@ Feature: Site configuration
     And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
     And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
     And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2020/01/31/entry2.html"
-
-  Scenario: Add a gem-based plugin
-    Given I have an "index.html" file that contains "Whatever"
-    And I have a configuration file with "gems" set to "[jekyll_test_plugin]"
-    When I run jekyll
-    Then the _site directory should exist
-    And I should see "Whatever" in "_site/index.html"
-    And I should see "this is a test" in "_site/test.txt"

data/features/site_data.feature

@@ -4,10 +4,10 @@ Feature: Site data
   In order to make the site slightly dynamic
 
   Scenario: Use page variable in a page
-    Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com"
+    Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@me.com"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Contact: email@example.com" in "_site/contact.html"
+    And I should see "Contact: email@me.com" in "_site/contact.html"
 
   Scenario Outline: Use page.path variable in a page
     Given I have a <dir> directory
@@ -95,10 +95,10 @@ Feature: Site data
 
   Scenario: Use configuration date in site payload
     Given I have an "index.html" page that contains "{{ site.url }}"
-    And I have a configuration file with "url" set to "http://example.com"
+    And I have a configuration file with "url" set to "http://mysite.com"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "http://example.com" in "_site/index.html"
+    And I should see "http://mysite.com" in "_site/index.html"
 
   Scenario: Access Jekyll version via jekyll.version
     Given I have an "index.html" page that contains "{{ jekyll.version }}"

data/features/step_definitions/{tigefa_steps.rb → jekyll_steps.rb}

@@ -7,14 +7,14 @@ end
 World(Test::Unit::Assertions)
 
 Given /^I have a blank site in "(.*)"$/ do |path|
-  FileUtils.mkdir_p(path)
+  FileUtils.mkdir(path)
 end
 
 Given /^I do not have a "(.*)" directory$/ do |path|
   File.directory?("#{TEST_DIR}/#{path}")
 end
 
-# Like "I have a foo file" but gives a yaml front matter so tigefa actually processes it
+# Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it
 Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text|
   File.open(file, 'w') do |f|
     f.write <<EOF
@@ -38,18 +38,7 @@ Given /^I have an? (.*) (layout|theme) that contains "(.*)"$/ do |name, type, te
   else
     '_theme'
   end
-  destination_file = File.join(folder, name + '.html')
-  destination_path = File.dirname(destination_file)
-  unless File.exist?(destination_path)
-    FileUtils.mkdir_p(destination_path)
-  end
-  File.open(destination_file, 'w') do |f|
-    f.write(text)
-  end
-end
-
-Given /^I have an? "(.*)" file with content:$/ do |file, text|
-  File.open(file, 'w') do |f|
+  File.open(File.join(folder, name + '.html'), 'w') do |f|
     f.write(text)
   end
 end
@@ -122,19 +111,19 @@ Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
 end
 
 
-When /^I run tigefa$/ do
+When /^I run jekyll$/ do
   run_jekyll
 end
 
-When /^I run tigefa with drafts$/ do
+When /^I run jekyll with drafts$/ do
   run_jekyll(:drafts => true)
 end
 
-When /^I call tigefa new with test_blank --blank$/ do
+When /^I call jekyll new with test_blank --blank$/ do
   call_jekyll_new(:path => "test_blank", :blank => true)
 end
 
-When /^I debug tigefa$/ do
+When /^I debug jekyll$/ do
   run_jekyll(:debug => true)
 end
 
@@ -148,42 +137,38 @@ When /^I delete the file "(.*)"$/ do |file|
   File.delete(file)
 end
 
-Then /^the (.*) directory should +exist$/ do |dir|
+Then /^the (.*) directory should exist$/ do |dir|
   assert File.directory?(dir), "The directory \"#{dir}\" does not exist"
 end
 
-Then /^the (.*) directory should not exist$/ do |dir|
-  assert !File.directory?(dir), "The directory \"#{dir}\" exists"
-end
-
 Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
-  assert_match Regexp.new(text), file_contents(file)
+  assert Regexp.new(text).match(File.open(file).readlines.join)
 end
 
 Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
-  assert_equal text, file_contents(file).strip
+  assert_equal text, File.open(file).readlines.join.strip
 end
 
 Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
-  assert_no_match Regexp.new(text), file_contents(file)
+  assert_no_match Regexp.new(text), File.read(file)
 end
 
 Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|
-  assert_match Regexp.new(Regexp.escape(text)), file_contents(file)
+  assert Regexp.new(Regexp.escape(text)).match(File.open(file).readlines.join)
 end
 
-Then /^the "(.*)" file should +exist$/ do |file|
-  assert File.file?(file), "The file \"#{file}\" does not exist"
+Then /^the "(.*)" file should exist$/ do |file|
+  assert File.file?(file)
 end
 
 Then /^the "(.*)" file should not exist$/ do |file|
-  assert !File.exists?(file), "The file \"#{file}\" exists"
+  assert !File.exists?(file)
 end
 
 Then /^I should see today's time in "(.*)"$/ do |file|
-  assert_match Regexp.new(seconds_agnostic_time(Time.now)), file_contents(file)
+  assert_match Regexp.new(Regexp.escape(Time.now.to_s)), File.open(file).readlines.join
 end
 
 Then /^I should see today's date in "(.*)"$/ do |file|
-  assert_match Regexp.new(Date.today.to_s), file_contents(file)
+  assert_match Regexp.new(Date.today.to_s), File.open(file).readlines.join
 end

data/features/support/env.rb

@@ -1,8 +1,3 @@
-if RUBY_VERSION > '1.9'
-  require 'coveralls'
-  Coveralls.wear_merged!
-end
-
 require 'fileutils'
 require 'rr'
 require 'test/unit'
@@ -12,7 +7,7 @@ TEST_DIR    = File.join('/', 'tmp', 'jekyll')
 JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')
 
 def run_jekyll(opts = {})
-  command = TIGEFA_PATH.clone
+  command = JEKYLL_PATH.clone
   command << " build"
   command << " --drafts" if opts[:drafts]
   command << " >> /dev/null 2>&1" if opts[:debug].nil?
@@ -20,7 +15,7 @@ def run_jekyll(opts = {})
 end
 
 def call_jekyll_new(opts = {})
-  command = TIGEFA_PATH.clone
+  command = JEKYLL_PATH.clone
   command << " new"
   command << " #{opts[:path]}" if opts[:path]
   command << " --blank" if opts[:blank]
@@ -40,36 +35,5 @@ def location(folder, direction)
   [before || '.', after || '.']
 end
 
-def file_contents(path)
-  File.open(path) do |file|
-    file.readlines.join # avoid differences with \n and \r\n line endings
-  end
-end
-
-def seconds_agnostic_datetime(datetime = Time.now)
-  pieces = datetime.to_s.split(" ")
-  if pieces.size == 6 # Ruby 1.8.7
-    date = pieces[0..2].join(" ")
-    time = seconds_agnostic_time(pieces[3])
-    zone = pieces[4..5].join(" ")
-  else # Ruby 1.9.1 or greater
-    date, time, zone = pieces
-    time = seconds_agnostic_time(time)
-  end
-  [
-    Regexp.escape(date),
-    "#{time}:\\d{2}",
-    Regexp.escape(zone)
-  ].join("\\ ")
-end
-
-def seconds_agnostic_time(time)
-  if time.is_a? Time
-    time = time.strftime("%H:%M:%S")
-  end
-  hour, minutes, _ = time.split(":")
-  "#{hour}:#{minutes}"
-end
-
 # work around "invalid option: --format" cucumber bug (see #296)
 Test::Unit.run = true if RUBY_VERSION < '1.9'

data/lib/site_template/_config.yml

@@ -1,3 +1,3 @@
-name: Your New Jekyll Site
-markdown: redcarpet
+name: Your New tigefa as Jekyll Site
+markdown: kromdown
 pygments: true

data/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb

@@ -22,3 +22,4 @@ Check out the [Jekyll docs][jekyll] for more info on how to get the most out of
 
 [jekyll-gh]: https://github.com/mojombo/jekyll
 [jekyll]:    http://jekyllrb.com
+[tigefa]:    http://tigefa.org

data/lib/site_template/css/main.css

@@ -34,16 +34,16 @@ a:visited { color: #a0a; }
 /* Home
 /*
 /*****************************************************************************/
-.posts {
+ul.posts {
   list-style-type: none;
   margin-bottom: 2em;
 }
 
-.posts li {
+ul.posts li {
   line-height: 1.75em;
 }
 
-.posts span {
+ul.posts span {
   color: #aaa;
   font-family: Monaco, "Courier New", monospace;
   font-size: 80%;
@@ -63,38 +63,38 @@ a:visited { color: #a0a; }
   line-height: 1.5em;
 }
 
-.header a {
+.site .header a {
   font-weight: bold;
   text-decoration: none;
 }
 
-.title {
+.site .header h1.title {
   display: inline-block;
   margin-bottom: 2em;
 }
 
-.title a {
+.site .header h1.title a {
   color: #a00;
 }
 
-.title a:hover {
+.site .header h1.title a:hover {
   color: #000;
 }
 
-.header a.extra {
+.site .header a.extra {
   color: #aaa;
   margin-left: 1em;
 }
 
-.header a.extra:hover {
+.site .header a.extra:hover {
   color: #000;
 }
 
-.meta {
+.site .meta {
   color: #aaa;
 }
 
-.footer {
+.site .footer {
   font-size: 80%;
   color: #666;
   border-top: 4px solid #eee;
@@ -102,22 +102,22 @@ a:visited { color: #a0a; }
   overflow: hidden;
 }
 
-.footer .contact {
+.site .footer .contact {
   float: left;
   margin-right: 3em;
 }
 
-.footer .contact a {
+.site .footer .contact a {
   color: #8085C1;
 }
 
-.footer .rss {
+.site .footer .rss {
   margin-top: 1.1em;
   margin-right: -.2em;
   float: right;
 }
 
-.footer .rss img {
+.site .footer .rss img {
   border: 0;
 }
 

data/lib/tigefa.rb

@@ -20,13 +20,11 @@ require 'fileutils'
 require 'time'
 require 'safe_yaml'
 require 'English'
-require 'pathname'
 
 # 3rd party
 require 'liquid'
 require 'maruku'
 require 'colorator'
-require 'toml'
 
 # internal requires
 require 'tigefa/core_ext'
@@ -46,7 +44,6 @@ require 'tigefa/static_file'
 require 'tigefa/errors'
 require 'tigefa/related_posts'
 require 'tigefa/cleaner'
-require 'tigefa/entry_filter'
 
 # extensions
 require 'tigefa/plugin'
@@ -62,8 +59,8 @@ require_all 'tigefa/tags'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
-module Tigefa
-  VERSION = '1.1.1'
+module Jekyll
+  VERSION = '1.1.3'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/tigefa/cleaner.rb

@@ -2,7 +2,7 @@ require 'set'
 
 module Tigefa
   class Site
-    # Handles the cleanup of a site's destination before it is built.
+    # Handles the cleanup of a site's destination before the site is built.
     class Cleaner
       def initialize(site)
         @site = site
@@ -15,14 +15,14 @@ module Tigefa
 
       private
 
-      # Private: The list of files and directories to be deleted during cleanup process
+      # Private: The list of files and directories to be deleted during the cleanup process
       #
-      # Returns an Array of the file and directory paths
+      # Returns an Array with the file and directory paths
       def obsolete_files
         (existing_files - new_files - new_dirs + replaced_files).to_a
       end
 
-      # Private: The list of existing files, apart from those included in keep_files and hidden files.
+      # Private: The list of existing files, except those included in keep_files and hidden files.
       #
       # Returns a Set with the file paths
       def existing_files
@@ -33,7 +33,7 @@ module Tigefa
         files
       end
 
-      # Private: The list of files to be created when site is built.
+      # Private: The list of files to be created when the site is built.
       #
       # Returns a Set with the file paths
       def new_files
@@ -42,7 +42,7 @@ module Tigefa
         files
       end
 
-      # Private: The list of directories to be created when site is built.
+      # Private: The list of directories to be created when the site is built.
       # These are the parent directories of the files in #new_files.
       #
       # Returns a Set with the directory paths
@@ -57,7 +57,7 @@ module Tigefa
         new_dirs.select { |dir| File.file?(dir) }.to_set
       end
 
-      # Private: Creates a regular expression from the config's keep_files array
+      # Private: creates a regular expression from the config's keep_files array
       #
       # Examples
       #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
@@ -70,4 +70,4 @@ module Tigefa
       end
     end
   end
-end
+end