git-crecord 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75901ead4962d50c7cc5a3e838a1da7ded9e9b69c1b01ae4297ded807ff51000
-  data.tar.gz: b01fd7ae94ea47f59464d0c2f293a0c97f19995ab2bb18f86e8c9e9884e3c9a7
+  metadata.gz: 301253d2b7495fed7ae9dc2c148b04bee0bb9241419b99d863c872e40e95eec9
+  data.tar.gz: 1b5aef42231723add9c71296d88bdc39a899133c7ec561bf6704a2edd2bd17c8
 SHA512:
-  metadata.gz: d840cdce7161d29f8025698a13e4e469506e80332b6ffa47a49b0cb85c8106fd7dae42a92929931e2ab45b7e3596d4ce2d3978a974b909d87c7b341385b4222d
-  data.tar.gz: 74deb70c563068660856b8783f90967561947935d19dc955b463ea2f2dcfa155c5d8a5ff84c4488ac70f8ce1d6507f9e6cbaed179c7cd2f5645521005a1d3200
+  metadata.gz: d0803b8dd1714df6b4b7e2382e2cd688bbd71739706eab5560b2683a7c4d2214dede1a265a24aee70e5667a605bc05c73224c47714b1c63967e9980fbcc7d43d
+  data.tar.gz: b563990aaaea1b8feff2e2e7d1403d230d5e048e3bb9c3584e8506b6a1b52ff031753e495e816e63f6b05d25ea861bb0cf86363733ae5a523b882b3e47848d6e

data/.rubocop.yml

@@ -1,3 +1,6 @@
+---
+require: rubocop-performance
+
 Documentation:
   Enabled: false
 

data/git-crecord.gemspec

@@ -30,4 +30,5 @@ GemSpec = Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.8', '>= 5.8.4'
   spec.add_development_dependency 'rake', '~> 10.1', '>= 10.1.1'
   spec.add_development_dependency 'rubocop', '>= 0.56.0'
+  spec.add_development_dependency 'rubocop-performance'
 end

data/lib/git_crecord.rb

@@ -34,10 +34,10 @@ module GitCrecord
     return false if toplevel_dir.empty?
 
     Dir.chdir(toplevel_dir) do
-      files = Diff.parse(Git.diff(staged: reverse), reverse)
-      files.concat(Diff.untracked_files(Git.status)) if with_untracked_files
+      files = Diff.create(reverse: reverse, untracked: with_untracked_files)
       return false if files.empty?
 
+      UI::StatusBar.reverse = reverse
       result = UI.run(files)
       return result.call(reverse) == true if result.respond_to?(:call)
 

data/lib/git_crecord/diff.rb

@@ -1,73 +1,81 @@
 # frozen_string_literal: true
 
 require_relative 'diff/file'
+require_relative 'git'
 
 module GitCrecord
   module Diff
-    def self.parse(diff, reverse = false)
-      files = []
-      enum = diff.lines.each
-      loop do
-        line = enum.next
-        line.chomp!
-        next files << parse_file_head(line, enum, reverse) if file_start?(line)
-        next files[-1] << line if hunk_start?(line)
+    def self.create(reverse: false, untracked: false)
+      GitCrecord::Git.status.lines.map do |file_status|
+        status = file_status[reverse ? 0 : 1].downcase
+        filename = file_status.chomp[3..-1]
+        next if status == ' ' || status == '?' && !untracked
 
-        files[-1].add_hunk_line(line)
-      end
-      files
-    end
-
-    def self.file_start?(line)
-      line.start_with?('diff')
-    end
-
-    def self.hunk_start?(line)
-      line.start_with?('@@')
-    end
-
-    def self.parse_file_head(line, enum, reverse)
-      index_line = enum.next # index ... or new ...
-      is_new_file = index_line.start_with?('new')
-      enum.next if is_new_file
-      enum.next # --- ...
-      enum.next # +++ ...
-      type = is_new_file ? :untracked : :modified
-      File.new(*parse_filenames(line), type: type, reverse: reverse)
+        method = "handle_status_#{status}"
+        send(method, filename, reverse: reverse) if respond_to?(method)
+      end.compact
     end
 
-    def self.parse_filenames(line)
-      line.match(%r{a/(.*) b/(.*)$})[1..2]
+    def self.handle_status_m(filename, reverse: false)
+      file = File.new(filename, filename, type: :modified, reverse: reverse)
+      diff_lines = Git.diff(filename: filename, staged: reverse).lines[4..-1]
+      diff_lines.each do |line|
+        handle_line(file, line)
+      end
+      file
     end
 
-    def self.untracked_files(git_status)
-      git_status.lines.select { |l| l.start_with?('??') }.flat_map do |path|
-        path = path.chomp[3..-1]
-        ::File.directory?(path) ? untracked_dir(path) : untracked_file(path)
-      end.compact
+    def self.handle_status_a(filename, reverse: false)
+      file = File.new(filename, filename, type: :new, reverse: reverse)
+      diff_lines = Git.diff(filename: filename, staged: reverse).lines[5..-1]
+      file.make_empty if diff_lines.nil?
+      (diff_lines || []).each do |line|
+        handle_line(file, line)
+      end
+      file
     end
 
-    def self.untracked_file(filename)
+    def self.handle_status_?(filename, **_)
       File.new(filename, filename, type: :untracked).tap do |file|
         lines, err = file_lines(filename)
-        file << "@@ -0,0 +1,#{lines.size} @@"
-        file.subs[0].subs << PseudoLine.new(err) if lines.empty?
-        lines.each { |line| file.add_hunk_line("+#{line.chomp}") }
+        if lines.empty?
+          file.make_empty(err)
+        else
+          file << "@@ -0,0 +1,#{lines.size} @@"
+          lines.each { |line| file.add_hunk_line("+#{line.chomp}") }
+        end
         file.selected = false
       end
     end
 
-    def self.untracked_dir(path)
-      Dir.glob(::File.join(path, '**/*')).map do |filename|
-        untracked_file(filename) unless ::File.directory?(filename)
+    # o   ' ' = unmodified
+    # o   M = modified
+    # o   A = added
+    # o   D = deleted
+    # o   R = renamed
+    # o   C = copied
+    # o   U = updated but unmerged
+
+    def self.handle_line(file, line)
+      line.chomp!
+      if hunk_start?(line)
+        file << line
+      else
+        file.add_hunk_line(line)
       end
     end
 
+    def self.hunk_start?(line)
+      line.start_with?('@@')
+    end
+
     def self.file_encoding(filename)
       `file --mime-encoding #{filename}`.split(': ', 2)[1].chomp
     end
 
     def self.file_lines(filename)
+      return [[], 'empty'] if ::File.size(filename).zero?
+
       encoding = file_encoding(filename)
       return [[], 'binary'] if encoding == 'binary'
 

data/lib/git_crecord/diff/difference.rb

@@ -27,6 +27,7 @@ module GitCrecord
         @reverse = reverse
         @selection_marker_map = reverse ? REVERSE_SELECTED_MAP : SELECTED_MAP
         @subs = []
+        @selected = true
       end
 
       def strings(width)
@@ -53,6 +54,8 @@ module GitCrecord
       end
 
       def selected
+        return @selected if selectable_subs.empty?
+
         s = selectable_subs.map(&:selected).uniq
         return s[0] if s.size == 1
 
@@ -60,7 +63,11 @@ module GitCrecord
       end
 
       def selected=(value)
-        selectable_subs.each { |sub| sub.selected = value }
+        if selectable_subs.empty?
+          @selected = value
+        else
+          selectable_subs.each { |sub| sub.selected = value }
+        end
       end
 
       def style(is_highlighted)

data/lib/git_crecord/diff/file.rb

@@ -19,7 +19,7 @@ module GitCrecord
       end
 
       def to_s
-        prefix = { modified: 'M', untracked: '?' }.fetch(type)
+        prefix = { modified: 'M', new: 'A', untracked: '?' }.fetch(type)
         return "#{prefix} #{@filename_a}" if @filename_a == @filename_b
 
         "#{prefix} #{filename_a} -> #{filename_b}"
@@ -68,6 +68,31 @@ module GitCrecord
       end
 
       alias prefix_style style
+
+      def make_empty(type = 'empty')
+        subs << PseudoLine.new(type)
+      end
+
+      def empty?
+        selectable_subs.empty?
+      end
+
+      def stage_steps
+        case type
+        when :modified then %i[stage]
+        when :new then empty? ? %i[add_file_full] : %i[stage]
+        when :untracked then empty? ? %i[add_file_full] : %i[add_file stage]
+        else raise "unknown file type - #{type.inspect}"
+        end
+      end
+
+      def unstage_steps
+        case type
+        when :modified then %i[unstage]
+        when :new then %i[unstage]
+        else raise "unknown file type - #{type.inspect}"
+        end
+      end
     end
   end
 end

data/lib/git_crecord/diff/line.rb

@@ -6,12 +6,10 @@ require_relative '../ui/color'
 module GitCrecord
   module Diff
     class PseudoLine < Difference
