unparser 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1de83bf10221446d1c5f7a5925dfd3df7022d51342678b5fd9eb0f2f1fbcce
-  data.tar.gz: '083da9ef8026a9afd957b3585e8915f379c126745f8c7863ae0c896258cd31db'
+  metadata.gz: e7b6ae43ecab2e1b02ad4688d19015cb19930b66c7c72b0d84603696a3bdd6a6
+  data.tar.gz: 21b9230570b7a1124c070b35c58c1704c3640d54581b07003fc9400b18a8f4ca
 SHA512:
-  metadata.gz: dafb7bb7320e6b238e52f92f5e31257f53309b276c4693238550459a1c4bb5d8c16ee616d2a5bc8262254c7796705b63ef1e18f0d3b59f8db8423460e0119371
-  data.tar.gz: 6af30e50074a3ed71557a7bb8f078bf6509bcf2adf8c5ceaf641a1e862a39ed021da672a9bcb29d8e2925b7769f9152a32050eb6adef52fb7b7933bded06ac0b
+  metadata.gz: 580f2639ae9a1bfe704be90ed16c390d6151bbfaf19644f84aa31012bb896a6e763cfc4e24573674df92c4329f68e3303e381ffa02097c818e66e6f42a28d2c2
+  data.tar.gz: 1bb2d10d2fa4f30e7b18ebe880d80e22b21e4fdf325518d3b9b65f2c2ec2f456307f74502a22399bad75f90a9ba26500ae553affd8ab71b126b9198a5cf15269

data/.circleci/config.yml

@@ -30,7 +30,15 @@ jobs:
     steps:
       - checkout
       - run: bundle install
-      - run: bundle exec mutant --since origin/master --zombie -- 'Unparser*'
+      - run: |
+          bundle                                                  \
+            exec                                                  \
+            mutant                                                \
+            --ignore-subject 'Unparser::AST::LocalVariableScope*' \
+            --since origin/master                                 \
+            --zombie                                              \
+            --                                                    \
+            'Unparser*'
 workflows:
   version: 2
   test:

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.4.6 2020-01-02
+
+* Upgrades to allow parser dependency to ~> 2.6.5
+
 # v0.4.5 2019-05-10
 
 * Bump parser dependency to ~> 2.6.3

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+gem 'mutant', git: 'https://github.com/mbj/mutant.git', branch: 'upgrade/parser'
 
 source 'https://oss:Px2ENN7S91OmWaD5G7MIQJi1dmtmYrEh@gem.mutant.dev' do
   gem 'mutant-license'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 GIT
   remote: https://github.com/mbj/mutant.git
-  revision: e07953eeb3a011d9c3496d6594fed263375fec59
+  revision: f138cc7b16ed6dab728ef2e2f46731754086b9e8
+  branch: upgrade/parser
   specs:
-    mutant (0.8.25)
+    mutant (0.9.1)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       anima (~> 0.3.1)
@@ -12,24 +13,21 @@ GIT
       equalizer (~> 0.0.9)
       ice_nine (~> 0.11.1)
       memoizable (~> 0.4.2)
-      mutant-license (~> 0.0.1)
-      parser (~> 2.6.0)
+      mutant-license (~> 0.1.0)
+      parser (~> 2.6.5)
       procto (~> 0.0.2)
-      unparser (~> 0.4.3)
-    mutant-rspec (0.8.25)
-      mutant (~> 0.8.25)
-      rspec-core (>= 3.8.0, < 4.0.0)
+      unparser (~> 0.4.5)
 
 PATH
   remote: .
   specs:
-    unparser (0.4.4)
+    unparser (0.4.6)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.3)
       equalizer (~> 0.0.9)
-      parser (~> 2.6.3)
+      parser (~> 2.6.5)
       procto (~> 0.0.2)
 
 GEM
@@ -58,15 +56,13 @@ GEM
       equalizer (~> 0.0.9)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devtools (0.1.23)
+    devtools (0.1.24)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       anima (~> 0.3.0)
       concord (~> 0.1.5)
       flay (~> 2.12.0)
       flog (~> 4.6.2)
-      mutant (~> 0.8.24)
-      mutant-rspec (~> 0.8.24)
       procto (~> 0.0.3)
       rake (~> 12.3.0)
       reek (~> 5.3.0)
@@ -78,21 +74,21 @@ GEM
       yard (~> 0.9.16)
       yardstick (~> 0.9.9)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     equalizer (0.0.11)
     erubis (2.7.0)
-    flay (2.12.0)
+    flay (2.12.1)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.6.2)
+    flog (4.6.4)
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
     ice_nine (0.11.2)
-    jaro_winkler (1.5.2)
-    json (2.2.0)
+    jaro_winkler (1.5.4)
+    json (2.3.0)
     kwalify (0.7.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -105,16 +101,16 @@ GEM
       equalizer (~> 0.0.9)
       ice_nine (~> 0.11.0)
       procto (~> 0.0.2)
-    mutant-license (0.0.1)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    mutant-license (0.1.0)
+    parallel (1.19.1)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
-    path_expander (1.0.3)
+    path_expander (1.1.0)
     powerpack (0.1.2)
     procto (0.0.3)
     psych (3.1.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     reek (5.3.2)
       codeclimate-engine-rb (~> 0.4.0)
       kwalify (~> 0.7.0)
@@ -125,18 +121,18 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.3)
     rubocop (0.61.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -145,10 +141,10 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    ruby_parser (3.13.1)
+    ruby-progressbar (1.10.1)
+    ruby_parser (3.14.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.12.0)
+    sexp_processor (4.13.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -161,7 +157,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    yard (0.9.19)
+    yard (0.9.22)
     yardstick (0.9.9)
       yard (~> 0.8, >= 0.8.7.2)
 

data/README.md

@@ -1,9 +1,8 @@
 unparser
 ========
 
-[![Build Status](https://secure.travis-ci.org/mbj/unparser.png?branch=master)](http://travis-ci.org/mbj/unparser)
-[![Dependency Status](https://gemnasium.com/mbj/unparser.png)](https://gemnasium.com/mbj/unparser)
-[![Code Climate](https://codeclimate.com/github/mbj/unparser.png)](https://codeclimate.com/github/mbj/unparser)
+[![Build Status](https://secure.travis-ci.org/mbj/unparser.svg?branch=master)](http://travis-ci.org/mbj/unparser)
+[![Code Climate](https://codeclimate.com/github/mbj/unparser.svg)](https://codeclimate.com/github/mbj/unparser)
 [![Gem Version](https://img.shields.io/gem/v/unparser.svg)](https://rubygems.org/gems/unparser)
 
 Generate equivalent source for ASTs from whitequarks [parser](https://github.com/whitequark/parser).

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 645
+total_score: 644

data/lib/unparser/ast.rb

@@ -50,7 +50,7 @@ module Unparser
 
     # Return local variables that get assigned in scope
     #
-    # @param [Parser::AST::Node]
+    # @param [Parser::AST::Node] node
     #
     # @return [Set<Symbol>]
     #

data/lib/unparser/ast/local_variable_scope.rb

@@ -56,8 +56,8 @@ module Unparser
 
       # Test if local variables where first assigned in body and read by conditional
       #
-      # @param [Parser::AST::Node] conditional
       # @param [Parser::AST::Node] body
+      # @param [Parser::AST::Node] condition
       #
       # @api private
       #
@@ -78,16 +78,16 @@ module Unparser
 
       # Match node
       #
-      # @param [Parser::AST::Node] node
+      # @param [Parser::AST::Node] needle
       #   if block given
       #
       # @return [Boolean]
       #
       # @api private
       #
-      def match(neddle)
+      def match(needle)
         @items.each do |node, current, before|
-          return yield(current, before) if node.equal?(neddle)
+          return yield(current, before) if node.equal?(needle)
         end
         false
       end
@@ -149,7 +149,7 @@ module Unparser
 
       # Visit node and record local variable state
       #
-      # @param [Parser::AST::Node]
+      # @param [Parser::AST::Node] node
       #
       # @return [undefined]
       #
@@ -168,7 +168,7 @@ module Unparser
 
       # Record local variable state
       #
-      # @param [Parser::AST::Node]
+      # @param [Parser::AST::Node] node
       #
       # @return [undefined]
       #

data/lib/unparser/cli.rb

@@ -108,7 +108,7 @@ module Unparser
 
     # Process source
     #
-    # @param [CLI::Source]
+    # @param [CLI::Source] source
     #
     # @return [undefined]
     #

data/lib/unparser/cli/source.rb

@@ -24,7 +24,7 @@ module Unparser
 
         # Build generated source
         #
-        # @param [Parser::AST::Node]
+        # @param [Parser::AST::Node] ast
         #
         # @api private
         #
@@ -82,7 +82,7 @@ module Unparser
 
       # Return stripped source
       #
-      # @param [String] string
+      # @param [String] source
       #
       # @return [String]
       #

data/lib/unparser/constants.rb

@@ -11,7 +11,7 @@ module Unparser
 
     # Return frozen symbol set from enumerable
     #
-    # @param [Enumerable]
+    # @param [Enumerable] enumerable
     #
     # @return [Set<Symbol>]
     #

data/lib/unparser/dsl.rb

@@ -45,7 +45,7 @@ module Unparser
     #
     # @return [undefined]
     #
-    # @pai private
+    # @api private
     #
     def define_group(name, range)
       define_method(name) do

data/lib/unparser/emitter.rb

@@ -79,7 +79,7 @@ module Unparser
 
     # Register emitter for type
     #
-    # @param [Symbol] type
+    # @param [Symbol] types
     #
     # @return [undefined]
     #
@@ -249,7 +249,6 @@ module Unparser
     # Emit delimited body
     #
     # @param [Enumerable<Parser::AST::Node>] nodes
-    # @param [String] delimiter
     #
     # @return [undefined]
     #
@@ -262,7 +261,6 @@ module Unparser
     # Emit delimited body
     #
     # @param [Enumerable<Parser::AST::Node>] nodes
-    # @param [String] delimiter
     #
     # @return [undefined]
     #
@@ -432,7 +430,7 @@ module Unparser
 
     # Emit non nil body
     #
-    # @param [Parser::AST::Node] node
+    # @param [Parser::AST::Node] body
     #
     # @return [undefined]
     #

data/lib/unparser/emitter/argument.rb

@@ -240,7 +240,7 @@ module Unparser
 
       handle :procarg0
 
-      children :first_argument
+      PARENS = %i[restarg mlhs].freeze
 
     private
 
@@ -251,22 +251,18 @@ module Unparser
       # @api private
       #
       def dispatch
-        if first_argument.instance_of?(Symbol)
-          write(first_argument.to_s)
+        if needs_parens?
+          parentheses do
+            delimited(children)
+          end
         else
-          emit_multiple_children
+          delimited(children)
         end
       end
 
-      # Emit multiple children
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_multiple_children
-        parentheses do
-          delimited(children)
+      def needs_parens?
+        children.length > 1 || children.any? do |node|
+          PARENS.include?(node.type)
         end
       end
     end

data/lib/unparser/emitter/literal/primitive.rb

@@ -107,7 +107,7 @@ module Unparser
 
           # Write rational format
           #
-          # @param [#to_s]
+          # @param [#to_s] value
           #
           # @return [undefined]
           #

data/lib/unparser/node_helpers.rb

@@ -5,7 +5,8 @@ module Unparser
 
     # Helper for building nodes
     #
-    # @param [Symbol]
+    # @param [Symbol] type
+    # @param [Parser::AST::Node] children
     #
     # @return [Parser::AST::Node]
     #
@@ -19,9 +20,10 @@ module Unparser
 
     # Helper for building nodes
     #
-    # @param [Symbol]
+    # @param [Symbol] type
     #
     # @return [Parser::AST::Node]
+    # @param [Array] children
     #
     # @api private
     #

data/lib/unparser/preprocessor.rb

@@ -114,7 +114,7 @@ module Unparser
 
       # Return preprocessor result
       #
-      # @param [Parser::AST::Node]
+      # @return [Parser::AST::Node]
       #
       # @api private
       #

data/spec/integrations.yml

@@ -40,10 +40,12 @@
     - core/env/element_reference_spec.rb
     - core/io/readpartial_spec.rb
     - core/io/shared/gets_ascii.rb
+    - core/kernel/shared/sprintf_encoding.rb
     - core/marshal/dump_spec.rb
     - core/marshal/fixtures/marshal_data.rb
     - core/marshal/shared/load.rb
     - core/random/bytes_spec.rb
+    - core/regexp/shared/new.rb
     - core/regexp/shared/new_ascii.rb
     - core/regexp/shared/new_ascii_8bit.rb
     - core/regexp/shared/quote.rb
@@ -51,6 +53,8 @@
     - core/string/casecmp_spec.rb
     - core/string/codepoints_spec.rb
     - core/string/count_spec.rb
+    - core/string/encode_spec.rb
+    - core/string/inspect_spec.rb
     - core/string/shared/codepoints.rb
     - core/string/shared/each_codepoint_without_block.rb
     - core/string/shared/eql.rb
@@ -71,6 +75,7 @@
     - language/regexp/escapes_spec.rb
     - language/source_encoding_spec.rb
     - language/string_spec.rb
+    - library/base64/decode64_spec.rb
     - library/digest/md5/shared/constants.rb
     - library/digest/md5/shared/sample.rb
     - library/digest/sha1/shared/constants.rb

data/spec/unit/unparser_spec.rb

@@ -547,12 +547,6 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         foo.bar(*args)
       RUBY
 
-      assert_source <<~'RUBY'
-        foo.bar do |(a)|
-          d
-        end
-      RUBY
-
       assert_source <<~'RUBY'
         foo.bar do |(a, b), c|
           d
@@ -574,6 +568,18 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
+      assert_source <<~'RUBY'
+        foo.bar do |*|
+          d
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        foo.bar do |(*)|
+          d
+        end
+      RUBY
+
       assert_source <<~'RUBY'
         foo.bar do |((*))|
           d

data/unparser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'unparser'
-  gem.version     = '0.4.5'
+  gem.version     = '0.4.6'
 
   gem.authors     = ['Markus Schirp']
   gem.email       = 'mbj@schirp-dso.com'
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('equalizer',     '~> 0.0.9')
   gem.add_dependency('diff-lcs',      '~> 1.3')
   gem.add_dependency('concord',       '~> 0.1.5')
-  gem.add_dependency('parser',        '~> 2.6.3')
+  gem.add_dependency('parser',        '~> 2.6.5')
   gem.add_dependency('procto',        '~> 0.0.2')
 
   gem.add_development_dependency('anima',    '~> 0.3.1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.6.5
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement