lib/make_menu.rb in make_menu-0.1.1 vs lib/make_menu.rb in make_menu-1.0.0

@@ -1,34 +1,16 @@
-require_relative 'make_menu/color_string'
+# frozen_string_literal: true
+
+require_relative 'make_menu/console/color_string'
 require_relative 'make_menu/menu'
 
 require 'tty-screen'
 
 module MakeMenu
-  String.include MakeMenu::ColorString
+  String.include MakeMenu::Console::ColorString
 
-  def self.run
-    # Allows CTRL+C to return to the menu instead of exiting the script
-    trap('SIGINT') { throw StandardError }
+  trap('SIGINT') { throw StandardError }
 
-    makefile = ENV.fetch('MAKEFILE', './Makefile')
-
-    if (menu_name = ENV.fetch('MENU', nil))
-      require "./#{menu_name.downcase}_menu.rb"
-      Object.const_get("#{menu_name.capitalize}Menu").new(makefile).run
-    else
-      MakeMenu::Menu.new(makefile).run
-    end
-
-  rescue LoadError, NameError => _e
-    puts
-    puts 'No customisation class found!'.red.bold
-    puts
-    puts 'Expected file:'
-    puts "    ./#{menu_name.downcase}_menu.rb".cyan
-    puts
-    puts 'To define class:'
-    puts "    #{menu_name.capitalize}Menu < MakeMenu::Menu".yellow
-    puts
-    exit 1
+  def self.run(makefile = './Makefile', &block)
+    MakeMenu::Menu.new(makefile).run(&block)
   end
-end
\ No newline at end of file
+end