-      attr_accessor :selected
-
       def initialize(line)
         @line = line || 'file is empty'
-        @selected = false
         super()
+        @selected = false
       end
 
       def to_s
@@ -23,7 +21,7 @@ module GitCrecord
       end
 
       def selectable?
-        true
+        false
       end
 
       def expanded
@@ -40,11 +38,8 @@ module GitCrecord
     end
 
     class Line < Difference
-      attr_reader :selected
-
       def initialize(line, reverse: false)
         @line = line
-        @selected = true
         super(reverse: reverse)
       end
 

data/lib/git_crecord/git.rb

@@ -5,16 +5,29 @@ require 'open3'
 
 module GitCrecord
   module Git
-    def self.stage(files, reverse = false)
-      selected_files = files.select(&:selected)
-      untracked_files = selected_files.select { |file| file.type == :untracked }
-      add_files(untracked_files) unless reverse
-      diff = selected_files.map(&:generate_diff).join("\n")
-      status = _stage(diff, reverse).success?
-      return status unless reverse
-
-      reset_files(untracked_files.select { |file| file.selected == true })
-      true
+    def self.stage_files(files, reverse = false)
+      method_name = reverse ? :unstage_steps : :stage_steps
+      success = true
+      files.each do |file|
+        next unless file.selected
+
+        file.send(method_name).each do |step|
+          success &&= send(step, file)
+        end
+      end
+      success
+    end
+
+    def self.stage(file)
+      _stage(file.generate_diff, false)
+    end
+
+    def self.unstage(file)
+      success = _stage(file.generate_diff, true)
+      return false unless success
+      return true unless file.type == :new && file.selected == true
+
+      reset_file(file)
     end
 
     def self._stage(diff, reverse = false)
@@ -26,47 +39,43 @@ module GitCrecord
       LOGGER.info('stdout/stderr:')
       LOGGER.info(content)
       LOGGER.info("return code: #{status}")
-      status
+      status.success?
     end
 
-    def self.add_files(files)
-      files.each do |file|
-        success = add_file(file.filename_a)
-        raise "could not add file #{file.filename_a}" unless success
-      end
-    end
-
-    def self.add_file(filename)
-      system("git add -N #{filename}")
+    def self.add_file(file)
+      system("git add -N #{file.filename_a}")
     end
 
-    def self.reset_files(files)
-      files.each do |file|
-        success = reset_file(file.filename_a)
-        raise "could not reset file #{file.filename_a}" unless success
-      end
+    def self.add_file_full(file)
+      system("git add #{file.filename_a}")
     end
 
-    def self.reset_file(filename)
-      system("git reset -q #{filename}")
+    def self.reset_file(file)
+      system("git reset -q #{file.filename_a}")
     end
 
     def self.status
-      `git status --porcelain`
+      `git status --porcelain --untracked-files=all`
     end
 
     def self.commit
       exec('git commit')
     end
 
-    def self.diff(staged: false)
-      `git diff --no-ext-diff --no-color -D #{staged ? '--staged' : ''}`
+    def self.diff(filename: nil, staged: false)
+      filename = "'#{filename}'" if filename
+      staged_option = staged ? '--staged' : ''
+      `git diff --no-ext-diff --no-color -D #{staged_option} #{filename}`
     end
 
     def self.toplevel_dir
       `git rev-parse --show-toplevel`.chomp
     end
 
+    def self.branch
+      `git rev-parse --abbrev-ref HEAD`.chomp
+    end
+
     def self.tab
       @tab ||= ' ' * [2, `git config crecord.tabwidth`.to_i].max
     end

data/lib/git_crecord/ui.rb

@@ -3,6 +3,7 @@
 require 'curses'
 require_relative 'ui/color'
 require_relative 'ui/hunks_window'
+require_relative 'ui/status_bar'
 
 module GitCrecord
   module UI
@@ -44,6 +45,7 @@ module GitCrecord
 
     def self.run_loop(win)
       loop do
+        StatusBar.refresh(win)
         c = win.getch
         next if ACTIONS[c].nil?
 

data/lib/git_crecord/ui/color.rb

@@ -9,7 +9,8 @@ module GitCrecord
         normal: 1,
         green: 2,
         red: 3,
-        hl: 4
+        hl: 4,
+        status_bar: 5
       }.freeze
 
       def self.init
@@ -19,6 +20,9 @@ module GitCrecord
         Curses.init_pair(MAP[:green], Curses::COLOR_GREEN, -1)
         Curses.init_pair(MAP[:red], Curses::COLOR_RED, -1)
         Curses.init_pair(MAP[:hl], Curses::COLOR_BLACK, Curses::COLOR_GREEN)
+        Curses.init_pair(
+          MAP[:status_bar], Curses::COLOR_BLACK, Curses::COLOR_BLUE
+        )
       end
 
       MAP.each_pair do |name, number|

data/lib/git_crecord/ui/hunks_window.rb

@@ -25,8 +25,12 @@ module GitCrecord
       delegate getch: :@win
       def_delegator :@win, :maxx, :width
 
+      def highlight_position
+        "#{@visibles.index(@highlighted) + 1}/#{@visibles.size}"
+      end
+
       def refresh
-        @win.refresh(scroll_position, 0, 0, 0, Curses.lines - 1, width)
+        @win.refresh(scroll_position, 0, 1, 0, Curses.lines - 1, width)
       end
 
       def redraw
@@ -37,7 +41,7 @@ module GitCrecord
 
       def resize
         new_width = Curses.cols
-        new_height = [Curses.lines, content_height(new_width)].max
+        new_height = [Curses.lines - 1, content_height(new_width)].max
         return if width == new_width && @win.maxy == new_height
 
         @win.resize(new_height, new_width)
@@ -106,11 +110,13 @@ module GitCrecord
       end
 
       def stage
-        QuitAction.new { |reverse| Git.stage(@files, reverse) }
+        QuitAction.new { |reverse| Git.stage_files(@files, reverse) }
       end
 
       def commit
-        QuitAction.new { |reverse| Git.stage(@files, reverse) && Git.commit }
+        QuitAction.new do |reverse|
+          Git.stage_files(@files, reverse) && Git.commit
+        end
       end
 
       def highlight_next

data/lib/git_crecord/ui/status_bar.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'curses'
+require_relative 'color'
+require_relative '../git'
+
+module GitCrecord
+  module UI
+    module StatusBar
+      def self.refresh(main_win)
+        write_left(main_win)
+        fill_to_eol
+        write_right(main_win)
+        win.refresh
+      end
+
+      def self.write_left(_main_win)
+        win.setpos(0, 0)
+        win.addstr(" #{branch}")
+      end
+
+      def self.write_right(main_win)
+        str = " #{reverse ? '[reverse]' : ''} #{main_win.highlight_position} "
+        win.setpos(0, [0, win.maxx - str.size].max)
+        win.addstr(str)
+      end
+
+      def self.fill_to_eol
+        fill_width = win.maxx - win.curx
+        win.addstr(' ' * fill_width) if fill_width.positive?
+      end
+
+      def self.win
+        @win ||= Curses::Window.new(1, Curses.cols, 0, 0).tap do |win|
+          win.attrset(Color.status_bar | Curses::A_BOLD)
+        end
+      end
+
+      def self.branch
+        @branch = Git.branch
+      end
+
+      def self.reverse
+        @reverse
+      end
+
+      def self.reverse=(reverse)
+        @reverse = reverse
+      end
+    end
+  end
+end

data/lib/git_crecord/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitCrecord
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/test/system-test.sh

@@ -196,6 +196,29 @@ assert-diff '-This is the second line.
 +This is line 2.
 +new line2'
 
+echo "test add empty files ----------------------------------------------------"
+git add .
+touch empty.txt
+touch empty-untrached.txt
+git add -N empty.txt
+run-git-crecord 'AAs'
+assert-status 'M  a_file.txt
+M  b_file.txt
+A  empty-untrached.txt
+A  empty.txt
+A  new.txt
+A  sub/sub2/sub-file.txt'
+
+echo "unstage empty file ------------------------------------------------------"
+run-git-crecord-reverse 'AG s'
+assert-status 'M  a_file.txt
+M  b_file.txt
+A  empty-untrached.txt
+A  empty.txt
+A  new.txt
+?? sub/'
+
+
 popd > /dev/null # $REPO_DIR
 
 cat << 'EOF'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-crecord
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Maik Brendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.56.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: This gem adds the git-crecord command. It provides a curses UI to stage/commit
   git-hunks.
 email: maik.brendler@invision.de
@@ -107,6 +121,7 @@ files:
 - lib/git_crecord/ui/color.rb
 - lib/git_crecord/ui/help_window.rb
 - lib/git_crecord/ui/hunks_window.rb
+- lib/git_crecord/ui/status_bar.rb
 - lib/git_crecord/version.rb
 - screenshot.jpg
 - test/git_crecord/diff/hunk_test.rb