git-crecord 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fffb4cbf34ec7e9c44ff7c17f598c2a2164adf03
+  data.tar.gz: 396608cc59e9a52e8315c4a35f68827693030d0f
+SHA512:
+  metadata.gz: f80d28b331abbb5dfe6387718fc37032f4329dab9dc3a6547108aeb8453139c8139b017891c60b858c41e091bb52bd18bb447531a5a0ea0df84244d9023e1458
+  data.tar.gz: 3377110378bbe79cbb61b9d3707171a0b0eb56847bdfcbb6fa92df4679fbd543ce89124d87dd42648d0075c8c301d6fe4f4fc2beaab1eadb8aa257500d9b3023

data/.gitignore

@@ -0,0 +1,3 @@
+pkg/
+tmp/
+Gemfile.lock

data/.rubocop.yml

@@ -0,0 +1,20 @@
+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
+
+AllCops:
+  DisplayStyleGuide: true

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'curses', '~> 1.0'

data/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Maik Brendler
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,50 @@
+# git-crecord
+
+Inspred by [crecord mercurial extension](https://bitbucket.org/edgimar/crecord/wiki/Home), git-crecord is an easy way for partially committing/staging of git changes.
+
+![Screenshot](/screenshot.jpg?raw=true)
+
+## Installation
+
+ TODO
+
+## Usage
+
+```shell
+$ git crecord
+```
+
+Key-bindings:
+```
+  q      - quit
+  s      - stage selection and quit
+  c      - commit selection and quit
+  j / ↓  - down
+  k / ↑  - up
+  h / ←  - collapse hunk
+  l / →  - expand
+  f      - toggle fold
+  g      - go to first line
+  G      - go to last line
+  C-P    - up to previous hunk / file
+  C-N    - down to previous hunk / file
+  SPACE  - toggle selection
+  A      - toggle all selections
+  ?      - display help
+  R      - force redraw
+```
+
+## Development
+
+```shell
+$ git clone https://github.com/mbrendler/git-crecord
+$ cd git-crecord
+$ bundle install
+$ ln -s bin/git-crecord /usr/bin/git-crecord
+```
+
+Tests:
+```shell
+$ bundle exec rake test
+$ bundle exec rake systemtest
+```

data/Rakefile

@@ -0,0 +1,14 @@
+require 'rake'
+require 'rake/testtask'
+require 'bundler/gem_tasks'
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/git_crecord/**/*test.rb']
+end
+
+desc 'run system tests'
+task :systemtest do
+  sh(File.join(__dir__, 'test/system-test.sh'))
+end
+
+task :default # dummy task to build native extension (install curses)

data/bin/git-crecord

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

data/ext/mkrf_conf.rb

@@ -0,0 +1,10 @@
+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')
+  di.install 'curses', '~>1.0'
+end

data/git-crecord.gemspec

@@ -0,0 +1,29 @@
+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.name = 'git-crecord'
+  spec.version = GitCrecord::VERSION
+  spec.authors = 'Maik Brendler'
+  spec.email = 'maik.brendler@invision.de'
+  spec.summary = 'Git command to stage/commit hunks the simple way.'
+  spec.description = %w(
+    This gem adds the git-crecord command.
+    It provides a curses UI to stage/commit git-hunks.
+  ).join(' ')
+  spec.license = 'MIT'
+  spec.homepage = 'https://github.com/mbrendler/git-crecord'
+  spec.metadata = {
+    '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.test_files = `git ls-files`.split($RS).grep(%r{^(spec|test)/})
+  spec.executables = %w(git-crecord)
+  spec.has_rdoc = false
+  spec.add_development_dependency 'rake', '~> 10.1', '>= 10.1.1'
+  spec.add_development_dependency 'minitest', '~> 5.8', '>= 5.8.4'
+  spec.extensions << 'ext/mkrf_conf.rb' # install curses dependency
+end

data/lib/git_crecord/diff/difference.rb

@@ -0,0 +1,81 @@
+require_relative '../ui/color'
+
+module GitCrecord
+  module Diff
+    class Difference
+      attr_accessor :expanded
+      attr_accessor :y1, :y2
+      attr_reader :subs
+
+      SELECTED_MAP = {
+        true => '[X]  ',
+        false => '[ ]  ',
+        :partly => '[~]  '
+      }.freeze
+      SELECTION_MARKER_WIDTH = SELECTED_MAP[true].size
+
+      def initialize
+        @subs = []
+      end
+
+      def strings(width)
+        to_s.scan(/.{1,#{content_width(width)}}/)
+      end
+
+      def max_height(width)
+        width = content_width(width)
+        ((to_s.size - 1).abs / width) + 1 + subs.reduce(0) do |a, e|
+          a + e.max_height(width)
+        end
+      end
+
+      def content_width(width)
+        [1, width - x_offset - SELECTION_MARKER_WIDTH].max
+      end
+
+      def selectable?
+        true
+      end
+
+      def selectable_subs
+        @selectable_subs ||= subs.select(&:selectable?)
+      end
+
+      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 }
+      end
+
+      def style(is_highlighted)
+        return Curses::A_BOLD | UI::Color.hl if is_highlighted
+        Curses::A_BOLD | UI::Color.normal
+      end
+
+      def prefix_style(_is_highlighted)
+        UI::Color.normal
+      end
+
+      def prefix(line_number)
+        return SELECTED_MAP.fetch(selected) if line_number == 0 && selectable?
+        ' ' * SELECTION_MARKER_WIDTH
+      end
+
+      def print(win, line_number, is_highlighted)
+        @y1 = line_number + 1
+        prefix_style = prefix_style(is_highlighted)
+        style = style(is_highlighted)
+        strings(win.width).each_with_index do |string, index|
+          win.addstr(' ' * x_offset, line_number += 1, attr: prefix_style)
+          win.addstr(prefix(index), attr: prefix_style)
+          win.addstr(string, attr: style, fill: ' ')
+        end
+        @y2 = line_number
+      end
+    end
+  end
+end

data/lib/git_crecord/diff/file.rb

@@ -0,0 +1,68 @@
+require_relative 'difference'
+require_relative 'hunk'
+require_relative '../ui/color'
+
+module GitCrecord
+  module Diff
+    class File < Difference
+      attr_reader :filename_a
+      attr_reader :type
+
+      def initialize(filename_a, filename_b, type: :modified)
+        @filename_a = filename_a
+        @filename_b = filename_b
+        @type = type
+        @expanded = false
+        super()
+      end
+
+      def to_s
+        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 }
+        "  #{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
+
+      def max_height(width)
+        super + ((info_string.size - 1).abs / content_width(width)) + 2
+      end
+
+      def x_offset
+        0
+      end
+
+      def <<(hunk)
+        subs << Hunk.new(hunk)
+        self
+      end
+
+      def add_hunk_line(line)
+        subs.last << line
+      end
+
+      def generate_diff
+        return unless selected
+        [
+          "diff --git a/#{@filename_a} b/#{@filename_b}",
+          "--- a/#{@filename_a}",
+          "+++ b/#{@filename_b}",
+          *subs.map(&:generate_diff).compact,
+          ''
+        ].join("\n")
+      end
+
+      alias prefix_style style
+    end
+  end
+end

data/lib/git_crecord/diff/hunk.rb

@@ -0,0 +1,49 @@
+require_relative 'difference'
+require_relative 'line'
+require_relative '../ui/color'
+
+module GitCrecord
+  module Diff
+    class Hunk < Difference
+      def initialize(head)
+        @head = head
+        @expanded = true
+        super()
+      end
+
+      def to_s
+        @head
+      end
+
+      def x_offset
+        3
+      end
+
+      def <<(line)
+        subs << Line.new(line)
+        self
+      end
+
+      def generate_diff
+        return nil unless selected
+        [generate_header, *subs.map(&:generate_diff).compact].join("\n")
+      end
+
+      def generate_header
+        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
+        "@@ -#{old_start},#{old_count} +#{new_start},#{new_count} @@"
+      end
+
+      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
+  end
+end

data/lib/git_crecord/diff/line.rb

@@ -0,0 +1,57 @@
+require_relative 'difference'
+require_relative '../ui/color'
+
+module GitCrecord
+  module Diff
+    class Line < Difference
+      attr_reader :selected
+
+      def initialize(line)
+        @line = line
+        @selected = true
+        super()
+      end
+
+      def to_s
+        @line
+      end
+
+      def x_offset
+        6
+      end
+
+      def add?
+        @line.start_with?('+')
+      end
+
+      def del?
+        @line.start_with?('-')
+      end
+
+      def selectable?
+        add? || del?
+      end
+
+      def selected=(value)
+        @selected = selectable? ? value : selected
+      end
+
+      def expanded
+        false
+      end
+
+      def generate_diff
+        return " #{@line[1..-1]}" if !selected && del?
+        return @line if selected
+        nil
+      end
+
+      def style(is_highlighted)
+        return UI::Color.hl if is_highlighted
+        return UI::Color.green if add?
+        return UI::Color.red if del?
+        UI::Color.normal
+      end
+    end
+  end
+end

data/lib/git_crecord/diff.rb

@@ -0,0 +1,59 @@
+require_relative 'diff/file'
+
+module GitCrecord
+  module Diff
+    def self.parse(diff)
+      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[-1] << line if hunk_start?(line)
+        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_header(line, enum)
+      enum.next # index ...
+      enum.next # --- ...
+      enum.next # +++ ...
+      File.new(*parse_filenames(line))
+    end
+
+    def self.parse_filenames(line)
+      line.match(%r{a/(.*) b/(.*)$})[1..2]
+    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
+    end
+
+    def self.untracked_file(filename)
+      File.new(filename, filename, type: :untracked).tap do |file|
+        file_lines = ::File.readlines(filename)
+        file << "@@ -0,0 +1,#{file_lines.size} @@"
+        file_lines.each{ |line| file.add_hunk_line("+#{line.chomp}") }
+        file.selected = false
+      end
+    end
+
+    def self.untracked_dir(path)
+      Dir.glob(::File.join(path, '**/*')).map do |filename|
+        untracked_file(filename)
+      end
+    end
+  end
+end

data/lib/git_crecord/git.rb

@@ -0,0 +1,52 @@
+require_relative 'logger'
+require 'open3'
+
+module GitCrecord
+  module Git
+    def self.stage(files)
+      selected_files = files.select(&:selected)
+      add_files(selected_files.select{ |file| file.type == :untracked })
+      diff = selected_files.map(&:generate_diff).join("\n")
+      _stage(diff).success?
+    end
+
+    def self._stage(diff)
+      cmd = 'git apply --cached --unidiff-zero - '
+      content, status = Open3.capture2e(cmd, stdin_data: diff)
+      LOGGER.info(cmd)
+      LOGGER.info(diff)
+      LOGGER.info(diff.lines.size)
+      LOGGER.info('stdout/stderr:')
+      LOGGER.info(content)
+      LOGGER.info("return code: #{status}")
+      status
+    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}")
+    end
+
+    def self.status
+      `git status --porcelain`
+    end
+
+    def self.commit
+      exec('git commit')
+    end
+
+    def self.diff
+      `git diff --no-ext-diff --no-color`
+    end
+
+    def self.toplevel_dir
+      `git rev-parse --show-toplevel`.chomp
+    end
+  end
+end

data/lib/git_crecord/logger.rb

@@ -0,0 +1,7 @@
+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.level = Logger::INFO
+end

data/lib/git_crecord/quit_action.rb

@@ -0,0 +1,8 @@
+
+module GitCrecord
+  class QuitAction < Proc
+    def ==(other)
+      :quit == other
+    end
+  end
+end

data/lib/git_crecord/ui/color.rb

@@ -0,0 +1,27 @@
+require 'curses'
+
+module GitCrecord
+  module UI
+    module Color
+      MAP = {
+        normal: 1,
+        green: 2,
+        red: 3,
+        hl: 4
+      }.freeze
+
+      def self.init
+        Curses.start_color
+        Curses.use_default_colors
+        Curses.init_pair(MAP[:normal], -1, -1)
+        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_WHITE, Curses::COLOR_GREEN)
+      end
+
+      MAP.each_pair do |name, number|
+        define_singleton_method(name){ Curses.color_pair(number) }
+      end
+    end
+  end
+end

