jekyll 4.0.1 → 4.2.1

data/lib/jekyll/utils/platforms.rb

@@ -1,82 +1,67 @@
-# frozen_string_literal: true
-
-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
-
-      # --
-      # Allows you to detect "real" Windows, or what we would consider
-      # "real" Windows.  That is, that we can pass the basic test and the
-      # /proc/version returns nothing to us.
-      # --
-
-      def vanilla_windows?
-        RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i && \
-          !proc_version
-      end
-
-      # --
-      # XXX: Remove in 4.0
-      # --
-
-      alias_method :really_windows?, \
-                   :vanilla_windows?
-
-      #
-
-      def bash_on_windows?
-        RbConfig::CONFIG["host_os"] =~ %r!linux! && \
-          proc_version =~ %r!microsoft!i
-      end
-
-      #
-
-      def windows?
-        vanilla_windows? || bash_on_windows?
-      end
-
-      #
-
-      def linux?
-        RbConfig::CONFIG["host_os"] =~ %r!linux! && \
-          proc_version !~ %r!microsoft!i
-      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.
-
-      { :osx? => %r!darwin|mac os!, :unix? => %r!solaris|bsd! }.each do |k, v|
-        define_method k do
-          !!(
-            RbConfig::CONFIG["host_os"] =~ v
-          )
-        end
-      end
-
-      #
-
-      private
-
-      def proc_version
-        @proc_version ||=
-          begin
-            File.read("/proc/version")
-          rescue Errno::ENOENT, Errno::EACCES
-            nil
-          end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Utils
+    module Platforms
+      extend self
+
+      def jruby?
+        RUBY_ENGINE == "jruby"
+      end
+
+      def mri?
+        RUBY_ENGINE == "ruby"
+      end
+
+      def windows?
+        vanilla_windows? || bash_on_windows?
+      end
+
+      # Not a Windows Subsystem for Linux (WSL)
+      def vanilla_windows?
+        rbconfig_host.match?(%r!mswin|mingw|cygwin!) && proc_version.empty?
+      end
+      alias_method :really_windows?, :vanilla_windows?
+
+      # Determine if Windows Subsystem for Linux (WSL)
+      def bash_on_windows?
+        linux_os? && microsoft_proc_version?
+      end
+
+      def linux?
+        linux_os? && !microsoft_proc_version?
+      end
+
+      def osx?
+        rbconfig_host.match?(%r!darwin|mac os!)
+      end
+
+      def unix?
+        rbconfig_host.match?(%r!solaris|bsd!)
+      end
+
+      private
+
+      def proc_version
+        @proc_version ||= \
+          begin
+            File.read("/proc/version").downcase
+          rescue Errno::ENOENT, Errno::EACCES
+            ""
+          end
+      end
+
+      def rbconfig_host
+        @rbconfig_host ||= RbConfig::CONFIG["host_os"].downcase
+      end
+
+      def linux_os?
+        rbconfig_host.include?("linux")
+      end
+
+      def microsoft_proc_version?
+        proc_version.include?("microsoft")
+      end
+    end
+  end
+end

data/lib/jekyll/utils/thread_event.rb

@@ -1,31 +1,31 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Utils
-    # Based on the pattern and code from
-    # https://emptysqua.re/blog/an-event-synchronization-primitive-for-ruby/
-    class ThreadEvent
-      attr_reader :flag
-
-      def initialize
-        @lock = Mutex.new
-        @cond = ConditionVariable.new
-        @flag = false
-      end
-
-      def set
-        @lock.synchronize do
-          yield if block_given?
-          @flag = true
-          @cond.broadcast
-        end
-      end
-
-      def wait
-        @lock.synchronize do
-          @cond.wait(@lock) unless @flag
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Utils
+    # Based on the pattern and code from
+    # https://emptysqua.re/blog/an-event-synchronization-primitive-for-ruby/
+    class ThreadEvent
+      attr_reader :flag
+
+      def initialize
+        @lock = Mutex.new
+        @cond = ConditionVariable.new
+        @flag = false
+      end
+
+      def set
+        @lock.synchronize do
+          yield if block_given?
+          @flag = true
+          @cond.broadcast
+        end
+      end
+
+      def wait
+        @lock.synchronize do
+          @cond.wait(@lock) unless @flag
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/utils/win_tz.rb

@@ -1,75 +1,75 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Utils
-    module WinTZ
-      extend self
-
-      # Public: Calculate the Timezone for Windows when the config file has a defined
-      #         'timezone' key.
-      #
-      # timezone - the IANA Time Zone specified in "_config.yml"
-      #
-      # Returns a string that ultimately re-defines ENV["TZ"] in Windows
-      def calculate(timezone)
-        External.require_with_graceful_fail("tzinfo") unless defined?(TZInfo)
-        tz = TZInfo::Timezone.get(timezone)
-        difference = Time.now.to_i - tz.now.to_i
-        #
-        # POSIX style definition reverses the offset sign.
-        #   e.g. Eastern Standard Time (EST) that is 5Hrs. to the 'west' of Prime Meridian
-        #   is denoted as:
-        #     EST+5 (or) EST+05:00
-        # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-        sign = difference.negative? ? "-" : "+"
-        offset = sign == "-" ? "+" : "-" unless difference.zero?
-        #
-        # convert the difference (in seconds) to hours, as a rational number, and perform
-        # a modulo operation on it.
-        modulo = modulo_of(rational_hour(difference))
-        #
-        # Format the hour as a two-digit number.
-        # Establish the minutes based on modulo expression.
-        hh = format("%02d", absolute_hour(difference).ceil)
-        mm = modulo.zero? ? "00" : "30"
-
-        Jekyll.logger.debug "Timezone:", "#{timezone} #{offset}#{hh}:#{mm}"
-        #
-        # Note: The 3-letter-word below doesn't have a particular significance.
-        "WTZ#{sign}#{hh}:#{mm}"
-      end
-
-      private
-
-      # Private: Convert given seconds to an hour as a rational number.
-      #
-      # seconds - supplied as an integer, it is converted to a rational number.
-      # 3600 - no. of seconds in an hour.
-      #
-      # Returns a rational number.
-      def rational_hour(seconds)
-        seconds.to_r / 3600
-      end
-
-      # Private: Convert given seconds to an hour as an absolute number.
-      #
-      # seconds - supplied as an integer, it is converted to its absolute.
-      # 3600 - no. of seconds in an hour.
-      #
-      # Returns an integer.
-      def absolute_hour(seconds)
-        seconds.abs / 3600
-      end
-
-      # Private: Perform a modulo operation on a given fraction.
-      #
-      # fraction - supplied as a rational number, its numerator is divided
-      #            by its denominator and the remainder returned.
-      #
-      # Returns an integer.
-      def modulo_of(fraction)
-        fraction.numerator % fraction.denominator
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Utils
+    module WinTZ
+      extend self
+
+      # Public: Calculate the Timezone for Windows when the config file has a defined
+      #         'timezone' key.
+      #
+      # timezone - the IANA Time Zone specified in "_config.yml"
+      #
+      # Returns a string that ultimately re-defines ENV["TZ"] in Windows
+      def calculate(timezone)
+        External.require_with_graceful_fail("tzinfo") unless defined?(TZInfo)
+        tz = TZInfo::Timezone.get(timezone)
+        difference = Time.now.to_i - tz.now.to_i
+        #
+        # POSIX style definition reverses the offset sign.
+        #   e.g. Eastern Standard Time (EST) that is 5Hrs. to the 'west' of Prime Meridian
+        #   is denoted as:
+        #     EST+5 (or) EST+05:00
+        # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
+        sign = difference.negative? ? "-" : "+"
+        offset = sign == "-" ? "+" : "-" unless difference.zero?
+        #
+        # convert the difference (in seconds) to hours, as a rational number, and perform
+        # a modulo operation on it.
+        modulo = modulo_of(rational_hour(difference))
+        #
+        # Format the hour as a two-digit number.
+        # Establish the minutes based on modulo expression.
+        hh = format("%<hour>02d", :hour => absolute_hour(difference).ceil)
+        mm = modulo.zero? ? "00" : "30"
+
+        Jekyll.logger.debug "Timezone:", "#{timezone} #{offset}#{hh}:#{mm}"
+        #
+        # Note: The 3-letter-word below doesn't have a particular significance.
+        "WTZ#{sign}#{hh}:#{mm}"
+      end
+
+      private
+
+      # Private: Convert given seconds to an hour as a rational number.
+      #
+      # seconds - supplied as an integer, it is converted to a rational number.
+      # 3600 - no. of seconds in an hour.
+      #
+      # Returns a rational number.
+      def rational_hour(seconds)
+        seconds.to_r / 3600
+      end
+
+      # Private: Convert given seconds to an hour as an absolute number.
+      #
+      # seconds - supplied as an integer, it is converted to its absolute.
+      # 3600 - no. of seconds in an hour.
+      #
+      # Returns an integer.
+      def absolute_hour(seconds)
+        seconds.abs / 3600
+      end
+
+      # Private: Perform a modulo operation on a given fraction.
+      #
+      # fraction - supplied as a rational number, its numerator is divided
+      #            by its denominator and the remainder returned.
+      #
+      # Returns an integer.
+      def modulo_of(fraction)
+        fraction.numerator % fraction.denominator
+      end
+    end
+  end
+end