Revision: 50552
Author: kim
Date: 2009-05-13 16:29:46 +0000 (Wed, 13 May 2009)
Log Message:
-----------
trademarks
Modified Paths:
--------------
trunk/wikiation/installer/LICENSE
trunk/wikiation/installer/installation_system.py
trunk/wikiation/installer/installer.py
trunk/wikiation/installer/installer_util.py
trunk/wikiation/installer/installers.py
trunk/wikiation/installer/isolation.py
trunk/wikiation/installer/mediawiki_installer.py
trunk/wikiation/installer/settings_handler.py
trunk/wikiation/installer/toolkit_installer.py
trunk/wikiation/installer/util/allnaive.py
Removed Paths:
-------------
trunk/wikiation/installer/settings.py.example
trunk/wikiation/installer/tests/
Modified: trunk/wikiation/installer/LICENSE
===================================================================
--- trunk/wikiation/installer/LICENSE 2009-05-13 16:29:11 UTC (rev 50551)
+++ trunk/wikiation/installer/LICENSE 2009-05-13 16:29:46 UTC (rev 50552)
@@ -1,4 +1,6 @@
-This software, copyright (C) 2008-2009 by Wikiation. This software is
developed by Kim Bruning.
+This software,
+Copyright (C) 2008-2009 by Wikiation. (Developed by Kim Bruning)
+Copyright (C) 2009 by Kim Bruning
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -17,5 +19,3 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
-Logo.png itself is a wikiation trademark and is (C) wikiation, all rights
reserved (same as the wikimedia or wikipedia logos)
Modified: trunk/wikiation/installer/installation_system.py
===================================================================
--- trunk/wikiation/installer/installation_system.py 2009-05-13 16:29:11 UTC
(rev 50551)
+++ trunk/wikiation/installer/installation_system.py 2009-05-13 16:29:46 UTC
(rev 50552)
@@ -17,7 +17,7 @@
An installation system understands how to install and uninstall
'things' (instances). An instance might be a particular wiki
(in the case of the mediawiki installer) or a particular
extension
- in that wiki (extension installer), or perhaps a tool from the
wikiation
+ in that wiki (extension installer), or perhaps a tool from the
toolkit.
Next to installing and uninstalling, an installer can also
determine
the status of an instance (installed or uninstalled), and can
provide
@@ -126,7 +126,7 @@
def installdir_name(self, installer_name):
"""returns the location of the .install directory for the given
installer_name.
An installer directory is where we store all the scripts to
install one particular
- extension, tool from the wikiation_toolkit, or etc. """
+ extension, tool from the toolkit, or etc. """
return os.path.join(self.subsystemdir,
installer_name+".install")
Modified: trunk/wikiation/installer/installer.py
===================================================================
--- trunk/wikiation/installer/installer.py 2009-05-13 16:29:11 UTC (rev
50551)
+++ trunk/wikiation/installer/installer.py 2009-05-13 16:29:46 UTC (rev
50552)
@@ -64,7 +64,7 @@
if len(args)<=1:
print \
"""available.mediawiki: installed.mediawiki:
-available.wikiation_toolkit: installed.wikiation_toolkit:
+available.toolkit: installed.toolkit:
available.scripted: installed.scripted: }
available.naive: installed.naive: } extensions
available.download: installer.download: }
@@ -80,6 +80,11 @@
"""install something"""
installers.install(args)
+def test(args):
+ """test something"""
+ installers.test(args)
+
+
def duplicate(args):
"""duplicate an instance"""
if len(args)!=3:
@@ -93,7 +98,7 @@
def update_self(args):
"""update self to newest revision, (and switch to interactive mode)"""
- print "This could cause the wikiation_installer to break. Are you sure?
Y/N"
+ print "This could cause the installer to break. Are you sure? Y/N"
answer=getch()
if answer.upper()=="Y":
print "Continuing..."
@@ -110,7 +115,7 @@
print "I'm not sure what to do with "+ (" ".join(args[1:]))
print "\n\n"
- print "wikiation_installer update attempted/completed. Restarting"
+ print "installer update attempted/completed. Restarting"
print "----------------------------------------------------------"
print "\n\n"
os.execl("/usr/bin/python","/usr/bin/python",__file__)
@@ -160,7 +165,8 @@
"check_isolation":check_isolation,
"update_self":update_self,
"update_tags":update_tags,
- "duplicate":duplicate
+ "duplicate":duplicate,
+ "test":test
}
# additional help texts for some commands.
Modified: trunk/wikiation/installer/installer_util.py
===================================================================
--- trunk/wikiation/installer/installer_util.py 2009-05-13 16:29:11 UTC (rev
50551)
+++ trunk/wikiation/installer/installer_util.py 2009-05-13 16:29:46 UTC (rev
50552)
@@ -1,6 +1,6 @@
# This software, copyright (C) 2008-2009 by Wikiation.
-# This software is developed by Kim Bruning.
-#
+# Copyright (C) 2009 Kim Bruning
+
# Distributed under the terms of the MIT license.
import sys, os
@@ -30,7 +30,7 @@
print subhelp[args[1]]
elif len(args)<=1:
print
- print "wikiation installer, interactive mode"
+ print "installer, interactive mode"
print "help: get help"
print "quit, exit: quit"
print "ls <path>: list information on available versions "
@@ -44,14 +44,14 @@
print "TODO: Implement help path , for now, see documentation
for info on how to specify <path>"
print
print "instead of interactive mode, you can also access
commands directly from the shell:"
- print "wikiation_installer command [args]..."
+ print "installer command [args]..."
else:
print 'no detailed help available'
def revision():
- """obtain revision number for wikiation_installer itself"""
+ """obtain revision number for installer itself"""
revision_string=None
os.chdir(settings.installerdir)
@@ -71,7 +71,7 @@
def intro():
"""a nice banner/intro text for interactive mode"""
- print "=== Wikiation installer (v. "+revision()+") ==="
+ print "=== Installer (v. "+revision()+") ==="
print
print "(last known safe version: 48528)"
print "Interactive mode.",
Modified: trunk/wikiation/installer/installers.py
===================================================================
--- trunk/wikiation/installer/installers.py 2009-05-13 16:29:11 UTC (rev
50551)
+++ trunk/wikiation/installer/installers.py 2009-05-13 16:29:46 UTC (rev
50552)
@@ -249,7 +249,7 @@
return value
def parse_path(path,defaults=None):
- ai=None # available, installed (and now revisions and tags too)
+ ai=None # available, installed (and now revisions and tags and test
too)
system=None # installation system
installer=None # installer from that installation system
in_installer=None # in which instance should we install?
@@ -369,7 +369,7 @@
# Constants
-systems={'wikiation_toolkit':Toolkit_Installer,'scripted': Scripted_Installer,
'mediawiki':Mediawiki_Installer,'naive': Naive_Installer,
'download':Download_Installer, 'extension':extension_installer2}
+systems={'toolkit':Toolkit_Installer,'scripted': Scripted_Installer,
'mediawiki':Mediawiki_Installer,'naive': Naive_Installer,
'download':Download_Installer, 'extension':extension_installer2}
if __name__=="__main__":
@@ -382,28 +382,28 @@
# print "ls available"
# ls2(["ls","available"])
# print
-# print "ls available/wikiation_toolkit"
-# ls2(["ls","available/wikiation_toolkit"])
+# print "ls available/toolkit"
+# ls2(["ls","available/toolkit"])
# print
-# print "ls installed/wikiation_toolkit"
-# ls2(["ls","installed/wikiation_toolkit"])
+# print "ls installed/toolkit"
+# ls2(["ls","installed/toolkit"])
# print
# print "get info"
-# system=get_system("wikiation_toolkit")
+# system=get_system("toolkit")
# system.get_info("pywikipedia")
#
# print "install"
# print "pywiki",repr(system.install("pywikipedia"))
-# print "exttest", repr(system.install("wikiation_exttest"))
-# print "isolation", repr(system.install("wikiation_check_isolation"))
+# print "exttest", repr(system.install("exttest"))
+# print "isolation", repr(system.install("check_isolation"))
# print "ls", os.listdir('..')
#
# print "uninstall"
# print "pywiki", repr(system.uninstall("pywikipedia"))
-# print "exttest", repr(system.uninstall("wikiation_exttest"))
-# print "isolation", repr(system.uninstall("wikiation_check_isolation"))
+# print "exttest", repr(system.uninstall("exttest"))
+# print "isolation", repr(system.uninstall("check_isolation"))
#
-# print "wikiation_extension (assumes existing wiki)"
+# print "extension (assumes existing wiki)"
# extension_installer=Scripted_Installer("REL1_13_3")
#
# print " \ uninstall " , repr (extension_installer.uninstall("ImageMap"))
@@ -447,7 +447,7 @@
# qls('installed.extension:in REL1_13_2')
# qls('installed.extension:in FOO')
# qls('installed.mediawiki:in FOO')
-# qls('available.wikiation')
-# qls('available.wikiation:in BAR as BAZ')
-# qls('available.wikiation:in BOG as BOT')
-# qls('available.wikiation:in BOG as BOT murp morp bla bla bla')
+# qls('available.toolkit')
+# qls('available.toolkit:in BAR as BAZ')
+# qls('available.toolkit:in BOG as BOT')
+# qls('available.toolkit:in BOG as BOT murp morp bla bla bla')
Modified: trunk/wikiation/installer/isolation.py
===================================================================
--- trunk/wikiation/installer/isolation.py 2009-05-13 16:29:11 UTC (rev
50551)
+++ trunk/wikiation/installer/isolation.py 2009-05-13 16:29:46 UTC (rev
50552)
@@ -6,10 +6,10 @@
import sys,os, os.path
import settings_handler as settings
-#support for wikiation_check_isolation
+#support for check_isolation
def _check_isolation(args):
- """wikiation_check_isolation: check diffs now"""
+ """check_isolation: check diffs now"""
difftest=settings.isolation_test
command=difftest+" "+" ".join(args)
exit_status=os.system(command)>>8
@@ -30,7 +30,7 @@
def difftests(target):
- """wikiation_check_isolation: store diffs, ready for testing later"""
+ """check_isolation: store diffs, ready for testing later"""
difftest=settings.isolation_create
command=difftest+" "+target
Modified: trunk/wikiation/installer/mediawiki_installer.py
===================================================================
--- trunk/wikiation/installer/mediawiki_installer.py 2009-05-13 16:29:11 UTC
(rev 50551)
+++ trunk/wikiation/installer/mediawiki_installer.py 2009-05-13 16:29:46 UTC
(rev 50552)
@@ -279,7 +279,7 @@
uniquesettings=settings.instancesdir+"/"+target+"/InstallerUniqueSettings.php"
unique=file(uniquesettings,"w")
unique.write('<?php\n')
- unique.write('$wgSitename = "Wikiation_'+target+'";\n')
+ unique.write('$wgSitename = "'+target+'";\n')
unique.write('$wgScriptPath = "'+settings.base_scriptpath+target+'";\n')
unique.write('$wgDBname = "'+target+'";\n')
unique.write('?>\n')
Deleted: trunk/wikiation/installer/settings.py.example
===================================================================
--- trunk/wikiation/installer/settings.py.example 2009-05-13 16:29:11 UTC
(rev 50551)
+++ trunk/wikiation/installer/settings.py.example 2009-05-13 16:29:46 UTC
(rev 50552)
@@ -1,51 +0,0 @@
-# This software, copyright (C) 2008-2009 by Wikiation.
-# This software is developed by Kim Bruning.
-#
-# Distributed under the terms of the MIT license.
-
-#Example settings file.
-
-import os
-
-# "You Are Here"
-installerdir=os.path.dirname(os.path.abspath(__file__))
-
-# where to find .install directories and the files contained therein
-installfiles=os.path.join(installerdir,'installfiles')
-
-
-# where to find mediawiki tags and trunk on svn
-tagsdir="http://svn.wikimedia.org/svnroot/mediawiki/tags";
-trunkdir="http://svn.wikimedia.org/svnroot/mediawiki/trunk";
-# we could alternately/additionally take a tag version for extensions. (future)
-extensionsdir=trunkdir+"/extensions"
-
-# where to install diverse revisions
-revisionsdir='/var/www/revisions'
-
-
-# base scriptpath for every installation (ie, where to reach the above over
the web)
-base_scriptpath="/revisions/"
-
-# where to install the toolkit
-toolkit_dir='/usr/local/wikiation'
-
-
-#where wikiation_check_isolation can be found
-isolation_create=toolkit_dir+'/wikiation_check_isolation/create_and_ul.sh'
-isolation_test=toolkit_dir+'/wikiation_check_isolation/dl_and_check.sh'
-
-# what mysql command should be used. (Who us? Use horrible hacks?)
-
-mysql_command="mysql -uroot"
-
-# run automated tests during installation
-# this is useful if you are in a testing environment.
-# If you are running production, you might want to leave
-# this set to False.
-run_automated_tests=False
-
-
-# Print debugging messages when executing insatller scripts
-# (off by default)
-debug=False
Modified: trunk/wikiation/installer/settings_handler.py
===================================================================
--- trunk/wikiation/installer/settings_handler.py 2009-05-13 16:29:11 UTC
(rev 50551)
+++ trunk/wikiation/installer/settings_handler.py 2009-05-13 16:29:46 UTC
(rev 50552)
@@ -17,6 +17,7 @@
# where to find .install directories and the files contained therein
installfiles=os.path.join(installerdir,'installfiles')
+testfiles=os.path.join(installerdir,'testfiles')
# where do we store the _tagcache file
tagcache=os.path.join(installerdir,"_tagcache")
@@ -36,12 +37,12 @@
base_scriptpath="/revisions/"
# where to install the toolkit
-toolkit_dir='/usr/local/wikiation'
+toolkit_dir='/usr/local/testing'
-#where wikiation_check_isolation can be found
-isolation_create=toolkit_dir+'/wikiation_check_isolation/create_and_ul.sh'
-isolation_test=toolkit_dir+'/wikiation_check_isolation/dl_and_check.sh'
+#where check_isolation can be found
+isolation_create=toolkit_dir+'/check_isolation/create_and_ul.sh'
+isolation_test=toolkit_dir+'/check_isolation/dl_and_check.sh'
# run automated tests during installation
# this is useful if you are in a testing environment.
# If you are running production, you might want to leave
Modified: trunk/wikiation/installer/toolkit_installer.py
===================================================================
--- trunk/wikiation/installer/toolkit_installer.py 2009-05-13 16:29:11 UTC
(rev 50551)
+++ trunk/wikiation/installer/toolkit_installer.py 2009-05-13 16:29:46 UTC
(rev 50552)
@@ -5,7 +5,7 @@
from installation_system import Installation_System
class Toolkit_Installer(Installation_System):
- system_name='wikiation_toolkit'
+ system_name='toolkit'
def __init__(self,instance=None):
Installation_System.__init__(self, instance)
self.destination_dir=settings.toolkit_dir
Modified: trunk/wikiation/installer/util/allnaive.py
===================================================================
--- trunk/wikiation/installer/util/allnaive.py 2009-05-13 16:29:11 UTC (rev
50551)
+++ trunk/wikiation/installer/util/allnaive.py 2009-05-13 16:29:46 UTC (rev
50552)
@@ -6,7 +6,7 @@
from naive_installer import Naive_Installer
-from wikiation_exttest import settings
+from exttest import settings
# settings
target_wiki='test'
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
