juicer 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec232a058df24e0e2cc70e10ef41e4b392152480
-  data.tar.gz: 319cbc42c5f1c831c351089fc2a8ccd9fd01f3d9
+  metadata.gz: f06b71c8fce4347fff482b82fa6ac3179263d764
+  data.tar.gz: 43301ee9d2637b94385ece374e2f99747222d156
 SHA512:
-  metadata.gz: 3e6a9dd9ada260b9e2ccc309558e6c96a319b72354eeb5afd25315bf230cfce861a4f36768bd6d27ebfaf26d2cf1c4705693ed8b75d17ad6123747a5f56d088c
-  data.tar.gz: 5af2f7f41c187a84461fd7f9ef7aed731134136652385fefd23d61834e7e1ac267aa5ca8cd748f82edc43336a8147ac678c83f4ce74a79c9a538864c54d991d2
+  metadata.gz: e1117c46084397beda8ee1f0922958fdbf008ceb6a55b7e44d9cc51c56d5d4b5ccd880b9beec9b2a65a0bfc1d5857624b5661ef89f7c1733bae0e6f11283d022
+  data.tar.gz: 56a67e2a3c05d82bac219b19862c46353c611f5821f161da1ef139178ac11ef3f6170cf0ae736345c78427450dff05974944da449d94d42e0ffecfed4a8e8ece

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   LOGGER = Logger.new(STDOUT)

data/lib/juicer/binary.rb

@@ -29,8 +29,8 @@ module Juicer
 
     # Run command
     #
-    def execute(params = nil)
-      cmd = IO.popen("#{self.command} #{params}", "r")
+    def execute(*params)
+      cmd = IO.popen(([self.command] + params).flatten, "r")
       results = cmd.gets(nil)
       cmd.close
       results
@@ -107,7 +107,7 @@ module Juicer
     def command
       return @command if !@opt_set && @command
       @opt_set = false
-      @command = "#{@binary} #{options}"
+      @command = [@binary, options]
     end
 
     # Locate the binary to execute. The binary is searched for in the

data/lib/juicer/jslint.rb

@@ -18,6 +18,18 @@ module Juicer
       path << options[:bin_path] if options[:bin_path]
     end
 
+    # Constructs the command to use
+    #
+    def command
+      java_opts = []
+      if ENV['JAVA_OPTS'].nil?
+        java_opts = []
+      else
+        java_opts = ENV['JAVA_OPTS'].split(" ")
+      end
+      @command = ([@binary] + java_opts).flatten
+    end
+
     #
     # Checks if a files has problems. Also includes experimental support for CSS
     # files. CSS files should begin with the line @charset "UTF-8";
@@ -32,7 +44,7 @@ module Juicer
       raise FileNotFoundError.new("Unable to locate JsLint '#{js_file}'") if !js_file || !File.exists?(js_file)
       raise FileNotFoundError.new("Unable to locate input file '#{file}'") unless File.exists?(file)
 
-      lines = execute(%Q{-jar "#{rhino}" "#{locate_lib}" "#{file}"}).split("\n")
+      lines = execute("-jar", rhino, locate_lib, file).split("\n")
       return Report.new if lines.length == 1 && lines[0] =~ /jslint: No problems/
 
       report = Report.new

data/lib/juicer/minifyer/closure_compiler.rb

@@ -62,7 +62,7 @@ module Juicer
 
         out_dir = File.dirname(output)
         FileUtils.mkdir_p(out_dir) unless File.exists?(out_dir)
-        execute(%Q{-jar "#{locate_jar}"#{jar_args} --js_output_file "#{output}" --js "#{file}"})
+        execute("-jar", "#{locate_jar}#{jar_args}", "--js_output_file", output, "--js", file)
 
         File.delete(file) if use_tmp
       end

data/lib/juicer/minifyer/java_base.rb

@@ -55,6 +55,18 @@ module Juicer
         @jar_args = " #{args}"
       end
 
+    # Constructs the command to use
+    #
+    def command
+      java_opts = []
+      if ENV['JAVA_OPTS'].nil?
+        java_opts = []
+      else
+        java_opts = ENV['JAVA_OPTS'].split(" ")
+      end
+      @command = ([@binary] + java_opts).flatten
+    end
+
       def jar_args
         @jar_args
       end

data/lib/juicer/minifyer/yui_compressor.rb

@@ -57,7 +57,7 @@ module Juicer
         output = File.join(Dir::tmpdir, File.basename(file) + '.min.tmp.' + type.to_s) if use_tmp
         FileUtils.mkdir_p(File.dirname(output))
 
-        result = execute(%Q{-jar "#{locate_jar}"#{jar_args} -o "#{output}" "#{file}"})
+        result = execute("-jar", "#{locate_jar}#{jar_args}", "-o", output, file)
 
         if use_tmp                            # If no output file is provided, YUI compressor will
           output.puts IO.read(output)         # compress to a temp file. This file should be cleared

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: juicer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Christian Johansen