macaw-ruby 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b3e2f788757673145ade623bb24d5e7d38b21d
-  data.tar.gz: b1e51aa42b192db8da4cb0c0b0f2801815317fae
+  metadata.gz: c924522b0283dc29571bc610015ed14f39a88024
+  data.tar.gz: 4350884eaf96add772061ee3b8f7cecec9c6cbc8
 SHA512:
-  metadata.gz: ad71d481842a195f1ab73e57f888696e5d745cf1d93939a40f914d46e11d42ab4b2a72a2b8daecfa9c000d1a7580d0bec9315b4a4c73f37c2f4b9e4196458779
-  data.tar.gz: 77d4bcb565cfb7626c21f665bcb46b547eee19d81650b761c45d5d74147accd29bc159e99d0495d2e61808ddae4d0e6db1726622e1bd4593c85f47aa02da6029
+  metadata.gz: 6a37bdfbaecbe3bf47e4d0f3af81c00de84dd742dd121168908dfa1fd349c4eec3e082361fbbca97f8e97cb80d8e70108b93c9ab8b45178347db4d805e0028ec
+  data.tar.gz: 422d2e6cca6dee464f04d2978e64c1fe15b14eb11e7e6b1713a9343f55cb9b9f63c6bc2fbf7eb1b57780b5842427d2984057f0418f27c3ff788682643947cd40

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    macaw-ruby (0.0.18)
+    macaw-ruby (0.0.19)
       i18n
       json_pure
       os

data/bin/macaw

@@ -11,9 +11,11 @@ require 'shellwords'
 require 'optparse'
 require 'timeout'
 require 'i18n'
+require 'open3'
 
 def error(msg)
-  puts msg
+  puts "\n\n#{msg}"
+  Macaw.log.close if Macaw.log
   exit 1
 end
 
@@ -160,7 +162,7 @@ class Macaw
 
     Macaw.load_rules
     macaw = Macaw.new(tex)
-    @@log = File.open(@base + '.log') if @@options[:log]
+    @@log = File.open(macaw.base + '.log', 'w') if @@options[:log]
 
     IO.readlines(tex).each{|line|
       next unless line =~ /^% arara: /
@@ -198,25 +200,32 @@ class Macaw
     }
   end
 
+  def self.log
+    @@log
+  end
+
   def self.system(cmd)
     cmd = cmd.compact.join(' ') if cmd.is_a?(Array)
     puts cmd
 
     output = ''
     begin
-      if @@options[:timeout]
-        Timeout::timeout(@@options[:timeout]) { output = `#{cmd}` }
-      else
-        output = `#{cmd}`
-      end
+      Timeout::timeout(@@options[:timeout] || 0) {
+        Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
+          while line = stdout_err.gets
+            puts line if @@options[:verbose]
+            @@log.write(line) if @@log
+            output += line + "\n"
+          end
+
+          exit_status = wait_thr.value
+          error "cmd failed: #{cmd}" unless exit_status.success?
+        end
+      }
     rescue Timeout::Error
-      throw "#{cmd}: timed out after #{@@options[:timeout]} seconds"
+      error "#{cmd}: timed out after #{@@options[:timeout]} seconds"
     end
-
-    @@log.write(output) if @@log
-    print output if @@options[:verbose]
-    return output if $?.to_i == 0
-    throw "#{cmd}: #{$?}"
+    return output
   end
 
   def self.load_rules

data/lib/macaw/version.rb

@@ -1,3 +1,3 @@
 class Macaw
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaw-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Emiliano Heyns