data/lib/git_crecord/ui/help_window.rb

@@ -0,0 +1,45 @@
+require 'curses'
+
+module GitCrecord
+  module UI
+    module HelpWindow
+      CONTENT = <<EOS.freeze
+  q      - quit
+  s      - stage selection and quit
+  c      - commit selection and quit
+  j / ↓  - down
+  k / ↑  - up
+  h / ←  - collapse hunk
+  l / →  - expand
+  f      - toggle fold
+  g      - go to first line
+  G      - go to last line
+  C-P    - up to previous hunk / file
+  C-N    - down to previous hunk / file
+  SPACE  - toggle selection
+  A      - toggle all selections
+  ?      - display help
+  R      - force redraw
+EOS
+
+      def self.show
+        win = Curses::Window.new(height, width, 0, 0)
+        win.box('|', '-')
+        CONTENT.split("\n").each_with_index do |line, index|
+          win.setpos(index + 1, 1)
+          win.addstr(line)
+        end
+        win.getch
+        win.close
+      end
+
+      def self.width
+        CONTENT.lines.map(&:size).max + 3
+      end
+
+      def self.height
+        CONTENT.lines.size + 2
+      end
+    end
+  end
+end

data/lib/git_crecord/ui/hunks_window.rb

@@ -0,0 +1,172 @@
+require 'curses'
+require_relative 'color'
+require_relative 'help_window'
+require_relative '../git'
+require_relative '../quit_action'
+
+module GitCrecord
+  module UI
+    class HunksWindow
+      def initialize(win, files)
+        @win = win
+        @files = files
+        @visibles = @files
+        @highlighted = @files[0]
+        @scroll_position = 0
+
+        resize
+      end
+
+      def getch
+        @win.getch
+      end
+
+      def width
+        @win.maxx
+      end
+
+      def refresh
+        @win.refresh(scroll_position, 0, 0, 0, Curses.lines - 1, width)
+      end
+
+      def redraw
+        @win.clear
+        print_list(@files)
+        refresh
+      end
+
+      def resize
+        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) }
+      end
+
+      def scroll_position
+        upper_position = @highlighted.y1 - 3
+        if @scroll_position > upper_position
+          @scroll_position = upper_position
+        elsif @scroll_position <= @highlighted.y2 + 4 - Curses.lines
+          @scroll_position = [@highlighted.y2 + 4, @win.maxy].min - Curses.lines
+        end
+        @scroll_position
+      end
+
+      def move_highlight(to)
+        return if to == @highlighted || to.nil?
+        from = @highlighted
+        @highlighted = to
+        from.print(self, from.y1 - 1, false)
+        to.print(self, to.y1 - 1, true)
+        refresh
+      end
+
+      def addstr(str, y = nil, x = 0, attr: 0, fill: false)
+        @win.setpos(y, x) unless y.nil?
+        @win.attrset(attr)
+        @win.addstr(str)
+        fill_size = width - @win.curx
+        return unless fill && fill_size > 0
+        @win.addstr((fill * fill_size)[0..fill_size])
+      end
+
+      def print_list(list, line_number = -1)
+        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
+        line_number
+      end
+
+      def update_visibles
+        @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
+          end
+        end
+      end
+
+      def quit
+        :quit
+      end
+
+      def stage
+        QuitAction.new{ Git.stage(@files) }
+      end
+
+      def commit
+        QuitAction.new{ Git.stage(@files) && Git.commit }
+      end
+
+      def highlight_next
+        move_highlight(@visibles[@visibles.index(@highlighted) + 1])
+      end
+
+      def highlight_previous
+        move_highlight(@visibles[[@visibles.index(@highlighted) - 1, 0].max])
+      end
+
+      def highlight_first
+        move_highlight(@visibles[0])
+      end
+
+      def highlight_last
+        move_highlight(@visibles[-1])
+      end
+
+      def highlight_next_hunk
+        index = @visibles.index(@highlighted)
+        move_highlight(
+          @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? }
+        )
+      end
+
+      def collapse
+        toggle_fold if !@highlighted.subs.empty? && @highlighted.expanded
+      end
+
+      def expand
+        toggle_fold if !@highlighted.subs.empty? && !@highlighted.expanded
+      end
+
+      def toggle_fold
+        @highlighted.expanded = !@highlighted.expanded
+        update_visibles
+        redraw
+      end
+
+      def toggle_selection
+        @highlighted.selected = !@highlighted.selected
+        redraw
+      end
+
+      def toggle_all_selections
+        new_selected = @files[0].selected == false
+        @files.each{ |file| file.selected = new_selected }
+        redraw
+      end
+
+      def help_window
+        HelpWindow.show
+        refresh
+      end
+    end
+  end
+end

data/lib/git_crecord/ui.rb

@@ -0,0 +1,51 @@
+require 'curses'
+require_relative 'ui/color'
+require_relative 'ui/hunks_window'
+
+module GitCrecord
+  module UI
+    ACTIONS = {
+      'q' => :quit,
+      's' => :stage,
+      'c' => :commit,
+      'j' => :highlight_next,
+      Curses::KEY_DOWN => :highlight_next,
+      'k' => :highlight_previous,
+      Curses::KEY_UP => :highlight_previous,
+      'h' => :collapse,
+      Curses::KEY_LEFT => :collapse,
+      'l' => :expand,
+      Curses::KEY_RIGHT => :expand,
+      'f' => :toggle_fold,
+      'g' => :highlight_first,
+      'G' => :highlight_last,
+      ''.ord => :highlight_next_hunk,
+      ''.ord => :highlight_previous_hunk,
+      ' ' => :toggle_selection,
+      'A' => :toggle_all_selections,
+      '?' => :help_window,
+      'R' => :redraw,
+      Curses::KEY_RESIZE => :resize
+    }.freeze
+
+    def self.run(files)
+      Curses.init_screen.keypad = true
+      Color.init
+      Curses.clear
+      Curses.noecho
+      Curses.curs_set(0)
+      run_loop(HunksWindow.new(Curses::Pad.new(1, 1), files))
+    ensure
+      Curses.close_screen
+    end
+
+    def self.run_loop(win)
+      loop do
+        c = win.getch
+        next if ACTIONS[c].nil?
+        quit = win.send(ACTIONS[c])
+        break quit if quit == :quit
+      end
+    end
+  end
+end

data/lib/git_crecord/version.rb

@@ -0,0 +1,3 @@
+module GitCrecord
+  VERSION = '1.0.0'.freeze
+end

data/lib/git_crecord.rb

@@ -0,0 +1,45 @@
+require_relative 'git_crecord/git'
+require_relative 'git_crecord/diff'
+require_relative 'git_crecord/ui'
+require_relative 'git_crecord/version'
+require_relative 'git_crecord/ui/help_window'
+
+module GitCrecord
+  def self.main(argv)
+    if argv.include?('--version')
+      puts VERSION
+      true
+    elsif argv.include?('--help') || argv.include?('-h')
+      help
+      true
+    else
+      run(with_untracked_files: !argv.include?('--no-untracked-files'))
+    end
+  end
+
+  def self.run(with_untracked_files: false)
+    toplevel_dir = Git.toplevel_dir
+    return false if toplevel_dir.empty?
+    Dir.chdir(toplevel_dir) do
+      files = Diff.parse(Git.diff)
+      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)
+      true
+    end
+  end
+
+  def self.help
+    puts <<EOS
+usage: git crecord [<options>]'
+
+  --no-untracked-files  -- ignore untracked files
+  --version             -- show version information'
+  -h                    -- this help message'
+
+  in-program commands:'
+#{UI::HelpWindow::CONTENT.gsub(/^/, '  ')}
+EOS
+  end
+end

