format-staged 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80bea79a03480ca702efd9bec176a0a2e180e82e854c7300773b064bf4c46b1e
-  data.tar.gz: 06356777c82f354560e700aef495929f1dc7e4d0d72c08456271a3b08fd3d8cc
+  metadata.gz: 1692442034aaff731e62e22677ccd3026d4e8e644c88fdcc4ec2df9db06521b7
+  data.tar.gz: a2f8d26b365c7c2b1597055490010398900335f0abc6e1dde9b6235adb6c9642
 SHA512:
-  metadata.gz: bd2a7a026faf4ff75b34b69a26aba8df9ff9d18d15be75341c365a8c5bae010044010d2fe3976cd5b60ccc9e7f0d68c7a62955bc620c56b7ad3955779713ec95
-  data.tar.gz: 126334604bfac8205438d64d597638490d560db058476f4a53b673f89f2b80cbc055a3f76863d5f6489b89f132140947794cb4a0cece89ea89ea287fe6c0c5f8
+  metadata.gz: e3bb54425caec06ca5ae575a9eb99726b57bd4974972a3db9a645f28cb199eb1e04f527305e4f2b6d1e0bd4abae2e7a5275041c2aa1c2b5baf37b9bfcec2bc44
+  data.tar.gz: e118755923b6a019cccc20e1354721692fd38fc6c1f6dc09013c47ab9a5d9959277f365362696111c7887faa74526477b8d140b654812a0152840aa9a91d6e34

data/lib/format-staged/io.rb

@@ -2,22 +2,11 @@
 
 require 'English'
 class FormatStaged
-  def get_output(*args, lines: true)
+  def get_output(*args, lines: true, silent: false)
     puts "> #{args.join(' ')}" if @verbose
 
-    output = IO.popen(args, err: :err) do |io|
-      if lines
-        io.readlines.map(&:chomp)
-      else
-        io.read
-      end
-    end
-
-    if @verbose && lines
-      output.each do |line|
-        puts "< #{line}"
-      end
-    end
+    r = IO.popen(args, err: :err)
+    output = read_output(r, lines: lines, silent: silent)
 
     raise 'Failed to run command' unless $CHILD_STATUS.success?
 
@@ -40,4 +29,17 @@ class FormatStaged
 
     [pid, r]
   end
+
+  def read_output(r, lines: true, silent: false)
+    result = r.read
+    splits = result.split("\n")
+    if @verbose && !silent
+      splits.each do |line|
+        puts "< #{line}"
+      end
+    end
+    r.close
+
+    lines ? splits : result
+  end
 end

data/lib/format-staged/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class FormatStaged
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/format_staged.rb

@@ -67,12 +67,7 @@ class FormatStaged
     pid2, r = pipe_command format_command, source: r
     pid3, r = pipe_command 'git', 'hash-object', '-w', '--stdin', source: r
 
-    result = r.readlines.map(&:chomp)
-    if @verbose
-      result.each do |line|
-        puts "< #{line}"
-      end
-    end
+    result = read_output(r, lines: false).chomp
 
     Process.wait pid1
     raise "Cannot read #{file.dst_hash} from object database" unless $CHILD_STATUS.success?
@@ -83,7 +78,7 @@ class FormatStaged
     Process.wait pid3
     raise 'Error writing formatted file back to object database' unless $CHILD_STATUS.success? && !result.empty?
 
-    result.first
+    result
   end
 
   def object_is_empty(hash)
@@ -92,7 +87,7 @@ class FormatStaged
   end
 
   def patch_working_file(file, new_hash)
-    patch = get_output 'git', 'diff', file.dst_hash, new_hash, lines: false
+    patch = get_output 'git', 'diff', file.dst_hash, new_hash, lines: false, silent: true
     patch.gsub! "a/#{file.dst_hash}", "a/#{file.src_path}"
     patch.gsub! "b/#{new_hash}", "b/#{file.src_path}"
 
@@ -102,6 +97,8 @@ class FormatStaged
     patch_out.write patch
     patch_out.close
 
+    read_output r
+
     Process.wait pid
     raise 'Error applying patch' unless $CHILD_STATUS.success?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format-staged
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sven Weidauer