unparser 0.4.7 → 0.5.2

data/lib/unparser/cli.rb

@@ -1,29 +1,61 @@
 # frozen_string_literal: true
 
-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
-  #
-  # :reek:InstanceVariableAssumption
-  # :reek:TooManyInstanceVariables
   class CLI
 
     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
+
+        # Literal for this target
+        #
+        # @return [Validation]
+        def literal_validation
+          Validation::Literal.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
+
+        # Literal for this target
+        #
+        # @return [Validation]
+        def literal_validation
+          Validation::Literal.from_string(path)
+        end
+      end # String
+    end # Target
+
+    private_constant(*constants(false))
+
     # Run CLI
     #
     # @param [Array<String>] arguments
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #   the exit status
     #
     # @api private
@@ -39,22 +71,21 @@ module Unparser
     # @return [undefined]
     #
     # @api private
-    #
-    # ignore :reek:TooManyStatements
     def initialize(arguments)
-      @sources = []
-      @ignore = Set.new
+      @ignore  = Set.new
+      @targets = []
 
-      @success   = true
-      @fail_fast = false
-      @verbose   = false
+      @fail_fast  = false
+      @success    = true
+      @validation = :validation
+      @verbose    = false
 
       opts = OptionParser.new do |builder|
         add_options(builder)
       end
 
       opts.parse!(arguments).each do |name|
-        @sources.concat(sources(name))
+        @targets.concat(targets(name))
       end
     end
 
@@ -66,38 +97,40 @@ module Unparser
     #
     # @api private
     #
-    # ignore :reek:TooManyStatements
+    # rubocop:disable Metrics/MethodLength
     def add_options(builder)
       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('-l', '--literal') do
+        @validation = :literal_validation
+      end
       builder.on('--ignore FILE') do |file|
-        @ignore.merge(sources(file))
+        @ignore.merge(targets(file))
       end
       builder.on('--fail-fast') do
         @fail_fast = true
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Return exit status
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #
     # @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,67 +139,41 @@ module Unparser
 
   private
 
-    # Process source
-    #
-    # @param [CLI::Source] source
-    #
-    # @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.public_send(@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 [Enumerable<CLI::Source>]
-    #
-    # @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
-    #
-    # @param [String] file_name
-    #
-    # @return [Enumerable<CLI::Source>]
-    #
-    # @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
 end # Unparser

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,28 +22,18 @@ module Unparser
       #
       # @return [String]
       #   the argument string
-      #
-      # @api private
-      #
       def format(text)
         text
       end
 
     private
 
-      # 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/comments.rb

@@ -3,8 +3,6 @@
 module Unparser
 
   # Holds the comments that remain to be emitted
-  #
-  # ignore :reek:RepeatedConditional
   class Comments
 
     # Proxy to singleton
@@ -113,39 +111,15 @@ module Unparser
 
   private
 
-    # Take comments while the provided block returns true
-    #
-    # @yield [Parser::Source::Comment]
-    #
-    # @return [Array]
-    #
-    # @api private
-    #
     def take_while
       number_to_take = @comments.index { |comment| !yield(comment) } || @comments.size
       @comments.shift(number_to_take)
     end
 
-    # Take comments up to the line number
-    #
-    # @param [Fixnum] line
-    #
-    # @return [Array]
-    #
-    # @api private
-    #
     def take_up_to_line(line)
       take_while { |comment| comment.location.expression.line <= line }
     end
 
-    # Unshift document comments and return the rest
-    #
-    # @param [Array] comments
-    #
-    # @return [Array]
-    #
-    # @api private
-    #
     def unshift_documents(comments)
       doc_comments, other_comments = comments.partition(&:document?)
       doc_comments.reverse_each { |comment| @comments.unshift(comment) }

data/lib/unparser/constants.rb

@@ -2,66 +2,19 @@
 
 module Unparser
   # All unparser constants maybe included in other libraries.
-  #
-  # False positive since constants are frozen dynamically
-  # to avoid duplication of `.freeze` calls
-  #
-  # :reek:TooManyConstants
   module Constants
 
-    # Return frozen symbol set from enumerable
-    #
-    # @param [Enumerable] enumerable
-    #
-    # @return [Set<Symbol>]
-    #
-    # @api private
-    #
-    def self.symbol_set(enumerable)
-      enumerable.map(&:to_sym).freeze
-    end
-    private_class_method :symbol_set
-
-    BRACKETS_CURLY  = IceNine.deep_freeze(%w[{ }])
-    BRACKETS_ROUND  = IceNine.deep_freeze(%w[( )])
-    BRACKETS_SQUARE = IceNine.deep_freeze(%w([ ]))
-
     # All unary operators of the ruby language
-    UNARY_OPERATORS = symbol_set %w[
+    UNARY_OPERATORS = %i[
       ! ~ -@ +@
-    ]
+    ].to_set.freeze
 
     # All binary operators of the ruby language
-    BINARY_OPERATORS = symbol_set %w[
+    BINARY_OPERATORS = %i[
       + - * / & | && || << >> ==
       === != <= < <=> > >= =~ !~ ^
       ** %
-    ]
-
-    COMMENT = '#'
-
-    WS       = ' '
-    NL       = "\n"
-    T_DOT    = '.'
-    T_LT     = '<'
-    T_DLT    = '<<'
-    T_AMP    = '&'
-    T_ASN    = '='
-    T_SPLAT  = '*'
-    T_DSPLAT = '**'
-    T_ASR    = '=>'
-    T_PIPE   = '|'
-    T_DCL    = '::'
-    T_NEG    = '!'
-    T_OR     = '||'
-    T_AND    = '&&'
-    T_COLON  = ':'
-
-    M_PO  = '('
-    M_PC  = ')'
-
-    SNGL_QUOTE = "'"
-    DBL_QUOTE  = '"'
+    ].to_set.freeze
 
     # Keywords
     K_DO       = 'do'
@@ -107,8 +60,6 @@ module Unparser
     K_FILE     = '__FILE__'
     K_THEN     = 'then'
 
-    DEFAULT_DELIMITER = ', '.freeze
-
     KEYWORDS = constants.each_with_object([]) do |name, keywords|
       value = const_get(name).freeze
       next unless name.to_s.start_with?('K_')

data/lib/unparser/diff.rb

@@ -0,0 +1,98 @@
+# 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
+
+    def diffs
+      ::Diff::LCS.diff(old, new)
+    end
+
+    def hunks
+      diffs.map do |diff|
+        ::Diff::LCS::Hunk.new(old.map(&:dup), new, diff, max_length, 0)
+      end
+    end
+
+    def minimized_hunk
+      head, *tail = hunks
+
+      tail.reduce(head) do |left, right|
+        right.merge(left)
+        right
+      end
+    end
+
+    def max_length
+      [old, new].map(&:length).max
+    end
+
+    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