Rakefile in whirled_peas-0.6.0 vs Rakefile in whirled_peas-0.7.0

@@ -3,39 +3,29 @@
 
 RSpec::Core::RakeTask.new(:spec)
 
 def screen_test(file, method)
   raise ArgumentError, 'Missing argument: file' unless file
-
-  require 'bundler/setup'
-  require 'whirled_peas'
-  require_relative 'screen_test/screen_tester'
-
-  WhirledPeas::ScreenTester.new(file).send(method)
+  require_relative 'tools/whirled_peas/tools/screen_tester'
+  WhirledPeas::Tools::ScreenTester.new(file).send(method)
 end
 
 namespace :screen_test do
-  %i[template view run save debug].each do |t|
+  %i[template view run save update debug].each do |t|
     task t, [:file] do |_, args|
       screen_test(args[:file], t)
     end
   end
 
   task :update_all do
-    require 'bundler/setup'
-    require 'whirled_peas'
-    require_relative 'screen_test/screen_tester'
-
-    WhirledPeas::ScreenTester.update_all
+    require_relative 'tools/whirled_peas/tools/screen_tester'
+    WhirledPeas::Tools::ScreenTester.update_all
   end
 end
 
 task :screen_test do
-  require 'bundler/setup'
-  require 'whirled_peas'
-  require_relative 'screen_test/screen_tester'
-
-  WhirledPeas::ScreenTester.run_all
+  require_relative 'tools/whirled_peas/tools/screen_tester'
+  WhirledPeas::Tools::ScreenTester.run_all
 end
 
 task default: :ci
-task ci: [:screen_test, :spec]
+task ci: %i[spec screen_test]