From a56f8b170b9d372dcb342ab732677ad00da2b8d7 Mon Sep 17 00:00:00 2001 From: Cezary Baginski Date: Mon, 1 Aug 2016 22:35:07 +0200 Subject: [PATCH] fix RuboCop offenses --- Guardfile | 4 ++-- Rakefile | 8 ++++---- guard-livereload.gemspec | 2 +- lib/guard/livereload/reactor.rb | 4 ++-- lib/guard/livereload/version.rb | 2 +- lib/guard/livereload/websocket.rb | 2 +- spec/lib/guard/livereload/reactor_spec.rb | 11 +++++------ spec/lib/guard/livereload/snippet_spec.rb | 4 ++-- spec/lib/guard/livereload_spec.rb | 16 ++++++++-------- spec/spec_helper.rb | 1 - 10 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Guardfile b/Guardfile index a2b6079..f890fc5 100644 --- a/Guardfile +++ b/Guardfile @@ -1,13 +1,13 @@ group :specs, halt_on_fail: true do guard :rspec, cmd: 'bundle exec rspec', failed_mode: :keep, all_on_start: true do watch(%r{spec/.+_spec.rb}) - watch(%r{lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" } + watch(%r{lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" } watch('spec/spec_helper.rb') { 'spec' } watch('lib/guard/livereload/templates/Guardfile') { 'spec/lib/guard/livereload/template_spec.rb' } end guard :rubocop, all_on_start: false, cli: '--rails' do - watch(%r{.+\.rb$}) { |m| m[0] } + watch(/.+\.rb$/) { |m| m[0] } watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) } watch(%r{(?:.+/)?\.rubocop_todo\.yml$}) { |m| File.dirname(m[0]) } end diff --git a/Rakefile b/Rakefile index 423596a..8ed2725 100644 --- a/Rakefile +++ b/Rakefile @@ -1,9 +1,9 @@ -require "bundler/gem_tasks" +require 'bundler/gem_tasks' -require "rspec/core/rake_task" +require 'rspec/core/rake_task' def ci? - ENV["CI"] == "true" + ENV['CI'] == 'true' end RSpec::Core::RakeTask.new(:spec) do |t| @@ -13,7 +13,7 @@ end default_tasks = [:spec] unless ci? - require "rubocop/rake_task" + require 'rubocop/rake_task' RuboCop::RakeTask.new(:rubocop) default_tasks << :rubocop end diff --git a/guard-livereload.gemspec b/guard-livereload.gemspec index 363f549..ff9a74e 100644 --- a/guard-livereload.gemspec +++ b/guard-livereload.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.homepage = 'https://rubygems.org/gems/guard-livereload' s.license = 'MIT' - s.files = `git ls-files`.split($/) + s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR) s.test_files = s.files.grep(%r{^spec/}) s.require_path = 'lib' diff --git a/lib/guard/livereload/reactor.rb b/lib/guard/livereload/reactor.rb index 1a3e1cc..4e47735 100644 --- a/lib/guard/livereload/reactor.rb +++ b/lib/guard/livereload/reactor.rb @@ -73,8 +73,8 @@ def _connect(ws) ) @web_sockets << ws rescue - Compat::UI.error $! - Compat::UI.error $!.backtrace + Compat::UI.error $ERROR_INFO + Compat::UI.error $ERROR_INFO.backtrace end def _disconnect(ws) diff --git a/lib/guard/livereload/version.rb b/lib/guard/livereload/version.rb index 00ca674..9808482 100644 --- a/lib/guard/livereload/version.rb +++ b/lib/guard/livereload/version.rb @@ -1,5 +1,5 @@ module Guard module LiveReloadVersion - VERSION = '2.5.1' + VERSION = '2.5.1'.freeze end end diff --git a/lib/guard/livereload/websocket.rb b/lib/guard/livereload/websocket.rb index b90ee7b..317e42c 100644 --- a/lib/guard/livereload/websocket.rb +++ b/lib/guard/livereload/websocket.rb @@ -25,7 +25,7 @@ def dispatch(data) path = payload stream_file_data(path).callback { close_connection_after_writing } else - fail "Unknown response type: #{type.inspect}" + raise "Unknown response type: #{type.inspect}" end end end diff --git a/spec/lib/guard/livereload/reactor_spec.rb b/spec/lib/guard/livereload/reactor_spec.rb index a48aed9..68b16b7 100644 --- a/spec/lib/guard/livereload/reactor_spec.rb +++ b/spec/lib/guard/livereload/reactor_spec.rb @@ -1,5 +1,5 @@ RSpec.describe Guard::LiveReload::Reactor do - let(:paths) { %w[stylesheets/layout.css stylesheets/style.css] } + let(:paths) { %w(stylesheets/layout.css stylesheets/style.css) } before do allow(Guard::Compat::UI).to receive(:info) @@ -10,8 +10,8 @@ describe '#reload_browser(paths = [])' do it 'displays a message' do - expect(Guard::Compat::UI).to receive(:info). - with('Reloading browser: stylesheets/layout.css stylesheets/style.css') + expect(Guard::Compat::UI).to receive(:info) + .with('Reloading browser: stylesheets/layout.css stylesheets/style.css') new_live_reactor.reload_browser(paths) end @@ -21,8 +21,8 @@ end it 'optionally pushes notification' do - expect(Guard::Compat::UI).to receive(:notify). - with(kind_of(String), have_key(:title)) + expect(Guard::Compat::UI).to receive(:notify) + .with(kind_of(String), have_key(:title)) new_live_reactor(notify: true).reload_browser(paths) end @@ -63,7 +63,6 @@ end.to change { reactor.connections_count }.from(0).to 1 end end - end def new_live_reactor(options = {}) diff --git a/spec/lib/guard/livereload/snippet_spec.rb b/spec/lib/guard/livereload/snippet_spec.rb index 66db77a..951a882 100644 --- a/spec/lib/guard/livereload/snippet_spec.rb +++ b/spec/lib/guard/livereload/snippet_spec.rb @@ -10,11 +10,11 @@ before do allow(File).to receive(:expand_path) do |*args| - fail "stub called for File.expand_path(#{args.map(&:inspect) * ','})" + raise "stub called for File.expand_path(#{args.map(&:inspect) * ','})" end allow(IO).to receive(:read) do |*args| - fail "stub called for IO.read(#{args.map(&:inspect) * ','})" + raise "stub called for IO.read(#{args.map(&:inspect) * ','})" end allow(IO).to receive(:read).with(template).and_return(contents) diff --git a/spec/lib/guard/livereload_spec.rb b/spec/lib/guard/livereload_spec.rb index aa2f96d..48804e1 100644 --- a/spec/lib/guard/livereload_spec.rb +++ b/spec/lib/guard/livereload_spec.rb @@ -9,12 +9,12 @@ before do allow(File).to receive(:expand_path) do |*args| - fail "stub called for File.expand_path(#{args.map(&:inspect) * ','})" + raise "stub called for File.expand_path(#{args.map(&:inspect) * ','})" end - allow(File).to receive(:expand_path). - with('../../../js/livereload.js.erb', anything). - and_return('/foo/js/livereload.js.erb') + allow(File).to receive(:expand_path) + .with('../../../js/livereload.js.erb', anything) + .and_return('/foo/js/livereload.js.erb') allow(Guard::LiveReload::Snippet).to receive(:new).and_return(snippet) @@ -93,8 +93,8 @@ end it 'evalutes the default snippet' do - expect(Guard::LiveReload::Snippet).to receive(:new). - with('/foo/js/livereload.js.erb', anything).and_return(snippet) + expect(Guard::LiveReload::Snippet).to receive(:new) + .with('/foo/js/livereload.js.erb', anything).and_return(snippet) subject end end @@ -107,8 +107,8 @@ end it 'evalutes the provided snippet' do - expect(Guard::LiveReload::Snippet).to receive(:new). - with('foo/bar.js.erb', anything).and_return(snippet) + expect(Guard::LiveReload::Snippet).to receive(:new) + .with('foo/bar.js.erb', anything).and_return(snippet) subject end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bde0105..717f045 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,7 +5,6 @@ require 'guard/livereload' RSpec.configure do |config| - def ci? ENV['CI'] == 'true' end