unparser 0.4.3 → 0.4.8

data/README.md

@@ -1,9 +1,7 @@
 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)
+[![CI](https://github.com/mbj/unparser/workflows/CI/badge.svg)
 [![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: 638

data/lib/unparser.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-require 'set'
 require 'abstract_type'
-require 'procto'
+require 'anima'
 require 'concord'
+require 'diff/lcs'
+require 'diff/lcs/hunk'
+require 'mprelude'
 require 'parser/current'
+require 'procto'
+require 'set'
 
 # Library namespace
 module Unparser
@@ -40,11 +44,22 @@ module Unparser
   #
   # @param [String] source
   #
-  # @return [Parser::AST::Node]
+  # @return [Parser::AST::Node, nil]
   def self.parse(source)
     parser.parse(buffer(source))
   end
 
+  # Parse string into either syntax error or AST
+  #
+  # @param [String] source
+  #
+  # @return [MPrelude::Either<Parser::SyntaxError, (Parser::ASTNode, nil)>]
+  def self.parse_either(source)
+    MPrelude::Either.wrap_error(Parser::SyntaxError) do
+      parser.parse(buffer(source))
+    end
+  end
+
   # Parse string into AST, with comments
   #
   # @param [String] source
@@ -100,6 +115,8 @@ require 'unparser/constants'
 require 'unparser/dsl'
 require 'unparser/ast'
 require 'unparser/ast/local_variable_scope'
+require 'unparser/diff'
+require 'unparser/color'
 require 'unparser/emitter'
 require 'unparser/emitter/literal'
 require 'unparser/emitter/literal/primitive'
@@ -152,5 +169,6 @@ require 'unparser/emitter/resbody'
 require 'unparser/emitter/ensure'
 require 'unparser/emitter/index'
 require 'unparser/emitter/lambda'
+require 'unparser/validation'
 # make it easy for zombie
 require 'unparser/finalize'

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

@@ -2,12 +2,6 @@
 
 require 'unparser'
 require 'optparse'
-require 'diff/lcs'
-require 'diff/lcs/hunk'
-
-require 'unparser/cli/source'
-require 'unparser/cli/differ'
-require 'unparser/cli/color'
 
 module Unparser
   # Unparser CLI implementation
@@ -19,6 +13,36 @@ module Unparser
     EXIT_SUCCESS = 0
     EXIT_FAILURE = 1
 
+    class Target
+      include AbstractType
+
+      # Path target
+      class Path < self
+        include Concord.new(:path)
+
+        # Validation for this target
+        #
+        # @return [Validation]
+        def validation
+          Validation.from_path(path)
+        end
+      end
+
+      # String target
+      class String
+        include Concord.new(:string)
+
+        # Validation for this target
+        #
+        # @return [Validation]
+        def validation
+          Validation.from_string(string)
+        end
+      end # String
+    end # Target
+
+    private_constant(*constants(false))
+
     # Run CLI
     #
     # @param [Array<String>] arguments
@@ -42,8 +66,8 @@ module Unparser
     #
     # ignore :reek:TooManyStatements
     def initialize(arguments)
-      @sources = []
-      @ignore = Set.new
+      @ignore  = Set.new
+      @targets = []
 
       @success   = true
       @fail_fast = false
@@ -54,7 +78,7 @@ module Unparser
       end
 
       opts.parse!(arguments).each do |name|
-        @sources.concat(sources(name))
+        @targets.concat(targets(name))
       end
     end
 
@@ -71,16 +95,16 @@ module Unparser
       builder.banner = 'usage: unparse [options] FILE [FILE]'
       builder.separator('')
       builder.on('-e', '--evaluate SOURCE') do |source|
-        @sources << Source::String.new(source)
+        @targets << Target::String.new(source)
       end
-      builder.on('--start-with FILE') do |file|
-        @start_with = sources(file).first
+      builder.on('--start-with FILE') do |path|
+        @start_with = targets(path).first
       end
       builder.on('-v', '--verbose') do
         @verbose = true
       end
       builder.on('--ignore FILE') do |file|
-        @ignore.merge(sources(file))
+        @ignore.merge(targets(file))
       end
       builder.on('--fail-fast') do
         @fail_fast = true
@@ -94,10 +118,8 @@ module Unparser
     # @api private
     #
     def exit_status
-      effective_sources.each do |source|
-        next if @ignore.include?(source)
-
-        process_source(source)
+      effective_targets.each do |target|
+        process_target(target)
         break if @fail_fast && !@success
       end
 
@@ -106,66 +128,64 @@ module Unparser
 
   private
 
-    # Process source
+    # Process target
     #
-    # @param [CLI::Source]
+    # @param [Target] target
     #
     # @return [undefined]
     #
     # @api private
     #
-    def process_source(source)
-      if source.success?
-        puts source.report if @verbose
-        puts "Success: #{source.identification}"
+    def process_target(target)
+      validation = target.validation
+      if validation.success?
+        puts validation.report if @verbose
+        puts "Success: #{validation.identification}"
       else
-        puts source.report
-        puts "Error: #{source.identification}"
+        puts validation.report
+        puts "Error: #{validation.identification}"
         @success = false
       end
     end
 
-    # Return effective sources
+    # Return effective targets
     #
-    # @return [Enumerable<CLI::Source>]
+    # @return [Enumerable<Target>]
     #
     # @api private
     #
-    def effective_sources
+    def effective_targets
       if @start_with
         reject = true
-        @sources.reject do |source|
-          if reject && source.eql?(@start_with)
+        @targets.reject do |targets|
+          if reject && targets.eql?(@start_with)
             reject = false
           end
 
           reject
         end
       else
-        @sources
-      end
+        @targets
+      end.reject(&@ignore.method(:include?))
     end
 
-    # Return sources for file name
+    # Return targets for file name
     #
     # @param [String] file_name
     #
-    # @return [Enumerable<CLI::Source>]
+    # @return [Enumerable<Target>]
     #
     # @api private
     #
     # ignore :reek:UtilityFunction
-    def sources(file_name)
-      files =
-        if File.directory?(file_name)
-          Dir.glob(File.join(file_name, '**/*.rb')).sort
-        elsif File.file?(file_name)
-          [file_name]
-        else
-          Dir.glob(file_name).sort
-        end
-
-      files.map(&Source::File.method(:new))
+    def targets(file_name)
+      if File.directory?(file_name)
+        Dir.glob(File.join(file_name, '**/*.rb')).sort
+      elsif File.file?(file_name)
+        [file_name]
+      else
+        Dir.glob(file_name).sort
+      end.map { |file| Target::Path.new(Pathname.new(file)) }
     end
 
   end # CLI

data/lib/unparser/{cli/color.rb → color.rb}

@@ -10,9 +10,6 @@ module Unparser
     # @param [String] text
     #
     # @return [String]
-    #
-    # @api private
-    #
     def format(text)
       "\e[#{code}m#{text}\e[0m"
     end
@@ -25,9 +22,6 @@ module Unparser
       #
       # @return [String]
       #   the argument string
-      #
-      # @api private
-      #
       def format(text)
         text
       end
@@ -37,16 +31,12 @@ module Unparser
       # Initialize null color
       #
       # @return [undefined]
-      #
-      # @api private
-      #
       def initialize; end
 
     end.new
 
     RED   = Color.new(31)
     GREEN = Color.new(32)
-    BLUE  = Color.new(34)
 
   end # Color
 end # Unparser

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/diff.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Unparser
+  # Class to create diffs from source code
+  class Diff
+    include Adamantium::Flat, Concord.new(:old, :new)
+
+    ADDITION = '+'
+    DELETION = '-'
+    NEWLINE  = "\n"
+
+    # Unified source diff between old and new
+    #
+    # @return [String]
+    #   if there is exactly one diff
+    #
+    # @return [nil]
+    #   otherwise
+    def diff
+      return if diffs.empty?
+
+      minimized_hunk.diff(:unified) + NEWLINE
+    end
+    memoize :diff
+
+    # Colorized unified source diff between old and new
+    #
+    # @return [String]
+    #   if there is a diff
+    #
+    # @return [nil]
+    #   otherwise
+    def colorized_diff
+      return unless diff
+
+      diff.lines.map(&self.class.method(:colorize_line)).join
+    end
+    memoize :colorized_diff
+
+    # Build new object from source strings
+    #
+    # @param [String] old
+    # @param [String] new
+    #
+    # @return [Diff]
+    def self.build(old, new)
+      new(lines(old), lines(new))
+    end
+
+    # Break up source into lines
+    #
+    # @param [String] source
+    #
+    # @return [Array<String>]
+    def self.lines(source)
+      source.lines.map(&:chomp)
+    end
+    private_class_method :lines
+
+  private
+
+    # Diffs between old and new
+    #
+    # @return [Array<Array>]
+    def diffs
+      ::Diff::LCS.diff(old, new)
+    end
+
+    # Raw diff-lcs hunks
+    #
+    # @return [Array<Diff::LCS::Hunk>]
+    def hunks
+      diffs.map do |diff|
+        ::Diff::LCS::Hunk.new(old.map(&:dup), new, diff, max_length, 0)
+      end
+    end
+
+    # Minimized hunk
+    #
+    # @return Diff::LCS::Hunk
+    def minimized_hunk
+      head, *tail = hunks
+
+      tail.reduce(head) do |left, right|
+        right.merge(left)
+        right
+      end
+    end
+
+    # Max length of source line in new and old
+    #
+    # @return [Integer]
+    def max_length
+      [old, new].map(&:length).max
+    end
+
+    # Colorized a unified diff line
+    #
+    # @param [String] line
+    #
+    # @return [String]
+    def self.colorize_line(line)
+      case line[0]
+      when ADDITION
+        Color::GREEN
+      when DELETION
+        Color::RED
+      else
+        Color::NONE
+      end.format(line)
+    end
+    private_class_method :colorize_line
+
+  end # Diff
+end # Unparser