data/test/git_crecord/diff/hunk_test.rb

@@ -0,0 +1,28 @@
+require_relative '../../test_helper'
+
+class HunkTest < Minitest::Test
+  include GitCrecord::Diff
+
+  def test_strings
+    hunk = Hunk.new('1234567890' * 5)
+    expected = %w(12345678901 23456789012 34567890123 45678901234 567890)
+    assert_equal(expected, hunk.strings(19))
+  end
+
+  def test_max_height
+    assert_equal(1, Hunk.new('').max_height(10))
+    assert_equal(1, Hunk.new('1234567890').max_height(18))
+    assert_equal(2, Hunk.new('12345678901').max_height(18))
+  end
+
+  def test_parse_header
+    assert_equal([1, 2, 3, 4], Hunk.new('@@ -1,2 +3,4 @@').parse_header)
+    assert_equal([1, 1, 3, 4], Hunk.new('@@ -1 +3,4 @@').parse_header)
+    assert_equal([1, 2, 3, 1], Hunk.new('@@ -1,2 +3 @@').parse_header)
+  end
+
+  def test_parse_header_failure
+    hunk = Hunk.new('ugly header')
+    assert_raises(RuntimeError){ hunk.parse_header }
+  end
+end

data/test/system-test.sh

@@ -0,0 +1,187 @@
+#! /usr/bin/env bash
+
+set -euo pipefail
+
+function assert-equal() {
+  local expected=$1
+  local actual=$1
+  if test "$expected" != "$actual" ; then
+    cat << 'EOF'
+expect:
+$expect
+but got:
+$actual
+ ____             _
+|  _ \ __ _ _ __ (_) ___
+| |_) / _` | '_ \| |/ __|
+|  __/ (_| | | | | | (__
+|_|   \__,_|_| |_|_|\___|
+EOF
+    exit 1
+  fi
+}
+
+function assert-diff(){
+  local expected=$1
+  assert-equal "$expected" "$(git diff | grep '^[+-][^+-]')"
+}
+
+function assert-status() {
+  local expected=$1
+  assert-equal "$expected" "$(git status -s)"
+}
+
+function run-git-crecord(){
+  local keys=$1
+  "$EXECUTABLE" <<<"$keys"
+}
+
+readonly HERE="$(dirname "$(readlink -m "${BASH_SOURCE[0]}")")"
+readonly TEST_DIR=$HERE/../tmp/__test__
+readonly EXECUTABLE=$HERE/../bin/git-crecord
+readonly REPO_DIR=$TEST_DIR/repo
+
+rm -rf "$TEST_DIR"
+mkdir -p "$TEST_DIR"
+
+git init "$REPO_DIR" > /dev/null
+
+pushd "$REPO_DIR" > /dev/null
+
+touch a_file.txt
+
+git add a_file.txt
+git ci -m 'add a_file.txt' > /dev/null
+
+cat > a_file.txt << 'EOF'
+This is line 1.
+This is the second line.
+This is line 3.
+This is line 4.
+EOF
+
+
+echo "add all -----------------------------------------------------------------"
+run-git-crecord "s"
+assert-diff ""
+
+git reset > /dev/null
+
+echo "add first line ----------------------------------------------------------"
+run-git-crecord " lj s"
+assert-diff "+This is the second line.
++This is line 3.
++This is line 4."
+
+git reset > /dev/null
+
+echo "add another line --------------------------------------------------------"
+run-git-crecord " ljjj s"
+assert-diff "+This is line 1.
++This is the second line.
++This is line 4."
+
+
+git ci -a -m "add some lines" > /dev/null
+
+sed -i '' '1,3d' a_file.txt
+
+echo "delete all lines --------------------------------------------------------"
+run-git-crecord "s"
+assert-diff ""
+
+git reset > /dev/null
+
+echo "delete one lines --------------------------------------------------------"
+run-git-crecord " ljj s"
+assert-diff "-This is line 1.
+-This is line 3."
+
+git reset --hard > /dev/null
+
+# add some more lines:
+cat >> a_file.txt << 'EOF'
+
+This is line 5.
+This is line 6.
+This is line 7.
+This is line 8.
+This is line 9.
+
+This is line 10.
+This is line 11.
+This is line 12.
+EOF
+git ci -a -m "add some more lines" > /dev/null
+
+sed -i '' '2s/.*/This is line 2./' a_file.txt
+sed -i '' '12s/.*/This is the tenth line./' a_file.txt
+sed -i '' '13s/.*/This is the eleventh line./' a_file.txt
+
+echo "multiple hunks ----------------------------------------------------------"
+run-git-crecord "s"
+assert-diff ""
+
+git reset > /dev/null
+
+echo "add lines of second hunk ------------------------------------------------"
+run-git-crecord " ljjj 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"
+assert-diff "-This is the second line.
+-This is line 11."
+
+git reset > /dev/null
+
+echo "run git-crecord in a subdirectory directory -----------------------------"
+mkdir -p "$REPO_DIR"/sub
+pushd "$REPO_DIR"/sub > /dev/null
+run-git-crecord "s"
+assert-diff ""
+popd > /dev/null # "$REPO_DIR"/sub
+
+git reset > /dev/null
+
+echo "add a untracked file ----------------------------------------------------"
+echo "b_file line 1" > b_file.txt
+run-git-crecord 'AG s'
+git commit -m "add b_file" > /dev/null
+assert-diff '-This is the second line.
++This is line 2.
+-This is line 10.
+-This is line 11.
++This is the tenth line.
++This is the eleventh line.'
+
+echo "a not selected file -----------------------------------------------------"
+echo "b_file line 2" >> b_file.txt
+run-git-crecord "j s"
+assert-diff "+b_file line 2"
+
+echo "add untracked file from untracked directory -----------------------------"
+echo "a line" > "$REPO_DIR/sub/sub-file.txt"
+run-git-crecord "AG s"
+assert-diff "+b_file line 2"
+assert-status 'M  a_file.txt
+ M b_file.txt
+A  sub/sub-file.txt'
+
+echo "test with +++ line ------------------------------------------------------"
+echo "++++" >> b_file.txt
+run-git-crecord "s"
+assert-diff ""
+
+popd > /dev/null # $REPO_DIR
+
+cat << 'EOF'
+  ___  _  __
+ / _ \| |/ /
+| | | | ' /
+| |_| | . \
+ \___/|_|\_\
+EOF

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'minitest/autorun'
+
+require_relative '../lib/git_crecord'

metadata

@@ -0,0 +1,117 @@
+--- !ruby/object:Gem::Specification
+name: git-crecord
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+platform: ruby
+authors:
+- Maik Brendler
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2016-06-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+- !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
+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
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rubocop.yml"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-crecord
+- ext/mkrf_conf.rb
+- git-crecord.gemspec
+- lib/git_crecord.rb
+- lib/git_crecord/diff.rb
+- lib/git_crecord/diff/difference.rb
+- lib/git_crecord/diff/file.rb
+- lib/git_crecord/diff/hunk.rb
+- lib/git_crecord/diff/line.rb
+- lib/git_crecord/git.rb
+- lib/git_crecord/logger.rb
+- lib/git_crecord/quit_action.rb
+- lib/git_crecord/ui.rb
+- lib/git_crecord/ui/color.rb
+- lib/git_crecord/ui/help_window.rb
+- lib/git_crecord/ui/hunks_window.rb
+- lib/git_crecord/version.rb
+- screenshot.jpg
+- test/git_crecord/diff/hunk_test.rb
+- test/system-test.sh
+- test/test_helper.rb
+homepage: https://github.com/mbrendler/git-crecord
+licenses:
+- MIT
+metadata:
+  issue_tracker: https://github.com/mbrendler/git-crecord/issues
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.0.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 1.3.6
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
+specification_version: 4
+summary: Git command to stage/commit hunks the simple way.
+test_files:
+- test/git_crecord/diff/hunk_test.rb
+- test/system-test.sh
+- test/test_helper.rb