git-newline-at-eof 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e320c92b47957332054b0dcccd4d2346b6277bd0
-  data.tar.gz: 763404dd4c659ae5aaed5f7bcba7b9b11f6528f4
+  metadata.gz: d2fe432548d95d15b23a35c313a5d24fff2067bc
+  data.tar.gz: a31cb2e1bea2cd767c0b4c2ffd2e422bc6c86477
 SHA512:
-  metadata.gz: da14cff0d8199ce71dfa84621fc2d167ab2673adfd9118a5980d6efa0de64d6c196ccaad73c3ca6f839127cd6f64c54019fe33ae07c5bfb9b2127f0b58ac4ef9
-  data.tar.gz: a8014c11ab8038f9fff0f5142989262109f15e80282d6811ab0f108f657792ada4b94161fcd9b37a390c54ac745ab960cfc6928a1e35086bfaa6ec03ac8a0d8c
+  metadata.gz: 0d53162265a23e6d9e87910e8136f58e2eec1bbf629262b452fa86ae2ff9bdc47e3ebede0f587af850dd64512bb9cf85786f8e1db8408fc68aa632a4902529ed
+  data.tar.gz: 110cea051d5fc90cf88cf8d241152bc7acf586a79a177abf071c2d84cf9a70b995c06685a6a3561015b1889e21103725d035048a3be5b26865538153921e78a2

data/git-newline-at-eof.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.3')
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'test-unit'

data/lib/git-newline-at-eof.rb

@@ -1,15 +1,18 @@
 require 'git-newline-at-eof/version'
 require 'optparse'
 require 'shellwords'
+require 'open3'
 
 module GitNewlineAtEof
   class Application
     def initialize(argv)
+      @in_git_dir = nil
       @options = {}
       @options[:feed_last_line] = false
       @options[:discard_last_newline] = false
       @options[:treat_all] = false
       @options[:check_all] = false
+      @options[:help] = false
       @options[:opted] = false
 
       @opt = OptionParser.new
@@ -54,7 +57,7 @@ module GitNewlineAtEof
           '--help',
           'Show this message.',
           proc { |v|
-            puts @opt.help
+            @options[:help] = true
             @options[:opted] = true
           }
         ],
@@ -76,30 +79,42 @@ module GitNewlineAtEof
       @opt.parse!(argv)
     end
 
-    def run
-      unless @options[:opted]
+    def run # return value is used for exit status
+      if !@options[:opted] || @options[:help]
         puts @opt.help
         0
-      end
-      IO.popen('git rev-parse', :err => [:child, :out])
-      if $? != 0
+      elsif !in_git_dir?
         puts 'Here is not Git dir.'
-        exit(128)
-      end
-      @files = files
-      if @options[:check_all]
-        check_all
-      elsif @options[:treat_all]
-        treat_all
-        0
+        128
       else
-        if @options[:feed_last_line]
-          feed_last_line_all
+        @files = files
+        if @options[:check_all]
+          check_all
+        elsif @options[:treat_all]
+          treat_all
+          0
+        else
+          if @options[:feed_last_line]
+            feed_last_line_all
+          end
+          if @options[:discard_last_newline]
+            discard_last_newline_all
+          end
+          0
         end
-        if @options[:discard_last_newline]
-          discard_last_newline_all
+      end
+    end
+
+    def in_git_dir?
+      if !@in_git_dir.nil?
+        @in_git_dir
+      else
+        o, e, exit_status = Open3.capture3('git rev-parse')
+        if exit_status == 0
+          @in_git_dir = true
+        else
+          @in_git_dir = false
         end
-        0
       end
     end
 

data/lib/git-newline-at-eof/version.rb

@@ -1,3 +1,3 @@
 module GitNewlineAtEof
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-newline-at-eof
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="