ruby-next-core 0.9.0.pre → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b797d87fbbc3b9eb0c31ad04466abadb286728a80a5222808072994939dc81
-  data.tar.gz: 3e3f018b5adbfb2f2213722509d5d50fafec01efd85e92580e26234f7fd2f99e
+  metadata.gz: 79dd9f615898df70de6648be3805f3c0da92c80e22cd8e2cffc109958ec0811b
+  data.tar.gz: 7ed7e923ca5f2b3f6eaf27135a722f2a23e868fe65bce32f6700e74867e6d62c
 SHA512:
-  metadata.gz: 9ee37b8457ecba6d8c0ae4ff82a1d9e4a5fbc72a7d9e8bd0997d13ce461d0d3894cae439ddde2836a1e48c1af481d978c66eec83cb6f9865b96c417b69a0d0ba
-  data.tar.gz: 4d74819e5235e53cdad9c8f5ae25d761309937002a4d03858c0b979fc504535fc04ab76a45dd74ceb9165acb06d73fb643dbc02349925dc438d21155dcc342fc
+  metadata.gz: e16c8585ed3e8b5b23ccc5a7b79b80d6da6e96f539c008bc9e781e523c8451fec954b6f0e0948056de9feb231b30dd62989c26aea77890afc2037d91c0a4028a
+  data.tar.gz: b2d0d3891032b51a22ffccc600410d250da89d34332cc4797fc4e216f13ab82024520c262e43788660e041937c081a254ae7597e93e686fc23fcbd2d9df37e0c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.9.0 (2020-06-04)
+
+- Add Ruby 2.3 support. ([@palkan][])
+
+- Remove stale transpiled files when running `ruby-next nextify`. ([@palkan][])
+
 - Add Ruby 2.4 support. ([@palkan][])
 
 APIs for <2.5 must be backported via [backports][] gem. Refinements are not supported.

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/ruby-next.svg)](https://rubygems.org/gems/ruby-next) [![Build](https://github.com/ruby-next/ruby-next/workflows/Build/badge.svg)](https://github.com/ruby-next/ruby-next/actions)
-[![JRuby Build](https://github.com/ruby-next/ruby-next/workflows/JRuby%20Build/badge.svg)](https://github.com/ruby-next/ruby-next/actions)
+[![JRuby Build](https://github.com/ruby-next/ruby-next/workflows/JRuby%20Build/badge.svg)](https://github.com/ruby-next/ruby-next/actions?query=workflow%3A%22TruffleRuby+Build%22)
+[![TruffleRuby Build](https://github.com/ruby-next/ruby-next/workflows/TruffleRuby%20Build/badge.svg)](https://github.com/ruby-next/ruby-next/actions?query=workflow%3A%22TruffleRuby+Build%22)
 
 # Ruby Next
 
@@ -66,7 +67,7 @@ Core provides **polyfills** for Ruby core classes APIs via Refinements (default
 Language is responsible for **transpiling** edge Ruby syntax into older versions. It could be done
 programmatically or via CLI. It also could be done in runtime.
 
-Currently, Ruby Next supports Ruby versions 2.4+ (including JRuby 9.2.8+). Support for EOL versions (<2.5) slightly differs though ([see below](#using-with-eol-rubies)).
+Currently, Ruby Next supports Ruby versions 2.3+, including JRuby 9.2.8+ and TruffleRuby 20.1+ (with some limitations). Support for EOL versions (<2.5) slightly differs though ([see below](#using-with-eol-rubies)).
 
 Please, [open an issue](https://github.com/ruby-next/ruby-next/issues/new/choose) or join the discussion in the existing ones if you would like us to support older Ruby versions.
 
@@ -137,6 +138,8 @@ The following _rule of thumb_ is recommended when choosing between refinements a
 - Using core extensions could be considered for application development (no need to think about `using RubyNext`); this approach could potentially lead to conflicts with dependencies (if these dependencies are not using refinements 🙂)
 - Use core extensions if refinements are not supported by your platform
 
+**NOTE:** TruffleRuby doesn't fully support refinements (refining modules is not supported as of v20.1.0).
+
 [**The list of supported APIs.**][features_core]
 
 ## Transpiling
@@ -390,6 +393,12 @@ RUBYOPT="-ruby-next" ruby my_ruby_script.rb
 ruby -ruby-next -e "puts [2, 4, 5].tally"
 ```
 
+**NOTE:** running Ruby scripts directly or executing code via `-e` option is not supported in TruffleRuby. You can still use `-ruby-next` to transpile required files, e.g.:
+
+```sh
+ruby -ruby-next -r my_ruby_script.rb -e "puts my_method"
+```
+
 ## Logging and debugging
 
 Ruby Next prints some debugging information when fails to load a file in the runtime mode (and fallbacks to the built-in loading mechanism).
@@ -426,9 +435,7 @@ AllCops:
 
 ## Using with EOL Rubies
 
-**NOTE:** Use Ruby Next `0.9.0.pre` to use this feature.
-
-We currently provide experimental support for Ruby 2.4. Work on older Rubies (down to 2.2) is in progress.
+We currently provide support for Ruby 2.3 and 2.4. Work on 2.2 is in progress.
 
 Ruby Next itself relies on 2.5 features and contains polyfills only for version 2.5+ (and that won't change).
 Thus, to make it work with <2.5 we need to backport some APIs ourselves.

data/bin/transform

@@ -9,6 +9,7 @@ ENV["RUBY_NEXT_EDGE"] = "1"
 ENV["RUBY_NEXT_PROPOSED"] = "1"
 
 require "ruby-next/language"
+require "ruby-next/language/rewriters/runtime"
 
 contents =
   if File.exist?(ARGV[0])
@@ -17,4 +18,11 @@ contents =
     ARGV[0]
   end
 
-puts RubyNext::Language.transform(contents)
+opts =
+  if ARGV[1] && ARGV[1] == "--current"
+    {rewriters: RubyNext::Language.current_rewriters}
+  else
+    {}
+  end
+
+puts RubyNext::Language.transform(contents, **opts)

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

@@ -69,7 +69,7 @@ module RubyNext
         RubyNext::Core.patches.extensions
           .values
           .flatten
-          .filter do |patch|
+          .select do |patch|
           next if min_version && Gem::Version.new(patch.version) <= min_version
           next if filter && !filter.match?(patch.name)
           true

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

@@ -16,6 +16,8 @@ module RubyNext
         log "RubyNext core strategy: #{RubyNext::Core.strategy}"
         log "RubyNext transpile mode: #{RubyNext::Language.mode}"
 
+        remove_rbnext!
+
         paths.each do |path|
           contents = File.read(path)
           transpile path, contents
@@ -120,25 +122,17 @@ module RubyNext
       end
 
       def save(contents, path, version)
-        return $stdout.puts(contents) if out_path == "stdout"
+        return $stdout.puts(contents) if stdout?
 
         paths = [Pathname.new(path).relative_path_from(Pathname.new(lib_path))]
 
         paths.unshift(version.segments[0..1].join(".")) unless single_version?
 
         next_path =
-          if out_path
-            if out_path.end_with?(".rb")
-              out_path
-            else
-              File.join(out_path, *paths)
-            end
+          if next_dir_path.end_with?(".rb")
+            out_path
           else
-            File.join(
-              lib_path,
-              RUBY_NEXT_DIR,
-              *paths
-            )
+            File.join(next_dir_path, *paths)
           end
 
         unless CLI.dry_run?
@@ -150,6 +144,23 @@ module RubyNext
         log "Generated: #{next_path}"
       end
 
+      def remove_rbnext!
+        return if CLI.dry_run? || stdout?
+
+        return unless File.directory?(next_dir_path)
+
+        log "Remove old files: #{next_dir_path}"
+        FileUtils.rm_r(next_dir_path)
+      end
+
+      def next_dir_path
+        @next_dir_path ||= (out_path || File.join(lib_path, RUBY_NEXT_DIR))
+      end
+
+      def stdout?
+        out_path == "stdout"
+      end
+
       alias single_version? single_version
     end
   end

data/lib/ruby-next/core.rb

@@ -2,6 +2,8 @@
 
 require "set"
 
+require_relative "utils"
+
 module RubyNext
   module Core
     # Patch contains the extension implementation
@@ -182,6 +184,9 @@ require_relative "core/struct/deconstruct_keys"
 # Generate refinements
 RubyNext.module_eval do
   RubyNext::Core.patches.refined.each do |mod, patches|
+    # Only refine modules when supported
+    next unless mod.is_a?(Class) || RubyNext::Utils.refine_modules?
+
     refine mod do
       patches.each do |patch|
         module_eval(patch.body, *patch.location)

data/lib/ruby-next/core/time/ceil.rb

@@ -3,7 +3,8 @@
 RubyNext::Core.patch Time, method: :ceil, version: "2.7" do
   <<~'RUBY'
     def ceil(den = 0)
-      change = subsec.ceil(den) - subsec
+      sceil = (subsec * 10**den).ceil.to_r / 10**den
+      change = sceil - subsec
       self + change
     end
   RUBY

data/lib/ruby-next/language.rb

@@ -83,6 +83,8 @@ module RubyNext
       end
 
       def runtime!
+        require "ruby-next/language/rewriters/runtime"
+
         if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0") && !defined?(Unparser::Emitter::CaseMatch)
           RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since Unparser doesn't support 2.7 AST yet.\n" \
             "See https://github.com/mbj/unparser/pull/142"

data/lib/ruby-next/language/eval.rb

@@ -3,14 +3,16 @@
 module RubyNext
   module Language
     module KernelEval
-      refine Kernel do
-        def eval(source, bind = nil, *args)
-          new_source = ::RubyNext::Language::Runtime.transform(
-            source,
-            using: bind&.receiver == TOPLEVEL_BINDING.receiver || bind&.receiver&.is_a?(Module)
-          )
-          RubyNext.debug_source(new_source, "(#{caller_locations(1, 1).first})")
-          super new_source, bind, *args
+      if Utils.refine_modules?
+        refine Kernel do
+          def eval(source, bind = nil, *args)
+            new_source = ::RubyNext::Language::Runtime.transform(
+              source,
+              using: bind&.receiver == TOPLEVEL_BINDING.receiver || bind&.receiver&.is_a?(Module)
+            )
+            RubyNext.debug_source(new_source, "(#{caller_locations(1, 1).first})")
+            super new_source, bind, *args
+          end
         end
       end
     end

data/lib/ruby-next/language/rewriters/base.rb

@@ -59,7 +59,7 @@ module RubyNext
           def unsupported_syntax?
             save_verbose, $VERBOSE = $VERBOSE, nil
             eval_mid = Kernel.respond_to?(:eval_without_ruby_next) ? :eval_without_ruby_next : :eval
-            Kernel.send eval_mid, self::SYNTAX_PROBE
+            Kernel.send eval_mid, self::SYNTAX_PROBE, nil, __FILE__, __LINE__
             false
           rescue SyntaxError, NameError
             true

data/lib/ruby-next/language/rewriters/pattern_matching.rb

@@ -816,11 +816,12 @@ module RubyNext
         end
 
         def respond_to_missing?(mid, *)
-          return true if mid.match?(/_(clause|array_element)/)
+          return true if mid.to_s.match?(/_(clause|array_element)/)
           super
         end
 
         def method_missing(mid, *args, &block)
+          mid = mid.to_s
           return case_eq_clause(*args) if mid.match?(/_clause$/)
           return case_eq_array_element(*args) if mid.match?(/_array_element$/)
           return case_eq_hash_element(*args) if mid.match?(/_hash_element$/)

data/lib/ruby-next/language/rewriters/runtime.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Load rewriters only required for runtime transpiling
+
+require "ruby-next/language/rewriters/runtime/dir"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::Dir

data/lib/ruby-next/language/rewriters/runtime/dir.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      # Special rewriter for Ruby <=2.3, which doesn't support __dir__ in iseq.eval
+      class Dir < Base
+        SYNTAX_PROBE = "defined?(RubyVM::InstructionSequence) && RubyVM::InstructionSequence.compile('raise SyntaxError if __dir__.nil?', 'test.rb').eval"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.4.0")
+
+        def on_send(node)
+          return super(node) unless node.children[1] == :__dir__
+
+          context.track! self
+
+          replace(node.loc.expression, "File.dirname(__FILE__)")
+
+          process(
+            node.updated(
+              nil,
+              [
+                s(:const, nil, :File),
+                :dirname,
+                s(:send, nil, "__FILE__")
+              ]
+            )
+          )
+        end
+      end
+    end
+  end
+end

data/lib/ruby-next/language/runtime.rb

@@ -42,7 +42,7 @@ module RubyNext
           path
         end
 
-        if defined?(JRUBY_VERSION)
+        if defined?(JRUBY_VERSION) || defined?(TruffleRuby)
           def evaluate(code, filepath)
             new_toplevel.eval(code, filepath)
           end
@@ -89,7 +89,8 @@ module Kernel
 
   alias_method :require_relative_without_ruby_next, :require_relative
   def require_relative(path)
-    from = caller_locations(1..1).first.absolute_path || File.join(Dir.pwd, "main")
+    loc = caller_locations(1..1).first
+    from = loc.absolute_path || loc.path || File.join(Dir.pwd, "main")
     realpath = File.absolute_path(
       File.join(
         File.dirname(File.absolute_path(from)),

data/lib/ruby-next/utils.rb

@@ -33,5 +33,35 @@ module RubyNext
         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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.9.0.pre"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre
+  version: 0.9.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0.4
+        version: 2.8.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0.4
+        version: 2.8.0.6
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,8 @@ files:
 - lib/ruby-next/language/rewriters/numbered_params.rb
 - lib/ruby-next/language/rewriters/pattern_matching.rb
 - lib/ruby-next/language/rewriters/right_hand_assignment.rb
+- lib/ruby-next/language/rewriters/runtime.rb
+- lib/ruby-next/language/rewriters/runtime/dir.rb
 - lib/ruby-next/language/runtime.rb
 - lib/ruby-next/language/setup.rb
 - lib/ruby-next/language/unparser.rb
@@ -121,12 +123,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: