ruby-next-core 0.15.2 → 1.0.0.rc.1

data/lib/ruby-next/language.rb

@@ -3,7 +3,7 @@
 gem "ruby-next-parser", ">= 2.8.0.3"
 gem "unparser", ">= 0.4.7"
 
-require "set"
+require "set" # rubocop:disable Lint/RedundantRequireStatement
 
 require "ruby-next"
 
@@ -62,8 +62,15 @@ module RubyNext
     end
 
     class << self
+      attr_reader :include_patterns
+      attr_reader :exclude_patterns
+
+      def watch_dirs
+        warn "[DEPRECATED] Use `RubyNext::Language.include_patterns` instead of `RubyNext::Language.watch_dirs`"
+        @watch_dirs
+      end
+
       attr_accessor :rewriters
-      attr_reader :watch_dirs
 
       attr_accessor :strategy
 
@@ -95,14 +102,17 @@ module RubyNext
       end
 
       def transform(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
+        text_rewriters, ast_rewriters = rewriters.partition(&:text?)
+
         retried = 0
-        new_source = nil
+        new_source = text_rewrite(source, rewriters: text_rewriters, using: using, context: context)
+
         begin
           new_source =
             if mode == :rewrite
-              rewrite(source, rewriters: rewriters, using: using, context: context)
+              rewrite(new_source, rewriters: ast_rewriters, using: using, context: context)
             else
-              regenerate(source, rewriters: rewriters, using: using, context: context)
+              regenerate(new_source, rewriters: ast_rewriters, using: using, context: context)
             end
         rescue Unparser::UnknownNodeError => err
           RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since the version of Unparser you use doesn't support some syntax yet: #{err.message}.\n" \
@@ -119,8 +129,17 @@ module RubyNext
         Core.inject! new_source.dup
       end
 
+      def target_dir?(dirname)
+        # fnmatch? requires a file name, not a folder
+        fname = File.join(dirname, "x.rb")
+
+        include_patterns.any? { |pattern| File.fnmatch?(pattern, fname) } &&
+          exclude_patterns.none? { |pattern| File.fnmatch?(pattern, fname) }
+      end
+
       def transformable?(path)
-        watch_dirs.any? { |dir| path.start_with?(dir) }
+        include_patterns.any? { |pattern| File.fnmatch?(pattern, path) } &&
+          exclude_patterns.none? { |pattern| File.fnmatch?(pattern, path) }
       end
 
       # Rewriters required for the current version
@@ -165,14 +184,36 @@ module RubyNext
         end
       end
 
+      def text_rewrite(source, rewriters:, using:, context:)
+        rewriters.inject(source) do |src, rewriter|
+          rewriter.new(context).rewrite(src)
+        end.then do |new_source|
+          next source unless context.dirty?
+
+          new_source
+        end
+      end
+
       attr_writer :watch_dirs
+      attr_writer :include_patterns, :exclude_patterns
     end
 
     self.rewriters = []
-    self.watch_dirs = %w[app lib spec test].map { |path| File.join(Dir.pwd, path) }
+    self.watch_dirs = [].tap do |dirs|
+      # For backward compatibility
+      dirs.define_singleton_method(:<<) do |dir|
+        super(dir)
+        RubyNext::Language.include_patterns << File.join(dir, "*.rb")
+      end
+    end
+
+    self.include_patterns = %w[app lib spec test].map { |path| File.join(Dir.pwd, path, "*.rb") }
+    self.exclude_patterns = %w[vendor/bundle].map { |path| File.join(Dir.pwd, path, "*") }
     self.mode = ENV.fetch("RUBY_NEXT_TRANSPILE_MODE", "rewrite").to_sym
 
+    require "ruby-next/language/rewriters/abstract"
     require "ruby-next/language/rewriters/base"
+    require "ruby-next/language/rewriters/text"
 
     require "ruby-next/language/rewriters/2.1/numeric_literals"
     rewriters << Rewriters::NumericLiterals
@@ -212,7 +253,7 @@ module RubyNext
     rewriters << Rewriters::InPattern
 
     require "ruby-next/language/rewriters/3.0/endless_method"
-    RubyNext::Language.rewriters << RubyNext::Language::Rewriters::EndlessMethod
+    rewriters << RubyNext::Language::Rewriters::EndlessMethod
 
     require "ruby-next/language/rewriters/3.1/oneline_pattern_parensless"
     rewriters << Rewriters::OnelinePatternParensless
@@ -232,16 +273,19 @@ module RubyNext
     require "ruby-next/language/rewriters/3.1/shorthand_hash"
     rewriters << RubyNext::Language::Rewriters::ShorthandHash
 
+    require "ruby-next/language/rewriters/3.2/anonymous_restargs"
+    rewriters << RubyNext::Language::Rewriters::AnonymousRestArgs
+
     # Put endless range in the end, 'cause Parser fails to parse it in
     # pattern matching
     require "ruby-next/language/rewriters/2.6/endless_range"
     rewriters << Rewriters::EndlessRange
 
-    if ENV["RUBY_NEXT_EDGE"] == "1"
+    if RubyNext.edge_syntax?
       require "ruby-next/language/rewriters/edge"
     end
 
-    if ENV["RUBY_NEXT_PROPOSED"] == "1"
+    if RubyNext.proposed_syntax?
       require "ruby-next/language/rewriters/proposed"
     end
   end

data/lib/ruby-next/pry.rb

@@ -64,7 +64,7 @@ end)
 Pry::Code.singleton_class.prepend(Module.new do
   def complete_expression?(str)
     silence_stderr do
-      ::Parser::RubyNext.parse(str)
+      ::RubyNext::Language.parser_class.parse(str)
     end
 
     true

data/lib/ruby-next/rubocop.rb

@@ -4,6 +4,7 @@
 # edge features and fix some bugs with 2.7+ syntax
 
 require "parser/ruby-next/version"
+require "ruby-next/config"
 require "ruby-next/language/parser"
 
 module RuboCop
@@ -38,6 +39,7 @@ module RuboCop
       def parser_class(version)
         return super unless version == RUBY_NEXT_VERSION
 
+        require "parser/rubynext"
         Parser::RubyNext
       end
     end

data/lib/ruby-next/utils.rb

@@ -4,28 +4,6 @@ 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)&.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}"
@@ -36,6 +14,7 @@ module RubyNext
 
     # Returns true if modules refinement is supported in current version
     def refine_modules?
+      save_verbose, $VERBOSE = $VERBOSE, nil
       @refine_modules ||=
         begin
           # Make sure that including modules within refinements works
@@ -61,6 +40,8 @@ module RubyNext
           true
         rescue TypeError, NoMethodError
           false
+        ensure
+          $VERBOSE = save_verbose
         end
     end
   end

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.15.2"
+  VERSION = "1.0.0.rc.1"
 end

data/lib/uby-next.rb

@@ -9,7 +9,7 @@ require "ruby-next/core/runtime"
 
 using RubyNext
 
-RubyNext::Language.watch_dirs << Dir.pwd
+RubyNext::Language.include_patterns << File.join(Dir.pwd, ".rb")
 
 require "stringio"
 
@@ -36,7 +36,7 @@ end
 at_exit do
   $stderr = orig_stderr
 
-  if NoMethodError === $! || SyntaxError === $!
+  if NoMethodError === $! || SyntaxError === $! || NameError === $!
     if $0 && File.exist?($0)
       load($0)
       exit!(0)

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: require-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.2.0
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: paco
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: "\n    Ruby Next Core is a zero deps version of Ruby Next meant to be
   used\n    as as dependency in your gems.\n\n    It contains all the polyfills and
   utility files but doesn't require transpiler\n    dependencies to be install.\n
@@ -52,14 +80,18 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- bin/mspec
 - bin/parse
 - bin/reparse
 - bin/ruby-next
 - bin/transform
+- lib/.rbnext/2.1/ruby-next/commands/nextify.rb
 - lib/.rbnext/2.1/ruby-next/core.rb
 - lib/.rbnext/2.1/ruby-next/language.rb
 - lib/.rbnext/2.3/ruby-next/commands/core_ext.rb
 - lib/.rbnext/2.3/ruby-next/commands/nextify.rb
+- lib/.rbnext/2.3/ruby-next/config.rb
+- lib/.rbnext/2.3/ruby-next/core/data.rb
 - lib/.rbnext/2.3/ruby-next/language/eval.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/2.6/endless_range.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/2.7/args_forward.rb
@@ -67,8 +99,15 @@ files:
 - lib/.rbnext/2.3/ruby-next/language/rewriters/3.1/anonymous_block.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb
 - lib/.rbnext/2.3/ruby-next/utils.rb
+- lib/.rbnext/2.6/ruby-next/core/data.rb
 - lib/.rbnext/2.7/ruby-next/core.rb
+- lib/.rbnext/2.7/ruby-next/core/data.rb
+- lib/.rbnext/2.7/ruby-next/language/paco_parsers/string_literals.rb
 - lib/.rbnext/2.7/ruby-next/language/rewriters/2.7/pattern_matching.rb
+- lib/.rbnext/2.7/ruby-next/language/rewriters/text.rb
+- lib/.rbnext/3.2/ruby-next/commands/base.rb
+- lib/.rbnext/3.2/ruby-next/language/rewriters/2.7/pattern_matching.rb
+- lib/.rbnext/3.2/ruby-next/rubocop.rb
 - lib/ruby-next.rb
 - lib/ruby-next/cli.rb
 - lib/ruby-next/commands/base.rb
@@ -81,6 +120,7 @@ files:
 - lib/ruby-next/core/array/intersect.rb
 - lib/ruby-next/core/constants/frozen_error.rb
 - lib/ruby-next/core/constants/no_matching_pattern_error.rb
+- lib/ruby-next/core/data.rb
 - lib/ruby-next/core/enumerable/compact.rb
 - lib/ruby-next/core/enumerable/filter.rb
 - lib/ruby-next/core/enumerable/filter_map.rb
@@ -91,7 +131,10 @@ files:
 - lib/ruby-next/core/hash/merge.rb
 - lib/ruby-next/core/integer/try_convert.rb
 - lib/ruby-next/core/kernel/then.rb
+- lib/ruby-next/core/matchdata/deconstruct.rb
+- lib/ruby-next/core/matchdata/deconstruct_keys.rb
 - lib/ruby-next/core/matchdata/match.rb
+- lib/ruby-next/core/matchdata/named_captures.rb
 - lib/ruby-next/core/proc/compose.rb
 - lib/ruby-next/core/refinement/import.rb
 - lib/ruby-next/core/runtime.rb
@@ -101,6 +144,7 @@ files:
 - lib/ruby-next/core/symbol/end_with.rb
 - lib/ruby-next/core/symbol/start_with.rb
 - lib/ruby-next/core/time/ceil.rb
+- lib/ruby-next/core/time/deconstruct_keys.rb
 - lib/ruby-next/core/time/floor.rb
 - lib/ruby-next/core/unboundmethod/bind_call.rb
 - lib/ruby-next/core_ext.rb
@@ -108,6 +152,10 @@ files:
 - lib/ruby-next/language.rb
 - lib/ruby-next/language/bootsnap.rb
 - lib/ruby-next/language/eval.rb
+- lib/ruby-next/language/paco_parser.rb
+- lib/ruby-next/language/paco_parsers/base.rb
+- lib/ruby-next/language/paco_parsers/comments.rb
+- lib/ruby-next/language/paco_parsers/string_literals.rb
 - lib/ruby-next/language/parser.rb
 - lib/ruby-next/language/rewriters/2.1/numeric_literals.rb
 - lib/ruby-next/language/rewriters/2.1/required_kwargs.rb
@@ -129,12 +177,16 @@ files:
 - lib/ruby-next/language/rewriters/3.1/pin_vars_pattern.rb
 - lib/ruby-next/language/rewriters/3.1/refinement_import_methods.rb
 - lib/ruby-next/language/rewriters/3.1/shorthand_hash.rb
+- lib/ruby-next/language/rewriters/3.2/anonymous_restargs.rb
+- lib/ruby-next/language/rewriters/abstract.rb
 - lib/ruby-next/language/rewriters/base.rb
 - lib/ruby-next/language/rewriters/edge.rb
+- lib/ruby-next/language/rewriters/edge/it_param.rb
 - lib/ruby-next/language/rewriters/proposed.rb
 - lib/ruby-next/language/rewriters/proposed/bind_vars_pattern.rb
 - lib/ruby-next/language/rewriters/proposed/method_reference.rb
 - lib/ruby-next/language/rewriters/runtime.rb
+- lib/ruby-next/language/rewriters/text.rb
 - lib/ruby-next/language/runtime.rb
 - lib/ruby-next/language/setup.rb
 - lib/ruby-next/language/unparser.rb
@@ -147,15 +199,16 @@ files:
 - lib/uby-next.rb
 - lib/uby-next/irb.rb
 - lib/uby-next/pry.rb
-homepage: http://github.com/palkan/ruby-next
+homepage: https://github.com/ruby-next/ruby-next
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: http://github.com/ruby-next/ruby-next/issues
+  bug_tracker_uri: https://github.com/ruby-next/ruby-next/issues
   changelog_uri: https://github.com/ruby-next/ruby-next/blob/master/CHANGELOG.md
-  documentation_uri: http://github.com/ruby-next/ruby-next/blob/master/README.md
-  homepage_uri: http://github.com/ruby-next/ruby-next
-  source_code_uri: http://github.com/ruby-next/ruby-next
+  documentation_uri: https://github.com/ruby-next/ruby-next/blob/master/README.md
+  homepage_uri: https://github.com/ruby-next/ruby-next
+  source_code_uri: https://github.com/ruby-next/ruby-next
+  funding_uri: https://github.com/sponsors/palkan
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -167,11 +220,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby Next core functionality