middleman-webp 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1373c13db7e3f50fe7748718f23f92cdba4da011
-  data.tar.gz: a587c6124eeeaa09bc1dfa4ed1ef82fa9e248181
+  metadata.gz: ec8dcd14e74ea71c1075c9117a650658f5e54545
+  data.tar.gz: 10e6ba4aa291d859481205b777a4023e1874f841
 SHA512:
-  metadata.gz: d0abfe763bb864ddadded7ac209b060ecee7449bdbc8d9f144147756e930e798898ef61e46ad124ccd387de24f39cc9a3b33d3c352a14fbaa4dbeabb151c272a
-  data.tar.gz: 94693ab1db6590a444ddf45b58600be59fe5aaea5d3fccf22b0ae3f3f6f43f7ad4942b9b641f8644e83e613205456961efd681e4aefef48d9c9c6cd7fffdcfcc
+  metadata.gz: dd04ccde3cc96ad40b07e4116eb28c2a92c17813bbefee655cd599f9855066bbed173900a51859ebc3ff8afd6808d7a9a6f0ec66636bd559e092ddde459a88a8
+  data.tar.gz: 99a36183da396473c3c049b69a828adea67b59ceecf94329d3a56dda9b492f0b093dbec37ef306fd605e04fb48559583fda3cec3c5e169498775459492d48548

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/FileName:
+  Enabled: false

data/lib/middleman-webp/converter.rb

@@ -2,14 +2,16 @@ require 'middleman-webp/options'
 
 module Middleman
   module WebP
+    ##
+    # Handles finding image assets and running them through the conversion using
+    # external cwebp and gif2webp commandline tools
     class Converter
       SUFFIX_RE = /(jpe?g|png|tiff?|gif)$/i
 
-      def initialize(app, options = {}, builder, logger)
+      def initialize(app, builder, options = {})
         @app = app
         @options = Middleman::WebP::Options.new(options)
         @builder = builder
-        @log = logger
       end
 
       def convert
@@ -17,27 +19,24 @@ module Middleman
         @converted_size = 0
 
         convert_images(image_files) do |src, dst|
-          if !!@options.allow_skip && dst.size >= src.size
-            next reject_file(dst)
-          end
+          next reject_file(dst) if @options.allow_skip && dst.size >= src.size
 
           @original_size += src.size
           @converted_size += dst.size
-          @log.info "#{dst.path} "\
+          @builder.trigger :created, "#{dst.path} "\
             "(#{change_percentage(src.size, dst.size)} smaller)"
         end
         print_summary
       end
 
-      def convert_images(paths, &after_conversion)
+      def convert_images(paths, &_after_conversion)
         paths.each do |p|
           begin
             dst = destination_path(p)
             exec_convert_tool(p, dst)
             yield File.new(p), File.new(dst.to_s)
           rescue StandardError => e
-            @log.error "Converting #{p} failed"
-            @log.debug e.to_s
+            @builder.trigger :error, "Converting #{p} failed", e.backtrace
           end
         end
       end
@@ -55,15 +54,15 @@ module Middleman
       end
 
       def reject_file(file)
-        @log.warn "#{file.path} skipped"
+        @builder.trigger :deleted, "#{file.path} skipped"
         File.unlink(file)
       end
 
       def print_summary
         savings = @original_size - @converted_size
-        @log.info 'Total conversion savings: '\
-        "#{number_to_human_size(savings)} "\
-        "(#{change_percentage(@original_size, @converted_size)})", :blue
+        @builder.trigger :webp, '', 'Total conversion savings: '\
+          "#{number_to_human_size(savings)} "\
+          "(#{change_percentage(@original_size, @converted_size)})"
       end
 
       # Calculate change percentage of converted file size
@@ -84,22 +83,16 @@ module Middleman
       end
 
       def destination_path(src_path)
-        if @options.append_extension
-          dst_name = "#{src_path.basename.to_s}.webp"
-        else
-          dst_name = src_path.basename.to_s.gsub(SUFFIX_RE, 'webp')
-        end
+        dst_name = if @options.append_extension
+                     "#{src_path.basename}.webp"
+                   else
+                     src_path.basename.to_s.gsub(SUFFIX_RE, 'webp')
+                   end
         src_path.parent.join(dst_name)
       end
 
       def image_files
-        if @options.run_before_build
-          app_dir = Pathname(File.join(@app.root, @app.config[:source]))
-        else
-          app_dir = Pathname(@app.config[:build_dir])
-        end
-
-        all = ::Middleman::Util.all_files_under(app_dir)
+        all = ::Middleman::Util.all_files_under(site_dir)
         images = all.select { |p| p.to_s =~ SUFFIX_RE }
 
         # Reject files matching possible ignore patterns
@@ -127,6 +120,16 @@ module Middleman
         format("%g #{units[exponent]}",
                format('%.2f', n.to_f / 1024**exponent))
       end
+
+      private
+
+      def site_dir
+        if @options.run_before_build
+          Pathname(File.join(@app.root, @app.config[:source]))
+        else
+          Pathname(@app.config[:build_dir])
+        end
+      end
     end
   end
 end

data/lib/middleman-webp/extension.rb

@@ -1,20 +1,27 @@
 require 'middleman-core'
-require 'middleman-webp/logger'
 require 'middleman-webp/converter'
 
 require 'shell'
 
 module Middleman
+  ##
+  # Middleman extension for converting image assets to WebP alternatives
+  #
+  # Conversion is run using after_build or before_build according to the
+  # configuration, after_build being the default.
   class WebPExtension < Extension
     option(:conversion_options, {},
            'Custom conversion options for cwebp/gif2webp')
     option(:append_extension, false,
-           'keep the original filename and extension and append .webp (image.png => image.png.webp)')
+           'keep the original filename and extension and append .webp '\
+           '(image.png => image.png.webp)')
     option(:ignore, [], 'Ignores files with matching paths')
     option(:verbose, false, 'Display all external command which are executed '\
            'to help debugging.')
-    option(:allow_skip, true, 'Skip saving .webp files which are larger than their source')
-    option(:run_before_build, false, 'Run before build and save .webp files in source dir')
+    option(:allow_skip, true, 'Skip saving .webp files which are larger than '\
+           'their source')
+    option(:run_before_build, false, 'Run before build and save .webp files in'\
+           ' source dir')
 
     def initialize(app, options_hash = {}, &block)
       super
@@ -22,45 +29,42 @@ module Middleman
     end
 
     def before_build(builder)
-      return unless options[:run_before_build]
+      return unless options.run_before_build
 
-      initialize_logger builder
-      return unless dependencies_installed?
-      Middleman::WebP::Converter.new(@app, options, builder, @logger).convert
+      return unless dependencies_installed?(builder)
+      Middleman::WebP::Converter.new(@app, builder, options).convert
     end
 
     def after_build(builder)
-      return if options[:run_before_build]
+      return if options.run_before_build
 
-      initialize_logger builder
-      return unless dependencies_installed?
-      Middleman::WebP::Converter.new(@app, options, builder, @logger).convert
+      return unless dependencies_installed? builder
+      Middleman::WebP::Converter.new(@app, builder, options).convert
     end
 
     # Internal: Check that cwebp and gif2webp commandline tools are available.
     #
     # Returns true if all is OK.
-    def dependencies_installed?
-      warn_if_gif2webp_missing
-      cwebp_installed?
-    end
-
-    def initialize_logger(builder)
-      @logger = Middleman::WebP::Logger.new(builder, verbose: @options.verbose)
+    def dependencies_installed?(builder)
+      warn_if_gif2webp_missing builder
+      cwebp_installed? builder
     end
 
     private
 
-    def warn_if_gif2webp_missing
+    def warn_if_gif2webp_missing(builder)
       Shell.new.find_system_command('gif2webp')
     rescue Shell::Error::CommandNotFound => e
-      @logger.error "#{e.message} Please install latest version of webp library and tools to get gif2webp and be able to convert gif files also."
+      builder.trigger :webp, nil, "#{e.message} Please install latest version"\
+        ' of webp library and tools to get gif2webp and be able to convert gif'\
+        'files also.'
     end
 
-    def cwebp_installed?
+    def cwebp_installed?(builder)
       true if Shell.new.find_system_command('cwebp')
     rescue Shell::Error::CommandNotFound => e
-      @logger.error "ERROR: #{e.message} Please install cwebp and gif2webp commandline tools first."
+      builder.trigger :error, "ERROR: #{e.message} Please install cwebp and "\
+        'gif2webp commandline tools first.'
       false
     end
   end

data/lib/middleman-webp/options.rb

@@ -3,7 +3,8 @@ require 'middleman-webp/pathname_matcher'
 module Middleman
   module WebP
     class Options
-      attr_reader :ignore, :verbose, :append_extension, :allow_skip, :run_before_build
+      attr_reader :ignore, :verbose, :append_extension, :allow_skip,
+        :run_before_build
 
       def initialize(options = {})
         @ignore = options[:ignore] || []
@@ -30,7 +31,7 @@ module Middleman
       # glob pattern matches file path and uses the one with longest
       # glob, because it's assumed to be the most precise one.
       def for(file)
-        matching = @conversion.select { |m, o| m.matches? file }
+        matching = @conversion.select { |m, _o| m.matches? file }
 
         return '' if matching.empty?
 

data/lib/middleman-webp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Webp
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'.freeze
   end
 end

data/middleman-webp.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "middleman-core", "~> 4.0.0"
+  spec.add_dependency "middleman-core", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "middleman-cli", "~> 4.0.0"

data/spec/integration/extension_spec.rb

@@ -4,15 +4,9 @@ require 'middleman-core/cli'
 require 'thor'
 require_relative '../../lib/middleman-webp/extension'
 
-class MockBuilder
-  def thor
-    return Middleman::Cli::Build.new
-  end
-end
-
 describe Middleman::WebPExtension do
   before do
-    @builder = MockBuilder.new
+    @builder = stub(thor: Middleman::Cli::Build.new)
   end
 
   after do
@@ -27,30 +21,17 @@ describe Middleman::WebPExtension do
 
   describe '#before_build' do
     it 'does not generate WebP versions by default' do
-      app_mock = stub({
-                        initialized: '',
-                        instance_available: true,
-                        after_configuration: nil,
-                        before_build: nil,
-                        after_build: nil,
-                        root: '.',
-                        config: {source: 'spec/fixtures/ok-source'}
-                      })
-
-      Middleman::WebP::Logger.any_instance.expects(:info).never
-        .with do |msg, color|
-          msg =~ /Total conversion savings/
-        end
-
-      Middleman::WebP::Logger.any_instance.expects(:info).never
-        .with do |msg|
-          msg =~ /cwebp/
-        end
-
-      Middleman::WebP::Logger.any_instance.expects(:info).never
-        .with do |msg|
-          msg =~ /\.webp \([0-9.]+ % smaller\)/
-        end
+      app_mock = stub(initialized: '',
+                      instance_available: true,
+                      after_configuration: nil,
+                      before_build: nil,
+                      after_build: nil,
+                      root: '.',
+                      config: { source: 'spec/fixtures/ok-source' })
+
+      @builder.expects(:trigger).never.with do |event|
+        [:webp, :created, :error, :deleted].include? event
+      end
 
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.before_build(@builder)
@@ -59,26 +40,24 @@ describe Middleman::WebPExtension do
     end
 
     it 'generates WebP versions using external tools when option is set' do
-      app_mock = stub({
-                        initialized: '',
-                        instance_available: true,
-                        after_configuration: nil,
-                        before_build: nil,
-                        after_build: nil,
-                        verbose: true,
-                        root: '.',
-                        config: {
-                          source: 'spec/fixtures/ok-source',
-                          build_dir: 'spec/fixtures/ok-build'
-                        }
+      app_mock = stub(initialized: '',
+                      instance_available: true,
+                      after_configuration: nil,
+                      before_build: nil,
+                      after_build: nil,
+                      verbose: true,
+                      root: '.',
+                      config: {
+                        source: 'spec/fixtures/ok-source',
+                        build_dir: 'spec/fixtures/ok-build'
                       })
 
-      Middleman::WebP::Logger.any_instance.expects(:info).once.with do |msg, c|
-        msg =~ /Total conversion savings/
+      @builder.expects(:trigger).twice.with do |event, msg|
+        event == :created && msg =~ /\.webp \([0-9.]+ % smaller\)/
       end
 
-      Middleman::WebP::Logger.any_instance.expects(:info).twice.with do |msg|
-        msg =~ /\.webp \([0-9.]+ % smaller\)/
+      @builder.expects(:trigger).once.with do |event, _target, msg|
+        event == :webp && msg =~ /Total conversion savings/
       end
 
       @extension = Middleman::WebPExtension.new(app_mock) do |webp|
@@ -92,27 +71,25 @@ describe Middleman::WebPExtension do
 
   describe '#after_build' do
     before do
-      Middleman::WebP::Logger.any_instance.expects(:info).once.with do |msg|
-          msg =~ /Total conversion savings/
-        end
+      @builder.expects(:trigger).once.with do |event, _target, msg|
+        event == :webp && msg =~ /Total conversion savings/
+      end
     end
 
     it 'generates WebP versions using external tools' do
-      app_mock = stub({
-                        initialized: '',
-                        instance_available: true,
-                        after_configuration: nil,
-                        before_build: nil,
-                        after_build: nil,
-                        root: '.',
-                        config: {
-                          source: 'spec/fixtures/ok-source',
-                          build_dir: 'spec/fixtures/ok-build'
-                        }
+      app_mock = stub(initialized: '',
+                      instance_available: true,
+                      after_configuration: nil,
+                      before_build: nil,
+                      after_build: nil,
+                      root: '.',
+                      config: {
+                        source: 'spec/fixtures/ok-source',
+                        build_dir: 'spec/fixtures/ok-build'
                       })
 
-      Middleman::WebP::Logger.any_instance.expects(:info).twice.with do |msg|
-        msg =~ /\.webp \([0-9.]+ % smaller\)/
+      @builder.expects(:trigger).twice.with do |event, msg|
+        event == :created && msg =~ /\.webp \([0-9.]+ % smaller\)/
       end
 
       @extension = Middleman::WebPExtension.new(app_mock)
@@ -122,21 +99,19 @@ describe Middleman::WebPExtension do
     end
 
     it 'shows errors if files couldn\'t be converted' do
-      app_mock = stub({
-                        initialized: '',
-                        instance_available: true,
-                        after_configuration: nil,
-                        before_build: nil,
-                        after_build: nil,
-                        root: '.',
-                        config: {build_dir: 'spec/fixtures/dummy-build'}
-                      })
-
-      Middleman::WebP::Converter.any_instance.
-        expects(:exec_convert_tool).times(3)
-
-      Middleman::WebP::Logger.any_instance.expects(:error).times(3).with do |msg|
-        msg =~ /Converting .*empty\.(jpg|gif|png) failed/
+      app_mock = stub(initialized: '',
+                      instance_available: true,
+                      after_configuration: nil,
+                      before_build: nil,
+                      after_build: nil,
+                      root: '.',
+                      config: { build_dir: 'spec/fixtures/dummy-build' })
+
+      Middleman::WebP::Converter.any_instance
+                                .expects(:exec_convert_tool).times(3)
+
+      @builder.expects(:trigger).times(3).with do |event, msg|
+        event == :error && msg =~ /Converting .*empty\.(jpg|gif|png) failed/
       end
 
       @extension = Middleman::WebPExtension.new(app_mock)
@@ -144,18 +119,16 @@ describe Middleman::WebPExtension do
     end
 
     it 'rejects file if it is larger than original' do
-      app_mock = stub({
-                        initialized: '',
-                        instance_available: true,
-                        after_configuration: nil,
-                        before_build: nil,
-                        after_build: nil,
-                        root: '.',
-                        config: {build_dir: 'spec/fixtures/dummy-build'}
-                      })
-
-      Middleman::WebP::Converter.any_instance.
-        expects(:exec_convert_tool).times(3).with do |src, dst|
+      app_mock = stub(initialized: '',
+                      instance_available: true,
+                      after_configuration: nil,
+                      before_build: nil,
+                      after_build: nil,
+                      root: '.',
+                      config: { build_dir: 'spec/fixtures/dummy-build' })
+
+      Middleman::WebP::Converter.any_instance
+                                .expects(:exec_convert_tool).times(3).with do |_src, dst|
         if dst.to_s =~ /spec\/fixtures\/dummy-build\/.*webp$/
           File.open(dst, 'w') do |f|
             f << 'Making it larger than empty dummy original'
@@ -166,8 +139,9 @@ describe Middleman::WebPExtension do
         end
       end
 
-      Middleman::WebP::Logger.any_instance.expects(:info).times(3)
-        .with { |msg| msg =~ /.*empty.webp skipped/ }.returns(nil)
+      @builder.expects(:trigger).times(3).with do |event, msg|
+        event == :deleted && msg =~ /.*empty.webp skipped/
+      end.returns(nil)
 
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.after_build(@builder)
@@ -175,5 +149,4 @@ describe Middleman::WebPExtension do
       Dir.glob('spec/fixtures/dummy-build/**/*.webp').size.must_equal 0
     end
   end
-
 end

data/spec/unit/converter_spec.rb

@@ -5,8 +5,8 @@ require_relative '../../lib/middleman-webp/converter'
 
 describe Middleman::WebP::Converter do
   before do
-    @app_mock = stub(config: {build_dir: 'spec/fixtures/dummy-build'})
-    @converter = Middleman::WebP::Converter.new(@app_mock, {}, nil)
+    @app_mock = stub(config: { build_dir: 'spec/fixtures/dummy-build' })
+    @converter = Middleman::WebP::Converter.new @app_mock, nil
   end
 
   describe '#destination_path' do
@@ -18,7 +18,8 @@ describe Middleman::WebP::Converter do
 
   describe '#destination_path with append_extension = true' do
     before do
-      @converter = Middleman::WebP::Converter.new(@app_mock, {append_extension: true}, nil, nil)
+      @converter = Middleman::WebP::Converter.new @app_mock, nil,
+                                                  append_extension: true
     end
 
     it 'returns file name with same basename and webp suffix' do
@@ -72,9 +73,8 @@ describe Middleman::WebP::Converter do
     end
 
     it 'won\'t include ignored files' do
-      @converter = Middleman::WebP::Converter.new(@app_mock, {
-                                                    ignore: [/jpg$/, '**/*.gif']
-                                                  }, nil, nil)
+      @converter = Middleman::WebP::Converter.new @app_mock, nil,
+                                                  ignore: [/jpg$/, '**/*.gif']
 
       files_to_include = [Pathname('spec/fixtures/dummy-build/empty.png')]
       @converter.image_files.must_equal files_to_include
@@ -84,7 +84,7 @@ describe Middleman::WebP::Converter do
       options = {
         ignore: ->(path) { path.end_with? 'jpg' }
       }
-      @converter = Middleman::WebP::Converter.new(@app_mock, options, nil, nil)
+      @converter = Middleman::WebP::Converter.new @app_mock, nil, options
 
       @converter.image_files.size.must_equal 2
     end

data/spec/unit/extension_spec.rb

@@ -2,17 +2,14 @@ require 'spec_helper'
 require_relative '../../lib/middleman-webp/extension'
 
 describe Middleman::WebPExtension do
-
   before do
-    app_mock = stub({
-                      initialized: '',
-                      instance_available: true,
-                      after_configuration: nil,
-                      before_build: nil,
-                      after_build: nil
-                    })
+    app_mock = stub(initialized: '',
+                    instance_available: true,
+                    after_configuration: nil,
+                    before_build: nil,
+                    after_build: nil)
     @extension = Middleman::WebPExtension.new(app_mock)
-    @extension.initialize_logger(stub(thor: {say_status: nil}))
+    @builder_mock = stub(trigger: nil)
   end
 
   describe '#dependencies_installed?' do
@@ -20,24 +17,27 @@ describe Middleman::WebPExtension do
       Shell.any_instance.expects(:find_system_command).with('cwebp').returns('/usr/bin/cwebp')
       Shell.any_instance.expects(:find_system_command).with('gif2webp').returns('/usr/bin/gif2webp')
 
-      @extension.dependencies_installed?.must_equal true
+      @extension.dependencies_installed?(@builder_mock).must_equal true
     end
 
     it 'returns false and displays error if cwebp is missing' do
       Shell.any_instance.expects(:find_system_command).with('cwebp').raises(Shell::Error::CommandNotFound)
       Shell.any_instance.stubs(:find_system_command).with('gif2webp').returns('/usr/bin/gif2webp')
 
-      Middleman::WebP::Logger.any_instance.expects(:error).once
-      @extension.dependencies_installed?.must_equal false
+      @builder_mock.expects(:trigger).once.with do |event|
+        event == :error
+      end
+      @extension.dependencies_installed?(@builder_mock).must_equal false
     end
 
     it 'displays error if only gif2webp is missing and returns still true' do
       Shell.any_instance.expects(:find_system_command).with('gif2webp').raises(Shell::Error::CommandNotFound)
       Shell.any_instance.stubs(:find_system_command).with('cwebp').returns('/usr/bin/cwebp')
 
-      Middleman::WebP::Logger.any_instance.expects(:error).once
-      @extension.dependencies_installed?.must_equal true
+      @builder_mock.expects(:trigger).once.with do |event, _target, msg|
+        event == :webp && msg =~ /gif2webp/
+      end
+      @extension.dependencies_installed?(@builder_mock).must_equal true
     end
   end
-
 end

data/spec/unit/options_spec.rb

@@ -4,17 +4,17 @@ require_relative '../../lib/middleman-webp/options'
 
 describe Middleman::WebP::Options do
   describe '#allow_skip' do
-    it "should default to true" do
+    it 'should default to true' do
       options = Middleman::WebP::Options.new
       options.allow_skip.must_equal(true)
     end
-    
-    it "should allow setting to true" do
+
+    it 'should allow setting to true' do
       options = Middleman::WebP::Options.new(allow_skip: false)
       options.allow_skip.must_equal(false)
     end
   end
-  
+
   describe '#for' do
     it 'returns cwebp args when given file matches option file pattern glob' do
       path = Pathname.new('test_image.jpg')

data/spec/unit/pathname_matcher_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require_relative '../../lib/middleman-webp/pathname_matcher'
 
 describe Middleman::WebP::PathnameMatcher do
-
   describe '#matches?' do
     it 'returns true when given file matches pattern' do
       patterns = ['**/*.jpg', /jpg$/, ->(path) { path.end_with?('jpg') }]
@@ -54,7 +53,5 @@ describe Middleman::WebP::PathnameMatcher do
     it 'handles nil path gracefully and returns false' do
       Middleman::WebP::PathnameMatcher.new('*.jpg').matches? nil
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-webp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Juhamatti Niemelä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -97,7 +98,6 @@ files:
 - lib/middleman-webp.rb
 - lib/middleman-webp/converter.rb
 - lib/middleman-webp/extension.rb
-- lib/middleman-webp/logger.rb
 - lib/middleman-webp/options.rb
 - lib/middleman-webp/pathname_matcher.rb
 - lib/middleman-webp/version.rb
@@ -115,7 +115,6 @@ files:
 - spec/spec_helper.rb
 - spec/unit/converter_spec.rb
 - spec/unit/extension_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/pathname_matcher_spec.rb
 homepage: http://github.com/iiska/middleman-webp
@@ -138,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: WebP image conversion for Middleman
@@ -155,6 +154,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/converter_spec.rb
 - spec/unit/extension_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/pathname_matcher_spec.rb

data/lib/middleman-webp/logger.rb

@@ -1,26 +0,0 @@
-module Middleman
-  module WebP
-    class Logger
-      def initialize(builder, opts = {})
-        @builder = builder
-        @options = opts
-      end
-
-      def info(msg, color = nil)
-        @builder.thor.say_status :webp, msg, color
-      end
-
-      def error(msg)
-        info msg, :red
-      end
-
-      def warn(msg)
-        info msg, :yellow
-      end
-
-      def debug(msg)
-        info msg if @options[:verbose]
-      end
-    end
-  end
-end

data/spec/unit/logger_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-require 'pathname'
-require_relative '../../lib/middleman-webp/logger'
-
-describe Middleman::WebP::Logger do
-  before do
-    @thor_mock = stub({say_status: nil})
-    @logger = Middleman::WebP::Logger.new(stub({thor: @thor_mock}))
-  end
-
-  it "logs info message through Thor with given color" do
-    @thor_mock.expects(:say_status).once.with do |action, msg, color|
-      msg == 'foobar' && color == :blue
-    end
-    @logger.info 'foobar', :blue
-  end
-
-  [[:error, :red], [:warn, :yellow]].each do |(method, color)|
-    it "##{method} logs message with color #{color}" do
-      @thor_mock.expects(:say_status).once.with do |action, msg, col|
-        msg == "#{method} message" && col == color
-      end
-      @logger.send method, "#{method} message"
-    end
-  end
-
-  it "logs error with red" do
-    @thor_mock.expects(:say_status).once.with do |action, msg, color|
-      msg == 'foobar' && color == :red
-    end
-    @logger.error 'foobar'
-  end
-end