unparser 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: ad86813fd975be2313a38f97a4c04f91dca90dc0
-  data.tar.gz: 19160d4496e5e5cbf13f1e2e149885ef8ebd6000
-SHA512:
-  metadata.gz: a689f724e095ff85b0a5398e3a9f111d3ba422bec3614afefc6f1906171059154606ab90d39b6a3581806a9892d59c9ad6b1c102ee88bbce8fbd1deff5f6f406
-  data.tar.gz: 2a8cd18a6623539df988d61e7bfd9c2cd800eb6f539ed1e2d8b9a15c54a43ebded2ad18419756aac5797f6e4fac99c2258dba6dd32f1f24240cc27b249e582bc
+--- 
+SHA1: 
+  metadata.gz: d4a7819ea2d8ce95d148c52ee34b15ebe1ff90b2
+  data.tar.gz: 0e9816a2e5d51a4e69f3a08e85ecfde8ae481a9f
+SHA512: 
+  metadata.gz: b06c3a9e8f10304d8acfb49504f4830400817506faaaa01e60a22c5b4da509f004ae5c5034604cb72568c1df6861ed0eaa495796988b839ce94fb217fd61b5d1
+  data.tar.gz: 4c1e6bb60efa42743788669d69aae5c67d47f278d2b97f357bd40eda44642da6daaa5e5fc58a90cc28e99214df03b76587d5593bc5e6b497caea116e2e9227b4

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --format progress
+--warnings
 --order random

data/.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  Includes:
+  Include:
     - 'Gemfile'
-  Excludes:
+  Exclude:
     - 'Gemfile.devtools'
-    - 'vendor/**'
-    - 'benchmarks/**'
-    - 'tmp/**'
+    - 'vendor/**/*'
+    - 'benchmarks/**/*'
+    - 'tmp/**/*'

data/.travis.yml

@@ -3,13 +3,13 @@ script: 'bundle exec rake ci'
 rvm:
   - 1.9.3
   - 2.0.0
-  - ruby
-  - jruby
-  - rbx
+  - 2.1.2
+  - jruby-19mode
+  - jruby-20mode
+  - rbx-2
 matrix:
   allow_failures:
-    - rvm: rbx
-    - rvm: ruby
+    - rvm: rbx-2
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.1.13 2014-06-08
+
+* Add support for rubinius.
+
 # v0.1.12 2014-04-13
 
 * Add support for 2.1 kwsplat

data/Gemfile

@@ -3,8 +3,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'anima'
-gem 'morpher'
+# Development only dependencies
+gem 'anima',   '~> 0.2.0'
+gem 'morpher', '~> 0.2.2'
 
 gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',       '~> 10.2.1'
-  gem 'rspec',      '~> 2.14.1'
-  gem 'rspec-core', '~> 2.14.8'
+  gem 'rake',       '~> 10.3.2'
+  gem 'rspec',      '~> 2.99.0'
+  gem 'rspec-core', '~> 2.99.0'
   gem 'yard',       '~> 0.8.7.4'
 
   platform :rbx do
@@ -16,35 +16,35 @@ group :yard do
 end
 
 group :guard do
-  gem 'guard',         '~> 2.6.0'
+  gem 'guard',         '~> 2.6.1'
   gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.8'
-  gem 'guard-rubocop', '~> 1.0.2'
+  gem 'guard-rspec',   '~> 4.2.9'
+  gem 'guard-rubocop', '~> 1.1.0'
 
   # file system change event handling
-  gem 'listen',     '~> 2.7.1'
+  gem 'listen',     '~> 2.7.7'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.4', require: false
-  gem 'rb-inotify', '~> 0.9.3', require: false
+  gem 'rb-inotify', '~> 0.9.5', require: false
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.2', require: false
+  gem 'libnotify',               '~> 0.8.3', require: false
   gem 'rb-notifu',               '~> 0.0.4', require: false
   gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 end
 
 group :metrics do
   gem 'coveralls', '~> 0.7.0'
-  gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.2.0'
+  gem 'flay',      '~> 2.5.0'
+  gem 'flog',      '~> 4.2.1'
   gem 'reek',      '~> 1.3.7'
-  gem 'rubocop',   '~> 0.19.1'
-  gem 'simplecov', '~> 0.8.2'
+  gem 'rubocop',   '~> 0.23.0'
+  gem 'simplecov', '~> 0.7.1'
   gem 'yardstick', '~> 0.9.9'
 
   platforms :mri do
-    gem 'mutant',       '~> 0.5.9'
-    gem 'mutant-rspec', '~> 0.5.3'
+    gem 'mutant',       '~> 0.5.19'
+    gem 'mutant-rspec', '~> 0.5.19'
   end
 
   platforms :ruby_19, :ruby_20 do
@@ -66,6 +66,6 @@ end
 
 platform :jruby do
   group :jruby do
-    gem 'jruby-openssl', '~> 0.8.5'
+    gem 'jruby-openssl', '~> 0.9.4'
   end
 end

data/README.md

@@ -4,16 +4,15 @@ 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)
+[![Gem Version](https://img.shields.io/gem/v/unparser.svg)](https://rubygems.org/gems/unparser)
+[![Gittip](https://img.shields.io/gittip/mbj.svg)](https://gittip.com/mbj)
 
 Generate equivalent source for ASTs from whitequarks [parser](https://github.com/whitequark/parser).
 
-This library is able to reproduce 100% of ruby 1.9 and 2.0 syntax. Including its own source code.
+This library is able to reproduce 100% of ruby 1.9, 2.0 and 2.1 syntax. Including its own source code.
 
 It serves well for [mutant](https://github.com/mbj/mutant) mutators and the in-memory vendoring for self hosting.
 
-This library dropped the reproduction of 1.8 syntax in the 0.1.0 release.
-It currently does not have support for 2.1 specific syntax.
-
 Usage
 -----
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 727
+total_score: 728

data/config/rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: ../.rubocop.yml
 
 AllCops:
-  Includes:
+  Include:
     - '**/*.rake'
     - 'Gemfile'
     - 'Gemfile.triage'

data/lib/unparser/ast/local_variable_scope.rb

@@ -21,7 +21,7 @@ module Unparser
           items << scope
         end
         @items = items
-        @node = node
+        super(node)
       end
 
       # Test if local variable was first at given assignment
@@ -99,9 +99,7 @@ module Unparser
       #
       def match(neddle)
         @items.each do |node, current, before|
-          if node.equal?(neddle)
-            return yield(current, before)
-          end
+          return yield(current, before) if node.equal?(neddle)
         end
         false
       end
@@ -175,9 +173,7 @@ module Unparser
         enter(node)
         yield node, current.dup, before
         node.children.each do |child|
-          if child.kind_of?(Parser::AST::Node)
-            visit(child, &block)
-          end
+          visit(child, &block) if child.kind_of?(Parser::AST::Node)
         end
         leave(node)
       end
@@ -210,9 +206,7 @@ module Unparser
       # @api private
       #
       def leave(node)
-        if CLOSE_NODES.include?(node.type)
-          pop
-        end
+        pop if CLOSE_NODES.include?(node.type)
       end
 
       # Define a local variable on current stack

data/lib/unparser/ast.rb

@@ -5,7 +5,7 @@ module Unparser
   module AST
 
     FIRST_CHILD = ->(node) { node.children.first }.freeze
-    TAUTOLOGY   = ->(node) { true }.freeze
+    TAUTOLOGY   = ->(_node) { true }.freeze
 
     RESET_NODES   = [:module, :class, :sclass, :def, :defs].freeze
     INHERIT_NODES = [:block].freeze
@@ -193,9 +193,8 @@ module Unparser
         return unless controller.call(node)
         block.call(node)
         node.children.each do |child|
-          if child.kind_of?(Parser::AST::Node)
-            call(child)
-          end
+          next unless child.kind_of?(Parser::AST::Node)
+          call(child)
         end
         self
       end

data/lib/unparser/cli.rb

@@ -70,7 +70,7 @@ module Unparser
       builder.on('--start-with FILE') do |file|
         @start_with = sources(file).first
       end
-      builder.on('-v', '--verbose') do |file|
+      builder.on('-v', '--verbose') do
         @verbose = true
       end
       builder.on('--ignore FILE') do |file|
@@ -91,9 +91,7 @@ module Unparser
       effective_sources.each do |source|
         next if @ignore.include?(source)
         process_source(source)
-        if @fail_fast
-          break unless @success
-        end
+        break unless @success if @fail_fast
       end
 
       @success ? EXIT_SUCCESS : EXIT_FAILURE

data/lib/unparser/comments.rb

@@ -43,9 +43,7 @@ module Unparser
     #
     def consume(node, source_part = :expression)
       range = source_range(node, source_part)
-      if range
-        @last_range_consumed = range
-      end
+      @last_range_consumed = range if range
     end
 
     # Take end-of-line comments

data/lib/unparser/constants.rb

@@ -115,9 +115,8 @@ module Unparser
 
     KEYWORDS = constants.each_with_object([]) do |name, keywords|
       value = const_get(name).freeze
-      if name.to_s.start_with?('K_')
-        keywords << value.to_sym
-      end
+      next unless name.to_s.start_with?('K_')
+      keywords << value.to_sym
     end.to_set.freeze
 
   end # Constants

data/lib/unparser/emitter/argument.rb

@@ -42,10 +42,9 @@ module Unparser
       #
       def dispatch
         delimited(normal_arguments)
-        unless shadowargs.empty?
-          write('; ')
-          delimited(shadowargs)
-        end
+        return if shadowargs.empty?
+        write('; ')
+        delimited(shadowargs)
       end
 
       # Return normal arguments

data/lib/unparser/emitter/assignment.rb

@@ -30,10 +30,9 @@ module Unparser
         #
         def emit_right
           right = right_node
-          if right
-            write(WS, T_ASN, WS)
-            visit(right)
-          end
+          return unless right
+          write(WS, T_ASN, WS)
+          visit(right)
         end
 
         abstract_method :emit_left
@@ -146,9 +145,7 @@ module Unparser
             delimited(children)
           end
 
-          if children.one? && !NO_COMMA.include?(children.first.type) && parent_type != :arg_expr
-            write(',')
-          end
+          write(',') if children.one? && !NO_COMMA.include?(children.first.type) && parent_type != :arg_expr
         end
 
       end # MLHS

data/lib/unparser/emitter/if.rb

@@ -114,9 +114,7 @@ module Unparser
           visit_indented(if_branch)
         end
 
-        if !if_branch && !else_branch
-          nl
-        end
+        nl if !if_branch && !else_branch
       end
 
       # Emit else branch

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

@@ -9,8 +9,6 @@ module Unparser
 
         children :value
 
-      private
-
         # Emitter for primitives based on Object#inspect
         class Inspect < self
 

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

@@ -86,7 +86,11 @@ module Unparser
           # @api private
           #
           def emit_normal_arguments
-            *indices, value = arguments
+            # Workaround bug in RBX causes to crash here on
+            # *indices, value = arguments
+            #
+            # https://github.com/rubinius/rubinius/issues/3037
+            indices, value = arguments[0..-2], arguments.last
             parentheses(*INDEX_PARENS) do
               delimited(indices)
             end

data/lib/unparser/emitter/variable.rb

@@ -53,9 +53,7 @@ module Unparser
       def emit_scope
         return unless scope
         visit(scope)
-        if scope.type != :cbase
-          write(T_DCL)
-        end
+        write(T_DCL) if scope.type != :cbase
       end
     end
 

data/lib/unparser/emitter.rb

@@ -345,10 +345,9 @@ module Unparser
     #
     def emit_comments_before(source_part = :expression)
       comments_before = comments.take_before(node, source_part)
-      unless comments_before.empty?
-        emit_comments(comments_before)
-        buffer.nl
-      end
+      return if comments_before.empty?
+      emit_comments(comments_before)
+      buffer.nl
     end
 
     # Write end-of-line comments
@@ -372,10 +371,9 @@ module Unparser
     def emit_eof_comments
       emit_eol_comments
       comments_left = comments.take_all
-      unless comments_left.empty?
-        buffer.nl
-        emit_comments(comments_left)
-      end
+      return if comments_left.empty?
+      buffer.nl
+      emit_comments(comments_left)
     end
 
     # Write each comment to a separate line

data/spec/integration/unparser/corpus_spec.rb

@@ -76,12 +76,12 @@ describe 'Unparser on ruby corpus' do
     # @api private
     #
     def system(arguments)
-      unless Kernel.system(*arguments)
-        if block_given?
-          yield
-        else
-          raise 'System command failed!'
-        end
+      return if Kernel.system(*arguments)
+
+      if block_given?
+        yield
+      else
+        raise 'System command failed!'
       end
     end
 

data/spec/integrations.yml

@@ -1,4 +1,8 @@
 ---
+# Might not elaborate all 2.1 specific ASTs but the only 2.1 lib I know
+- name: chassis
+  repo_uri: 'https://github.com/ahawkins/chassis.git'
+  exclude: []
 - name: rubyspec
   repo_uri: 'https://github.com/rubyspec/rubyspec.git'
   exclude:

data/spec/unit/unparser_spec.rb

@@ -134,7 +134,7 @@ describe Unparser do
       context 'execute string' do
         assert_source '`foo`'
         assert_source '`foo#{@bar}`'
-        assert_generates  '%x(\))', '`)`'
+        assert_generates '%x(\))', '`)`'
         # FIXME: Research into this one!
         # assert_generates  '%x(`)', '`\``'
         assert_source '`"`'
@@ -179,9 +179,9 @@ describe Unparser do
 
       context 'irange' do
         assert_generates '1..2', %q(1..2)
-        assert_source   '(0.0 / 0.0)..1'
-        assert_source   '1..(0.0 / 0.0)'
-        assert_source   '(0.0 / 0.0)..100'
+        assert_source '(0.0 / 0.0)..1'
+        assert_source '1..(0.0 / 0.0)'
+        assert_source '(0.0 / 0.0)..100'
       end
 
       context 'erange' do

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.12'
+  gem.version  = '0.1.13'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('parser',        '~> 2.1')
   gem.add_dependency('procto',        '~> 0.0.2')
-  gem.add_dependency('concord',       '~> 0.1.4')
+  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')

metadata

@@ -1,107 +1,85 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: unparser
-version: !ruby/object:Gem::Version
-  version: 0.1.12
+version: !ruby/object:Gem::Version 
+  version: 0.1.13
 platform: ruby
-authors:
+authors: 
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-06-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: procto
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+      - !ruby/object:Gem::Version 
+        version: "2.1"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: procto
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: concord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.4
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: concord
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: adamantium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+      - !ruby/object:Gem::Version 
+        version: 0.1.5
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: adamantium
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.9
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: equalizer
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.9
-- !ruby/object:Gem::Dependency
-  name: abstract_type
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.7
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: abstract_type
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.7
+  type: :runtime
+  version_requirements: *id006
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
-executables:
+executables: 
 - unparser
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - .gitignore
 - .rspec
 - .rubocop.yml
@@ -206,30 +184,32 @@ files:
 - spec/unit/unparser_spec.rb
 - unparser.gemspec
 homepage: http://github.com/mbj/unparser
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id007 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
-test_files:
+test_files: 
 - spec/integration/unparser/corpus_spec.rb
 - spec/integrations.yml
 - spec/spec_helper.rb