svgeez 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1bce20ebd93334034c81f289bc0afbccafa602f
-  data.tar.gz: 00257096f8f4c43218dcfe2cc40324bd545a26f9
+  metadata.gz: 8d3afb52b2f6c2e729e45e0424973b27b55915af
+  data.tar.gz: 985940a3598cc19bcc6204e67874717154179f86
 SHA512:
-  metadata.gz: bed9d3d9ecb1e777a2f7cbb9b2141d9bd28e13993b63981fee1af710f5447746bcc601f59197b3c339beddadb540aabe611eb41f397835269a1ca85848abf16d
-  data.tar.gz: 631d6f71da3b8f25169ddf41ec68041827cdac54b8a8ace6a22c59f967d7004817a6ddff05cdf2f44e8a8a09ce53f331517dca849b0c7cd3c5336b64fcb2df5b
+  metadata.gz: 6500f825534a6f87d21cb1eda1f0eebe7654c1ff5c313486a7686fb6d07ba1ab86d5a24abb60bef7ace4c35ad6a1ec78d29c0471afd0ec49b5f4052b9a42d4dc
+  data.tar.gz: 382fa4b98557b1343c087b32e11e9194f9f23bca8855f34ec2b4ab75cafd604945bb3ef464e6da51c8394fd73c6211285d2eeea3029ea5400b9779d5df743f05

data/.codeclimate.yml

@@ -1,8 +1,17 @@
+---
 engines:
   duplication:
     enabled: true
     config:
       languages:
         - ruby
+  fixme:
+    enabled: true
   rubocop:
     enabled: true
+ratings:
+  paths:
+    - bin/
+    - lib/
+exclude_paths:
+  - spec/

data/Rakefile

@@ -5,4 +5,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new
 RuboCop::RakeTask.new
 
-task :default => :spec
+task default: :spec

data/bin/svgeez

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w(.. lib))
 
 require 'svgeez'
 require 'mercenary'

data/lib/svgeez/commands/watch.rb

@@ -17,7 +17,7 @@ module Svgeez
         end
 
         def process(options)
-          Svgeez.logger.info %{Watching `#{File.expand_path(options['source'])}` for changes... Press ctrl-c to stop.}
+          Svgeez.logger.info %(Watching `#{File.expand_path(options['source'])}` for changes... Press ctrl-c to stop.)
 
           listener = Listen.to(options['source'], only: /\.svg$/) do
             Svgeez::Commands::Build.process(options)

data/lib/svgeez/sprite_builder.rb

@@ -3,56 +3,56 @@ module Svgeez
     def initialize(options)
       @source = File.expand_path(options.fetch('source', './'))
       @destination = File.expand_path(options.fetch('destination', './_svgeez/svgeez.svg'))
-      @with_svgo = options['svgo']
+      @svgo = options['svgo']
     end
 
     def build
-      unless source_is_destination?
-        if source_file_paths.any?
-          Svgeez.logger.info %{Generating sprite at `#{destination_file_path}` from #{source_file_paths.length} SVG#{'s' if source_file_paths.length > 1}...}
-
-          # Make destination folder
-          FileUtils.mkdir_p(destination_folder_path)
-
-          # Notify if SVGO requested but not found
-          if @with_svgo && !svgo_installed?
-            Svgeez.logger.warn %{Unable to find `svgo` in your PATH. Continuing with standard sprite generation...}
-          end
-
-          # Write the file
-          File.open(destination_file_path, 'w') do |f|
-            f.write build_destination_file_contents
-          end
-
-          Svgeez.logger.info %{Successfully generated sprite at `#{destination_file_path}`.}
-        else
-          Svgeez.logger.warn %{No SVGs were found in `#{@source}`.}
+      if source_is_destination?
+        Svgeez.logger.error %(Setting `source` and `destination` to the same path isn't allowed!)
+      elsif source_file_paths.any?
+        Svgeez.logger.info %(Generating sprite at `#{destination_file_path}` from #{source_file_paths.length} SVG#{'s' if source_file_paths.length > 1}...)
+
+        # Make destination folder
+        FileUtils.mkdir_p(destination_folder_path)
+
+        # Notify if SVGO requested but not found
+        if @svgo && !svgo_installed?
+          Svgeez.logger.warn %(Unable to find `svgo` in your PATH. Continuing with standard sprite generation...)
+        end
+
+        # Write the file
+        File.open(destination_file_path, 'w') do |f|
+          f.write build_destination_file_contents
         end
+
+        Svgeez.logger.info %(Successfully generated sprite at `#{destination_file_path}`.)
       else
-        Svgeez.logger.error %{Setting `source` and `destination` to the same path isn't allowed!}
+        Svgeez.logger.warn %(No SVGs were found in `#{@source}`.)
       end
     end
 
+    private
+
     def build_destination_file_contents
-      destination_file_contents = '<svg>'.tap do |file_contents|
-        source_file_paths.each do |file_path|
-          IO.read(file_path).match(/^<svg.*?(?<viewbox>viewBox=".*?").*?>(?<content>.*?)<\/svg>/m) do |matches|
-            file_contents << %{<symbol id="#{destination_file_id}-#{File.basename(file_path, '.svg').gsub(/['"\s]/, '-')}" #{matches[:viewbox]}>#{matches[:content]}</symbol>}
-          end
-        end
+      destination_file_contents = '<svg>'
 
-        file_contents << '</svg>'
+      source_file_paths.each do |file_path|
+        IO.read(file_path).match(%r{^<svg.*?(?<viewbox>viewBox=".*?").*?>(?<content>.*?)</svg>}m) do |matches|
+          destination_file_contents << %(<symbol id="#{destination_file_id}-#{File.basename(file_path, '.svg').gsub(/['"\s]/, '-')}" #{matches[:viewbox]}>#{matches[:content]}</symbol>)
+        end
       end
 
-      if use_svgo?
+      destination_file_contents << '</svg>'
+
+      if @svgo && svgo_installed?
         destination_file_contents = `cat <<EOF | svgo --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"})
+      destination_file_contents.insert(4, %( id="#{destination_file_id}" style="display: none;" version="1.1"))
     end
 
     def destination_file_id
-      @destination_file_id ||= File.basename(destination_file_name, '.svg').gsub(' ', '-')
+      @destination_file_id ||= File.basename(destination_file_name, '.svg').tr(' ', '-')
     end
 
     def destination_file_name
@@ -80,15 +80,11 @@ module Svgeez
     end
 
     def source_is_destination?
-      %r{^#{@source}} =~ destination_folder_path
+      /^#{@source}/ =~ destination_folder_path
     end
 
     def svgo_installed?
       @svgo_installed ||= find_executable0('svgo')
     end
-
-    def use_svgo?
-      @use_svgo ||= @with_svgo && svgo_installed?
-    end
   end
 end

data/lib/svgeez/version.rb

@@ -1,3 +1,3 @@
 module Svgeez
-  VERSION = '0.2.4'
+  VERSION = '0.2.7'
 end

data/lib/svgeez.rb

@@ -16,7 +16,7 @@ module Svgeez
     end
   end
 
-  self.logger.formatter = proc do |_, _, _, msg|
-    %{#{msg}\n}
+  logger.formatter = proc do |_, _, _, msg|
+    "#{msg}\n"
   end
 end

data/svgeez.gemspec

@@ -4,13 +4,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'svgeez/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 2.2.5'
+
   spec.name          = 'svgeez'
   spec.version       = Svgeez::VERSION
   spec.authors       = ['Jason Garber']
   spec.email         = ['jason@sixtwothree.org']
 
-  spec.summary       = %{Automatically generate an SVG sprite from a folder of SVG icons.}
-  spec.description   = %{Automatically generate an SVG sprite from a folder of SVG icons.}
+  spec.summary       = 'Automatically generate an SVG sprite from a folder of SVG icons.'
+  spec.description   = spec.summary
   spec.homepage      = 'https://github.com/jgarber623/svgeez'
   spec.license       = 'MIT'
 
@@ -19,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.6.0'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rubocop', '~> 0.42.0'
 
   spec.add_runtime_dependency 'listen', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svgeez
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.7
 platform: ruby
 authors:
 - Jason Garber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="