diff --git a/lib/annotate/annotate_routes.rb b/lib/annotate/annotate_routes.rb index 31e2d5b63..37fc452ca 100644 --- a/lib/annotate/annotate_routes.rb +++ b/lib/annotate/annotate_routes.rb @@ -28,33 +28,34 @@ module AnnotateRoutes class << self def do_annotations(options = {}) - return unless routes_exists? - existing_text = File.read(routes_file) - - if rewrite_contents_with_header(existing_text, header(options), options) - puts "#{routes_file} annotated." + if routes_file_exist? + existing_text = File.read(routes_file) + if rewrite_contents_with_header(existing_text, header(options), options) + puts "#{routes_file} annotated." + end + else + puts "Can't find routes.rb" end end def remove_annotations(_options={}) - return unless routes_exists? - existing_text = File.read(routes_file) - content, header_position = strip_annotations(existing_text) - new_content = strip_on_removal(content, header_position) - new_text = new_content.join("\n") - - if rewrite_contents(existing_text, new_text) - puts "Removed annotations from #{routes_file}." + if routes_file_exist? + existing_text = File.read(routes_file) + content, header_position = strip_annotations(existing_text) + new_content = strip_on_removal(content, header_position) + new_text = new_content.join("\n") + if rewrite_contents(existing_text, new_text) + puts "Removed annotations from #{routes_file}." + end + else + puts "Can't find routes.rb" end end private - def routes_exists? - routes_exists = File.exists?(routes_file) - puts "Can't find routes.rb" unless routes_exists - - routes_exists + def routes_file_exist? + File.exist?(routes_file) end def routes_file diff --git a/spec/lib/annotate/annotate_routes_spec.rb b/spec/lib/annotate/annotate_routes_spec.rb index 2d2cd4eae..ed19b781d 100644 --- a/spec/lib/annotate/annotate_routes_spec.rb +++ b/spec/lib/annotate/annotate_routes_spec.rb @@ -28,7 +28,7 @@ def magic_comments_list_each end it 'should check if routes.rb exists' do - expect(File).to receive(:exists?).with(ROUTE_FILE).and_return(false) + expect(File).to receive(:exist?).with(ROUTE_FILE).and_return(false) expect(AnnotateRoutes).to receive(:puts).with("Can't find routes.rb") AnnotateRoutes.do_annotations end @@ -42,7 +42,7 @@ def magic_comments_list_each end before(:each) do - expect(File).to receive(:exists?).with(ROUTE_FILE).and_return(true).at_least(:once) + expect(File).to receive(:exist?).with(ROUTE_FILE).and_return(true).at_least(:once) expect(File).to receive(:read).with(ROUTE_FILE).and_return("").at_least(:once) @@ -164,7 +164,7 @@ def magic_comments_list_each describe 'When adding' do before(:each) do - expect(File).to receive(:exists?).with(ROUTE_FILE) + expect(File).to receive(:exist?).with(ROUTE_FILE) .and_return(true).at_least(:once) expect(AnnotateRoutes).to receive(:`).with('rake routes') .and_return('').at_least(:once) @@ -243,7 +243,7 @@ def magic_comments_list_each describe 'When adding with older Rake versions' do before(:each) do - expect(File).to receive(:exists?).with(ROUTE_FILE).and_return(true) + expect(File).to receive(:exist?).with(ROUTE_FILE).and_return(true) expect(AnnotateRoutes).to receive(:`).with('rake routes').and_return("(in /bad/line)\ngood line") expect(File).to receive(:open).with(ROUTE_FILE, 'wb').and_yield(mock_file) expect(AnnotateRoutes).to receive(:puts).with(ANNOTATION_ADDED) @@ -264,7 +264,7 @@ def magic_comments_list_each describe 'When adding with newer Rake versions' do before(:each) do - expect(File).to receive(:exists?).with(ROUTE_FILE).and_return(true) + expect(File).to receive(:exist?).with(ROUTE_FILE).and_return(true) expect(AnnotateRoutes).to receive(:`).with('rake routes').and_return("another good line\ngood line") expect(File).to receive(:open).with(ROUTE_FILE, 'wb').and_yield(mock_file) expect(AnnotateRoutes).to receive(:puts).with(ANNOTATION_ADDED) @@ -291,7 +291,7 @@ def magic_comments_list_each describe 'When removing' do before(:each) do - expect(File).to receive(:exists?).with(ROUTE_FILE).and_return(true) + expect(File).to receive(:exist?).with(ROUTE_FILE).and_return(true) expect(File).to receive(:open).with(ROUTE_FILE, 'wb').and_yield(mock_file) expect(AnnotateRoutes).to receive(:puts).with(ANNOTATION_REMOVED) end