jekyll 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDFjMjNlNTk3YTMzYjA1NzM5ZDc2N2Q3OGQyMzRhMzM5YTdkMjljMg==
+  data.tar.gz: !binary |-
+    Y2YzY2UwMjI1ZjViMGIzOGZhYThmYWZhY2E1ZjQ4YzBhZDIzMDk0OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NDQ3MzU3ZTVmMzM5MDRlNmEzMTg5NjYyZDc2MDJjZGYyMjVjZDIwN2M5N2Fi
+    Yjc0ZmZmYTAwMWIxYjdhMzkzYjYxMjdjYzU0NjI4N2Q3NjY1MWQ2MGJlM2Zk
+    MWEyOWY5MTY5ZTU0ZTNmMGRmNDBkNzhmNTliZTFhY2NiYTZiMmI=
+  data.tar.gz: !binary |-
+    ZWUyNmU3YWEyNGY0ZjhlZmE5ZTU0NWVjOTA5NDk5NmUzY2U3Y2E2OGI3ZTA2
+    ODA0NGQ4NDRkZDZkNDc0ODkwN2RiZjQxOTQwNjhjZTFkOWY5YzM0YjJiMDg3
+    YmUzZjJlZmMwN2E4MzQ2ODQzMDUyODZkOGYxYTI1NjNmOWZlYjE=

data/History.markdown

@@ -1,5 +1,34 @@
 ## HEAD
 ### Major Enhancements
+### Minor Enhancements
+### Bug Fixes
+### Site Enhancements
+### Development Fixes
+
+## 1.0.2 / 2013-05-12
+
+### Major Enhancements
+  * Add `jekyll doctor` command to check site for any known compatibility problems (#1081)
+  * Backwards-compatibilize relative permalinks (#1081)
+
+### Minor Enhancements
+  * Add a `data-lang="<lang>"` attribute to Redcarpet code blocks (#1066)
+  * Deprecate old config `server_port`, match to `port` if `port` isn't set (#1084)
+  * Update pygments.rb version to 0.5.0 (#1061)
+  * Update Kramdown version to 1.0.2 (#1067)
+
+### Bug Fixes
+  * Fix issue when categories are numbers (#1078)
+  * Catching that Redcarpet gem isn't installed (#1059)
+
+### Site Enhancements
+  * Add documentation about `relative_permalinks` (#1081)
+  * Remove pygments-installation instructions, as pygments.rb is bundled with it (#1079)
+  * Move pages to be Pages for realz (#985)
+  * Updated links to Liquid documentation (#1073)
+
+## 1.0.1 / 2013-05-08
+
 ### Minor Enhancements
   * Do not force use of toc_token when using generate_tok in RDiscount (#1048)
   * Add newer `language-` class name prefix to code blocks (#1037)

data/bin/jekyll

@@ -86,6 +86,20 @@ command :serve do |c|
 end
 alias_command :server, :serve
 
+command :doctor do |c|
+  c.syntax = 'jekyll doctor'
+  c.description = 'Search site and print specific deprecation warnings'
+
+  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+
+  c.action do |args, options|
+    options = normalize_options(options.__hash__)
+    options = Jekyll.configuration(options)
+    Jekyll::Commands::Doctor.process(options)
+  end
+end
+alias_command :hyde, :doctor
+
 command :import do |c|
   c.syntax = 'jekyll import <platform> [options]'
   c.description = 'Import your old blog to Jekyll'

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.0.1'
+  s.version           = '1.0.2'
   s.license           = 'MIT'
-  s.date              = '2013-05-08'
+  s.date              = '2013-05-12'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
   s.add_runtime_dependency('maruku', "~> 0.5")
-  s.add_runtime_dependency('kramdown', "~> 0.14")
-  s.add_runtime_dependency('pygments.rb', "~> 0.4.2")
+  s.add_runtime_dependency('kramdown', "~> 1.0.2")
+  s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
   s.add_runtime_dependency('commander', "~> 4.1.3")
   s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
   s.add_runtime_dependency('colorator', "~> 0.1")
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     lib/jekyll.rb
     lib/jekyll/command.rb
     lib/jekyll/commands/build.rb
+    lib/jekyll/commands/doctor.rb
     lib/jekyll/commands/new.rb
     lib/jekyll/commands/serve.rb
     lib/jekyll/configuration.rb
@@ -125,34 +126,33 @@ Gem::Specification.new do |s|
     site/_includes/top.html
     site/_layouts/default.html
     site/_layouts/docs.html
-    site/_posts/2012-07-01-configuration.md
-    site/_posts/2012-07-01-contributing.md
-    site/_posts/2012-07-01-deployment-methods.md
-    site/_posts/2012-07-01-extras.md
-    site/_posts/2012-07-01-frontmatter.md
-    site/_posts/2012-07-01-github-pages.md
-    site/_posts/2012-07-01-heroku.md
-    site/_posts/2012-07-01-home.md
-    site/_posts/2012-07-01-installation.md
-    site/_posts/2012-07-01-migrations.md
-    site/_posts/2012-07-01-pages.md
-    site/_posts/2012-07-01-pagination.md
-    site/_posts/2012-07-01-permalinks.md
-    site/_posts/2012-07-01-plugins.md
-    site/_posts/2012-07-01-posts.md
-    site/_posts/2012-07-01-resources.md
-    site/_posts/2012-07-01-sites.md
-    site/_posts/2012-07-01-structure.md
-    site/_posts/2012-07-01-templates.md
-    site/_posts/2012-07-01-troubleshooting.md
-    site/_posts/2012-07-01-upgrading.md
-    site/_posts/2012-07-01-usage.md
-    site/_posts/2012-07-01-variables.md
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
     site/css/style.css
-    site/docs/index.html
+    site/docs/configuration.md
+    site/docs/contributing.md
+    site/docs/deployment-methods.md
+    site/docs/extras.md
+    site/docs/frontmatter.md
+    site/docs/github-pages.md
+    site/docs/heroku.md
+    site/docs/index.md
+    site/docs/installation.md
+    site/docs/migrations.md
+    site/docs/pages.md
+    site/docs/pagination.md
+    site/docs/permalinks.md
+    site/docs/plugins.md
+    site/docs/posts.md
+    site/docs/resources.md
+    site/docs/sites.md
+    site/docs/structure.md
+    site/docs/templates.md
+    site/docs/troubleshooting.md
+    site/docs/upgrading.md
+    site/docs/usage.md
+    site/docs/variables.md
     site/favicon.png
     site/img/article-footer.png
     site/img/footer-arrow.png
@@ -204,6 +204,7 @@ Gem::Specification.new do |s|
     test/source/_posts/2013-01-12-no-layout.textile
     test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
     test/source/_posts/2013-04-11-custom-excerpt.markdown
+    test/source/_posts/2013-05-10-number-category.textile
     test/source/_posts/es/2008-11-21-nested.textile
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile

data/lib/jekyll.rb

@@ -56,7 +56,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   # 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/jekyll/commands/doctor.rb

@@ -0,0 +1,29 @@
+module Jekyll
+  module Commands
+    class Doctor < Command
+      class << self
+        def process(options)
+          site = Jekyll::Site.new(options)
+          site.read
+
+          unless deprecated_relative_permalinks(site)
+            Jekyll::Logger.info "Your test results", "are in. Everything looks fine."
+          end
+        end
+
+        def deprecated_relative_permalinks(site)
+          contains_deprecated_pages = false
+          site.pages.each do |page|
+            if page.uses_relative_permalinks
+              Jekyll::Logger.warn "Deprecation:", "'#{page.path}' uses relative" +
+                                  " permalinks which will be deprecated in" +
+                                  " Jekyll v1.1 and beyond."
+              contains_deprecated_pages = true
+            end
+          end
+          contains_deprecated_pages
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/configuration.rb

@@ -19,7 +19,10 @@ module Jekyll
       'limit_posts'   => 0,
       'lsi'           => false,
       'future'        => true,           # remove and make true just default
-      'pygments'      => true,           # remove and make true just default
+      'pygments'      => true,
+
+      'relative_permalinks' => true,     # backwards-compatibility with < 1.0
+                                         # will be set to false once 1.1 hits
 
       'markdown'      => 'maruku',
       'permalink'     => 'date',
@@ -164,6 +167,15 @@ module Jekyll
         config.delete('server')
       end
 
+      if config.has_key? 'server_port'
+        Jekyll::Logger.warn "Deprecation:", "The 'server_port' configuration option" +
+                            " has been renamed to 'port'. Please update your config" +
+                            " file accordingly."
+        # copy but don't overwrite:
+        config['port'] = config['server_port'] unless config.has_key?('port')
+        config.delete('server_port')
+      end
+
       config
     end
 

data/lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -5,7 +5,7 @@ module Jekyll
 
         module CommonMethods
           def add_code_tags(code, lang)
-            code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\">")
+            code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">")
             code = code.sub(/<\/pre>/,"</code></pre>")
           end
         end
@@ -52,7 +52,7 @@ module Jekyll
                             include WithoutPygments
                           end
                         end
-        rescue LoadErro
+        rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install redcarpet'
           raise FatalException.new("Missing dependency: redcarpet")

data/lib/jekyll/page.rb

@@ -64,7 +64,11 @@ module Jekyll
       return @url if @url
 
       url = if permalink
-        permalink
+        if site.config['relative_permalinks']
+          File.join(@dir, permalink)
+        else
+          permalink
+        end
       else
         {
           "path"       => @dir,
@@ -114,7 +118,14 @@ module Jekyll
       self.data.deep_merge({
         "url"        => self.url,
         "content"    => self.content,
-        "path"       => self.data['path'] || File.join(@dir, @name).sub(/\A\//, '') })
+        "path"       => self.data['path'] || path })
+    end
+
+    # The path to the source file
+    #
+    # Returns the path to the source file
+    def path
+      File.join(@dir, @name).sub(/\A\//, '')
     end
 
     # Obtain destination path.
@@ -144,5 +155,9 @@ module Jekyll
     def index?
       basename == 'index'
     end
+
+    def uses_relative_permalinks
+      permalink && @dir != "" && site.config['relative_permalinks']
+    end
   end
 end

data/lib/jekyll/post.rb

@@ -76,7 +76,7 @@ module Jekyll
 
     def populate_categories
       if self.categories.empty?
-        self.categories = self.data.pluralized_array('category', 'categories').map {|c| c.downcase}
+        self.categories = self.data.pluralized_array('category', 'categories').map {|c| c.to_s.downcase}
       end
       self.categories.flatten!
     end

data/lib/jekyll/site.rb

@@ -231,6 +231,7 @@ module Jekyll
       end
 
       self.pages.each do |page|
+        relative_permalinks_deprecation_method if page.uses_relative_permalinks
         page.render(self.layouts, payload)
       end
 
@@ -418,5 +419,18 @@ module Jekyll
       post.categories.each { |c| self.categories[c] << post }
       post.tags.each { |c| self.tags[c] << post }
     end
+
+    def relative_permalinks_deprecation_method
+      if config['relative_permalinks'] && !@deprecated_relative_permalinks
+        $stderr.puts # Places newline after "Generating..."
+        Jekyll::Logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
+                                            " in subfolders must be relative to the" +
+                                            " site source directory, not the parent" +
+                                            " directory. Check http://jekyllrb.com/docs/upgrading/"+
+                                            " for more info."
+        $stderr.print Jekyll::Logger.formatted_topic("") + "..." # for "done."
+        @deprecated_relative_permalinks = true
+      end
+    end
   end
 end

data/site/_config.yml

@@ -1,3 +1,3 @@
-permalink: /docs/:categories/:title
 pygments: true
+relative_permalinks: false
 gauges_id: 503c5af6613f5d0f19000027

data/site/_includes/primary-nav-items.html

@@ -3,9 +3,9 @@
     <a href="{{ site.url }}/">Overview</a>
   </li>
   <li class="{% unless page.overview %}current{% endunless %}">
-    <a href="{{ site.url }}/docs">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
+    <a href="{{ site.url }}/docs/home">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
   </li>
   <li class="">
     <a href="https://github.com/mojombo/jekyll"><span class="hide-on-mobiles">View on </span>GitHub</a>
   </li>
-</ul>
+</ul>

data/site/{_posts/2012-07-01-configuration.md → docs/configuration.md}

@@ -3,6 +3,7 @@ layout: docs
 title: Configuration
 prev_section: structure
 next_section: frontmatter
+permalink: /docs/configuration/
 ---
 
 Jekyll allows you to concoct your sites in any way you can dream up, and it’s
@@ -252,6 +253,8 @@ show_drafts: nil
 limit_posts: 0
 pygments:    true
 
+relative_permalinks: true
+
 permalink:     date
 paginate_path: 'page:num'
 

data/site/{_posts/2012-07-01-contributing.md → docs/contributing.md}

@@ -3,6 +3,7 @@ layout: docs
 title: Contributing
 prev_section: deployment-methods
 next_section: troubleshooting
+permalink: /docs/contributing/
 ---
 
 So you've got an awesome idea to throw into Jekyll. Great! Please keep the

data/site/{_posts/2012-07-01-deployment-methods.md → docs/deployment-methods.md}

@@ -3,6 +3,7 @@ layout: docs
 title: Deployment methods
 prev_section: github-pages
 next_section: contributing
+permalink: /docs/deployment-methods/
 ---
 
 Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below.

data/site/docs/extras.md

@@ -0,0 +1,35 @@
+---
+layout: docs
+title: Extras
+prev_section: plugins
+next_section: github-pages
+permalink: /docs/extras/
+---
+
+There are a number of (optional) extra features that Jekyll supports that you
+may want to install, depending on how you plan to use Jekyll.
+
+## LaTeX Support
+
+Maruku comes with optional support for LaTeX to PNG rendering via blahtex
+(Version 0.6) which must be in your `$PATH` along with `dvips`. If you need
+Maruku to not assume a fixed location for `dvips`, check out [Remi’s Maruku
+fork](http://github.com/remi/maruku).
+
+## RDiscount
+
+If you prefer to use [RDiscount](http://github.com/rtomayko/rdiscount) instead
+of [Maruku](http://maruku.rubyforge.org/) for markdown, just make sure you have
+it installed:
+
+{% highlight bash %}
+$ sudo gem install rdiscount
+{% endhighlight %}
+
+And then specify RDiscount as the Markdown engine in your `_config.yml` file to
+have Jekyll run with that option.
+
+{% highlight bash %}
+# In _config.yml
+markdown: rdiscount
+{% endhighlight %}

data/site/{_posts/2012-07-01-frontmatter.md → docs/frontmatter.md}

@@ -3,6 +3,7 @@ layout: docs
 title: Front-matter
 prev_section: configuration
 next_section: posts
+permalink: /docs/frontmatter/
 ---
 
 The front-matter is where Jekyll starts to get really cool. Any file that

data/site/{_posts/2012-07-01-github-pages.md → docs/github-pages.md}

@@ -3,6 +3,7 @@ layout: docs
 title: GitHub Pages
 prev_section: extras
 next_section: deployment-methods
+permalink: /docs/github-pages/
 ---
 
 [GitHub Pages](http://pages.github.com) are public web pages for users,

data/site/{_posts/2012-07-01-heroku.md → docs/heroku.md}

@@ -3,6 +3,7 @@ layout: docs
 title: Heroku
 prev_section: github-pages
 next_section: manual-deployment
+permalink: /docs/heroku/
 ---
 
 Move along, people. Nothing to see here.