Navigation

← Previous Changeset
Next Changeset →

Changeset 198

Timestamp:

03/26/07 19:25:59 (1 year ago)

Author:

ingy

Message:

 r3683@skinny:  ingy | 2007-03-26 19:23:03 -0700
 Get Spork working under K2.

Files:

trunk/lib/Kwiki/Boot/Base.pm (deleted)
trunk/lib/Kwiki/Paths.pm (deleted)
trunk/lib/Spoon/Boot (added)
trunk/lib/Spoon/Boot/Base.pm (added)
trunk/lib/Spoon/Paths.pm (added)
trunk/lib/Spork/Boot (added)
trunk/lib/Spork/Boot.pm (added)
trunk/lib/Spork/Boot/V1.pm (added)
trunk/lib/Spork/Paths.pm (added)
trunk/src/core/Kwiki/kwiki (modified) (1 diff)
trunk/src/core/Kwiki/lib/Kwiki/Boot/Base.pm (deleted)
trunk/src/core/Kwiki/lib/Kwiki/Boot/V1.pm (modified) (1 diff)
trunk/src/core/Kwiki/lib/Kwiki/Boot/V2.pm (modified) (1 diff)
trunk/src/core/Kwiki/lib/Kwiki/Paths.pm (deleted)
trunk/src/core/Kwiki/lib/Kwiki/Paths/V1.pm (modified) (1 diff)
trunk/src/core/Kwiki/lib/Kwiki/Paths/V2.pm (modified) (1 diff)
trunk/src/core/Spoon/lib/Spoon/Boot (added)
trunk/src/core/Spoon/lib/Spoon/Boot/Base.pm (added)
trunk/src/core/Spoon/lib/Spoon/Paths.pm (added)
trunk/src/core/Spork/lib/Spork/Boot (added)
trunk/src/core/Spork/lib/Spork/Boot.pm (added)
trunk/src/core/Spork/lib/Spork/Boot/V1.pm (added)
trunk/src/core/Spork/lib/Spork/Config.pm (modified) (1 diff)
trunk/src/core/Spork/lib/Spork/Paths.pm (added)
trunk/src/core/Spork/spork (modified) (1 diff)
trunk/src/core/modules.mk (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/core/Kwiki/kwiki

r178	r198
55	55	use lib grep { -e } split /:/, $ENV{KWIKI_LIB_PATH} \|\| 'lib';
56	56	use Kwiki::Boot;
57		Kwiki::Boot->boot->~~kwiki~~->hub->command->process(@ARGV)->hub->remove_hooks;
	57	Kwiki::Boot->boot->main->hub->command->process(@ARGV)->hub->remove_hooks;
58	58
59	59	__END__

trunk/src/core/Kwiki/lib/Kwiki/Boot/V1.pm

r194	r198
1	1	package Kwiki::Boot::V1;
2		use ~~Kwiki~~::Boot::Base -Base;
	2	use Spoon::Boot::Base -Base;
3	3
4	4	const main_class => 'Kwiki';
5	5	const config_class => 'Kwiki::Config';
6	6	const hub_class => 'Kwiki::Hub';
	7
	8	sub kwiki { $self->main(@_) }
7	9
8	10	sub add_configs_files {

trunk/src/core/Kwiki/lib/Kwiki/Boot/V2.pm

r194	r198
1	1	package Kwiki::Boot::V2;
2		use ~~Kwiki~~::Boot::Base -Base;
	2	use Spoon::Boot::Base -Base;
3	3
4	4	const main_class => 'Kwiki';
5	5	const config_class => 'Kwiki::Config';
6	6	const hub_class => 'Kwiki::Hub';
	7
	8	sub kwiki { $self->main(@_) }
7	9
8	10	sub add_configs_files {

trunk/src/core/Kwiki/lib/Kwiki/Paths/V1.pm

r194 r198

1 1 package Kwiki::Paths::V1;
2 use ~~Kwiki~~::Paths -Base;
2 use Spoon::Paths -Base;
3 3
4 4 sub path_values_init {
trunk/src/core/Kwiki/lib/Kwiki/Paths/V2.pm

r194 r198

1 1 package Kwiki::Paths::V2;
2 use ~~Kwiki~~::Paths -Base;
2 use Spoon::Paths -Base;
3 3
4 4 field 'all_paths_cache';

trunk/src/core/Spork/lib/Spork/Config.pm

r168	r198
19	19	sub default_classes {
20	20	(
	21	command_class => 'Spork::Command',
21	22	config_class => 'Spork::Config',
	23	formatter_class => 'Spork::Formatter',
	24	hooks_class => 'Spoon::Hooks',
	25	hub_class => 'Spork::Hub',
22	26	registry_class => 'Spork::Registry',
23		hub_class => 'Spork::Hub',
24		formatter_class => 'Spork::Formatter',
	27	slides_class => 'Spork::Slides',
25	28	template_class => 'Spork::Template::TT2',
26		command_class => 'Spork::Command',
27		slides_class => 'Spork::Slides',
28		hooks_class => 'Spoon::Hooks',
	29
29	30	# For Kwiki Plugins:
	31	cache_class => 'Kwiki::Cache',
30	32	cgi_class => 'Kwiki::CGI',
	33	css_class => 'Kwiki::CSS',
	34	javascript_class => 'Kwiki::Javascript',
	35	kwiki_command_class => 'Kwiki::Command',
31	36	pages_class => 'Kwiki::Pages',
32	37	preferences_class => 'Kwiki::Preferences',
33		~~css_class => 'Kwiki::CSS',~~
34		~~javascript_class => 'Kwiki::Javascript',~~
35		~~cache_class => 'Kwiki::Cache',~~
36		~~kwiki_command_class => 'Kwiki::Command',~~
37	38	)
38	39	}

trunk/src/core/Spork/spork

r168	r198
1		#!/usr/bin/perl -w
	1	#!/usr/bin/env perl
	2	use 5.008003;
2	3	use strict;
3		use warnings;
4		use Spork;
5		our $VERSION = '0.19';
	4	our $VERSION = '0.20';
	5	use Cwd 'cwd', 'abs_path';
	6	use FindBin;
	7	use Config;
6	8
7		use lib 'lib';
8		Spork->new->load_hub->command->process(@ARGV);
	9	sub find_base {
	10	return $ENV{SPORK_BASE} if defined $ENV{SPORK_BASE};
	11
	12	my $base = $FindBin::Bin;
	13	my $bin = $0;
	14	$bin =~ s/.*\///;
	15	$bin = "$base/$bin";
	16	my $home = cwd();
	17	while (-l $bin) {
	18	chdir $base;
	19	$bin = abs_path(readlink $bin);
	20	$base = $bin;
	21	$base =~ s/(.)\/./$1/;
	22	}
	23	chdir $home;
	24	$base = abs_path("$base/../../..");
	25
	26	die "ERROR: Can't locate Spork base repository."
	27	unless -d "$base/lib/Spork" and -d "$base/src/core/Spork";
	28	$ENV{SPORK_BASE} = $base;
	29	return $base;
	30	}
	31
	32	BEGIN {
	33	my @env_files = qw(spork.env);
	34	push @env_files, "$ENV{HOME}/.sporkrc/spork.env" if defined $ENV{HOME};
	35	my $fh;
	36	for (@env_files) {
	37	if (open $fh, $_) {
	38	do {
	39	$ENV{$1} \|\|= $2 if /^(\w+)\s=\s['"]?(.?)['"]?\s$/;
	40	} for <$fh>;
	41	last;
	42	}
	43	}
	44
	45	if ($ENV{SPORK_TEST_CLEAN}) {
	46	@INC = (
	47	$Config::Config{archlib},
	48	$Config::Config{privlib},
	49	);
	50	}
	51
	52	$ENV{SPORK_LIB_PATH} \|\|= find_base() . "/lib";
	53	}
	54
	55	use lib grep { -e } split /:/, $ENV{SPORK_LIB_PATH} \|\| 'lib';
	56	use Spork::Boot;
	57	Spork::Boot->boot->main->hub->command->process(@ARGV);
	58
	59	=comment
	60	Lastlog:
	61	12:52 < lamech> no. Spork. not Spoon. sorry.
	62	12:53 < lamech> point being Spork's makefile doesn't specify Kwiki::Cache, it
	63	specifies Kwiki, so you have to install Kwiki::Cache separately after
	64	guessing.
	65	13:04 < ingy> lamech: do you have spork working?
	66	13:05 < ingy> I have pulled the spork code into
	67	http://svn.kwiki.org/kwiki/trunk/
	68	13:06 < ingy> need to get Spork working in there
	69	13:06 < diotalevi> Oh btw, I just consulted my notes from the last time I tried
	70	using Spork. plugin_classes can't be set in
	71	my-presentation/config.yaml just throws errors so it has to be set at
	72	~/.sporkrc/config.yaml.
	73	13:07 < ingy> yeah, I need to decide whether or not I will use spork next week
	74	in YAPC::Tokyo
	75	13:40 < diotalevi> Hey lamech, maybe you also want to see
	76	http://perlmonks.org/?node_id=516229 about Spork.
	77	=cut
9	78
10	79	__END__

trunk/src/core/modules.mk

r194	r198
12	12	Spiffy \
13	13	Spoon \
	14	Spoon/Boot \
14	15	Spork \
	16	Spork/Boot \
15	17	Spork/Config \
16	18	Spork/Formatter \
…	…
59	61	Kwiki/Pages.pm \
60	62	Kwiki/Pane.pm \
61		~~Kwiki/Paths.pm \~~
62	63	Kwiki/Plugin.pm \
63	64	Kwiki/Preferences.pm \
…	…
85	86	Spoon/Installer.pm \
86	87	Spoon/MetadataObject.pm \
	88	Spoon/Paths.pm \
87	89	Spoon/Plugin.pm \
88	90	Spoon/Registry.pm \
…	…
90	92	Spoon/Trace.pm \
91	93	Spoon/Utils.pm \
	94	Spork/Boot.pm \
92	95	Spork/Command.pm \
93	96	Spork/Config.pm \
94	97	Spork/Formatter.pm \
95	98	Spork/Hub.pm \
	99	Spork/Paths.pm \
96	100	Spork/Plugin.pm \
97	101	Spork/Registry.pm \
…	…
139	143	IO/All/Temp.pm \
140	144	Kwiki/Archive/Simple.pm \
141		~~Kwiki/Boot/Base.pm \~~
142	145	Kwiki/Boot/V1.pm \
143	146	Kwiki/Boot/V2.pm \
…	…
149	152	Kwiki/Paths/V2.pm \
150	153	Kwiki/Theme/Basic.pm \
	154	Spoon/Boot/Base.pm \
	155	Spork/Boot/V1.pm \
151	156	Spork/Config/Default.pm \
152	157	Spork/Formatter/Autringy.pm \

r194	r198
1	1	package Kwiki::Paths::V1;
2		use ~~Kwiki~~::Paths -Base;
	2	use Spoon::Paths -Base;
3	3
4	4	sub path_values_init {

r194	r198
1	1	package Kwiki::Paths::V2;
2		use ~~Kwiki~~::Paths -Base;
	2	use Spoon::Paths -Base;
3	3
4	4	field 'all_paths_cache';

Navigation

Changeset 198

Legend:

Download in other formats: