jekyll 3.0.5 → 3.1.0.pre.beta1

data/lib/jekyll/utils.rb

@@ -1,6 +1,7 @@
 module Jekyll
   module Utils extend self
     autoload :Platforms, 'jekyll/utils/platforms'
+    autoload :Ansi, "jekyll/utils/ansi"
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w{raw default pretty}
@@ -8,6 +9,10 @@ module Jekyll
     SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
+    def strip_heredoc(str)
+      str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "")
+    end
+
     # Non-destructive version of deep_merge_hashes! See that method.
     #
     # Returns the merged hashes.
@@ -26,7 +31,8 @@ module Jekyll
     # Thanks to whoever made it.
     def deep_merge_hashes!(target, overwrite)
       overwrite.each_key do |key|
-        if overwrite[key].is_a? Hash and target[key].is_a? Hash
+        if (overwrite[key].is_a?(Hash) or overwrite[key].is_a?(Drops::Drop)) and
+            (target[key].is_a?(Hash) or target[key].is_a?(Drops::Drop))
           target[key] = Utils.deep_merge_hashes(target[key], overwrite[key])
           next
         end
@@ -34,7 +40,7 @@ module Jekyll
         target[key] = overwrite[key]
       end
 
-      if target.default_proc.nil?
+      if target.respond_to?(:default_proc) && overwrite.respond_to?(:default_proc) && target.default_proc.nil?
         target.default_proc = overwrite.default_proc
       end
 
@@ -169,13 +175,14 @@ module Jekyll
         SLUGIFY_PRETTY_REGEXP
       end
 
-      slug = string.
-        # Strip according to the mode
-        gsub(re, '-').
-        # Remove leading/trailing hyphen
-        gsub(/^\-|\-$/i, '')
+      # Strip according to the mode
+      slug = string.gsub(re, '-')
 
-      cased ? slug : slug.downcase
+      # Remove leading/trailing hyphen
+      slug.gsub!(/^\-|\-$/i, '')
+
+      slug.downcase! unless cased
+      slug
     end
 
     # Add an appropriate suffix to template so that it matches the specified
@@ -218,5 +225,38 @@ module Jekyll
       template
     end
 
+
+    # Work the same way as Dir.glob but seperating the input into two parts
+    # ('dir' + '/' + 'pattern') to make sure the first part('dir') does not act
+    # as a pattern.
+    #
+    # For example, Dir.glob("path[/*") always returns an empty array,
+    # because the method fails to find the closing pattern to '[' which is ']'
+    #
+    # Examples:
+    #   safe_glob("path[", "*")
+    #   # => ["path[/file1", "path[/file2"]
+    #
+    #   safe_glob("path", "*", File::FNM_DOTMATCH)
+    #   # => ["path/.", "path/..", "path/file1"]
+    #
+    #   safe_glob("path", ["**", "*"])
+    #   # => ["path[/file1", "path[/folder/file2"]
+    #
+    # dir      - the dir where glob will be executed under
+    #           (the dir will be included to each result)
+    # patterns - the patterns (or the pattern) which will be applied under the dir
+    # flags    - the flags which will be applied to the pattern
+    #
+    # Returns matched pathes
+    def safe_glob(dir, patterns, flags = 0)
+      return [] unless Dir.exist?(dir)
+      pattern = File.join(Array patterns)
+      return [dir] if pattern.empty?
+      Dir.chdir(dir) do
+        Dir.glob(pattern, flags).map { |f| File.join(dir, f) }
+      end
+    end
+
   end
 end

data/lib/jekyll/utils/ansi.rb

@@ -0,0 +1,59 @@
+# Frozen-string-literal: true
+# Copyright: 2015 Jekyll - MIT License
+# Encoding: utf-8
+
+module Jekyll
+  module Utils
+    module Ansi
+      extend self
+
+      ESCAPE = format("%c", 27)
+      MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze
+      COLORS = {
+        :red => 31,
+        :green => 32,
+        :black => 30,
+        :magenta => 35,
+        :yellow => 33,
+        :white => 37,
+        :blue => 34,
+        :cyan => 36
+      }
+
+      # Strip ANSI from the current string.  It also strips cursor stuff,
+      # well some of it, and it also strips some other stuff that a lot of
+      # the other ANSI strippers don't.
+
+      def strip(str)
+        str.gsub MATCH, ""
+      end
+
+      #
+
+      def has?(str)
+        !!(str =~ MATCH)
+      end
+      
+      # Reset the color back to the default color so that you do not leak any
+      # colors when you move onto the next line. This is probably normally
+      # used as part of a wrapper so that we don't leak colors.
+
+      def reset(str = "")
+        @ansi_reset ||= format("%c[0m", 27)
+        "#{@ansi_reset}#{str}"
+      end
+
+      # SEE: `self::COLORS` for a list of methods.  They are mostly
+      # standard base colors supported by pretty much any xterm-color, we do
+      # not need more than the base colors so we do not include them.
+      # Actually... if I'm honest we don't even need most of the
+      # base colors.
+
+      COLORS.each do |color, num|
+        define_method color do |str|
+          "#{format("%c", 27)}[#{num}m#{str}#{reset}"
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/utils/platforms.rb

@@ -1,6 +1,7 @@
 module Jekyll
   module Utils
-    module Platforms extend self
+    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

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.5'
+  VERSION = '3.1.0.pre.beta1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.0.pre.beta1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -144,6 +144,7 @@ files:
 - lib/jekyll/commands/help.rb
 - lib/jekyll/commands/new.rb
 - lib/jekyll/commands/serve.rb
+- lib/jekyll/commands/serve/servlet.rb
 - lib/jekyll/configuration.rb
 - lib/jekyll/converter.rb
 - lib/jekyll/converters/identity.rb
@@ -154,6 +155,13 @@ files:
 - lib/jekyll/convertible.rb
 - lib/jekyll/deprecator.rb
 - lib/jekyll/document.rb
+- lib/jekyll/drops/collection_drop.rb
+- lib/jekyll/drops/document_drop.rb
+- lib/jekyll/drops/drop.rb
+- lib/jekyll/drops/jekyll_drop.rb
+- lib/jekyll/drops/site_drop.rb
+- lib/jekyll/drops/unified_payload_drop.rb
+- lib/jekyll/drops/url_drop.rb
 - lib/jekyll/entry_filter.rb
 - lib/jekyll/errors.rb
 - lib/jekyll/excerpt.rb
@@ -191,6 +199,7 @@ files:
 - lib/jekyll/tags/post_url.rb
 - lib/jekyll/url.rb
 - lib/jekyll/utils.rb
+- lib/jekyll/utils/ansi.rb
 - lib/jekyll/utils/platforms.rb
 - lib/jekyll/version.rb
 - lib/site_template/.gitignore
@@ -229,12 +238,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.