Fixup macOS detection (#3238)

puma · Sep 29, 2023 · 02a7d01 · 02a7d01
1 parent 252890c
commit 02a7d01
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/puma/detect.rb b/lib/puma/detect.rb
@@ -12,15 +12,14 @@ module Puma
 
   IS_JRUBY = Object.const_defined? :JRUBY_VERSION
 
-  IS_OSX = RUBY_PLATFORM.include? 'darwin'
+  IS_OSX = RUBY_DESCRIPTION.include? 'darwin'
 
-  IS_WINDOWS = !!(RUBY_PLATFORM =~ /mswin|ming|cygwin/) ||
-    IS_JRUBY && RUBY_DESCRIPTION.include?('mswin')
+  IS_WINDOWS = RUBY_DESCRIPTION.match?(/mswin|ming|cygwin/)
 
   IS_LINUX = !(IS_OSX || IS_WINDOWS)
 
   # @version 5.2.0
-  IS_MRI = (RUBY_ENGINE == 'ruby' || RUBY_ENGINE.nil?)
+  IS_MRI = RUBY_ENGINE == 'ruby'
 
   def self.jruby?
     IS_JRUBY

diff --git a/test/helpers/integration.rb b/test/helpers/integration.rb
@@ -9,7 +9,6 @@
 # have their own files, use those instead
 class TestIntegration < Minitest::Test
   include TmpPath
-  DARWIN = RUBY_PLATFORM.include? 'darwin'
   HOST  = "127.0.0.1"
   TOKEN = "xxyyzz"
   RESP_READ_LEN = 65_536

diff --git a/test/helpers/tmp_path.rb b/test/helpers/tmp_path.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TmpPath
   def clean_tmp_paths
     while path = tmp_paths.pop
@@ -14,7 +16,8 @@ def clean_tmp_paths
   #
   PUMA_TMPDIR =
     begin
-      if RUBY_PLATFORM.include? 'darwin'
+      if RUBY_DESCRIPTION.include? 'darwin'
+        # adds subdirectory 'tmp' in repository folder
         dir_temp = File.absolute_path("#{__dir__}/../../tmp")
         Dir.mkdir dir_temp unless Dir.exist? dir_temp
         './tmp'