ruby-next-core 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5689b631e2b8dd6e9222a60b25434fcb323d008458342c395ff891015d9f651d
-  data.tar.gz: 6178612f34fbbe59ea3f3042fc62ea23cc3bede62a944e187791a7304164d819
+  metadata.gz: 31bef7eea12c9a2c8b04f3daa62816e96b764bcbaf7cfc0f01d4bf1b040f34b9
+  data.tar.gz: 793834fef3c0a00944b7026a975f7ee4b97219ae42b2b3ebfb5327d4a3e5311c
 SHA512:
-  metadata.gz: f24eef8dc28b0ad4e8f9d5073d1254f31111354291b9bfb60cb8c688fbf312f153ba8fe17886183798b9413280bac554f9012e2ec2b63d250f0bf3c34a3362eb
-  data.tar.gz: d9ab4a36680864b81cd545d438e001a51e4c6dfbca56336a971b557af50786b70c7b7f9eee37698fc0373480e56f51c153080b9e06ec218dc8d08e0da2dc79d6
+  metadata.gz: 690f42ac5954bbe4b2c6a0e4ee0a05f4842c87a4ade5bccb3f7be90d76b92df89e715a07c785f5286bb4137ac3357fe4341e90b41f010db8716fab5a9bdcfb83
+  data.tar.gz: 48bd02bbd66656cd9892cad1c8fe767c205bfba5eb47c59cfacdf3060af3c7cf886fbba6396283f3e19eb1da66cd53e9b6a5125595ec694cd8c37ad6ecb4e0f1

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+## 0.9.2 (2020-06-24)
+
+- Support passing rewriters to CLI. ([@sl4vr][])
+
+Use `nextify --list-rewriters` to view all available rewriters.
+Use `nextify` with `--rewrite=REWRITERS...` option to specify which particular rewriters to use.
+
 ## 0.9.1 (2020-06-05)
 
 - Keep `ruby-next` version in sync with `ruby-next-core`. ([@palkan][])
@@ -195,3 +202,4 @@ p a #=> 1
 
 [@palkan]: https://github.com/palkan
 [backports]: https://github.com/marcandre/backports
+[@sl4vr]: https://github.com/sl4vr

data/README.md

