Fixing working path detection for executables and minor bugs

Author: sverrirs

lib/jekyll-webp/webpExec.rb

@@ -1,4 +1,4 @@
-require 'os'
+require 'open3'
 
 module Jekyll
   module Webp
@@ -17,18 +17,23 @@ def self.run(quality, input_file, output_file)
         # What is the OS and architecture specific executable name?
         exe_name = WebpExec.exe_name
 
-        full_path = File.join(bin_path, exe_name)
+        # We need to locate the Gems bin path as we're currently running inside the 
+        # jekyll site working directory
+        # http://stackoverflow.com/a/10083594/779521
+        gem_spec = Gem::Specification.find_by_name("jekyll-webp")
+        gem_root = gem_spec.gem_dir
+
+        # Construct the full path to the executable
+        full_path = File.join(gem_root, bin_path, exe_name)
 
         # Construct the full program call
         cmd = "\"#{full_path}\" -quiet -mt -q #{quality.to_s} \"#{input_file}\" -o \"#{output_file}\""
-
-        puts "Command: "+cmd
 
         # Execute the command
-        retValue = %x[ #{cmd} ]
+        stdin, stdout, stderr = Open3.popen3(cmd)
 
         # Return any captured return value
-        return retValue 
+        return [stdin, stdout, stderr]
       end #function run
 
       #
@@ -38,13 +43,13 @@ def self.exe_name
         if OS.mac?
           return "osx-cwebp"
         elsif OS.windows?
-          if OS.32bit?
+          if OS.x32?
             return "win-x86-cwebp.exe"
           else
             return "win-x64-cwebp.exe"
           end
         elsif OS.unix? || OS.linux?
-          if OS.32bit?
+          if OS.x32?
             return "linux-x86-cwebp"
           else
             return "linux-x64-cwebp"
@@ -75,11 +80,11 @@ def OS.linux?
       OS.unix? and not OS.mac?
     end
 
-    def OS.32bit?
+    def OS.x32?
       return 1.size != 8
     end
 
-    def OS.64bit?
+    def OS.x64?
       return 1.size == 8
     end
   end #module OS

lib/jekyll-webp/webpGenerator.rb

@@ -10,7 +10,7 @@ class WebpFile < StaticFile
       def write(dest)
         true # Recover from strange exception when starting server without --auto
       end
-    end #class WebPImageFile
+    end #class WebpFile
 
     class WebpGenerator < Generator
       # This generator is safe from arbitrary code execution.
@@ -34,11 +34,14 @@ def generate(site)
           return
         end
 
-        Jekyll.logger.info "WebP:","Starting"
+        Jekyll.logger.debug "WebP:","Starting"
 
         # If the site destination directory has not yet been created then create it now. Otherwise, we cannot write our file there.
         Dir::mkdir(site.dest) if !File.directory? site.dest
 
+        # Counting the number of files generated
+        file_count = 0
+
         # Iterate through every image in each of the image folders and create a webp image
         # if one has not been created already for that image.
         for imgdir in @config['img_dir']
@@ -75,8 +78,6 @@ def generate(site)
               if( File.file?(outfile_fullpath_webp) && 
                   File.mtime(outfile_fullpath_webp) <= File.mtime(infile_fullpath) )
                 Jekyll.logger.info "WebP:", "Change to source image file #{imgfile} detected, regenerating WebP"
-                #puts "      WebP: "+File.mtime(outfile_fullpath_webp).strftime('%Y-%m-%d %H:%M:%S')
-                #puts "      Source: "+File.mtime(infile_fullpath).strftime('%Y-%m-%d %H:%M:%S')
               end
 
               # Generate the file