jekyll 3.0.0.pre.beta4 → 3.0.0.pre.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b671ad21c396f69a1ce1e75bfa41ae9f7ab299f
-  data.tar.gz: 65895690b84df23c794c12dc1d3f1c4d6e61ba15
+  metadata.gz: edd6e9afd1a7efdf658b22ee6c1d5fb8d404d885
+  data.tar.gz: 2cefab9b3051eb3e99baedbc3fc81c4196aadf97
 SHA512:
-  metadata.gz: 017c26c08ee3989732900b36af6464ed884d5c6a19f083c42bfbfce8cc345910934ea3695f02b2198fe91da9d813562c91da2d93d25d851f549773fa7f1e4840
-  data.tar.gz: 3298b7ff1db4e4e271d3f0ed1e48e95e32c05c8908cdfbfd58d42086f6275f72962fe97f9063b03bb2e296705aefaa0a88d2bc1aa342640ed68260460d5ec052
+  metadata.gz: 213dcb3607112de64364c9f5c301bf804d321eb1a1aedee626a17db38fa5b2d792c881915b2fadff2315ec74573f5cc01abcbb32aba28bb051ff073d08e227e5
+  data.tar.gz: a4e81449531d328e96d75db1014fb7dd86f9f44e73312054ae2f2e7bcd124bbca3b7e55ea7781b0116ddd634ae9bf1ba1fc214c69ca41582b4d860b8ad4f215c

data/README.markdown

@@ -20,7 +20,7 @@ Jekyll does what you tell it to do — no more, no less. It doesn't try to outs
 * Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
 * Take a gander at some existing [Sites](https://wiki.github.com/jekyll/jekyll/sites)
 * Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
-* Have questions? Check out [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/)
+* Have questions? Check out our official forum community [Jekyll Talk](https://talk.jekyllrb.com/) or [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/)
 
 ## Diving In
 

data/lib/jekyll/cleaner.rb

@@ -36,9 +36,14 @@ module Jekyll
     # Returns a Set with the file paths
     def existing_files
       files = Set.new
+      regex = keep_file_regex
+      dirs = keep_dirs
+
       Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
-        files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
+        next if file =~ /\/\.{1,2}$/ || file =~ regex || dirs.include?(file)
+        files << file
       end
+
       files
     end
 
@@ -93,9 +98,7 @@ module Jekyll
     #
     # Returns the regular expression
     def keep_file_regex
-      or_list = site.keep_files.join("|")
-      pattern = "\/(#{or_list.gsub(".", "\.")})"
-      Regexp.new pattern
+      Regexp.union(site.keep_files)
     end
   end
 end

data/lib/jekyll/commands/doctor.rb

@@ -30,6 +30,7 @@ module Jekyll
 
         def healthy?(site)
           [
+            fsnotify_buggy?(site),
             !deprecated_relative_permalinks(site),
             !conflicting_urls(site)
           ].all?
@@ -59,8 +60,23 @@ module Jekyll
           conflicting_urls
         end
 
-        private
+        def fsnotify_buggy?(site)
+          return true if !Utils::Platforms.osx?
+          if Dir.pwd != `pwd`.strip
+            Jekyll.logger.error "  " + <<-STR.strip.gsub(/\n\s+/, "\n  ")
+              We have detected that there might be trouble using fsevent on your
+              operating system, you can read https://github.com/thibaudgg/rb-fsevent/wiki/no-fsevents-fired-(OSX-bug)
+              for possible work arounds or you can work around it immediately
+              with `--force-polling`.
+            STR
+
+            false
+          end
 
+          true
+        end
+
+        private
         def collect_urls(urls, things, destination)
           things.each do |thing|
             dest = thing.destination(destination)

data/lib/jekyll/reader.rb

@@ -15,10 +15,18 @@ module Jekyll
     def read
       @site.layouts = LayoutReader.new(site).read
       read_directories
+      sort_files!
       @site.data = DataReader.new(site).read(site.config['data_source'])
       CollectionReader.new(site).read
     end
 
+    # Sorts posts, pages, and static files.
+    def sort_files!
+      site.posts.sort!
+      site.pages.sort_by!(&:name)
+      site.static_files.sort_by!(&:relative_path)
+    end
+
     # Recursively traverse directories to find posts, pages and static files
     # that will become part of the site according to the rules in
     # filter_entries.
@@ -50,7 +58,6 @@ module Jekyll
     def retrieve_posts(dir)
       site.posts.concat(PostReader.new(site).read(dir))
       site.posts.concat(DraftReader.new(site).read(dir)) if site.show_drafts
-      site.posts.sort!
     end
 
     # Recursively traverse directories with the read_directories function.
@@ -77,7 +84,6 @@ module Jekyll
     # Returns nothing.
     def retrieve_pages(dir, dot_pages)
       site.pages.concat(PageReader.new(site, dir).read(dot_pages))
-      site.pages.sort_by!(&:name)
     end
 
     # Retrieve all the static files from the current directory,
@@ -89,7 +95,6 @@ module Jekyll
     # Returns nothing.
     def retrieve_static_files(dir, dot_static_files)
       site.static_files.concat(StaticFileReader.new(site, dir).read(dot_static_files))
-      site.static_files.sort_by!(&:relative_path)
     end
 
     # Filter out any files/directories that are hidden or backup files (start

data/lib/jekyll/regenerator.rb

@@ -131,7 +131,7 @@ module Jekyll
     # Returns nothing.
     def write_metadata
       File.open(metadata_file, 'w') do |f|
-        f.write(metadata.to_yaml)
+        f.write(Marshal.dump(metadata))
       end
     end
 
@@ -158,7 +158,13 @@ module Jekyll
     # Returns the read metadata.
     def read_metadata
       @metadata = if !disabled? && File.file?(metadata_file)
-        SafeYAML.load(File.read(metadata_file))
+        content = File.read(metadata_file)
+
+        begin
+          Marshal.load(content)
+        rescue TypeError
+          SafeYAML.load(content)
+        end
       else
         {}
       end

data/lib/jekyll/utils.rb

@@ -1,6 +1,6 @@
 module Jekyll
-  module Utils
-    extend self
+  module Utils extend self
+    autoload :Platforms, 'jekyll/utils/platforms'
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w{raw default pretty}

data/lib/jekyll/utils/platforms.rb

@@ -0,0 +1,30 @@
+module Jekyll
+  module Utils
+    module Platforms extend self
+
+      # Provides jruby? and mri? which respectively detect these two types of
+      # tested Engines we support, in the future we might probably support the
+      # other one that everyone used to talk about.
+
+      { :jruby? => "jruby", :mri? => "ruby" }.each do |k, v|
+        define_method k do
+          ::RUBY_ENGINE == v
+        end
+      end
+
+      # Provides windows?, linux?, osx?, unix? so that we can detect
+      # platforms. This is mostly useful for `jekyll doctor` and for testing
+      # where we kick off certain tests based on the platform.
+
+      { :windows? => /mswin|mingw|cygwin/, :linux? => /linux/, \
+          :osx? => /darwin|mac os/, :unix? => /solaris|bsd/ }.each do |k, v|
+
+        define_method k do
+          !!(
+            RbConfig::CONFIG["host_os"] =~ v
+          )
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0.pre.beta4'
+  VERSION = '3.0.0.pre.beta5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta4
+  version: 3.0.0.pre.beta5
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -191,6 +191,7 @@ files:
 - lib/jekyll/tags/post_url.rb
 - lib/jekyll/url.rb
 - lib/jekyll/utils.rb
+- lib/jekyll/utils/platforms.rb
 - lib/jekyll/version.rb
 - lib/site_template/.gitignore
 - lib/site_template/_config.yml