tty-file 0.9.0 → 0.10.0

data/lib/tty/file/compare_files.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require_relative "differ"
+
+module TTY
+  module File
+    class CompareFiles
+      extend Forwardable
+
+      def initialize(format: :unified, header: true, context_lines: 5,
+                     verbose: true, color: :green, noop: false, diff_colors: nil)
+        @format = format
+        @header = header
+        @context_lines = context_lines
+        @verbose = verbose
+        @color = color
+        @noop = noop
+        @diff_colors = diff_colors
+      end
+
+      # Compare files
+      #
+      # @api public
+      def call(file_a, file_b, file_a_path, file_b_path)
+        differ = Differ.new(format: @format, context_lines: @context_lines)
+        block_size = file_a.lstat.blksize
+        file_a_chunk = file_a.read(block_size)
+        file_b_chunk = file_b.read(block_size)
+        hunks = differ.(file_a_chunk, file_b_chunk)
+
+        return "" if file_a_chunk.empty? && file_b_chunk.empty?
+        return "No differences found\n" if hunks.empty?
+
+        output = []
+
+        if %i[unified context old].include?(@format) && @header
+          output << "#{differ.delete_char * 3} #{file_a_path}\n"
+          output << "#{differ.add_char * 3} #{file_b_path}"
+        end
+
+        output << "\n" unless hunks =~ /\A\n+@@/
+        output << hunks
+        while !file_a.eof? && !file_b.eof?
+          output << differ.(file_a.read(block_size), file_b.read(block_size))
+        end
+        color_diff_lines(output.join)
+      end
+
+      private
+
+      # @api private
+      def color_diff_lines(hunks)
+        return hunks unless @color && @format == :unified
+
+        newline = "\n"
+        hunks.lines.map do |line|
+          if matched = line.to_s.match(/^(\+[^+]*?)\n/)
+            @diff_colors[:green].(matched[1]) + newline
+          elsif matched = line.to_s.match(/^(\-[^-].*?)\n/)
+            @diff_colors[:red].(matched[1]) + newline
+          elsif matched = line.to_s.match(/^(@@.+?@@)\n/)
+            @diff_colors[:cyan].(matched[1]) + newline
+          else
+            line
+          end
+        end.join
+      end
+    end # CompareFiles
+  end # File
+end # TTY

data/lib/tty/file/create_file.rb

@@ -6,18 +6,21 @@ module TTY
   module File
     class CreateFile
 
-      attr_reader :base, :relative_path, :content, :options, :prompt
+      attr_reader :base, :relative_path, :content, :prompt, :context
 
-      def initialize(base, relative_path, content, options = {})
+      def initialize(base, relative_path, content, context: nil, force: false,
+                     skip: false, verbose: true, noop: false, color: :green,
+                     quiet: true)
         @base    = base
         @content = content
-        @options = options
+        @context = context || @base
+        @force   = force
+        @skip    = skip
+        @noop    = noop
+        @verbose = verbose
+        @color   = color
         @relative_path = convert_encoded_path(relative_path)
-        @prompt  = TTY::Prompt.new
-      end
-
-      def context
-        options[:context] || @base
+        @prompt  = TTY::Prompt.new(quiet: quiet)
       end
 
       def exist?
@@ -59,10 +62,10 @@ module TTY
         if exist?
           if identical?
             notify(:identical, :cyan)
-          elsif options[:force]
+          elsif @force
             notify(:force, :yellow)
-            yield unless options[:noop]
-          elsif options[:skip]
+            yield unless @noop
+          elsif @skip
             notify(:skip, :yellow)
           else
             notify(:collision, :red)
@@ -70,15 +73,16 @@ module TTY
           end
         else
           notify(:create, :green)
-          yield unless options[:noop]
+          yield unless @noop
         end
       end
 
       # Notify console about performed action
+      #
       # @api private
       def notify(name, color)
         base.__send__(:log_status, name, relative_path,
-                      options.fetch(:verbose, true), options.fetch(:color, color))
+                      verbose: @verbose, color: @color ? color : false)
       end
 
       # Display conflict resolution menu and gather answer
@@ -87,13 +91,23 @@ module TTY
       def file_collision(relative_path, content)
         choices = [
           { key: "y", name: "yes, overwrite", value: :yes },
+          { key: "d", name: "diff, compare files", value: :diff },
           { key: "n", name: "no, do not overwrite", value: :no },
           { key: "q", name: "quit, abort", value: :quit }
         ]
-        answer = prompt.expand("Overwrite #{relative_path}?", choices)
+        while (answer = prompt.expand("Overwrite #{relative_path}?", choices)) == :diff do
+          show_diff
+        end
         interpret_answer(answer)
       end
 
+      # Display difference between old and new file
+      #
+      # @api private
+      def show_diff
+        print base.__send__(:diff_files, relative_path, content, verbose: @verbose)
+      end
+
       # @api private
       def interpret_answer(answer)
         case answer

data/lib/tty/file/differ.rb

@@ -2,7 +2,6 @@
 
 require "diff/lcs"
 require "diff/lcs/hunk"
-require "enumerator"
 
 module TTY
   module File
@@ -10,11 +9,9 @@ module TTY
       # Create a Differ
       #
       # @api public
-      def initialize(string_a, string_b, options = {})
-        @string_a      = string_a
-        @string_b      = string_b
-        @format        = options.fetch(:format, :unified)
-        @context_lines = options.fetch(:context_lines, 3)
+      def initialize(format: :unified, context_lines: 3)
+        @format = format
+        @context_lines = context_lines
       end
 
       # Find character difference between two strings
@@ -24,30 +21,53 @@ module TTY
       #   difference found
       #
       # @api public
-      def call
-        diffs  = Diff::LCS.diff(string_a_lines, string_b_lines)
+      def call(string_a, string_b)
+        string_a_lines = convert_to_lines(string_a)
+        string_b_lines = convert_to_lines(string_b)
+        diffs = Diff::LCS.diff(string_a_lines, string_b_lines)
         return "" if diffs.empty?
 
-        hunks  = extract_hunks(diffs)
+        hunks = extract_hunks(diffs, string_a_lines, string_b_lines)
         format_hunks(hunks)
       end
 
-      private
-
-      def convert_to_lines(string)
-        string.split(/\n/).map(&:chomp)
+      # Diff add char
+      #
+      # @api public
+      def add_char
+        case @format
+        when :old
+          ">"
+        when :unified
+          "+"
+        else
+          "*"
+        end
       end
 
-      def string_a_lines
-        convert_to_lines(@string_a)
+      # Diff delete char
+      #
+      # @api public
+      def delete_char
+        case @format
+        when :old
+          "<"
+        when :unified
+          "-"
+        else
+          "*"
+        end
       end
 
-      def string_b_lines
-        convert_to_lines(@string_b)
+      private
+
+      # @api private
+      def convert_to_lines(string)
+        string.split(/\n/).map(&:chomp)
       end
 
-      # @api public
-      def extract_hunks(diffs)
+      # @api private
+      def extract_hunks(diffs, string_a_lines, string_b_lines)
         file_length_difference = 0
 
         diffs.map do |piece|
@@ -58,7 +78,7 @@ module TTY
         end
       end
 
-      # @api public
+      # @api private
       def format_hunks(hunks)
         output = []
         hunks.each_cons(2) do |prev_hunk, current_hunk|

data/lib/tty/file/download_file.rb

@@ -14,10 +14,10 @@ module TTY
 
       # @options
       #
-      def initialize(url, dest_path, options = {})
+      def initialize(url, dest_path, limit: nil)
         @uri       = URI.parse(url)
         @dest_path = dest_path
-        @limit     = options.fetch(:limit) { DEFAULT_REDIRECTS }
+        @limit     = limit || DEFAULT_REDIRECTS
       end
 
       # Download a file

data/lib/tty/file/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   module File
-    VERSION = "0.9.0"
+    VERSION = "0.10.0"
   end # File
 end # TTY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-file
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +109,22 @@ files:
 - README.md
 - lib/tty-file.rb
 - lib/tty/file.rb
+- lib/tty/file/compare_files.rb
 - lib/tty/file/create_file.rb
 - lib/tty/file/differ.rb
 - lib/tty/file/digest_file.rb
 - lib/tty/file/download_file.rb
 - lib/tty/file/read_backward_file.rb
 - lib/tty/file/version.rb
-homepage: https://piotrmurach.github.io/tty
+homepage: https://ttytoolkit.org
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  bug_tracker_uri: https://github.com/piotrmurach/tty-file/issues
   changelog_uri: https://github.com/piotrmurach/tty-file/blob/master/CHANGELOG.md
   documentation_uri: https://www.rubydoc.info/gems/tty-file
-  homepage_uri: https://piotrmurach.github.io/tty
+  homepage_uri: https://ttytoolkit.org
   source_code_uri: https://github.com/piotrmurach/tty-file
 post_install_message: 
 rdoc_options: []