format-staged 0.0.3 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1692442034aaff731e62e22677ccd3026d4e8e644c88fdcc4ec2df9db06521b7
-  data.tar.gz: a2f8d26b365c7c2b1597055490010398900335f0abc6e1dde9b6235adb6c9642
+  metadata.gz: 0cbe105d9ed76b62c405089e69950bbc9059c957bd0b94d948e050a64792ba44
+  data.tar.gz: caf375de5ba8673ff12c36dc23e1278f961b9e5a26164d54154161eb55f1ae9f
 SHA512:
-  metadata.gz: e3bb54425caec06ca5ae575a9eb99726b57bd4974972a3db9a645f28cb199eb1e04f527305e4f2b6d1e0bd4abae2e7a5275041c2aa1c2b5baf37b9bfcec2bc44
-  data.tar.gz: e118755923b6a019cccc20e1354721692fd38fc6c1f6dc09013c47ab9a5d9959277f365362696111c7887faa74526477b8d140b654812a0152840aa9a91d6e34
+  metadata.gz: '0505564873558cbe27cacf1b6da2eb0d7f4bdff4748a08838825ce9b9b918a42a7bb5839bc0c7535bfbe25bb416b4afe606c9de89c9da0f29f8bce56f7c47ad3'
+  data.tar.gz: 9e6045dcf96acc3b592d3075b5263ad55322e5b087d94902c7b010e009b4db6d14320c09b96db11af77b0a28611233bd1307b66ead05b6145152368e9368c4ed

data/bin/git-format-staged

@@ -57,6 +57,10 @@ parser = OptionParser.new do |opt|
     puts FormatStaged::VERSION
     exit
   end
+
+  opt.on('--[no-]color', 'Colorizes output') do |value|
+    parameters[:color_output] = value
+  end
 end
 
 parser.parse!
@@ -69,5 +73,10 @@ if !parameters[:formatter] || parameters[:patterns].empty?
   exit
 end
 
-formatter = FormatStaged.new(**parameters)
-formatter.run
+begin
+  success = FormatStaged.run(**parameters)
+  exit success ? 0 : 1
+rescue RuntimeError => e
+  puts "💣 Error: #{e.message}".red
+  exit 1
+end

data/lib/format-staged/entry.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-class FormatStaged
+module FormatStaged
+  ##
+  # Entry in the git index.
+  #
+  # Data as produced by `git diff-index`
   class Entry
     PATTERN = /^
       :(?<src_mode>\d+)\s

data/lib/format-staged/io.rb

@@ -1,45 +1,77 @@
 # frozen_string_literal: true
 
 require 'English'
-class FormatStaged
-  def get_output(*args, lines: true, silent: false)
-    puts "> #{args.join(' ')}" if @verbose
 
-    r = IO.popen(args, err: :err)
-    output = read_output(r, lines: lines, silent: silent)
+module FormatStaged
+  ##
+  # Mixin that provides IO methods
+  module IOMixin
+    def get_output(*args, lines: true, silent: false)
+      puts "> #{args.join(' ')}" if @verbose
 
-    raise 'Failed to run command' unless $CHILD_STATUS.success?
+      r = IO.popen(args, err: :err)
+      output = read_output(r, lines: lines, silent: silent)
 
-    output
-  end
+      raise 'Failed to run command' unless $CHILD_STATUS.success?
 
-  def pipe_command(*args, source: nil)
-    puts (source.nil? ? '> ' : '| ') + args.join(' ') if @verbose
-    r, w = IO.pipe
+      output
+    end
 
-    opts = {}
-    opts[:in] = source unless source.nil?
-    opts[:out] = w
-    opts[:err] = :err
+    def get_status(*args)
+      puts "> #{args.join(' ')}" if @verbose
+      result = system(*args)
 
-    pid = spawn(*args, **opts)
+      raise 'Failed to run command' if result.nil?
 
-    w.close
-    source&.close
+      puts "? #{$CHILD_STATUS.exitstatus}" if @verbose
 
-    [pid, r]
-  end
+      $CHILD_STATUS.exitstatus
+    end
+
+    def pipe_command(*args, source: nil)
+      puts (source.nil? ? '> ' : '| ') + args.join(' ') if @verbose
+      r, w = IO.pipe
+
+      opts = {}
+      opts[:in] = source unless source.nil?
+      opts[:out] = w
+      opts[:err] = :err
+
+      pid = spawn(*args, **opts)
+
+      w.close
+      source&.close
+
+      [pid, r]
+    end
 
-  def read_output(r, lines: true, silent: false)
-    result = r.read
-    splits = result.split("\n")
-    if @verbose && !silent
-      splits.each do |line|
-        puts "< #{line}"
+    def read_output(output, lines: true, silent: false)
+      result = output.read
+      splits = result.split("\n")
+      if @verbose && !silent
+        splits.each do |line|
+          puts "< #{line}"
+        end
       end
