jekyll 3.0.0.pre.beta9 → 3.0.0.pre.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44394afe01d213f0bccb40542f3138a948b10fc5
-  data.tar.gz: e84b496b8c5a18cd5eb955002913c286c56b2c24
+  metadata.gz: 632b5286e2a7093e76fe77a51c398287edaad2a7
+  data.tar.gz: 1e21bd762b78a2fc59537a89c6b0776abb656352
 SHA512:
-  metadata.gz: c3c873064a35e082c033944413896352889b603b1a7c38afeb8d4d25ee00ed1680010a65f62c1229306d0897c2cdc34b418b6ca53b934fbd0bf894c4362a1721
-  data.tar.gz: 71df465bb905a956d3931e11d9887cd96b3ea11f6d54fcb0d14ce418e41a902647909cf8bc85775040fd1e0672fcc4a8b01bb60a8e62d624c59338a25f2b4479
+  metadata.gz: f35c3c3690736f43f5afe00e9e4915597e1af52680781bdce7a1590ac22672c6a75634c0e547d7b390b0976c6d6e045613cafcff5a931ce3b7d8016a85f8e2e2
+  data.tar.gz: 39908d9a537b41c7545698b80c10850eff2dcf132eb0bdcee663cf602126825ea4c960fbee0d08b72d1a4bae8427ccd3a62478de4b436e6f26d0c30f84bed3d4

data/lib/jekyll/deprecator.rb

@@ -3,9 +3,10 @@ module Jekyll
     extend self
 
     def process(args)
-      no_subcommand(args)
       arg_is_present? args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
+      arg_is_present? args, "--serve", "The --server command has been replaced by the \
+                          'serve' subcommand."
       arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
                           use the 'build' subcommand."
       arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
@@ -16,12 +17,13 @@ module Jekyll
       arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
                           config files."
       arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
+      no_subcommand(args)
     end
 
     def no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
-        deprecation_message "Jekyll now uses subcommands instead of just \
-                            switches. Run `jekyll --help` to find out more."
+        deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll --help` to find out more."
+        abort
       end
     end
 

data/lib/jekyll/excerpt.rb

@@ -107,7 +107,11 @@ module Jekyll
     def extract_excerpt(post_content)
       head, _, tail = post_content.to_s.partition(post.excerpt_separator)
 
-      "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+      if tail.empty?
+        head
+      else
+        "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+      end
     end
   end
 end

data/lib/jekyll/post.rb

@@ -227,6 +227,9 @@ module Jekyll
         :year        => date.strftime("%Y"),
         :month       => date.strftime("%m"),
         :day         => date.strftime("%d"),
+        :hour        => date.strftime("%H"),
+        :minute      => date.strftime("%M"),
+        :second      => date.strftime("%S"),
         :title       => slug,
         :i_day       => date.strftime("%-d"),
         :i_month     => date.strftime("%-m"),

data/lib/jekyll/tags/highlight.rb

@@ -48,13 +48,13 @@ eos
 
         output =
           case context.registers[:site].highlighter
-            when 'pygments'
-              render_pygments(code, is_safe)
-            when 'rouge'
-              render_rouge(code)
-            else
-              render_codehighlighter(code)
-            end
+          when 'pygments'
+            render_pygments(code, is_safe)
+          when 'rouge'
+            render_rouge(code)
+          else
+            render_codehighlighter(code)
+          end
 
         rendered_output = add_code_tag(output)
         prefix + rendered_output + suffix

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0.pre.beta9'
+  VERSION = '3.0.0.pre.beta10'
 end

data/lib/site_template/_config.yml

@@ -1,3 +1,10 @@
+# Welcome to Jekyll!
+#
+# This config file is meant for settings that affect your whole blog, values
+# which you are expected to set up once and rarely need to edit after that.
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# 'jekyll serve'. If you change this file, please restart the server process.
+
 # Site settings
 title: Your awesome title
 email: your-email@domain.com

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

@@ -1,7 +1,7 @@
 ---
 layout: post
 title:  "Welcome to Jekyll!"
-date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>
+date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>
 categories: jekyll update
 ---
 You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta9
+  version: 3.0.0.pre.beta10
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid