ruby-next-core 0.9.2 → 0.10.0

data/lib/.rbnext/2.3/ruby-next/utils.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Utils
+    module_function
+
+    if $LOAD_PATH.respond_to?(:resolve_feature_path)
+      def resolve_feature_path(feature)
+        ((!$LOAD_PATH.resolve_feature_path(feature).nil?) || nil) && $LOAD_PATH.resolve_feature_path(feature).last
+      rescue LoadError
+      end
+    else
+      def resolve_feature_path(path)
+        if File.file?(relative = File.expand_path(path))
+          path = relative
+        end
+
+        path = "#{path}.rb" if File.extname(path).empty?
+
+        return path if Pathname.new(path).absolute?
+
+        $LOAD_PATH.find do |lp|
+          lpath = File.join(lp, path)
+          return File.realpath(lpath) if File.file?(lpath)
+        end
+      end
+    end
+
+    def source_with_lines(source, path)
+      source.lines.map.with_index do |line, i|
+        "#{(i + 1).to_s.rjust(4)}:  #{line}"
+      end.tap do |lines|
+        lines.unshift "   0:  # source: #{path}"
+      end
+    end
+
+    # Returns true if modules refinement is supported in current version
+    def refine_modules?
+      @refine_modules ||=
+        begin
+          # Make sure that including modules within refinements works
+          # See https://github.com/oracle/truffleruby/issues/2026
+          eval <<-RUBY, TOPLEVEL_BINDING, __FILE__, __LINE__ + 1
+           module RubyNext::Utils::A; end
+           class RubyNext::Utils::B
+             include RubyNext::Utils::A
+           end
+           using(Module.new do
+             refine RubyNext::Utils::A do
+               include(Module.new do
+                 def i_am_refinement
+                   "yes, you are!"
+                 end
+               end)
+             end
+           end)
+           RubyNext::Utils::B.new.i_am_refinement
+          RUBY
+          true
+        rescue TypeError, NoMethodError
+          false
+        end
+    end
+  end
+end

data/lib/ruby-next.rb

@@ -4,17 +4,18 @@ require "ruby-next/version"
 
 module RubyNext
   # Mininum Ruby version supported by RubyNext
-  MIN_SUPPORTED_VERSION = Gem::Version.new("2.5.0")
+  MIN_SUPPORTED_VERSION = Gem::Version.new("2.2.0")
 
   # Where to store transpiled files (relative from the project LOAD_PATH, usually `lib/`)
   RUBY_NEXT_DIR = ".rbnext"
 
   # Defines last minor version for every major version
   LAST_MINOR_VERSIONS = {
-    2 => 8
+    2 => 8, # 2.8 is required for backward compatibility: some gems already uses it
+    3 => 0
   }.freeze
 
-  LATEST_VERSION = [2, 8].freeze
+  LATEST_VERSION = [3, 0].freeze
 
   class << self
     def next_version(version = RUBY_VERSION)
@@ -33,7 +34,8 @@ module RubyNext
     end
   end
 
-  require_relative "ruby-next/core"
-  require_relative "ruby-next/core_ext" if RubyNext::Core.core_ext?
-  require_relative "ruby-next/logging"
+  require "ruby-next/setup_self"
+  require "ruby-next/core"
+  require "ruby-next/core_ext" if RubyNext::Core.core_ext?
+  require "ruby-next/logging"
 end

data/lib/ruby-next/cli.rb

@@ -61,7 +61,7 @@ module RubyNext
     def maybe_print_help
       return unless @print_help
 
-      STDOUT.puts optparser.help
+      $stdout.puts optparser.help
       exit 0
     end
 
@@ -85,7 +85,7 @@ module RubyNext
           opts.banner = "Usage: ruby-next COMMAND [options]"
 
           opts.on("-v", "--version", "Print version") do
-            STDOUT.puts RubyNext::VERSION
+            $stdout.puts RubyNext::VERSION
             exit 0
           end
 

data/lib/ruby-next/commands/core_ext.rb

@@ -160,7 +160,7 @@ module RubyNext
         # remove empty lines
         new_src.gsub!(/^\s+$/, "")
         # remove traling blank lines
-        new_src.gsub!(/\n\z/, "")
+        new_src.delete_suffix!("\n")
         new_src
       end
     end

data/lib/ruby-next/core.rb

@@ -2,7 +2,7 @@
 
 require "set"
 
-require_relative "utils"
+require "ruby-next/utils"
 
 module RubyNext
   module Core
@@ -25,7 +25,7 @@ module RubyNext
           @supported = supported.nil? ? mod.method_defined?(method_name) : supported
           # define whether running Ruby has a native implementation for this method
           # for that, we check the source_location (which is nil for C defined methods)
-          @native = native.nil? ? (supported? && mod.instance_method(method_name).source_location.nil?) : native
+          @native = native.nil? ? (supported? && native_location?(mod.instance_method(method_name).source_location)) : native
         end
         @singleton = singleton
         @refineables = Array(refineable)
@@ -75,6 +75,10 @@ module RubyNext
 
         [trace_location.absolute_path, trace_location.lineno + 2]
       end
+
+      def native_location?(location)
+        location.nil? || location.first.match?(/(<internal:|resource:\/truffleruby\/core)/)
+      end
     end
 
     # Registry for patches
@@ -144,29 +148,29 @@ end
 
 require "backports/2.5" if RubyNext::Core.backports?
 
-require_relative "core/kernel/then"
+require "ruby-next/core/kernel/then"
 
-require_relative "core/proc/compose"
+require "ruby-next/core/proc/compose"
 
-require_relative "core/enumerable/tally"
-require_relative "core/enumerable/filter"
-require_relative "core/enumerable/filter_map"
+require "ruby-next/core/enumerable/tally"
+require "ruby-next/core/enumerable/filter"
+require "ruby-next/core/enumerable/filter_map"
 
-require_relative "core/enumerator/produce"
+require "ruby-next/core/enumerator/produce"
 
-require_relative "core/array/difference_union_intersection"
+require "ruby-next/core/array/difference_union_intersection"
 
-require_relative "core/hash/merge"
+require "ruby-next/core/hash/merge"
 
-require_relative "core/string/split"
+require "ruby-next/core/string/split"
 
-require_relative "core/symbol/start_with"
-require_relative "core/symbol/end_with"
+require "ruby-next/core/symbol/start_with"
+require "ruby-next/core/symbol/end_with"
 
-require_relative "core/unboundmethod/bind_call"
+require "ruby-next/core/unboundmethod/bind_call"
 
-require_relative "core/time/floor"
-require_relative "core/time/ceil"
+require "ruby-next/core/time/floor"
+require "ruby-next/core/time/ceil"
 
 # Core extensions required for pattern matching
 # Required for pattern matching with refinements
@@ -175,11 +179,13 @@ unless defined?(NoMatchingPatternError)
   end
 end
 
-require_relative "core/constants/no_matching_pattern_error"
-require_relative "core/array/deconstruct"
-require_relative "core/hash/deconstruct_keys"
-require_relative "core/struct/deconstruct"
-require_relative "core/struct/deconstruct_keys"
+require "ruby-next/core/constants/no_matching_pattern_error"
+require "ruby-next/core/array/deconstruct"
+require "ruby-next/core/hash/deconstruct_keys"
+require "ruby-next/core/struct/deconstruct"
+require "ruby-next/core/struct/deconstruct_keys"
+
+require "ruby-next/core/hash/except"
 
 # Generate refinements
 RubyNext.module_eval do

data/lib/ruby-next/core/array/deconstruct.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Array, method: :deconstruct, version: "2.7" do
-  <<~RUBY
-    def deconstruct
-      self
-    end
+  <<-RUBY
+def deconstruct
+  self
+end
   RUBY
 end
 
 # We need to hack `respond_to?` in Ruby 2.5, since it's not working with refinements
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
   RubyNext::Core.patch refineable: Array, name: "ArrayRespondToDeconstruct", method: :deconstruct, version: "2.7" do
-    <<~RUBY
-      def respond_to?(mid, *)
-        return true if mid == :deconstruct
-        super
-      end
+    <<-RUBY
+def respond_to?(mid, *)
+  return true if mid == :deconstruct
+  super
+end
     RUBY
   end
 end

data/lib/ruby-next/core/array/difference_union_intersection.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Array, method: :union, version: "2.6" do
-  <<~RUBY
-    def union(*others)
-      others.reduce(Array.new(self).uniq) { |acc, arr| acc | arr }
-    end
+  <<-RUBY
+def union(*others)
+  others.reduce(Array.new(self).uniq) { |acc, arr| acc | arr }
+end
   RUBY
 end
 
 RubyNext::Core.patch Array, method: :difference, version: "2.6" do
-  <<~RUBY
-    def difference(*others)
-      others.reduce(Array.new(self)) { |acc, arr| acc - arr }
-    end
+  <<-RUBY
+def difference(*others)
+  others.reduce(Array.new(self)) { |acc, arr| acc - arr }
+end
   RUBY
 end
 
 RubyNext::Core.patch Array, method: :intersection, version: "2.7" do
-  <<~RUBY
-    def intersection(*others)
-      others.reduce(Array.new(self)) { |acc, arr| acc & arr }
-    end
+  <<-RUBY
+def intersection(*others)
+  others.reduce(Array.new(self)) { |acc, arr| acc & arr }
+end
   RUBY
 end

data/lib/ruby-next/core/constants/no_matching_pattern_error.rb

@@ -10,8 +10,8 @@ RubyNext::Core.patch Object,
   # we only use the contents in `ruby-next core_ext`.
   supported: true,
   location: [__FILE__, __LINE__ + 2] do
-  <<~RUBY
-    class NoMatchingPatternError < RuntimeError
-    end
+  <<-RUBY
+class NoMatchingPatternError < RuntimeError
+end
   RUBY
 end

data/lib/ruby-next/core/enumerable/filter.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Enumerable, method: :filter, version: "2.6" do
-  <<~RUBY
-    alias filter select
+  <<-RUBY
+alias filter select
   RUBY
 end
 
@@ -11,15 +11,15 @@ end
 #
 # Also, Array also have `filter!`
 RubyNext::Core.patch Array, method: :filter!, version: "2.6" do
-  <<~RUBY
-    alias filter select
-    alias filter! select!
+  <<-RUBY
+alias filter select
+alias filter! select!
   RUBY
 end
 
 RubyNext::Core.patch Hash, method: :filter!, version: "2.6" do
-  <<~RUBY
-    alias filter select
-    alias filter! select!
+  <<-RUBY
+alias filter select
+alias filter! select!
   RUBY
 end

data/lib/ruby-next/core/enumerable/filter_map.rb

@@ -3,36 +3,36 @@
 # Refine Array seprately, 'cause refining modules is vulnerable to prepend:
 # - https://bugs.ruby-lang.org/issues/13446
 RubyNext::Core.patch Enumerable, method: :filter_map, version: "2.7", refineable: [Enumerable, Array] do
-  <<~RUBY
-    def filter_map
-      if block_given?
-        result = []
-        each do |element|
-          res = yield element
-          result << res if res
-        end
-        result
-      else
-        Enumerator.new do |yielder|
-          result = []
-          each do |element|
-            res = yielder.yield element
-            result << res if res
-          end
-          result
-        end
+  <<-RUBY
+def filter_map
+  if block_given?
+    result = []
+    each do |element|
+      res = yield element
+      result << res if res
+    end
+    result
+  else
+    Enumerator.new do |yielder|
+      result = []
+      each do |element|
+        res = yielder.yield element
+        result << res if res
       end
+      result
     end
+  end
+end
   RUBY
 end
 
 RubyNext::Core.patch Enumerator::Lazy, method: :filter_map, version: "2.7" do
-  <<~RUBY
-    def filter_map
-      Enumerator::Lazy.new(self) do |yielder, *values|
-        result = yield(*values)
-        yielder << result if result
-      end
-    end
+  <<-RUBY
+def filter_map
+  Enumerator::Lazy.new(self) do |yielder, *values|
+    result = yield(*values)
+    yielder << result if result
+  end
+end
   RUBY
 end

data/lib/ruby-next/core/enumerable/tally.rb

@@ -3,12 +3,12 @@
 # Refine Array seprately, 'cause refining modules is vulnerable to prepend:
 # - https://bugs.ruby-lang.org/issues/13446
 RubyNext::Core.patch Enumerable, method: :tally, version: "2.7", refineable: [Enumerable, Array] do
-  <<~RUBY
-    def tally
-      each_with_object({}) do |v, acc|
-        acc[v] ||= 0
-        acc[v] += 1
-      end
-    end
+  <<-RUBY
+def tally
+  each_with_object({}) do |v, acc|
+    acc[v] ||= 0
+    acc[v] += 1
+  end
+end
   RUBY
 end

data/lib/ruby-next/core/enumerator/produce.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Enumerator.singleton_class, method: :produce, singleton: Enumerator, version: "2.7" do
-  <<~'RUBY'
-    # Based on https://github.com/zverok/enumerator_generate
-    def produce(*rest, &block)
-      raise ArgumentError, "wrong number of arguments (given #{rest.size}, expected 0..1)" if rest.size > 1
-      raise ArgumentError, "No block given" unless block
+  <<-'RUBY'
+# Based on https://github.com/zverok/enumerator_generate
+def produce(*rest, &block)
+  raise ArgumentError, "wrong number of arguments (given #{rest.size}, expected 0..1)" if rest.size > 1
+  raise ArgumentError, "No block given" unless block
 
-      Enumerator.new(Float::INFINITY) do |y|
-        val = rest.empty? ? yield() : rest.pop
+  Enumerator.new(Float::INFINITY) do |y|
+    val = rest.empty? ? yield() : rest.pop
 
-        loop do
-          y << val
-          val = yield(val)
-        end
-      end
+    loop do
+      y << val
+      val = yield(val)
     end
+  end
+end
   RUBY
 end