@@ -1,3 +1,4 @@
+[![Cult Of Martians](http://cultofmartians.com/assets/badges/badge.svg)](https://cultofmartians.com/tasks/ruby-next-cli-rewriters.html#task)
 [![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?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)
@@ -200,12 +201,15 @@ It has the following interface:
 ```sh
 $ ruby-next nextify
 Usage: ruby-next nextify DIRECTORY_OR_FILE [options]
-    -o, --output=OUTPUT              Specify output directory or file or stdout (use -o stdout for that)
+    -o, --output=OUTPUT              Specify output directory or file or stdout
         --min-version=VERSION        Specify the minimum Ruby version to support
         --single-version             Only create one version of a file (for the earliest Ruby version)
-        --enable-method-reference    Enable reverted method reference syntax (requires custom parser)
+        --edge                       Enable edge (master) Ruby features
+        --proposed                   Enable proposed/experimental Ruby features
         --transpile-mode=MODE        Transpiler mode (ast or rewrite). Default: ast
         --[no-]refine                Do not inject `using RubyNext`
+        --list-rewriters             List available rewriters
+        --rewrite=REWRITERS...       Specify particular Ruby features to rewrite
     -h, --help                       Print help
     -V                               Turn on verbose mode
         --dry-run                    Print verbose output without generating files

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

@@ -10,7 +10,7 @@ module RubyNext
     class Nextify < Base
       using RubyNext
 
-      attr_reader :lib_path, :paths, :out_path, :min_version, :single_version
+      attr_reader :lib_path, :paths, :out_path, :min_version, :single_version, :specified_rewriters
 
       def run
         log "RubyNext core strategy: #{RubyNext::Core.strategy}"
@@ -18,6 +18,8 @@ module RubyNext
 
         remove_rbnext!
 
+        @min_version ||= MIN_SUPPORTED_VERSION
+
         paths.each do |path|
           contents = File.read(path)
           transpile path, contents
@@ -26,7 +28,8 @@ module RubyNext
 
       def parse!(args)
         print_help = false
-        @min_version = MIN_SUPPORTED_VERSION
+        print_rewriters = false
+        rewriter_names = []
         @single_version = false
 
         optparser = base_parser do |opts|
@@ -63,6 +66,14 @@ module RubyNext
             Core.strategy = :core_ext unless val
           end
 
+          opts.on("--list-rewriters", "List available rewriters") do |val|
+            print_rewriters = true
+          end
+
+          opts.on("--rewrite=REWRITERS...", "Specify particular Ruby features to rewrite") do |val|
+            rewriter_names << val
+          end
+
           opts.on("-h", "--help", "Print help") do
             print_help = true
           end
@@ -77,12 +88,35 @@ module RubyNext
           exit 0
         end
 
+        if print_rewriters
+          Language.rewriters.each do |rewriter|
+            $stdout.puts "#{rewriter::NAME} (\"#{rewriter::SYNTAX_PROBE}\")"
+          end
+          exit 0
+        end
+
         unless lib_path&.then(&File.method(:exist?))
           $stdout.puts "Path not found: #{lib_path}"
           $stdout.puts optparser.help
           exit 2
         end
 
+        if rewriter_names.any? && min_version
+          $stdout.puts "--rewrite cannot be used with --min-version simultaneously"
+          exit 2
+        end
+
+        @specified_rewriters =
+          if rewriter_names.any?
+            begin
+              Language.select_rewriters(*rewriter_names)
+            rescue Language::RewriterNotFoundError => error
+              $stdout.puts error.message
+              $stdout.puts "Try --list-rewriters to see list of available rewriters"
+              exit 2
+            end
+          end
+
         @paths =
           if File.directory?(lib_path)
             Dir[File.join(lib_path, "**/*.rb")]
@@ -96,16 +130,11 @@ module RubyNext
       private
 
       def transpile(path, contents, version: min_version)
-        rewriters = Language.rewriters.select { |rw| rw.unsupported_version?(version) }
+        rewriters = specified_rewriters || Language.rewriters.select { |rw| rw.unsupported_version?(version) }
 
         context = Language::TransformContext.new
 
-        new_contents =
-          if Gem::Version.new(version) >= Gem::Version.new("2.7.0") && !defined?(Unparser::Emitter::CaseMatch)
-            Language.rewrite contents, context: context, rewriters: rewriters
-          else
-            Language.transform contents, context: context, rewriters: rewriters
-          end
+        new_contents = Language.transform contents, context: context, rewriters: rewriters
 
         return unless context.dirty?
 
@@ -161,7 +190,9 @@ module RubyNext
         out_path == "stdout"
       end
 
-      alias single_version? single_version
+      def single_version?
+        single_version || specified_rewriters
+      end
     end
   end
 end

data/lib/ruby-next/language.rb

@@ -23,6 +23,8 @@ module RubyNext
     require "ruby-next/language/parser"
     require "ruby-next/language/unparser"
 
+    RewriterNotFoundError = Class.new(StandardError)
+
     class TransformContext
       attr_reader :versions, :use_ruby_next
 
@@ -85,12 +87,6 @@ module RubyNext
       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"
-          self.mode = :rewrite
-        end
-
         @runtime = true
       end
 
@@ -104,6 +100,13 @@ module RubyNext
         else
           regenerate(*args, **kwargs)
         end
+      rescue Unparser::UnknownEmitterError
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
+          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"
+          self.mode = :rewrite
+        end
+        rewrite(*args, **kwargs)
       end
 
       def regenerate(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
@@ -149,6 +152,16 @@ module RubyNext
         @current_rewriters ||= rewriters.select(&:unsupported_syntax?)
       end
 
+      # This method guarantees that rewriters will be returned in order they defined in Language module
+      def select_rewriters(*names)
+        rewriters_delta = names - rewriters.map { |rewriter| rewriter::NAME }
+        if rewriters_delta.any?
+          raise RewriterNotFoundError, "Rewriters not found: #{rewriters_delta.join(",")}"
+        end
+
+        rewriters.select { |rewriter| names.include?(rewriter::NAME) }
+      end
+
       private
 
       attr_writer :watch_dirs

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

@@ -6,6 +6,9 @@ module RubyNext
   module Language
     class Builder < ::Parser::Builders::Default
       modernize
+
+      # FIXME: add support for 2.8 forward args
+      self.emit_forward_arg = false
     end
 
     class << self

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

@@ -4,6 +4,7 @@ module RubyNext
   module Language
     module Rewriters
       class ArgsForward < Base
+        NAME = "args-forward"
         SYNTAX_PROBE = "obj = Object.new; def obj.foo(...) super(...); end"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
 

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

@@ -4,6 +4,7 @@ module RubyNext
   module Language
     module Rewriters
       class EndlessMethod < Base
+        NAME = "endless-method"
         SYNTAX_PROBE = "obj = Object.new; def obj.foo() = 42"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.8.0")
 

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

@@ -4,6 +4,7 @@ module RubyNext
   module Language
     module Rewriters
       class EndlessRange < Base
+        NAME = "endless-range"
         SYNTAX_PROBE = "[0, 1][1..]"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.6.0")
 

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

@@ -4,6 +4,7 @@ module RubyNext
   module Language
     module Rewriters
       class MethodReference < Base
+        NAME = "method-reference"
         SYNTAX_PROBE = "Language.:transform"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
 

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

@@ -6,6 +6,7 @@ module RubyNext
       class NumberedParams < Base
         using RubyNext
 
+        NAME = "numbered-params"
         SYNTAX_PROBE = "proc { _1 }.call(1)"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
 

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

@@ -216,6 +216,7 @@ module RubyNext
       end
 
       class PatternMatching < Base
+        NAME = "pattern-matching"
         SYNTAX_PROBE = "case 0; in 0; true; else; 1; end"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
 

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

@@ -4,6 +4,7 @@ module RubyNext
   module Language
     module Rewriters
       class RightHandAssignment < Base
+        NAME = "right-hand-assignment"
         SYNTAX_PROBE = "1 + 2 => a"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.8.0")
 

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

@@ -6,3 +6,17 @@ require "parser/current"
 $VERBOSE = save_verbose
 
 require "unparser"
+
+unless defined?(Unparser::UnknownEmitterError)
+  module Unparser
+    class UnknownEmitterError < ArgumentError
+    end
+
+    Emitter.singleton_class.prepend(Module.new do
+      def emitter(node, parent)
+        raise UnknownEmitterError, "No emitter for node: #{node.type.inspect}" unless Emitter::REGISTRY.key?(node.type)
+        super
+      end
+    end)
+  end
+end

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-23 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.6
+        version: 2.8.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0.6
+        version: 2.8.0.7
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement