From 32fbdb9fba94061ddb5848ec981c8694bdad9dd6 Mon Sep 17 00:00:00 2001
From: Markos Fragkakis <fragkakis@workable.com>
Date: Fri, 16 Sep 2016 13:56:18 +0300
Subject: [PATCH] svgo param can now be an absolute/relative path to svgo. If
 not, trying out local node_modules, then global

---
 lib/svgeez/sprite_builder.rb | 32 ++++++++++++++++++++++++++++++--
 lib/svgeez/version.rb        |  2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/svgeez/sprite_builder.rb b/lib/svgeez/sprite_builder.rb
index 39c19ee..aa48f00 100644
--- a/lib/svgeez/sprite_builder.rb
+++ b/lib/svgeez/sprite_builder.rb
@@ -43,7 +43,7 @@ def build_destination_file_contents
       destination_file_contents = "<svg>#{collect_source_files_contents.join}</svg>"
 
       if svgo_use? && svgo_installed?
-        destination_file_contents = `cat <<EOF | svgo --disable=cleanupIDs -i - -o -\n#{destination_file_contents}\nEOF`
+        destination_file_contents = `cat <<EOF | #{svgo_executable} --disable=cleanupIDs -i - -o -\n#{destination_file_contents}\nEOF`
       end
 
       destination_file_contents.insert(4, %( id="#{destination_file_id}" style="display: none;" version="1.1"))
@@ -94,7 +94,35 @@ def svgo_use?
     end
 
     def svgo_installed?
-      @svgo_installed ||= find_executable0('svgo')
+      @svgo_installed ||= svgo_executable
+    end
+
+    def svgo_executable
+      @svgo_executable ||= find_svgo_executable
+    end
+
+    def find_svgo_executable
+      specified_executable || local_svgo_executable || global_svgo_executable
+    end
+
+    def specified_executable
+      svgo_path = specified_svgo_path
+      find_executable0('svgo', svgo_path) if svgo_path
+    end
+
+    def specified_svgo_path
+      return unless @options['svgo']
+      path = File.expand_path(@options['svgo'])
+      return unless File.directory?(path)
+      path
+    end
+
+    def local_svgo_executable
+      find_executable0('svgo', File.expand_path('./node_modules/svgo/bin', Dir.pwd))
+    end
+
+    def global_svgo_executable
+      find_executable0('svgo')
     end
   end
 end
diff --git a/lib/svgeez/version.rb b/lib/svgeez/version.rb
index ed049fe..0afba3f 100644
--- a/lib/svgeez/version.rb
+++ b/lib/svgeez/version.rb
@@ -1,3 +1,3 @@
 module Svgeez
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end