+      output.close
+
+      lines ? splits : result
     end
-    r.close
 
-    lines ? splits : result
+    def fail!(message)
+      abort "💣  #{message.red}"
+    end
+
+    def warning(message)
+      warn "⚠️  #{message.yellow}"
+    end
+
+    def info(message)
+      puts message.blue
+    end
+
+    def verbose_info(message)
+      puts "ℹ️  #{message}" if verbose
+    end
   end
 end

data/lib/format-staged/job.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require_relative 'entry'
+require_relative 'io'
+
+require 'shellwords'
+require 'colorize'
+require 'English'
+
+module FormatStaged
+  ##
+  # Runs staged changes through a formatting tool
+  class Job
+    include IOMixin
+
+    attr_reader :formatter, :patterns, :update, :write, :verbose
+
+    def initialize(formatter:, patterns:, **options)
+      validate_patterns patterns
+
+      @formatter = formatter
+      @patterns = patterns
+      @update = options.fetch(:update, true)
+      @write = options.fetch(:write, true)
+      @verbose = options.fetch(:verbose, true)
+
+      String.disable_colorization = !options.fetch(:color_output, $stdout.isatty)
+    end
+
+    def run
+      files = matching_files(repo_root)
+      if files.empty?
+        info 'No staged file matching pattern. Done'
+        return true
+      end
+
+      formatted = files.filter { |file| format_file file }
+
+      return false unless formatted.size == files.size
+
+      quiet = @verbose ? [] : ['--quiet']
+      return !write || get_status('git', 'diff-index', '--cached', '--exit-code', *quiet, 'HEAD') != 0
+    end
+
+    def repo_root
+      verbose_info 'Finding repository root'
+      root = get_output('git', 'rev-parse', '--show-toplevel', lines: false).chomp
+      verbose_info "Repo at #{root}"
+
+      root
+    end
+
+    def matching_files(root)
+      verbose_info 'Listing staged files'
+
+      get_output('git', 'diff-index', '--cached', '--diff-filter=AM', '--no-renames', 'HEAD')
+        .map { |line| Entry.new(line, root: root) }
+        .reject(&:symlink?)
+        .filter { |entry| entry.matches?(@patterns) }
+    end
+
+    def format_file(file)
+      new_hash = format_object file
+
+      return true unless write
+
+      if new_hash == file.dst_hash
+        info "Unchanged #{file.src_path}"
+        return true
+      end
+
+      if object_is_empty new_hash
+        info "Skipping #{file.src_path}, formatted file is empty"
+        return false
+      end
+
+      replace_file_in_index file, new_hash
+      update_working_copy file, new_hash
+
+      if new_hash == file.src_hash
+        info "File #{file.src_path} equal to comitted"
+        return true
+      end
+
+      true
+    end
+
+    def update_working_copy(file, new_hash)
+      return unless update
+
+      begin
+        patch_working_file file, new_hash
+      rescue StandardError => e
+        warning "failed updating #{file.src_path} in working copy: #{e}"
+      end
+    end
+
+    def format_object(file)
+      info "Formatting #{file.src_path}"
+
+      format_command = formatter.sub('{}', file.src_path.shellescape)
+
+      pid1, r = pipe_command 'git', 'cat-file', '-p', file.dst_hash
+      pid2, r = pipe_command format_command, source: r
+
+      write_args = write ? ['-w'] : []
+      pid3, r = pipe_command 'git', 'hash-object', *write_args, '--stdin', source: r
+
+      result = read_output(r, lines: false).chomp
+
+      Process.wait pid1
+      raise "Cannot read #{file.dst_hash} from object database" unless $CHILD_STATUS.success?
+
+      Process.wait pid2
+      raise "Error formatting #{file.src_path}" unless $CHILD_STATUS.success?
+
+      Process.wait pid3
+      raise 'Error writing formatted file back to object database' unless $CHILD_STATUS.success? && !result.empty?
+
+      result
+    end
+
+    def object_is_empty(hash)
+      size = get_output('git', 'cat-file', '-s', hash).first.to_i
+      size.zero?
+    end
+
+    def patch_working_file(file, new_hash)
+      info 'Updating working copy'
+
+      patch = get_output 'git', 'diff', file.dst_hash, new_hash, lines: false, silent: true
+      patch.gsub! "a/#{file.dst_hash}", "a/#{file.src_path}"
+      patch.gsub! "b/#{new_hash}", "b/#{file.src_path}"
+
+      input, patch_out = IO.pipe
+      pid, r = pipe_command 'git', 'apply', '-', source: input
+
+      patch_out.write patch
+      patch_out.close
+
+      read_output r
+
+      Process.wait pid
+      raise 'Error applying patch' unless $CHILD_STATUS.success?
+    end
+
+    def replace_file_in_index(file, new_hash)
+      get_output 'git', 'update-index', '--cacheinfo', "#{file.dst_mode},#{new_hash},#{file.src_path}"
+    end
+
+    def validate_patterns(patterns)
+      patterns.each do |pattern|
+        fail! "Negative pattern '#{pattern}' is not yet supported" if pattern.start_with? '!'
+      end
+    end
+  end
+end

data/lib/format-staged/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class FormatStaged
-  VERSION = '0.0.3'
+module FormatStaged
+  VERSION = '0.1.2'
 end

data/lib/format_staged.rb

@@ -1,109 +1,12 @@
 # frozen_string_literal: true
 
-require 'English'
-require 'format-staged/version'
-require 'format-staged/entry'
-require 'format-staged/io'
-require 'shellwords'
-
-class FormatStaged
-  attr_reader :formatter, :patterns, :update, :write, :verbose
-
-  def initialize(formatter:, patterns:, update: true, write: true, verbose: true)
-    @formatter = formatter
-    @patterns = patterns
-    @update = update
-    @write = write
-    @verbose = verbose
-  end
-
-  def run
-    root = get_output('git', 'rev-parse', '--show-toplevel').first
-
-    files = get_output('git', 'diff-index', '--cached', '--diff-filter=AM', '--no-renames', 'HEAD')
-            .map { |line| Entry.new(line, root: root) }
-            .reject(&:symlink?)
-            .filter { |entry| entry.matches?(@patterns) }
-
-    files.each do |file|
-      format_file(file)
-    end
-  end
-
-  def format_file(file)
-    new_hash = format_object file
-
-    return true unless write
-
-    if new_hash == file.dst_hash
-      puts "Unchanged #{file.src_path}"
-      return false
-    end
-
-    if object_is_empty new_hash
-      puts "Skipping #{file.src_path}, formatted file is empty"
-      return false
-    end
-
-    replace_file_in_index file, new_hash
-
-    if update
-      begin
-        patch_working_file file, new_hash
-      rescue StandardError => e
-        puts "Warning: failed updating #{file.src_path} in working copy: #{e}"
-      end
-    end
-
-    true
-  end
-
-  def format_object(file)
-    puts "Formatting #{file.src_path}"
-
-    format_command = formatter.sub('{}', file.src_path.shellescape)
-
-    pid1, r = pipe_command 'git', 'cat-file', '-p', file.dst_hash
-    pid2, r = pipe_command format_command, source: r
-    pid3, r = pipe_command 'git', 'hash-object', '-w', '--stdin', source: r
-
-    result = read_output(r, lines: false).chomp
-
-    Process.wait pid1
-    raise "Cannot read #{file.dst_hash} from object database" unless $CHILD_STATUS.success?
-
-    Process.wait pid2
-    raise "Error formatting #{file.src_path}" unless $CHILD_STATUS.success?
-
-    Process.wait pid3
-    raise 'Error writing formatted file back to object database' unless $CHILD_STATUS.success? && !result.empty?
-
-    result
-  end
-
-  def object_is_empty(hash)
-    size = get_output('git', 'cat-file', '-s', hash).first.to_i
-    size.zero?
-  end
-
-  def patch_working_file(file, new_hash)
-    patch = get_output 'git', 'diff', file.dst_hash, new_hash, lines: false, silent: true
-    patch.gsub! "a/#{file.dst_hash}", "a/#{file.src_path}"
-    patch.gsub! "b/#{new_hash}", "b/#{file.src_path}"
-
-    input, patch_out = IO.pipe
-    pid, r = pipe_command 'git', 'apply', '-', source: input
-
-    patch_out.write patch
-    patch_out.close
-
-    read_output r
-
-    Process.wait pid
-    raise 'Error applying patch' unless $CHILD_STATUS.success?
-  end
-
-  def replace_file_in_index(file, new_hash)
-    get_output 'git', 'update-index', '--cacheinfo', "#{file.dst_mode},#{new_hash},#{file.src_path}"
+require_relative 'format-staged/job'
+require_relative 'format-staged/version'
+
+##
+# FormatStaged module
+module FormatStaged
+  def self.run(**options)
+    Job.new(**options).run
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: format-staged
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.2
 platform: ruby
 authors:
 - Sven Weidauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: git format staged
 email: sven@5sw.de
 executables:
@@ -62,6 +104,7 @@ files:
 - bin/git-format-staged
 - lib/format-staged/entry.rb
 - lib/format-staged/io.rb
+- lib/format-staged/job.rb
 - lib/format-staged/version.rb
 - lib/format_staged.rb
 homepage: https://github.com/5sw/format-staged
@@ -75,7 +118,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement