macaw-ruby 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4adb7b466883f1cbd4d365363bb0cde9d264b552
-  data.tar.gz: 9f35d226538a731497f44f5487fcfc0ab8ba0649
+  metadata.gz: 9367e4ac5f8391b4cae45120b4e3a92d1dea8856
+  data.tar.gz: 8622c40e5e6d9955757d7a33c0a529f4883d557b
 SHA512:
-  metadata.gz: 7dbda8a32b5ed8f294693630fa0692bc59a20d6dd2d9dfb5e0096ab302ec968fef519171c149db8f85713dd9d27793678568cc870e46d46df940a8d884377cae
-  data.tar.gz: d843862f7bb8c1ceec30b39ece1ffba3bba868f5ed516f0170f848940b30f14b986db749a565ba16b90f09fca898e29f265f6e9103188247c2777a82b9672f38
+  metadata.gz: 1fc92de28198a71aa7d523e1b66f733c3db1fbb60c06ed6246c6c6191b9398822e60e639c2a98977c5fc38cd75d7858a2b780a852757ce9afdb502dee8fab240
+  data.tar.gz: 8444039f3f2943ef06267742daa413cc643e05af25ac57dfbdfe4cc809774bdd5421b10217ae276ab46165fd5cbf979f0cdf66e23b34e53e6dc52d6730648882

data/Gemfile.lock

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

data/Rakefile

@@ -20,5 +20,7 @@ task :publish do
 end
 
 task :test do
-  require './lib/macaw'
+  sh "cp test/test.tex ."
+  sh "./bin/macaw test"
+  sh "rm test.*"
 end

data/bin/macaw

@@ -7,6 +7,7 @@ require_relative '../lib/macaw'
 require_relative '../lib/macaw/version'
 require 'json/pure'
 require 'os'
+require 'ostruct'
 require 'shellwords'
 require 'optparse'
 require 'timeout'
@@ -54,7 +55,7 @@ def options!
       parser.separator ""
 
       options[:language] = I18n.default_locale
-      parser.on('-L', '--language LANG', I18n.t('help.language')){|lang|
+      parser.on('-L', '--language LANG', I18n.t('help.Language')){|lang|
         begin
           I18n.locale = lang.intern
           options[:language] = lang.intern
@@ -66,15 +67,18 @@ def options!
         end
       }
 
-      parser.on('-l', '--log', I18n.t('help.log')) {|v|
+      parser.on('-p', '--progress', I18n.t('help.Progress')) {|v|
+        options[:progress] = v
+      }
+      parser.on('-l', '--log', I18n.t('help.Log')) {|v|
         options[:log] = v
       }
 
-      parser.on('-t', '--timeout SECONDS', I18n.t('help.timeout')){|timeout|
-        options[:timeout] = Integer(timeout)
+      parser.on('-t', '--timeout SECONDS', I18n.t('help.Timeout')){|timeout|
+        options[:timeout] = Float(timeout) / 1000
       }
 
-      parser.on('-v', '--verbose', I18n.t('help.verbose')) {|v|
+      parser.on('-v', '--verbose', I18n.t('help.Verbose')) {|v|
         options[:verbose] = v
       }
 
@@ -85,7 +89,7 @@ def options!
         end
       }
 
-      parser.on_tail('-V', '--version', I18n.t('help.version')){
+      parser.on_tail('-V', '--version', I18n.t('help.Version')){
         if !dryrun
           puts "macaw #{Macaw::VERSION} - #{I18n.t('header.Slogan')}\nCopyright (c) 2012, Paulo Roberto Massa Cereda\n"
           puts I18n.t('header.AllRightsReserved')
@@ -101,7 +105,7 @@ def options!
       opts.parse!
     end
   }
-  options
+  OpenStruct.new(options)
 end
 
 CONFIGFILE = [File.join(Dir.home, 'araraconfig.yaml'), File.join(Dir.home, '.araraconfig.yaml')].detect{|config| File.file?(config) }
@@ -164,7 +168,7 @@ class Macaw
   end
 
   def self.run
-    @@options=options!
+    @@options ||= options!
 
     error("No filename to process") if ARGV.size == 0
     error("Expected exactly one filename to process #{ARGV.inspect}") if ARGV.size != 1
@@ -173,7 +177,7 @@ class Macaw
 
     Macaw.load_rules
     macaw = Macaw.new(tex)
-    @@log = File.open(macaw.base + '.log', 'w') if @@options[:log]
+    @@log = File.open(macaw.base + '.log', 'w') if @@options.log
 
     IO.readlines(tex).each{|line|
       next unless line =~ /^% arara: /
@@ -213,7 +217,7 @@ class Macaw
   end
 
   def self.log(line, force=false)
-    puts line if @@options[:verbose] || force
+    print (options.progress && !force ? '.' : line + "\n") if @@options.verbose || @@options.progress || force
     @@log.write(line) if @@log
   end
 
@@ -225,7 +229,7 @@ class Macaw
 
     output = ''
     begin
-      Timeout::timeout(@@options[:timeout] || 0) {
+      Timeout::timeout(@@options.timeout || 0) {
         Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
           while line = stdout_err.gets
             self.log(line)
@@ -237,7 +241,7 @@ class Macaw
         end
       }
     rescue Timeout::Error
-      error "#{cmd}: timed out after #{@@options[:timeout]} seconds" if failonerror
+      error "#{cmd}: timed out after #{@@options.timeout} seconds" if failonerror
     end
     return output
   end

data/lib/macaw/i18n/en.yml

@@ -1,13 +1,7 @@
 ---
 en:
   help:
-    language: set the application language
-    log: generate a log output
-    timeout: set execution timeout
-    verbose: print the command output
-    version: print the application version
     usage: Usage
-    rights: All rights reserved.
     Version: print the application version
     Help: print the help message
     Log: generate a log output
@@ -16,6 +10,7 @@ en:
     Language: set the application language
     DryRun: go through all the motions of running a command, but with no actual calls
     MaximumNumberOfLoops: set the maximum number of loops
+    Progress: print dots for progress
   log:
     WelcomeMessage: Welcome to arara %{0}!
     ProcessingFile: Processing file ''%{0}'', please wait.

data/lib/macaw/version.rb

@@ -1,3 +1,3 @@
 class Macaw
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaw-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Emiliano Heyns
@@ -166,7 +166,7 @@ files:
 - lib/macaw/rules/xetex.rb
 - lib/macaw/version.rb
 - macaw.gemspec
-- test.tex
+- test/test.tex
 - test/test_macaw.rb
 homepage: ''
 licenses:
@@ -193,4 +193,5 @@ signing_key:
 specification_version: 4
 summary: Ruby Arara
 test_files:
+- test/test.tex
 - test/test_macaw.rb