esvg 2.8.7 → 2.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024f0bbd1df2c2dbd045bd632801f1160bb85317
-  data.tar.gz: 555c4cdfedee44c6fb56ef8f56d35fa3dbe0b980
+  metadata.gz: 6158cde2155dd544488ee09f7ee14094e61c0a74
+  data.tar.gz: 093adddf985e571ea56f4a5459b3f209dd905fc0
 SHA512:
-  metadata.gz: b70387215bb00af1982291c9163a9c2f769aa744002d103f9307dc6cbbfb3df261ac452452654281f2b17ae03646774057dba985d2ef19fbc7a1696b5dbac18f
-  data.tar.gz: 97e83f19a08a193cff6192398795515b83545713831b094759479364e24f0cda827b7abe547a9c47a05887a75ef3a500229eed067d59cfa913ded52886ba88b1
+  metadata.gz: cd644a99896b618e21229e439efc4df2684f7d0a4f859672b72fa582dc14c378e38349ac1099a047b2d5b47960482fbd74a016f813d4453120b957a29ebe37db
+  data.tar.gz: f730a2c8f16945e965322ef424250183a5d4d74a46afcee8c9829795807822db9302e16708936592eec12b4999b46ce6eb64d866d4f8644876d3807efd33564d

data/exe/esvg

@@ -20,6 +20,10 @@ OptionParser.new do |opts|
     options[:config_file] = path
   end
 
+  opts.on("-r", "--rails", "Use Rails defaults") do
+    options[:rails] = true
+  end
+
   opts.on("-O", "--optimize", "Optimize svgs with svgo") do |svgo|
     options[:optimize] = svgo
   end
@@ -28,7 +32,7 @@ OptionParser.new do |opts|
     options[:npm_path] = path
   end
 
-  opts.on("-l", "--log", "Print version") do |version|
+  opts.on("-v", "--version", "Print version") do |version|
     options[:version] = true
   end
 
@@ -37,7 +41,11 @@ end.parse!
 if options[:version]
   puts "Esvg #{Esvg::VERSION}"
 else
-  options[:path] = ARGV.shift
+
+  if path = ARGV.shift
+    options[:path] = path
+  end
+
   options[:cli] = true
   esvg = Esvg::SVG.new(options).write
 end

data/lib/esvg/svg.rb

@@ -6,14 +6,12 @@ module Esvg
     attr_accessor :files, :svgs, :last_read
 
     CONFIG = {
-      path: Dir.pwd,
       base_class: 'svg-icon',
       namespace: 'icon',
       optimize: false,
       npm_path: false,
       namespace_before: true,
       font_size: '1em',
-      output_path: Dir.pwd,
       verbose: false,
       format: 'js',
       throttle_read: 4,
@@ -21,7 +19,9 @@ module Esvg
     }
 
     CONFIG_RAILS = {
-      path: "app/assets/esvg"
+      path: "app/assets/esvg",
+      js_path: "app/assets/javascripts/esvg.js",
+      css_path: "app/assets/stylesheets/esvg.css"
     }
 
     def initialize(options={})
@@ -39,13 +39,19 @@ module Esvg
         paths = [options[:config_file], 'config/esvg.yml', 'esvg.yml'].compact
 
         config = CONFIG
-        config.merge!(CONFIG_RAILS) if Esvg.rails?
+
+        if Esvg.rails? || options[:rails]
+          config.merge!(CONFIG_RAILS) 
+        end
 
         if path = paths.select{ |p| File.exist?(p)}.first
           config.merge!(symbolize_keys(YAML.load(File.read(path) || {})))
         end
 
         config.merge!(options)
+        
+        config[:path] ||= Dir.pwd
+        config[:output_path] ||= Dir.pwd
 
         if config[:cli]
           config[:path] = File.expand_path(config[:path])

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "2.8.7"
+  VERSION = "2.8.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.8
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler