esvg 2.8.9 → 2.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8e640110063dbdfbbafa067e3a46b1cb6312cb
-  data.tar.gz: f544c21a203eef867fe5579b3737ce9705153662
+  metadata.gz: 7f1213db1c8babf0143f05a93ab2e18a677a2207
+  data.tar.gz: d149e49116c60aa64adf6335680d1f4676d7e94c
 SHA512:
-  metadata.gz: 6144b4bddd911155e0d9b72a6c4ac8869a8c4b98bd6fa932987a55ea1b6ba1c22d71503b26d95205eba09f9c529f9ae5bf21c562910cd1114dbe558aa7f60036
-  data.tar.gz: c64e3128426de249f0eb22f7f16d59bbf8a8979e0b8903e70147556df114794f5a69c5a4b194fb26478bd66e20575bd4eb4a593dd95c47be63561f9b67dadd91
+  metadata.gz: e6a99543e715908e3713fc9a412530f91871365af61db8143c0879816cada1d6b7a82f3d0bc133a38f8b5f34603c1ab0637034a5e581a9071999da39efe662d3
+  data.tar.gz: 12b33696959aa397bdfc37f444fd946b248f8a1103f13a869ac06655472568b14da825297f83cc700db031e273005212d7f626e37b7aaaf9b1068161bee70866

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.8.10 (2016-07-01)
+- Fix: Improved svgo detection; no longer requires svgo_path.
+
 ### 2.8.9 (2016-06-29)
 - Fix: Now write path is returned after write.
 

data/exe/esvg

@@ -28,10 +28,6 @@ OptionParser.new do |opts|
     options[:optimize] = svgo
   end
 
-  opts.on("-n", "--npm", String, "Path to node_modules director") do |path|
-    options[:npm_path] = path
-  end
-
   opts.on("-v", "--version", "Print version") do |version|
     options[:version] = true
   end

data/lib/esvg/svg.rb

@@ -9,7 +9,6 @@ module Esvg
       base_class: 'svg-icon',
       namespace: 'icon',
       optimize: false,
-      npm_path: false,
       namespace_before: true,
       font_size: '1em',
       verbose: false,
@@ -27,7 +26,6 @@ module Esvg
     def initialize(options={})
       config(options)
 
-      @svgo = nil
       @last_read = nil
       @svgs = {}
 
@@ -277,7 +275,7 @@ module Esvg
     end
 
     def write_svg(svg)
-      path = File.join(config[:path], '.esvg-cache')
+      path = File.join((config[:tmp_path] || config[:path]), '.esvg-tmp')
       write_file path, svg
       path
     end
@@ -352,9 +350,9 @@ module Esvg
     end
 
     def optimize(svg)
-      if config[:optimize] && svgo?
+      if config[:optimize] && svgo_path = find_node_module('svgo')
         path = write_svg(svg)
-        svg = `#{@svgo} '#{path}' -o -`
+        svg = `#{svgo_path} '#{path}' -o -`
         FileUtils.rm(path)
       end
 
@@ -435,22 +433,18 @@ if(typeof(module) != 'undefined') { module.exports = esvg }
 }
     end
 
-    def svgo?
-      @svgo ||= begin
-        npm_path   = "#{config[:npm_path] || Dir.pwd}/node_modules"
-        local_path = File.join(npm_path, "svgo/bin/svgo")
+    def find_node_module(cmd)
+      require 'open3'
 
-        if config[:npm_path] && !File.exist?(npm_path)
-          abort "NPM Path not found: #{File.expand_path(config[:npm_path])}"
-        end
+      response = Open3.capture3("npm ls #{cmd}")
 
-        if File.exist?(local_path)
-          local_path
-        elsif `npm ls -g svgo`.match(/empty/).nil?
-          "svgo"
-        else
-          false
-        end
+      # Check for error
+      if response[1].empty?
+        "$(npm bin)/#{cmd}"
+
+      # Attempt global module path
+      elsif Open3.capture3("npm ls -g #{cmd}")[1].empty?
+        cmd
       end
     end
 

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "2.8.9"
+  VERSION = "2.8.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.8.9
+  version: 2.8.10
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler