macaw-ruby 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb0b0f4729eaad142f96daf4678d5bf73bd70ea
-  data.tar.gz: 82fcc20619fb567856368d2a109ad7fd4163d47c
+  metadata.gz: 641515431f8af01e69b01e2071dc82b3fd734e57
+  data.tar.gz: a5244b87b62d510c1a6bcff5929095d4f6110db0
 SHA512:
-  metadata.gz: 1c9f95e64d65299aecb840ff8159fdaedf3dadc42aecd55763b3d6c50c97c446d0230a5acc0740dc62fbe126a50a85ec1009ce1c657f982a098623b216d3fab7
-  data.tar.gz: cb756f8a318b3942e94d2e179de1c2e560f909517456be76c06dfb4d1847b52577d5e7644f535c3bb61edc594415316f6d6c6d11fef1e0e97e11f77f7786bf8e
+  metadata.gz: 8ffd958af42839c0a4de5d325a22e6aa895db2d2edc412bf6db241ae4d933136665630278f0382ccd01992c4b2c5244039a25c9ca3aa952ec280e7df628708b2
+  data.tar.gz: 7a874af507f5f6cb52e3172749574411821ce06a23cb77954672ae8269a45293417996db9b0d5d1de7187f31f41d0eed0697bf9217767830b7beb909856c5cdb

data/Gemfile.lock

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

data/README.md

@@ -11,8 +11,8 @@ To install, make sure you have Ruby 1.9 or later installed, and then (on a comma
 
 ## Usage
 
-In day-to-day use it will (should) behave exactly like arara. It accepts the same command line parameters and reads the
-same *standard* rules that are bundled with arara; if you use only those, there's no need to change anything in your
+In day-to-day use it will (should) behave exactly like Arara. It accepts the same command line parameters and reads the
+same *standard* rules that are bundled with Arara; if you use only those, there's no need to change anything in your
 LaTeX documents. Instead of
 
     arara
@@ -29,14 +29,13 @@ Macaw doesn't use yaml for its rules; rules are Ruby scripts. Macaw will read yo
 your custom rules; in that location, you can drop files that end in '.rb', which are structured like this:
 
     class Macaw # this line is mandatory
-
       # define your macaw rule here. The name after 'def' is the name of your rule,
       # the options between parenthesis are the parameters your rule will accept.
       # Optional parameters are marked using '=nil'.
       #
       # For those of you who know ruby, this looks familiar but behaves oddly;
       # using anything else than 'nil' will likewise make the parameter optional,
-      # but you will *always* be passed 'nil' if the arara rule in the tex file
+      # but you will *always* be passed 'nil' if the Arara rule in the tex file
       # did not pass the parameters).
       def zoterobib(collection, format=nil, port=nil, exportCharset=nil, exportNotes=nil, useJournalAbbreviation=nil)
         # ||= assigns a value if it wasn't set; set your default values here
@@ -60,7 +59,7 @@ your custom rules; in that location, you can drop files that end in '.rb', which
       end
     end
 
-You are not required to use Macaw.system BTW; arara is mainly focused on running shell programs, but since Macaw rules
+You are not required to use Macaw.system BTW; Arara is mainly focused on running shell programs, but since Macaw rules
 are ruby scripts, they can do some things natively:
 
     # Clean rule for arara

data/bin/macaw

@@ -134,18 +134,29 @@ class JSON::Pure::Parser
 end
 
 class Macaw
+  class CommandlineError < StandardError; end
+
   @@log = nil
 
   def initialize(tex)
     @file = tex
-    @base = File.basename(@file, File.extname(@file))
+    @base = File.join(File.dirname(@file), File.basename(@file, File.extname(@file)))
   end
   attr_reader :file, :base
 
-  def self.error(msg)
-    puts "\n\n#{msg}"
-    Macaw.log.close if Macaw.log
-    exit 1
+  ERRORMODES=%i{exit throw ignore}
+  def self.error(msg, onfail=:exit)
+    throw "errormode can only be #{ERRORMODES.inspect}" unless ERRORMODES.include?(onfail)
+    case onfail
+      when :exit
+        @@log.close if @@log
+        puts "\n\n#{msg}"
+        exit 1
+      when :throw
+        throw msg
+      else
+        puts msg
+    end
   end
 
   def self.options
@@ -205,7 +216,9 @@ class Macaw
     @@log.write(line) if @@log
   end
 
-  def self.system(cmd, failonerror=true)
+  def self.system(cmd, onfail=:exit)
+    throw "errormode can only be #{ERRORMODES.inspect}" unless ERRORMODES.include?(onfail)
+
     cmd = cmd.compact.join(' ') if cmd.is_a?(Array)
     puts cmd
 
@@ -219,7 +232,7 @@ class Macaw
           end
 
           exit_status = wait_thr.value
-          error "cmd failed: #{cmd}" unless exit_status.success? && failonerror
+          error "cmd failed: #{cmd}", onfail unless exit_status.success?
         end
       }
     rescue Timeout::Error

data/lib/macaw/version.rb

@@ -1,3 +1,3 @@
 class Macaw
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

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