unparser 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9153738b80c2b264cca4dcdbc4e333fec8880eda
-  data.tar.gz: d6bd39195946e4811e288fe0a3b73e393edaec44
+  metadata.gz: cd0aa87d79ce744a9716b80c4a33767b8cbcd662
+  data.tar.gz: 6209862711ac0f807c9a6f20bdfdc626236a1b86
 SHA512:
-  metadata.gz: 5cf0d1780d1bd52776fefc33d7fb76e5e0e745143f7bc6e81f22a47a1ed6caa3c89a13ddb5a28589614ebe9743eafd6269872bf7a0465b3b483409f4a6c84f49
-  data.tar.gz: 00365496176f10480f5bc5d1402a28b1b80a45d876c900d4616f7823c1aa9274a0cc4717fe08168d4370bac55d6a59ec30a0f1090a4d34cc5fc59acdde5edafe
+  metadata.gz: 9cbac595a34a132926c4c09a703ec08f57b71980e2ba711534ea188d4512703d000ebbef2d2eb743aceb2fa2d10ef2230adad17518300bb1aaba0e65d7e1361f
+  data.tar.gz: 2536d2b1151da2b12d2efe9dc3d45fb5de4158adfa4698d70204d343b50cac2217ad142e9d7220a43069bb912839dc080925bb9c05ea30320e8451b0b8efdaea

data/Changelog.md

@@ -1,3 +1,10 @@
+# v0.2.5 2016-01-24
+
+* Add support for ruby 2.3
+* Bump parser dependency to ~>2.3.0
+* Trade uglier for more correct dstring / dsyms
+* Drop support for ruby < 2.1
+
 # v0.2.4 2015-05-30
 
 * Relax parser dependency to ~>2.2.2

data/Gemfile

@@ -1,11 +1,5 @@
-# encoding: UTF-8
 source 'https://rubygems.org'
 
 gemspec
 
-# Development only dependencies
-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'
+gem 'mutant', git: 'https://github.com/mbj/mutant.git', branch: 'feature/parser-2-3'

data/README.md

@@ -7,10 +7,15 @@ 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).
+Excluding the macruby extensions the parser gem implemnents on top of ruby syntax.
+
+Excluding the MacRuby / RubyMotion extensions the parser gem implemenents on top of MRI ruby syntax starting with parser release 2.3.
+If you feel the need to get them supported, contact me.
 
 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.
+It serves well for [mutant](https://github.com/mbj/mutant) mutators and the in-memory vendoring for self hosting,
+and other tooling.
 
 Usage
 -----

data/Rakefile

@@ -5,7 +5,16 @@ Rake.application.load_imports
 task('metrics:mutant').clear
 
 namespace :metrics do
-  task :mutant => :coverage do
-    $stderr.puts 'Mutant is disabled till flexible rspec strategy is implemented'
+  task mutant: :coverage do
+    system(*%w[
+      bundle exec mutant
+        --include lib
+        --require unparser
+        --use rspec
+        --zombie
+        --since HEAD~1
+        --
+        Unparser*
+    ]) or fail "Mutant task failed"
   end
 end

data/bin/unparser

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
-
 trap('INT') do |status|
   exit! 128 + status
 end

data/config/devtools.yml

@@ -1,2 +1,2 @@
 ---
-unit_test_timeout: 1.0
+unit_test_timeout: 2.0

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 666
+total_score: 673

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 23.7
+threshold: 21.3

data/config/reek.yml

@@ -55,7 +55,7 @@ BooleanParameter:
   enabled: true
 IrresponsibleModule:
   exclude: []
-  enabled: true
+  enabled: false # buggy / broken
 UncommunicativeModuleName:
   accept: []
   exclude: []
@@ -90,6 +90,9 @@ UtilityFunction:
   exclude:
   # Intent to be helper methods
   - Unparser::CLI::Source#strip
+  - Unparser::CLI::Source#parse
+  - Unparser::NodeHelpers#n
+  - Unparser::NodeHelpers#s
   - Unparser::CLI#sources
   enabled: true
 Attribute:

data/config/rubocop.yml

@@ -72,10 +72,6 @@ ConstantName:
 TrivialAccessors:
   Enabled: false
 
-# Do not prefer do/end over {} for multiline blocks
-Blocks:
-  Enabled: false
-
 # I like to have an empty line before closing the currently opened body
 EmptyLinesAroundBlockBody:
   Enabled: false

data/lib/unparser.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'set'
 require 'abstract_type'
 require 'procto'
@@ -58,6 +56,7 @@ require 'unparser/emitter/send/unary'
 require 'unparser/emitter/send/binary'
 require 'unparser/emitter/send/index'
 require 'unparser/emitter/send/regular'
+require 'unparser/emitter/send/conditional'
 require 'unparser/emitter/send/arguments'
 require 'unparser/emitter/send/attribute_assignment'
 require 'unparser/emitter/block'

data/lib/unparser/ast.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Unparser
   # Namespace for AST processing tools
   module AST

data/lib/unparser/ast/local_variable_scope.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Unparser
   module AST
 

data/lib/unparser/buffer.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
 
   # Buffer used to emit into

data/lib/unparser/cli.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'unparser'
 require 'optparse'
 require 'diff/lcs'
@@ -38,7 +36,8 @@ module Unparser
     # @api private
     #
     def initialize(arguments)
-      @sources, @ignore = [], Set.new
+      @sources = []
+      @ignore = Set.new
 
       @success   = true
       @fail_fast = false
@@ -91,7 +90,7 @@ module Unparser
       effective_sources.each do |source|
         next if @ignore.include?(source)
         process_source(source)
-        break unless @success if @fail_fast
+        break if @fail_fast && !@success
       end
 
       @success ? EXIT_SUCCESS : EXIT_FAILURE

data/lib/unparser/cli/color.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   # Class to colorize strings
   class Color

data/lib/unparser/cli/differ.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class CLI
     # Class to create diffs from source code

data/lib/unparser/cli/source.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class CLI
     # Source representation for CLI sources
@@ -20,7 +18,7 @@ module Unparser
           !error
         end
 
-        # Build generateg source
+        # Build generated source
         #
         # @param [Parser::AST::Node]
         #

data/lib/unparser/comments.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
 
   # Holds the comments that remain to be emitted

data/lib/unparser/constants.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   # All unparser constants maybe included in other libraries.
   module Constants

data/lib/unparser/emitter.rb

@@ -1,8 +1,9 @@
-# encoding: utf-8
-
 module Unparser
 
   # Emitter base class
+  #
+  # buggy, argument values are sends to self
+  # rubocop:disable CircularArgumentReference
   class Emitter
     include Adamantium::Flat, AbstractType, Constants, NodeHelpers
     include Concord.new(:node, :parent)
@@ -198,7 +199,7 @@ module Unparser
       emitter.write_to_buffer
     end
 
-    # Visit ambigous node
+    # Visit ambiguous node
     #
     # @param [Parser::AST::Node] node
     #

data/lib/unparser/emitter/alias.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for alias nodes

data/lib/unparser/emitter/argument.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/assignment.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/begin.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
 
@@ -38,7 +36,7 @@ module Unparser
           children.empty?
         end
 
-        TERMINATING_PARENT = [:root, :dyn_str_body].to_set.freeze
+        TERMINATING_PARENT = %i(root interpolated dyn_str_body).to_set.freeze
 
       private
 

data/lib/unparser/emitter/binary.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Base class for binary emitters

data/lib/unparser/emitter/block.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/case.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for case nodes

data/lib/unparser/emitter/cbase.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for toplevel constant reference nodes

data/lib/unparser/emitter/class.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for class nodes
@@ -41,7 +39,7 @@ module Unparser
     end # Class
 
     # Emitter for sclass nodes
-    class SClass  < self
+    class SClass < self
       include Terminated
 
       handle :sclass

data/lib/unparser/emitter/def.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for def node

data/lib/unparser/emitter/defined.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for defined? nodes

data/lib/unparser/emitter/empty.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/ensure.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/flipflop.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for flip flops

data/lib/unparser/emitter/flow_modifier.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter control flow modifiers

data/lib/unparser/emitter/for.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter for for nodes

data/lib/unparser/emitter/hookexe.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Base class for pre and postexe emitters

data/lib/unparser/emitter/if.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Emitter if nodes

data/lib/unparser/emitter/literal.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     # Namespace class for literal emiters

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     class Literal

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Unparser
   class Emitter
     class Literal
@@ -17,21 +15,7 @@ module Unparser
         #
         def dispatch
           util = self.class
-          if interpolation?
-            visit_parentheses(dynamic_body, util::OPEN, util::CLOSE)
-          else
-            emit_non_interpolated
-          end
-        end
-
-        # Test for interpolation
-        #
-        # @return [Boolean]
-        #
-        # @api private
-        #
-        def interpolation?
-          children.any? { |child| !child.type.equal?(:str) }
+          visit_parentheses(dynamic_body, util::OPEN, util::CLOSE)
         end
 
         # Return dynamic body
@@ -50,18 +34,6 @@ module Unparser
           OPEN = CLOSE = '"'.freeze
           handle :dstr
 
-        private
-
-          # Emit non interpolated form
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def emit_non_interpolated
-            delimited(children, WS)
-          end
-
         end # String
 
         # Dynamic symbol literal emitter
@@ -72,21 +44,8 @@ module Unparser
 
           handle :dsym
 
-        private
-
-          # Emit non interpolated form
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def emit_non_interpolated
-            visit_parentheses(dynamic_body, OPEN, CLOSE)
-          end
-
         end # Symbol
-
-      end
+      end # Dynamic
     end # Literal
   end # Emitter
 end # Unparser