git-crecord 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd83bcf3fc3378b78623d0250febdbcb66aed3c
-  data.tar.gz: 4349e3696a60f5a48c1801057644919e84eab154
+  metadata.gz: 32b27152b0c2462bac010cb3f9ded85e80555cc8
+  data.tar.gz: abb4843e7164833a17d309f49b7886b2f77b6b97
 SHA512:
-  metadata.gz: 943dfa88d390346df32ca083a4d5b2c2516c2c40c2462cb8e7aa79219ec7f67af63c56648fd22f6efd13ed4d3c1192238e2041fa2d8bfa4db8968756f85e58db
-  data.tar.gz: 735a723fdbe787c6acced19a2a203983bf87eeae75444f7ad0449d5f241b734698c9177841b2a932f7c73de924a12f792f680224dc855f848e6fda573b7e3aca
+  metadata.gz: e7237132d036b3efda7640151444aec7592a32ae0986d86b32d602e8836ff4ecba48c3a22c737d5fd9965a88b6ead0f83267a7fb8bd55fb4c826afd954a780f1
+  data.tar.gz: 3351f2120e57e49f1a4b6554bb17b5ecba9f894d5afb4ed1add950b1d726d79986e2d8f2a3d0333688b0170b9bd73c0e078d9ba32f4ea8c8ac37dad67fcf9912

data/README.md

@@ -24,18 +24,25 @@ Key-bindings:
   j / ↓  - down
   k / ↑  - up
   h / ←  - collapse hunk
-  l / →  - expand
+  l / →  - expand hunk
   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
+  C-N    - down to next hunk / file
   SPACE  - toggle selection
   A      - toggle all selections
   ?      - display help
   R      - force redraw
 ```
 
+## Configuration
+
+```shell
+# configure tab-width to four spaces, default is two spaces:
+$ git config --global crecord.tabwidth 4
+```
+
 ## Development
 
 ```shell

data/Rakefile

@@ -11,4 +11,4 @@ task :systemtest do
   sh(File.join(__dir__, 'test/system-test.sh'))
 end
 
-task default: %i(test systemtest)
+task default: %i[test systemtest]

data/git-crecord.gemspec

@@ -9,19 +9,19 @@ GemSpec = Gem::Specification.new do |spec|
   spec.authors = 'Maik Brendler'
   spec.email = 'maik.brendler@invision.de'
   spec.summary = 'Git command to stage/commit hunks the simple way.'
-  spec.description = %w(
+  spec.description = %w[
     This gem adds the git-crecord command.
     It provides a curses UI to stage/commit git-hunks.
-  ).join(' ')
+  ].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.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.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

data/lib/git_crecord/diff/difference.rb

@@ -61,7 +61,7 @@ module GitCrecord
       end
 
       def prefix(line_number)
-        return SELECTED_MAP.fetch(selected) if line_number == 0 && selectable?
+        return SELECTED_MAP.fetch(selected) if line_number.zero? && selectable?
         ' ' * SELECTION_MARKER_WIDTH
       end
 

data/lib/git_crecord/diff/line.rb

@@ -13,7 +13,7 @@ module GitCrecord
       end
 
       def to_s
-        @line
+        @to_s ||= @line.include?("\t") ? @line.gsub(/\t/, Git.tab) : @line
       end
 
       def x_offset

data/lib/git_crecord/git.rb

@@ -48,5 +48,9 @@ module GitCrecord
     def self.toplevel_dir
       `git rev-parse --show-toplevel`.chomp
     end
+
+    def self.tab
+      @tab ||= ' ' * [2, `git config crecord.tabwidth`.to_i].max
+    end
   end
 end

data/lib/git_crecord/ui/help_window.rb

@@ -10,12 +10,12 @@ module GitCrecord
   j / ↓  - down
   k / ↑  - up
   h / ←  - collapse hunk
-  l / →  - expand
+  l / →  - expand hunk
   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
+  C-N    - down to next hunk / file
   SPACE  - toggle selection
   A      - toggle all selections
   ?      - display help

data/lib/git_crecord/version.rb

@@ -1,3 +1,3 @@
 module GitCrecord
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/test/git_crecord/diff/hunk_test.rb

@@ -5,7 +5,7 @@ class HunkTest < Minitest::Test
 
   def test_strings
     hunk = Hunk.new('1234567890' * 5)
-    expected = %w(12345678901 23456789012 34567890123 45678901234 567890)
+    expected = %w[12345678901 23456789012 34567890123 45678901234 567890]
     assert_equal(expected, hunk.strings(19))
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-crecord
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Maik Brendler