Some core refactoring

docs/VERSION.txt

@@ -1,6 +1,9 @@
 0.7
 --
 
+* New slogan (at last)
+* All Milkbone.pm exports are by request only, except for register_hook
+* path function removed
 * Ticker runs in BList
 * Milkbone::Hooks works
 * Net-Demo mostly working

guid/tk.pl

@@ -6,6 +6,7 @@
 use strict;
 use warnings;
 
+use Milkbone qw(load_plugin);
 use Milkbone::Hooks qw(create_logon_prompt pre_mainloop mainloop
 		       post_mainloop);
 

lib/Milkbone.pm

@@ -15,7 +15,7 @@ require Exporter;
 
 # include the rest of the core
 use Milkbone::HookEntry;
-use Milkbone::Util;
+use Milkbone::Util qw(path slurp win32 nix nt loaded_files user_path strip_html);
 use Milkbone::Plugin;
 
 # equal to the version of the current milkbone release
@@ -27,13 +27,13 @@ our $FatalLog = "fatals.txt";
 push @INC, "./plugins";
 
 # exports
-our @ISA = qw( Exporter );
-our @EXPORT = qw(@Milkbone::Util::EXPORT hook is_running abort register_hook 
-		 option data slurp
-		 deregister_hook strip_html user_file set_option
-		 unload_plugin load_plugin reload_core reload_plugin
-		 nix win32 %ARGS);
-our @EXPORT_OK = qw(@Milkbone::Util::EXPORT_OK);
+our @ISA = qw(Exporter);
+our @EXPORT = (@Milkbone::Util::EXPORT, qw(hook is_running abort register_hook 
+		 option data deregister_hook strip_html user_file set_option
+		 unload_plugin reload_core reload_plugin
+		 nix win32 %ARGS path));
+our @EXPORT_OK = (@EXPORT, @Milkbone::Util::EXPORT_OK,
+		  qw(load_plugin));
 
 # global variables
 my ($running, $dirty);
@@ -47,29 +47,32 @@ $running = 1;
 # autoflushing on
 $| = 1;
 
+# This causes @EXPORT to be exported even when using import lists
+sub import {
+    Milkbone->export_to_level(1, @_, @EXPORT);
+}
+
 # returns a boolean indicating whether or not the core loop is running
-sub is_running
-{
-  $running;
+sub is_running {
+    $running;
 }
 
+
 # end the core loop and begin shutdown
-sub abort
-{
-  $running = 0;
-  print @_;
-  exit;
+sub abort {
+    $running = 0;
+    print @_;
+    exit;
 }
 
 # initialize the core
-sub init
-{
-  register_hook("load_plugins", \&load_plugins);
-  register_hook("pre_mainloop", \&pre_mainloop);
-  register_hook("post_mainloop", \&post_mainloop);
-  register_hook("save_options", \&save_options);
-  register_hook("loaded_plugins", \&plugin_list);
-  register_hook("error", \&error);
+sub init {
+    register_hook("load_plugins", \&load_plugins);
+    register_hook("pre_mainloop", \&pre_mainloop);
+    register_hook("post_mainloop", \&post_mainloop);
+    register_hook("save_options", \&save_options);
+    register_hook("loaded_plugins", \&plugin_list);
+    register_hook("error", \&error);
 }
 
 # ------------------------------------------
@@ -77,22 +80,22 @@ sub init
 # ------------------------------------------
 
 sub load_options
-{
-	my ($directive, $temp, @args);
-	my $file = $ARGS{-file} || "mb.conf";
-
-	open(GLOBAL, "<$file") or die "Can't open config file: $!";
-
-	while(<GLOBAL>)
+  {
+      my ($directive, $temp, @args);
+      my $file = $ARGS{-file} || "mb.conf";
+      
+      open(GLOBAL, "<$file") or die "Can't open config file: $!";
+      
+      while(<GLOBAL>)
 	{
-		next if /^\#/;
-		next if /^\s*\n/;
-
-		chomp;
-		
-		($directive, @args) = split /\s|\,/;
-
-		if(@args > 1)
+	    next if /^\#/;
+	    next if /^\s*\n/;
+	    
+	    chomp;
+	    
+	    ($directive, @args) = split /\s|\,/;
+	    
+	    if(@args > 1)
 		{
 			my @val = grep { !/^$/ } @args;
 			$options{$directive} = \@val;
@@ -167,12 +170,12 @@ sub prep_plugin
 
   return unless $plugin;
 
-  if(-e path("plugins/$plugin.pl")) {
+  if(-e "plugins/$plugin.pl") {
     # single-file plugin - no need for @INC setting
   }
-  elsif(-e path("plugins/$plugin") and -d path("plugins/$plugin")) {
+  elsif(-e "plugins/$plugin" and -d "plugins/$plugin") {
     # multi-file plugin - add its folder to @INC
-    unshift @INC, path("plugins/$plugin");
+    unshift @INC, "plugins/$plugin";
   }
   else {
     # plugin doesn't exist
@@ -189,7 +192,7 @@ sub init_plugin
 {
   my ($plugin) = @_;
   eval "require \"$plugin.pl\";";
-  error("Couldn't require $plugin.pl for $plugin: $@") if $@;
+  die "Couldn't require $plugin.pl for $plugin: $@" if $@;
 }
 
 # load one or more plugins

lib/Milkbone/Util.pm

@@ -8,8 +8,11 @@ package Milkbone::Util;
 use strict;
 use warnings;
 
+use Carp;
+
 our @ISA = qw(Exporter);
-our @EXPORT_OK = qw(slurp win32 nix nt loaded_files user_path strip_html);
+our @EXPORT = qw();
+our @EXPORT_OK = qw(slurp win32 nix nt loaded_files user_path strip_html path);
 
 # read a file in one big slurp
 sub slurp
@@ -99,4 +102,10 @@ sub loaded_files
     } grep s/^_<//, keys %main::;
 }
 
+sub path
+{
+  confess "Milkbone::path is deprecated";
+  return @_;
+}
+
 1;

plugins/Tk-BList/Milkbone/BList.pm

@@ -2,7 +2,7 @@
 
 package Milkbone::BList;
 
-use Milkbone;
+use Milkbone qw(slurp abort %ARGS);
 
 use warnings;
 use strict;

plugins/Tk-BList/Tk-BList.pl

@@ -4,7 +4,7 @@ use Tk;
 
 use Milkbone::BList;
 use Milkbone::Tree;
-use Milkbone;
+use Milkbone qw(slurp);
 
 use strict;
 use warnings;

plugins/Tk-GUI/Tk-GUI.pl

@@ -35,7 +35,7 @@ $mw->optionAdd("*highlightThickness", 0);
 
 $mw->optionAdd("*background", option("ThemeColor")) if(option("ThemeColor"));
 
-my $icon = $mw->Photo(-file => path("images/icon.bmp"));
+my $icon = $mw->Photo(-file => "images/icon.bmp");
 
 register_hook("tk_seticon", sub { $ARGS{-wnd}->Icon(-image => $icon); });
 register_hook("tk_get_default_font", sub { $defaultFont });

plugins/Tk-Logon/Milkbone/Logon.pm

@@ -13,7 +13,7 @@ Construct Tk::Widget 'MBLogon';
 
 my $mw = hook("tk_getmain");
 
-my $slogan = "when you run out of clever slogans,\n you get something like this";
+my $slogan = "earth!  wind!  water!  fire!  spirit!  MILKBONE!";
 
 sub ClassInit
 {