git-crecord 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b27152b0c2462bac010cb3f9ded85e80555cc8
-  data.tar.gz: abb4843e7164833a17d309f49b7886b2f77b6b97
+  metadata.gz: f50b11b78c296e17be381bfcd4bcd6f0c353debf
+  data.tar.gz: 63b91fcd44796f4ca85dae4cdabf05ddd8c2d4d7
 SHA512:
-  metadata.gz: e7237132d036b3efda7640151444aec7592a32ae0986d86b32d602e8836ff4ecba48c3a22c737d5fd9965a88b6ead0f83267a7fb8bd55fb4c826afd954a780f1
-  data.tar.gz: 3351f2120e57e49f1a4b6554bb17b5ecba9f894d5afb4ed1add950b1d726d79986e2d8f2a3d0333688b0170b9bd73c0e078d9ba32f4ea8c8ac37dad67fcf9912
+  metadata.gz: 53df5470936c02756917e03606bc3c36c661b5387761392422943252e68216005ca50ecf00323fb9f9f2c83376d40c6d19172e8d098f80764149ea867c9cc804
+  data.tar.gz: 3a31aa6f040cd3f3c9c955305fb3b5e6d38f24275812fd3cd30730496a93cf560bba27c084a1514f74a067bb9bbdd63ade1ff1e5b1020d9c4449567f1ca61ad4

data/README.md

@@ -23,8 +23,8 @@ Key-bindings:
   c      - commit selection and quit
   j / ↓  - down
   k / ↑  - up
-  h / ←  - collapse hunk
-  l / →  - expand hunk
+  h / ←  - collapse fold
+  l / →  - expand fold
   f      - toggle fold
   g      - go to first line
   G      - go to last line

data/lib/git_crecord/diff/line.rb

@@ -3,6 +3,40 @@ 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()
+      end
+
+      def to_s
+        @line
+      end
+
+      def x_offset
+        6
+      end
+
+      def selectable?
+        true
+      end
+
+      def expanded
+        false
+      end
+
+      def generate_diff
+        nil
+      end
+
+      def style(is_highlighted)
+        Curses::A_BOLD | (is_highlighted ? UI::Color.hl : UI::Color.normal)
+      end
+    end
+
     class Line < Difference
       attr_reader :selected
 
@@ -13,7 +47,7 @@ module GitCrecord
       end
 
       def to_s
-        @to_s ||= @line.include?("\t") ? @line.gsub(/\t/, Git.tab) : @line
+        @to_s ||= @line.gsub(/\t/, Git.tab)
       end
 
       def x_offset

data/lib/git_crecord/diff.rb

@@ -42,11 +42,11 @@ module GitCrecord
     end
 
     def self.untracked_file(filename)
-      file_lines = ::File.readlines(filename)
-      return nil if file_lines.empty?
       File.new(filename, filename, type: :untracked).tap do |file|
-        file << "@@ -0,0 +1,#{file_lines.size} @@"
-        file_lines.each{ |line| file.add_hunk_line("+#{line.chomp}") }
+        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}") }
         file.selected = false
       end
     end
@@ -56,5 +56,15 @@ module GitCrecord
         untracked_file(filename) unless ::File.directory?(filename)
       end
     end
+
+    def self.file_encoding(filename)
+      `file --mime-encoding #{filename}`.split(': ', 2)[1].chomp
+    end
+
+    def self.file_lines(filename)
+      encoding = file_encoding(filename)
+      return [[], 'binary'] if encoding == 'binary'
+      [::File.open(filename, "r:#{encoding}", &:readlines), nil]
+    end
   end
 end

data/lib/git_crecord/quit_action.rb

@@ -2,7 +2,7 @@
 module GitCrecord
   class QuitAction < Proc
     def ==(other)
-      :quit == other
+      other == :quit
     end
   end
 end

data/lib/git_crecord/ui/help_window.rb

@@ -9,8 +9,8 @@ module GitCrecord
   c      - commit selection and quit
   j / ↓  - down
   k / ↑  - up
-  h / ←  - collapse hunk
-  l / →  - expand hunk
+  h / ←  - collapse fold
+  l / →  - expand fold
   f      - toggle fold
   g      - go to first line
   G      - go to last line

data/lib/git_crecord/version.rb

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

data/lib/git_crecord.rb

@@ -1,8 +1,8 @@
-require_relative 'git_crecord/git'
 require_relative 'git_crecord/diff'
+require_relative 'git_crecord/git'
 require_relative 'git_crecord/ui'
-require_relative 'git_crecord/version'
 require_relative 'git_crecord/ui/help_window'
+require_relative 'git_crecord/version'
 
 module GitCrecord
   def self.main(argv)
@@ -32,13 +32,13 @@ module GitCrecord
 
   def self.help
     puts <<EOS
-usage: git crecord [<options>]'
+usage: git crecord [<options>]
 
   --no-untracked-files  -- ignore untracked files
-  --version             -- show version information'
-  -h                    -- this help message'
+  --version             -- show version information
+  -h                    -- this help message
 
-  in-program commands:'
+  in-program commands:
 #{UI::HelpWindow::CONTENT.gsub(/^/, '  ')}
 EOS
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-crecord
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Maik Brendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake