macaw-ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14bf704b4aebec039f6b0a1482999a7892fb6750
-  data.tar.gz: 3b9802e6d7b8c2cec0973659d61d50a7ab630e37
+  metadata.gz: 7514c0734c40f728de1ac1b940bbc0e4b8011c3c
+  data.tar.gz: 945a5878104180bbc8a3c7a05ecbf91805becc55
 SHA512:
-  metadata.gz: af2cb7d499b297cda415fcf2a43985a08ccb0dc9c715cd92b465cd22ec87b17b347ce12ebe5d5d1ded8dd96692c616553de462715264cb8961d3937a7492b47f
-  data.tar.gz: 01a853958e7ee014244dfc6114dc114d42f94513257cf9196f2dd337949157bc1e06f7dc65f5197e912e535970ca8abbd5f93fcbc0e5ae7a3eb89bc74ba306b0
+  metadata.gz: bc38a14c1e53b3f32a0ced64f2269cd1d873c329447b6147c7ad4b84fe6f9f577001a0d7b32551b4e079b1f0b671b53f4be68641fc47ae6d5997afe7f7a1b52c
+  data.tar.gz: ea96fd7e0b7e64d4f6536df107a99ee769a54cd2561e7b67c2ffcb4b2d36cb9f30607b1f1817dac83d269ce4b0a0beca2ba1e3b265597dafc6f1f6c02df70c59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    macaw-ruby (0.0.8)
+    macaw-ruby (0.0.9)
       json_pure
       os
       require_all

data/bin/macaw

@@ -24,6 +24,16 @@ end
 CONFIGFILE = [File.join(Dir.home, 'araraconfig.yaml'), File.join(Dir.home, '.araraconfig.yaml')].detect{|config| File.file?(config) }
 CONFIG = CONFIGFILE ? YAML.load_file(CONFIGFILE) : {}
 
+class String
+  def ~
+    if os.windows?
+      return '"' + self.gsub('"', '""') + '"'
+    else
+      return self.shellescape
+    end
+  end
+end
+
 class JSON::Pure::Parser
   IDENTIFIER = /[^:\s\\",{}\[\]]+/i
   alias :parse_quoted_string :parse_string
@@ -85,6 +95,14 @@ class Macaw
     }
   end
 
+  def !(value)
+    if os.windows?
+      return '"' + value.to_s.gsub('"', '""') + '"'
+    else
+      return value.to_s.shellescape
+    end
+  end
+
   def self.system(cmd)
     cmd = cmd.compact.join(' ') if cmd.is_a?(Array)
     puts cmd

data/lib/macaw/rules/animate.rb

@@ -21,6 +21,6 @@ class Macaw
     loop ||= 0
     density ||= 300
 
-    Macaw.system "convert -delay #{delay} -loop #{loop} -density #{density} #{"#{@base}.pdf".shellescape} #{"#{@base}.gif".shellescape}"
+    Macaw.system "convert -delay #{delay} -loop #{loop} -density #{density} #{~"#{@base}.pdf"} #{~"#{@base}.gif"}"
   end
 end

data/lib/macaw/rules/biber.rb

@@ -3,6 +3,6 @@
 # requires arara 3.0+
 class Macaw
   def biber(options=nil)
-    Macaw.system "biber #{options} #{@base.shellescape}"
+    Macaw.system "biber #{options} #{~@base}"
   end
 end

data/lib/macaw/rules/bibtex.rb

@@ -3,6 +3,6 @@
 # requires arara 3.0+
 class Macaw
   def bibtex(options=nil)
-    Macaw.system "bibtex #{options} #{"#{@base}.aux".shellescape}"
+    Macaw.system "bibtex #{options} #{~"#{@base}.aux"}"
   end
 end

data/lib/macaw/rules/dvipdfm.rb

@@ -4,6 +4,6 @@
 class Macaw
   def dvipdfm(options=nil, output=nil)
     output ||= @base
-    Macaw.system "dvipdfm #{"#{@base}.dvi".shellescape} -o #{"#{output}.ps".shellescape} #{options}"
+    Macaw.system "dvipdfm #{~"#{@base}.dvi"} -o #{~"#{output}.ps"} #{options}"
   end
 end

data/lib/macaw/rules/dvipdfmx.rb

@@ -4,6 +4,6 @@
 class Macaw
   def dvipdfmx(options=nil, output=nil)
     output ||= @base
-    Macaw.system "dvipdfmx #{"#{@base}.dvi".shellescape} -o #{"#{output}.ps".shellescape} #{options}"
+    Macaw.system "dvipdfmx #{~"#{@base}.dvi"} -o #{~"#{output}.ps"} #{options}"
   end
 end

data/lib/macaw/rules/dvips.rb

@@ -4,6 +4,6 @@
 class Macaw
   def dvips(options=nil, output=nil)
     output ||= @base
-    Macaw.system "dvips #{"#{@base}.dvi".shellescape} -o #{"#{output}.ps".shellescape} #{options}"
+    Macaw.system "dvips #{~"#{@base}.dvi"} -o #{~"#{output}.ps"} #{options}"
   end
 end

data/lib/macaw/rules/dvipsps2pdf.rb

@@ -4,7 +4,7 @@
 class Macaw
   def dvipsps2pdf(options=nil, output=nil)
     output ||= @base
-    Macaw.system "dvips #{"#{@base}.dvi".shellescape} -o #{"#{@base}.ps".shellescape} #{options}"
-    Macaw.system "ps2pdf #{options} #{"#{@base}.ps".shellescape} #{"#{output}.pdf".shellescape}"
+    Macaw.system "dvips #{~"#{@base}.dvi"} -o #{~"#{@base}.ps"} #{options}"
+    Macaw.system "ps2pdf #{options} #{~"#{@base}.ps"} #{~"#{output}.pdf"}"
   end
 end

data/lib/macaw/rules/frontespizio.rb

@@ -6,9 +6,9 @@ class Macaw
   def frontespizio(engine)
     engine ||= 'pdflatex'
 
-    Macaw.system "#{engine} #{@base.shellescape}"
-    Macaw.system "#{engine} #{"#{@base}-frn".shellescape}"
-    Macaw.system "dvips -o #{"#{@base}-frn.eps".shellescape} #{"#{@base}-frn".shellescape}" if engine == 'latex'
-    Macaw.system "#{engine} #{@base.shellescape}"
+    Macaw.system "#{engine} #{~@base}"
+    Macaw.system "#{engine} #{~"#{@base}-frn"}"
+    Macaw.system "dvips -o #{~"#{@base}-frn.eps"} #{~"#{@base}-frn"}" if engine == 'latex'
+    Macaw.system "#{engine} #{~@base}"
   end
 end

data/lib/macaw/rules/indent.rb

@@ -24,12 +24,12 @@ class Macaw
     cmd << '-s' if silent
     cmd << '-t' if trace
     cmd << '-l' if localSettings
-    cmd << "-c=#{cruft.shellescape}" if cruft
+    cmd << "-c=#{~cruft}" if cruft
     cmd << '-w' if overwrite
     cmd << '-d' if onlyDefault
-    cmd << "-o #{output.shellescape}" if output
-    cmd << @file.shellescape
-    cmd << output.shellescape if output
+    cmd << "-o #{~output}" if output
+    cmd << ~@file
+    cmd << ~output if output
 
     Macaw.system cmd
   end

data/lib/macaw/rules/latex.rb

@@ -10,7 +10,7 @@ class Macaw
     cmd << shell ? '--shell-escape' : '--no-shell-escape'
     cmd << "--synctex=#{synctex ? 1 : 0}"
     cmd << options
-    cmd << @file.shellescape
+    cmd << ~@file
 
     Macaw.system cmd
   end

data/lib/macaw/rules/lmkclean.rb

@@ -7,7 +7,7 @@ class Macaw
 
     cmd = ['latexmk']
     cmd << include.downcase if include && %w{all -c}.include(include.downcase)
-    cmd << @file.shellescape
+    cmd << ~@file
     Macaw.system cmd
   end
 end

data/lib/macaw/rules/lualatex.rb

@@ -10,7 +10,7 @@ class Macaw
     cmd << "--#{shell ? '' : 'no-'}shell-escape"
     cmd << "--synctex=#{synctex ? 1 : 0}"
     cmd << options
-    cmd << @file.shellescape
+    cmd << ~@file
 
     Macaw.system cmd
   end

data/lib/macaw/rules/lualatexmk.rb

@@ -10,7 +10,7 @@ class Macaw
     cmd << shell ? '--shell-escape' : '--no-shell-escape'
     cmd << options
     cmd << "$makeindex=q/makeindex %O -s #{style}.ist -o %D %S/" if style
-    cmd << "-pdf #{@file.shellescape}"
+    cmd << "-pdf #{~@file}"
 
     Macaw.system cmd
   end

data/lib/macaw/rules/luatex.rb

@@ -10,7 +10,7 @@ class Macaw
     cmd << "--#{shell ? '' : 'no-'}shell-escape"
     cmd << "--synctex=#{synctex ? 1 : 0}"
     cmd << options
-    cmd << @file.shellescape
+    cmd << ~@file
 
     Macaw.system cmd
   end

data/lib/macaw/rules/makeglossaries.rb

@@ -4,6 +4,6 @@
 class Macaw
   def makeglossaries(options=nil)
 
-    Macaw.system ['makeglossaries', options, @base.shellescape]
+    Macaw.system ['makeglossaries', options, ~@base]
   end
 end

data/lib/macaw/rules/makeindex.rb

@@ -9,7 +9,7 @@ class Macaw
     cmd = ['makeindex']
     cmd << '-g' if german
     cmd << "-s #{style}" if style
-    cmd << "#{@base}.#{extension}".shellescape
+    cmd << ~"#{@base}.#{extension}"
 
     Macaw.system cmd
   end

data/lib/macaw/rules/nomencl.rb

@@ -8,9 +8,9 @@ class Macaw
 
     cmd = ['makeindex']
     cmd << options
-    cmd << "#{@base}.nlo".shellescape
-    cmd << '-s ' + "#{style}.ist".shellescape if style
-    cmd << '-o ' + "#{@base}.nls".shellescape
+    cmd << ~"#{@base}.nlo"
+    cmd << '-s ' + ~"#{style}.ist" if style
+    cmd << '-o ' + ~"#{@base}.nls"
 
     Macaw.system cmd
   end

data/lib/macaw/rules/pdflatex.rb

@@ -10,7 +10,7 @@ class Macaw
     cmd << shell ? '--shell-escape' : '--no-shell-escape'
     cmd << "--synctex=#{synctex ? 1 : 0}"
     cmd << options
-    cmd << @file.shellescape
+    cmd << ~@file
 
     Macaw.system cmd
   end

data/lib/macaw/rules/pdflatexmk.rb

@@ -8,9 +8,9 @@ class Macaw
     cmd << "--synctex=#{synctex ? 1 : 0}"
     cmd << "--#{shell ? '' : 'no-'}shell-escape"
     cmd << options
-    cmd << "-e '$makeindex=q/makeindex %O -s #{"#{style}.ist".shellescape} -o %D %S/'" if style
+    cmd << "-e '$makeindex=q/makeindex %O -s #{~"#{style}.ist"} -o %D %S/'" if style
     cmd << '-pdf'
-    cmd << @file.shellescape
+    cmd << ~@file
 
     Macaw.system cmd
   end

data/lib/macaw/rules/pdftex.rb

@@ -9,7 +9,7 @@ class Macaw
     cmd << "--#{shell ? '' : 'no-'}shell-escape"
     cmd << "--synctex=#{synctex ? 1 : 0}"
     cmd << options
-    cmd << @file.shellescape
+    cmd << ~@file
 
     Macaw.system cmd
   end

data/lib/macaw/rules/ps2pdf.rb

@@ -8,8 +8,8 @@ class Macaw
 
     cmd = ['ps2pdf']
     cmd << options
-    cmd << "#{@base}.ps".shellescape
-    cmd << "#{output}.pdf".shellescape
+    cmd << ~"#{@base}.ps"
+    cmd << ~"#{output}.pdf"
 
     Macaw.system cmd
   end

data/lib/macaw/rules/sketch.rb

@@ -5,9 +5,9 @@ class Macaw
   def sketch(options=nil)
     cmd = ['sketch']
     cmd << options
-    cmd << @file.shellescape
+    cmd << ~@file
     cmd << '-o'
-    cmd << "#{@base}.tex".shellescape
+    cmd << ~"#{@base}.tex"
 
     Macaw.system cmd
   end

data/lib/macaw/rules/songidx.rb

@@ -3,6 +3,6 @@
 # requires arara 3.0
 class Macaw
   def songidx(input)
-    Macaw.system "songidx " + "#{input}.sxd".shellescape
+    Macaw.system "songidx " + ~"#{input}.sxd"
   end
 end

data/lib/macaw/rules/tex.rb

@@ -4,6 +4,6 @@
 # requires arara 3.0+
 class Macaw
   def tex(action, shell=nil, options=nil)
-    Macaw.system ['tex', action ? "--interaction=#{action}" : nil, "--#{shell ? '' : 'no-'}shell-escape", options, @file.shellescape]
+    Macaw.system ['tex', action ? "--interaction=#{action}" : nil, "--#{shell ? '' : 'no-'}shell-escape", options, ~@file]
   end
 end

data/lib/macaw/rules/xdvipdfmx.rb

@@ -4,6 +4,6 @@
 class Macaw
   def dvipdfmx(output=nil, options=nil)
     output ||= base
-    Macaw.system ['xdvipdfmx', "#{@base}.dvi".shellescape, '-o', "#{output}.ps", options]
+    Macaw.system ['xdvipdfmx', ~"#{@base}.dvi", '-o', ~"#{output}.ps", options]
   end
 end

data/lib/macaw/rules/xelatex.rb

@@ -10,7 +10,7 @@ class Macaw
       "--#{shell ? '' : 'no-'}shell-escape",
       "--synctex=#{syntex ? 1 : 0}",
       options,
-      @file.shellescape
+      ~@file
     ]
   end
 end

data/lib/macaw/rules/xelatexmk.rb

@@ -8,7 +8,7 @@ class Macaw
       options, 
       style ? "-e '$makeindex=q/makeindex %O -s #{style}.ist -o %D %S/'" : nil,
       '-pdf',
-      @file.shellescape
+      ~@file
     ]
   end
 end

data/lib/macaw/rules/xetex.rb

@@ -9,7 +9,7 @@ class Macaw
       "--#{shell ? '' : 'no-'}shell-escape",
       "--synctex=#{synctex ? 1 : 0}",
       options,
-      @file.shellescape
+      ~@file
     ]
   end
 end

data/lib/macaw/version.rb

@@ -1,3 +1,3 @@
 class Macaw
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaw-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Emiliano Heyns
@@ -130,7 +130,6 @@ files:
 - macaw.gemspec
 - test.tex
 - test/test_macaw.rb
-- tt.rb
 homepage: ''
 licenses:
 - MIT

data/tt.rb

@@ -1,8 +0,0 @@
-class A
-  def b(c, loop=4)
-  end
-end
-
-p A.instance_method(:b).parameters
-
-