git-crecord 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f6c8a30051ca52a3a3406430672f24506e6f30b
-  data.tar.gz: c06ab9d96429ae54b0a4f126341a627e6a722b98
+SHA256:
+  metadata.gz: 9faaad49aba11b3aad863f3923f1249cd6d83ae88148405bcb0799f6019cb6c5
+  data.tar.gz: 5ee14973f732a9117c37ea52cbc3040cdb4c4331a4342efb8624143121f84d87
 SHA512:
-  metadata.gz: d06b9d27174afc185dbd30a5aa34958a15b6340067bc80de05c2296ac13df9e513d0b3986627cd23b3ecd1ca9ee01163bbb752f9e85bb41a822ce847d07f811d
-  data.tar.gz: 9ad67d7e9f9b06b7fb17545d0a1d22c9741439671aaebcfe6d184f118309a28a7fc55272c0eea8596136876984908e5a0fa22d86ed3ae6ab158ea134c9659461
+  metadata.gz: 23c240bc80cda76c5aa13bd2d296b1a8f65a40a0364ea5eea0098f51b8af5f69a40f189a67abe8be19ac98f240e6bfd14f432aa051268e33352067305661c7c8
+  data.tar.gz: 8259cb00118d75e7ee7aa49c57ae949197fae66a6cc20e24a1644890fc4691a8049d88834dc91778d9689cd388566526337698e01884b9929314f5772353110d

data/.rubocop.yml

@@ -1,20 +1,13 @@
-Metrics/LineLength:
-  Max: 80
-
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
-
-Style/NumericLiterals:
-  MinDigits: 666
-
 Documentation:
   Enabled: false
 
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Max: 30
+
 AllCops:
+  DisplayCopNames: true
   DisplayStyleGuide: true
+  TargetRubyVersion: 2.3

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 

data/README.md

@@ -15,6 +15,7 @@ $ gem install git-crecord
 ```shell
 $ git crecord
 $ git crecord --untracked-files  # show untracked files
+$ git crecord --reverse          # unstage hunks
 ```
 
 Key-bindings:
@@ -55,6 +56,5 @@ $ ln -s bin/git-crecord /usr/bin/git-crecord
 
 Tests:
 ```shell
-$ bundle exec rake test
-$ bundle exec rake systemtest
+$ bundle exec rake
 ```

data/Rakefile

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
 
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/git_crecord/**/*test.rb']
@@ -11,4 +14,6 @@ task :systemtest do
   sh(File.join(__dir__, 'test/system-test.sh'))
 end
 
-task default: %i[test systemtest]
+RuboCop::RakeTask.new
+
+task default: %i[test systemtest rubocop]

data/bin/git-crecord

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../lib/git_crecord'
 
 exit(GitCrecord.main(ARGV))

data/git-crecord.gemspec

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'lib/git_crecord/version'
 
 GemSpec = Gem::Specification.new do |spec|
   spec.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
   spec.platform = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.3.0'
   spec.name = 'git-crecord'
   spec.version = GitCrecord::VERSION
   spec.authors = 'Maik Brendler'
@@ -19,14 +21,14 @@ GemSpec = Gem::Specification.new do |spec|
     'issue_tracker' => 'https://github.com/mbrendler/git-crecord/issues'
   }
   spec.require_paths = %w[lib]
-  spec.files = `git ls-files`.split($RS).delete_if{ |f| %r{^(spec|test)/} =~ f }
+  spec.files = `git ls-files`.split($RS).delete_if do |f|
+    %r{^(spec|test)/} =~ f
+  end
   spec.test_files = `git ls-files`.split($RS).grep(%r{^(spec|test)/})
   spec.executables = %w[git-crecord]
   spec.has_rdoc = false
-  # Install curses dependency, via a native extension hack, because
-  # ruby 2.0 includes curses and can't install curses-gem
-  # spec.add_dependency 'curses', '~> 1.0'
-  spec.extensions << 'ext/mkrf_conf.rb'
-  spec.add_development_dependency 'rake', '~> 10.1', '>= 10.1.1'
+  spec.add_dependency 'curses', '~>1.0'
   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'
 end

data/lib/git_crecord/diff/difference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ui/color'
 
 module GitCrecord
@@ -12,9 +14,18 @@ module GitCrecord
         false => '[ ]  ',
         :partly => '[~]  '
       }.freeze
+
+      REVERSE_SELECTED_MAP = {
+        true => '[R]  ',
+        false => '[X]  ',
+        :partly => '[~]  '
+      }.freeze
+
       SELECTION_MARKER_WIDTH = SELECTED_MAP[true].size
 
-      def initialize
+      def initialize(reverse: false)
+        @reverse = reverse
+        @selection_marker_map = reverse ? REVERSE_SELECTED_MAP : SELECTED_MAP
         @subs = []
       end
 
@@ -44,15 +55,17 @@ module GitCrecord
       def selected
         s = selectable_subs.map(&:selected).uniq
         return s[0] if s.size == 1
+
         :partly
       end
 
       def selected=(value)
-        selectable_subs.each{ |sub| sub.selected = value }
+        selectable_subs.each { |sub| sub.selected = value }
       end
 
       def style(is_highlighted)
         return Curses::A_BOLD | UI::Color.hl if is_highlighted
+
         Curses::A_BOLD | UI::Color.normal
       end
 
@@ -61,7 +74,9 @@ module GitCrecord
       end
 
       def prefix(line_number)
-        return SELECTED_MAP.fetch(selected) if line_number.zero? && selectable?
+        show_selection_marker = line_number.zero? && selectable?
+        return @selection_marker_map.fetch(selected) if show_selection_marker
+
         ' ' * SELECTION_MARKER_WIDTH
       end
 

data/lib/git_crecord/diff/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'difference'
 require_relative 'hunk'
 require_relative '../ui/color'
@@ -8,28 +10,30 @@ module GitCrecord
       attr_reader :filename_a
       attr_reader :type
 
-      def initialize(filename_a, filename_b, type: :modified)
+      def initialize(filename_a, filename_b, type: :modified, reverse: false)
         @filename_a = filename_a
         @filename_b = filename_b
         @type = type
         @expanded = false
-        super()
+        super(reverse: reverse)
       end
 
       def to_s
-        prefix = {modified: 'M', untracked: '?'}.fetch(type)
+        prefix = { modified: 'M', untracked: '?' }.fetch(type)
         return "#{prefix} #{@filename_a}" if @filename_a == @filename_b
+
         "#{prefix} #{filename_a} -> #{filename_b}"
       end
 
       def info_string
-        line_count = subs.reduce(0){ |a, e| e.selectable_subs.size + a }
+        line_count = subs.reduce(0) { |a, e| e.selectable_subs.size + a }
         "  #{subs.size} hunk(s), #{line_count} line(s) changed"
       end
 
       def strings(width)
         result = super
         return result unless expanded
+
         result += info_string.scan(/.{1,#{content_width(width)}}/)
         result << ''
       end
@@ -43,7 +47,7 @@ module GitCrecord
       end
 
       def <<(hunk)
-        subs << Hunk.new(hunk)
+        subs << Hunk.new(hunk, reverse: @reverse)
         self
       end
 
@@ -53,6 +57,7 @@ module GitCrecord
 
       def generate_diff
         return unless selected
+
         [
           "diff --git a/#{@filename_a} b/#{@filename_b}",
           "--- a/#{@filename_a}",

data/lib/git_crecord/diff/hunk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'difference'
 require_relative 'line'
 require_relative '../ui/color'
@@ -5,10 +7,10 @@ require_relative '../ui/color'
 module GitCrecord
   module Diff
     class Hunk < Difference
-      def initialize(head)
+      def initialize(head, reverse: false)
         @head = head
         @expanded = true
-        super()
+        super(reverse: reverse)
       end
 
       def to_s
@@ -20,12 +22,13 @@ module GitCrecord
       end
 
       def <<(line)
-        subs << Line.new(line)
+        subs << Line.new(line, reverse: @reverse)
         self
       end
 
       def generate_diff
         return nil unless selected
+
         [generate_header, *subs.map(&:generate_diff).compact].join("\n")
       end
 
@@ -33,6 +36,7 @@ module GitCrecord
         old_start, old_count, new_start, new_count = parse_header
         selectable_subs.each do |sub|
           next if sub.selected
+
           new_count -= 1 if sub.add?
           new_count += 1 if sub.del?
         end
@@ -42,6 +46,7 @@ module GitCrecord
       def parse_header
         match = @head.match(/@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@/)
         raise "mismatching hunk-header - '#{@head}'" if match.nil?
+
         [match[1], match[3] || 1, match[4], match[6] || 1].map(&:to_i)
       end
     end

data/lib/git_crecord/diff/line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'difference'
 require_relative '../ui/color'
 
@@ -40,10 +42,10 @@ module GitCrecord
     class Line < Difference
       attr_reader :selected
 
-      def initialize(line)
+      def initialize(line, reverse: false)
         @line = line
         @selected = true
-        super()
+        super(reverse: reverse)
       end
 
       def to_s
@@ -77,6 +79,7 @@ module GitCrecord
       def generate_diff
         return " #{@line[1..-1]}" if !selected && del?
         return @line if selected
+
         nil
       end
 
@@ -84,6 +87,7 @@ module GitCrecord
         return UI::Color.hl if is_highlighted
         return UI::Color.green if add?
         return UI::Color.red if del?
+
         UI::Color.normal
       end
     end

data/lib/git_crecord/diff.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 require_relative 'diff/file'
 
 module GitCrecord
   module Diff
-    def self.parse(diff)
+    def self.parse(diff, reverse = false)
       files = []
       enum = diff.lines.each
       loop do
         line = enum.next
         line.chomp!
-        next files << parse_file_header(line, enum) if file_start?(line)
+        next files << parse_file_head(line, enum, reverse) if file_start?(line)
         next files[-1] << line if hunk_start?(line)
+
         files[-1].add_hunk_line(line)
       end
       files
@@ -23,11 +26,14 @@ module GitCrecord
       line.start_with?('@@')
     end
 
-    def self.parse_file_header(line, enum)
-      enum.next # index ...
+    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 # +++ ...
-      File.new(*parse_filenames(line))
+      type = is_new_file ? :untracked : :modified
+      File.new(*parse_filenames(line), type: type, reverse: reverse)
     end
 
     def self.parse_filenames(line)
@@ -35,7 +41,7 @@ module GitCrecord
     end
 
     def self.untracked_files(git_status)
-      git_status.lines.select{ |l| l.start_with?('??') }.flat_map do |path|
+      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
@@ -46,7 +52,7 @@ module GitCrecord
         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}") }
+        lines.each { |line| file.add_hunk_line("+#{line.chomp}") }
         file.selected = false
       end
     end
@@ -64,6 +70,7 @@ module GitCrecord
     def self.file_lines(filename)
       encoding = file_encoding(filename)
       return [[], 'binary'] if encoding == 'binary'
+
       [::File.open(filename, "r:#{encoding}", &:readlines), nil]
     end
   end

data/lib/git_crecord/git.rb

@@ -1,17 +1,24 @@
+# frozen_string_literal: true
+
 require_relative 'logger'
 require 'open3'
 
 module GitCrecord
   module Git
-    def self.stage(files)
+    def self.stage(files, reverse = false)
       selected_files = files.select(&:selected)
-      add_files(selected_files.select{ |file| file.type == :untracked })
+      untracked_files = selected_files.select { |file| file.type == :untracked }
+      add_files(untracked_files) unless reverse
       diff = selected_files.map(&:generate_diff).join("\n")
-      _stage(diff).success?
+      status = _stage(diff, reverse).success?
+      return status unless reverse
+
+      reset_files(untracked_files.select { |file| file.selected == true })
+      true
     end
 
-    def self._stage(diff)
-      cmd = 'git apply --cached --unidiff-zero - '
+    def self._stage(diff, reverse = false)
+      cmd = "git apply --cached --unidiff-zero #{reverse ? '-R' : ''} - "
       content, status = Open3.capture2e(cmd, stdin_data: diff)
       LOGGER.info(cmd)
       LOGGER.info(diff)
@@ -33,6 +40,17 @@ module GitCrecord
       system("git add -N #{filename}")
     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
+    end
+
+    def self.reset_file(filename)
+      system("git reset -q #{filename}")
+    end
+
     def self.status
       `git status --porcelain`
     end
@@ -41,8 +59,8 @@ module GitCrecord
       exec('git commit')
     end
 
-    def self.diff
-      `git diff --no-ext-diff --no-color`
+    def self.diff(staged: false)
+      `git diff --no-ext-diff --no-color #{staged ? '--staged' : ''}`
     end
 
     def self.toplevel_dir

data/lib/git_crecord/logger.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module GitCrecord
   LOGGER = Logger.new(File.new(File.join(ENV['HOME'], '.git-crecord.log'), 'w'))
-  LOGGER.formatter = proc{ |_severity, _datetime, _progname, msg| "#{msg}\n" }
+  LOGGER.formatter = proc { |_severity, _datetime, _progname, msg| "#{msg}\n" }
   LOGGER.level = Logger::INFO
 end

data/lib/git_crecord/quit_action.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module GitCrecord
   class QuitAction < Proc

data/lib/git_crecord/ui/color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'curses'
 
 module GitCrecord
@@ -20,7 +22,7 @@ module GitCrecord
       end
 
       MAP.each_pair do |name, number|
-        define_singleton_method(name){ Curses.color_pair(number) }
+        define_singleton_method(name) { Curses.color_pair(number) }
       end
     end
   end

data/lib/git_crecord/ui/help_window.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'curses'
 
 module GitCrecord
   module UI
     module HelpWindow
-      CONTENT = <<EOS.freeze
+      CONTENT = <<HELP
   q      - quit
   s      - stage selection and quit
   c      - commit selection and quit
@@ -20,7 +22,7 @@ module GitCrecord
   A      - toggle all selections
   ?      - display help
   R      - force redraw
-EOS
+HELP
 
       def self.show
         win = Curses::Window.new(height, width, 0, 0)

data/lib/git_crecord/ui/hunks_window.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'curses'
 require_relative 'color'
 require_relative 'help_window'
@@ -39,12 +41,13 @@ module GitCrecord
         new_width = Curses.cols
         new_height = [Curses.lines, content_height(new_width)].max
         return if width == new_width && @win.maxy == new_height
+
         @win.resize(new_height, new_width)
         redraw
       end
 
       def content_height(width)
-        @files.reduce(@files.size){ |a, e| a + e.max_height(width) }
+        @files.reduce(@files.size) { |a, e| a + e.max_height(width) }
       end
 
       def scroll_position
@@ -59,6 +62,7 @@ module GitCrecord
 
       def move_highlight(to)
         return if to == @highlighted || to.nil?
+
         from = @highlighted
         @highlighted = to
         from.print(self, from.y1 - 1, false)
@@ -66,12 +70,13 @@ module GitCrecord
         refresh
       end
 
-      def addstr(str, y = nil, x = 0, attr: 0, fill: false)
-        @win.setpos(y, x) unless y.nil?
+      def addstr(str, y_pos = nil, x_pos = 0, attr: 0, fill: false)
+        @win.setpos(y_pos, x_pos) unless y_pos.nil?
         @win.attrset(attr)
         @win.addstr(str)
         fill_size = width - @win.curx
-        return unless fill && fill_size > 0
+        return unless fill && fill_size.positive?
+
         @win.addstr((fill * fill_size)[0..fill_size])
       end
 
@@ -79,6 +84,7 @@ module GitCrecord
         list.each do |entry|
           line_number = entry.print(self, line_number, entry == @highlighted)
           next unless entry.expanded
+
           line_number = print_list(entry.subs, line_number)
           addstr('', line_number += 1, fill: '_') if entry.is_a?(Diff::File)
         end
@@ -89,6 +95,7 @@ module GitCrecord
         @visibles = @files.each_with_object([]) do |entry, vs|
           vs << entry
           next unless entry.expanded
+
           entry.selectable_subs.each do |entryy|
             vs << entryy
             vs.concat(entryy.selectable_subs) if entryy.expanded
@@ -101,11 +108,11 @@ module GitCrecord
       end
 
       def stage
-        QuitAction.new{ Git.stage(@files) }
+        QuitAction.new { |reverse| Git.stage(@files, reverse) }
       end
 
       def commit
-        QuitAction.new{ Git.stage(@files) && Git.commit }
+        QuitAction.new { |reverse| Git.stage(@files, reverse) && Git.commit }
       end
 
       def highlight_next
@@ -127,14 +134,14 @@ module GitCrecord
       def highlight_next_hunk
         index = @visibles.index(@highlighted)
         move_highlight(
-          @visibles[(index + 1)..-1].find{ |entry| !entry.subs.empty? }
+          @visibles[(index + 1)..-1].find { |entry| !entry.subs.empty? }
         )
       end
 
       def highlight_previous_hunk
         index = @visibles.index(@highlighted)
         move_highlight(
-          @visibles[0...index].reverse_each.find{ |entry| !entry.subs.empty? }
+          @visibles[0...index].reverse_each.find { |entry| !entry.subs.empty? }
         )
       end
 
@@ -159,7 +166,7 @@ module GitCrecord
 
       def toggle_all_selections
         new_selected = @files[0].selected == false
-        @files.each{ |file| file.selected = new_selected }
+        @files.each { |file| file.selected = new_selected }
         redraw
       end
 

data/lib/git_crecord/ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'curses'
 require_relative 'ui/color'
 require_relative 'ui/hunks_window'
@@ -34,7 +36,7 @@ module GitCrecord
       Curses.clear
       Curses.noecho
       Curses.curs_set(0)
-      pad = Curses::Pad.new(1, 1).tap{ |p| p.keypad = true }
+      pad = Curses::Pad.new(1, 1).tap { |p| p.keypad = true }
       run_loop(HunksWindow.new(pad, files))
     ensure
       Curses.close_screen
@@ -44,6 +46,7 @@ module GitCrecord
       loop do
         c = win.getch
         next if ACTIONS[c].nil?
+
         quit = win.send(ACTIONS[c])
         break quit if quit == :quit
       end

data/lib/git_crecord/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitCrecord
-  VERSION = '1.0.8'.freeze
+  VERSION = '1.1.0'
 end

data/lib/git_crecord.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'git_crecord/diff'
 require_relative 'git_crecord/git'
 require_relative 'git_crecord/ui'
@@ -13,37 +15,47 @@ module GitCrecord
       help
       true
     else
-      run(with_untracked_files: untracked_files?(argv))
+      run(with_untracked_files: untracked_files?(argv), reverse: reverse?(argv))
     end
   end
 
   def self.untracked_files?(argv)
+    return false if reverse?(argv)
+
     argv.include?('--untracked-files') || argv.include?('-u')
   end
 
-  def self.run(with_untracked_files: false)
+  def self.reverse?(argv)
+    argv.include?('--reverse') || argv.include?('-R')
+  end
+
+  def self.run(with_untracked_files: false, reverse: false)
     toplevel_dir = Git.toplevel_dir
     return false if toplevel_dir.empty?
+
     Dir.chdir(toplevel_dir) do
-      files = Diff.parse(Git.diff)
+      files = Diff.parse(Git.diff(staged: reverse), reverse)
       files.concat(Diff.untracked_files(Git.status)) if with_untracked_files
       return false if files.empty?
+
       result = UI.run(files)
-      return result.call == true if result.respond_to?(:call)
+      return result.call(reverse) == true if result.respond_to?(:call)
+
       true
     end
   end
 
   def self.help
-    puts <<EOS
-usage: git crecord [<options>]
+    puts <<~HELP
+      usage: git crecord [<options>]
 
-  -u, --untracked-files  -- show untracked files
-  --version              -- show version information
-  -h                     -- this help message
+        -u, --untracked-files  -- show untracked files
+        -R, --reverse          -- unstage hunks
+        --version              -- show version information
+        -h                     -- this help message
 
-  in-program commands:
-#{UI::HelpWindow::CONTENT.gsub(/^/, '  ')}
-EOS
+        in-program commands:
+      #{UI::HelpWindow::CONTENT.gsub(/^/, '  ')}
+    HELP
   end
 end

data/test/git_crecord/diff/hunk_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 
 class HunkTest < Minitest::Test
@@ -23,6 +25,6 @@ class HunkTest < Minitest::Test
 
   def test_parse_header_failure
     hunk = Hunk.new('ugly header')
-    assert_raises(RuntimeError){ hunk.parse_header }
+    assert_raises(RuntimeError) { hunk.parse_header }
   end
 end

data/test/system-test.sh

@@ -4,13 +4,15 @@ set -euo pipefail
 
 function assert-equal() {
   local expected=$1
-  local actual=$1
+  local actual=$2
   if test "$expected" != "$actual" ; then
-    cat << 'EOF'
+    cat << EOF
 expect:
-$expect
+$expected
 but got:
 $actual
+EOF
+    cat << 'EOF'
  ____             _
 |  _ \ __ _ _ __ (_) ___
 | |_) / _` | '_ \| |/ __|
@@ -31,9 +33,14 @@ function assert-status() {
   assert-equal "$expected" "$(git status -s)"
 }
 
-function run-git-crecord(){
+function run-git-crecord() {
   local keys=$1
-  "$EXECUTABLE" -u <<<"$keys"
+  "$EXECUTABLE" -u "$@" <<<"$keys"
+}
+
+function run-git-crecord-reverse() {
+  local keys=$1
+  "$EXECUTABLE" -R <<<"$keys"
 }
 
 readonly HERE="$(dirname "$(readlink -m "${BASH_SOURCE[0]}")")"
@@ -68,7 +75,7 @@ assert-diff ""
 git reset > /dev/null
 
 echo "add first line ----------------------------------------------------------"
-run-git-crecord " lj s"
+run-git-crecord " ljj s"
 assert-diff "+This is the second line.
 +This is line 3.
 +This is line 4."
@@ -76,7 +83,7 @@ assert-diff "+This is the second line.
 git reset > /dev/null
 
 echo "add another line --------------------------------------------------------"
-run-git-crecord " ljjj s"
+run-git-crecord " ljjjj s"
 assert-diff "+This is line 1.
 +This is the second line.
 +This is line 4."
@@ -92,8 +99,8 @@ assert-diff ""
 
 git reset > /dev/null
 
-echo "delete one lines --------------------------------------------------------"
-run-git-crecord " ljj s"
+echo "delete one line ---------------------------------------------------------"
+run-git-crecord " ljjj s"
 assert-diff "-This is line 1.
 -This is line 3."
 
@@ -125,14 +132,14 @@ assert-diff ""
 git reset > /dev/null
 
 echo "add lines of second hunk ------------------------------------------------"
-run-git-crecord " ljjj sq "
+run-git-crecord " ljjjj sq "
 assert-diff "-This is the second line.
 +This is line 2."
 
 git reset > /dev/null
 
 echo "add some lines of all hunks ---------------------------------------------"
-run-git-crecord " ljj jj jj j s"
+run-git-crecord " ljjj jj jj j s"
 assert-diff "-This is the second line.
 -This is line 11."
 
@@ -176,6 +183,19 @@ echo "++++" >> b_file.txt
 run-git-crecord "s"
 assert-diff ""
 
+echo "test unstage ------------------------------------------------------------"
+echo new line1 > new.txt
+echo new line2 >> new.txt
+git add new.txt
+run-git-crecord-reverse 'j k lj Gkljj s'
+assert-status 'MM a_file.txt
+M  b_file.txt
+AM new.txt
+?? sub/'
+assert-diff '-This is the second line.
++This is line 2.
++new line2'
+
 popd > /dev/null # $REPO_DIR
 
 cat << 'EOF'

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'minitest/autorun'
 
 require_relative '../lib/git_crecord'

metadata

@@ -1,15 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: git-crecord
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Maik Brendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.8.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -31,32 +65,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 0.56.0
 description: This gem adds the git-crecord command. It provides a curses UI to stage/commit
   git-hunks.
 email: maik.brendler@invision.de
 executables:
 - git-crecord
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -66,7 +93,6 @@ files:
 - README.md
 - Rakefile
 - bin/git-crecord
-- ext/mkrf_conf.rb
 - git-crecord.gemspec
 - lib/git_crecord.rb
 - lib/git_crecord/diff.rb
@@ -99,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -107,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Git command to stage/commit hunks the simple way.

data/ext/mkrf_conf.rb

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'rubygems/dependency_installer'
-
-# This is a hack to not install curses for ruby-2.0.
-
-di = Gem::DependencyInstaller.new
-
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.1.0')
-  puts 'install curses'
-  di.install 'curses', '~>1.0'
-end
-
-File.open(File.join(__dir__, 'Rakefile'), 'w') do |f|
-  f.write("task :default#{$/}")
-end