unparser 0.1.16 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8311740d232b8385dfa4e602fdb037769593990f
-  data.tar.gz: c2cbcfa29bc39e0affdaa3eb02acddd60a78ec85
+  metadata.gz: 0a41fab2f00404023369e2884e52cbfee6b9c185
+  data.tar.gz: b1a7581222eff7a3a688403181fce2a7f79f18f4
 SHA512:
-  metadata.gz: 664dd07c08c822714a16c4c2ae9758cd270d3a643bebccfc4cee2c1a536cc5a4aa1eff6e80302dbc4438592b3d443787fc6400a4761eda3ef51f497087f4efb9
-  data.tar.gz: a9af21984e94034f91b33d8b68b13a5ee045fe6d1e03459e45739c8eaeeedaabf0d3ce41e51957b08d8eec86894388739b97d336df0d428ec5ff8b123cf80901
+  metadata.gz: 80c8b0f4341d2d7db23b5d182ec844eecf87f693b6aea4d3763a09bc69b9441b33a884ba031b33be1029dcad43625fed2d658162445b0fc2fff2b1cad2e59df9
+  data.tar.gz: fbdcc36729c937e203c302064ea6543db2f704eb95ecd678af19b3b4a58b4a7248a177160315633da59ac8aff74315cc07168661749ce6c7b35964dc1c138521

data/.travis.yml

@@ -1,15 +1,13 @@
+sudo: false
 language: ruby
 script: 'bundle exec rake ci'
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.1.3
+  - 2.1.4
+  - 2.2.0
   - rbx-2
 matrix:
   include:
-    - rvm: jruby
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug --1.9"  # for simplecov
     - rvm: jruby
       env: JRUBY_OPTS="$JRUBY_OPTS --debug --2.0"  # for simplecov
   allow_failures:

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.1.17 2015-01-10
+
+* Fix jruby complex / rational generation edge case
+* Support generation under MRI 2.2
+
 # v0.1.16 2014-11-07
 
 * Add emitter for complex and rational literals

data/Gemfile

@@ -8,4 +8,5 @@ gem 'anima',   '~> 0.2.0'
 gem 'morpher', '~> 0.2.2'
 
 gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
+gem 'mutant',   git: 'https://github.com/mbj/mutant.git'
 eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -1,69 +1,37 @@
-# encoding: utf-8
-
 group :development do
-  gem 'rake',       '~> 10.3.2'
-  gem 'rspec',      '~> 3.1.0'
-  gem 'rspec-its',  '~> 1.0.1'
-  gem 'yard',       '~> 0.8.7.4'
-
   platform :rbx do
     gem 'rubysl-singleton', '~> 2.0.0'
   end
 end
 
-group :yard do
-  gem 'kramdown', '~> 1.3.3'
-end
-
 group :guard do
-  gem 'guard',         '~> 2.6.1'
-  gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.9'
-  gem 'guard-rubocop', '~> 1.1.0'
+  gem 'guard',         '~> 2.10.3'
+  gem 'guard-bundler', '~> 2.1.0'
+  gem 'guard-rspec',   '~> 4.5.0'
+  gem 'guard-rubocop', '~> 1.2.0'
 
   # file system change event handling
-  gem 'listen',     '~> 2.7.7'
+  gem 'listen',     '~> 2.8.4'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.4', require: false
   gem 'rb-inotify', '~> 0.9.5', require: false
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.3', require: false
+  gem 'libnotify',               '~> 0.9.0', require: false
   gem 'rb-notifu',               '~> 0.0.4', require: false
-  gem 'terminal-notifier-guard', '~> 1.5.3', require: false
+  gem 'terminal-notifier-guard', '~> 1.6.4', require: false
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.7.0'
-  gem 'flay',      '~> 2.5.0'
-  gem 'flog',      '~> 4.2.1'
-  gem 'reek',      '~> 1.3.7'
-  gem 'rubocop',   '~> 0.26.1'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.9'
-
-  platforms :mri do
-    gem 'mutant',       '~> 0.6.3'
-    gem 'mutant-rspec', '~> 0.6.3'
-  end
-
-  platforms :ruby_19, :ruby_20 do
-    gem 'yard-spellcheck', '~> 0.1.5'
-  end
-
   platform :rbx do
     gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.11'
-    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'racc',               '~> 1.4.12'
+    gem 'rubysl-logger',      '~> 2.1.0'
     gem 'rubysl-open-uri',    '~> 2.0.0'
     gem 'rubysl-prettyprint', '~> 2.0.3'
   end
 end
 
-group :benchmarks do
-  gem 'rbench', '~> 0.2.3'
-end
-
 platform :jruby do
   group :jruby do
     gem 'jruby-openssl', '~> 0.9.4'

data/README.md

@@ -110,8 +110,7 @@ Install the gem `unparser` via your prefered method.
 People
 ------
 
-* [Markus Schirp (mbj)](https://github.com/mbj) Author
-* [Trent Ogren (misfo)](https://github.com/misfo) Adding comment reproduction
+Various people contributed to this repository. See [Contributors](https://github.com/mbj/unparser/graphs/contributors).
 
 Contributing
 -------------

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 679
+total_score: 674

data/config/rubocop.yml

@@ -15,6 +15,9 @@ MethodLength:
   CountComments: false
   Max: 17
 
+AbcSize:
+  Max: 18
+
 # Avoid more than `Max` levels of nesting.
 BlockNesting:
   Max: 3
@@ -74,7 +77,13 @@ Blocks:
   Enabled: false
 
 # I like to have an empty line before closing the currently opened body
-EmptyLinesAroundBody:
+EmptyLinesAroundBlockBody:
+  Enabled: false
+
+EmptyLinesAroundClassBody:
+  Enabled: false
+
+EmptyLinesAroundModuleBody:
   Enabled: false
 
 # I like my style more

data/lib/unparser/emitter.rb

@@ -446,7 +446,7 @@ module Unparser
     #
     # @api private
     #
-    def emit_body(body = body)
+    def emit_body(body = body())
       unless body
         buffer.indent
         nl
@@ -494,7 +494,7 @@ module Unparser
     #
     # @api private
     #
-    def run(emitter, node = node)
+    def run(emitter, node = node())
       emitter.new(node, self).write_to_buffer
     end
 

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

@@ -83,8 +83,8 @@ module Unparser
           util = self.class
           string = node.children.first
           segment = string
-            .gsub(REPLACEMENTS, ESCAPES)
-            .gsub(util::DELIMITER, util::REPLACEMENT)
+                    .gsub(REPLACEMENTS, ESCAPES)
+                    .gsub(util::DELIMITER, util::REPLACEMENT)
           write(segment)
         end
 

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

@@ -93,7 +93,7 @@ module Unparser
             integer = value.to_i
             float   = value.to_f
 
-            write_rational(integer.to_f.equal?(float) ? integer : float)
+            write_rational(integer.to_f.eql?(float) ? integer : float)
           end
 
           # Write rational format

data/lib/unparser/emitter/send/index.rb

@@ -105,7 +105,7 @@ module Unparser
           #
           def emit_normal_operation
             parentheses(*INDEX_PARENS) do
-              delimited(indices)
+              delimited_plain(indices)
             end
             write(WS, T_ASN, WS)
             visit(value)

data/lib/unparser/preprocessor.rb

@@ -184,7 +184,7 @@ module Unparser
       register :float
       register :int
 
-      NEG_INFINITY = Float::INFINITY - 1
+      NEG_INFINITY = -(Float::INFINITY - 1)
 
       # Return preprocessor result
       #
@@ -197,7 +197,7 @@ module Unparser
         case value
         when Float::INFINITY
           s(:const, s(:const, nil, :Float), :INFINITY)
-        when -NEG_INFINITY
+        when NEG_INFINITY
           s(:send, s(:const, s(:const, nil, :Float), :INFINITY), :-@)
         else
           node

data/spec/spec_helper.rb

@@ -8,7 +8,10 @@ require 'morpher'
 require 'devtools/spec_helper'
 
 require 'parser/current'
+require 'parser/ruby19'
+require 'parser/ruby20'
 require 'parser/ruby21'
+require 'parser/ruby22'
 
 module SpecHelper
   def s(type, *children)
@@ -26,4 +29,5 @@ end
 RSpec.configure do |config|
   config.include(SpecHelper)
   config.extend(SpecHelper)
+  config.raise_errors_for_deprecations!
 end

data/spec/unit/unparser_spec.rb

@@ -8,7 +8,8 @@ describe Unparser do
     PARSERS = IceNine.deep_freeze(
       '1.9' => Parser::Ruby19,
       '2.0' => Parser::Ruby20,
-      '2.1' => Parser::Ruby21
+      '2.1' => Parser::Ruby21,
+      '2.2' => Parser::Ruby22
     )
 
     RUBIES = PARSERS.keys.freeze
@@ -28,7 +29,7 @@ describe Unparser do
     def assert_round_trip(input, parser)
       ast, comments = parser.parse_with_comments(input)
       generated = Unparser.unparse(ast, comments)
-      generated.should eql(input)
+      expect(generated).to eql(input)
       generated_ast, _ = parser.parse_with_comments(generated)
       expect(ast == generated_ast).to be(true)
     end
@@ -41,9 +42,9 @@ describe Unparser do
 
     def assert_generates_from_ast(parser, ast_with_comments, expected)
       generated = Unparser.unparse(*ast_with_comments)
-      generated.should eql(expected)
+      expect(generated).to eql(expected)
       ast, comments = parser.parse_with_comments(generated)
-      Unparser.unparse(ast, comments).should eql(expected)
+      expect(Unparser.unparse(ast, comments)).to eql(expected)
     end
 
     def self.assert_unterminated(expression)
@@ -111,25 +112,29 @@ describe Unparser do
         assert_generates '-10e10000000000', '-Float::INFINITY'
       end
 
-      context 'rational' do
-        assert_terminated '1r', %w(2.1)
-        assert_generates '1.0r', '1r', %w(2.1)
-        assert_generates '-0r', '0r', %w(2.1)
+      # Rubies < 2.0 do not have these literals, parser can parse them
+      # but there are subtible differencies. Excluding them under those rubies.
+      if RUBY_VERSION >= '2.0'
+        context 'rational' do
+          assert_terminated '1r', %w(2.1)
+          assert_generates '1.0r', '1r', %w(2.1)
+          assert_generates '-0r', '0r', %w(2.1)
 
-        assert_terminated '1.5r', %w(2.1)
-        assert_terminated '1.3r', %w(2.1)
-      end
+          assert_terminated '1.5r', %w(2.1)
+          assert_terminated '1.3r', %w(2.1)
+        end
 
-      context 'rational' do
-        %w(
-          5i
-          -5i
-          0.6i
-          -0.6i
-          1000000000000000000000000000000i
-          1ri
-        ).each do |expression|
-          assert_terminated(expression, %w(2.1))
+        context 'complex' do
+          %w(
+            5i
+            -5i
+            0.6i
+            -0.6i
+            1000000000000000000000000000000i
+            1ri
+          ).each do |expression|
+            assert_terminated(expression, %w(2.1))
+          end
         end
       end
 
@@ -1308,6 +1313,7 @@ describe Unparser do
         assert_source 'foo[index] = value'
         assert_source 'foo[*index] = value'
         assert_source 'foo[a, b] = value'
+        assert_source 'foo[1..2] = value'
         assert_source 'foo.[]=()'
         assert_source 'foo[] = 1'
 

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.16'
+  gem.version  = '0.2.0'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -17,12 +17,13 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w(README.md)
   gem.executables      = [ 'unparser' ]
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_dependency('parser',        '~> 2.2.0.pre.7')
+  gem.add_dependency('parser',        '~> 2.2.0.2')
   gem.add_dependency('procto',        '~> 0.0.2')
   gem.add_dependency('concord',       '~> 0.1.5')
   gem.add_dependency('adamantium',    '~> 0.2.0')
   gem.add_dependency('equalizer',     '~> 0.0.9')
   gem.add_dependency('abstract_type', '~> 0.0.7')
+  gem.add_dependency('diff-lcs',      '~> 1.2.5')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.7
+        version: 2.2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.7
+        version: 2.2.0.2
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
 executables:
@@ -187,7 +201,6 @@ files:
 - lib/unparser/finalize.rb
 - lib/unparser/node_helpers.rb
 - lib/unparser/preprocessor.rb
-- rubyspec.sh
 - spec/integration/unparser/corpus_spec.rb
 - spec/integrations.yml
 - spec/spec_helper.rb
@@ -218,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/rubyspec.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-exec bundle exec bin/unparser ../rubyspec --fail-fast             \
-  --ignore '../rubyspec/core/array/pack/{b,h,u}_spec.rb'          \
-  --ignore '../rubyspec/language/versions/*1.8*'                  \
-  --ignore '../rubyspec/core/array/pack/shared/float.rb'          \
-  --ignore '../rubyspec/core/array/pack/shared/integer.rb'        \
-  --ignore '../rubyspec/core/array/pack/{c,m,w}_spec.rb'          \
-  --ignore '../rubyspec/core/regexp/shared/new.rb'                \
-  --ignore '../rubyspec/core/regexp/shared/quote.rb'              \
-  --ignore '../rubyspec/core/encoding/compatible_spec.rb'         \
-  --ignore '../rubyspec/core/io/readpartial_spec.rb'              \
-  --ignore '../rubyspec/core/env/element_reference_spec.rb'       \
-  --ignore '../rubyspec/core/dir/pwd_spec.rb'                     \
-  --ignore '../rubyspec/core/string/casecmp_spec.rb'              \
-  --ignore '../rubyspec/core/string/unpack/{b,c,h,m,u,w}_spec.rb' \
-  --ignore '../rubyspec/core/string/unpack/b_spec.rb'             \
-  --ignore '../rubyspec/core/string/unpack/shared/float.rb'       \
-  --ignore '../rubyspec/core/string/unpack/shared/integer.rb'     \
-  --ignore '../rubyspec/core/symbol/casecmp_spec.rb'              \
-  $*