Christopher Allan Webber [Sun, 19 Jun 2011 21:43:23 +0000 (16:43 -0500)]
Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.
Basically, if we don't do this celery sets itself up before it should
and improperly. :\
Christopher Allan Webber [Sun, 19 Jun 2011 21:24:31 +0000 (16:24 -0500)]
Documenting the setup_globals function.
Christopher Allan Webber [Sun, 19 Jun 2011 21:23:17 +0000 (16:23 -0500)]
Document our new global objects added during the configobj branch
Christopher Allan Webber [Sun, 19 Jun 2011 21:22:41 +0000 (16:22 -0500)]
Merge remote branch 'remotes/elrond/idea/globals_check'
Conflicts:
mediagoblin/tests/test_globals.py
Christopher Allan Webber [Sun, 19 Jun 2011 21:03:13 +0000 (16:03 -0500)]
Reset the globals parameters while testing parameters
(This way we can be sure that the database is torn down if necessary
but this was the only test that passed last.)
Christopher Allan Webber [Sun, 19 Jun 2011 20:35:19 +0000 (15:35 -0500)]
Re-commenting-out lxml from setup.py
Clarifying that this is something to install from the package manager
and not via python setuptools itself.
Christopher Allan Webber [Sun, 19 Jun 2011 19:03:08 +0000 (14:03 -0500)]
Updated hacking howto to reflect our new, easier to run lazyserver.sh command.
Christopher Allan Webber [Sun, 19 Jun 2011 18:38:33 +0000 (13:38 -0500)]
./lazyserver.sh: launch a server in the most basic way possible
Looks for paster either in buildout or in virtualenv / on the path,
wherever it seems to be.
Christopher Allan Webber [Sun, 19 Jun 2011 18:00:49 +0000 (13:00 -0500)]
Actually we need pkg_resources again in test_celery_setup :)
This got removed in master at the same time that it got used in the
configobj branch...
Christopher Allan Webber [Sun, 19 Jun 2011 17:59:19 +0000 (12:59 -0500)]
Merge branch 'configobj'
Christopher Allan Webber [Sun, 19 Jun 2011 16:50:05 +0000 (11:50 -0500)]
Adjusting hackinghowto docs to reflect change in server/tests commands
Christopher Allan Webber [Sun, 19 Jun 2011 16:41:48 +0000 (11:41 -0500)]
Removing a couple of unused imports from util.py
Christopher Allan Webber [Sun, 19 Jun 2011 16:39:35 +0000 (11:39 -0500)]
Removing "paste config" phrasing where we're no longer using paste's config
Christopher Allan Webber [Sun, 19 Jun 2011 16:36:52 +0000 (11:36 -0500)]
renaming storage_system_from_paste_config()->storage_system_from_config()
As Elrond points out, this name doesn't make sense anymore since this
isn't based on the paste config. Thanks Elrond!
Christopher Allan Webber [Sun, 19 Jun 2011 16:10:45 +0000 (11:10 -0500)]
util.read_config_file() no longer needed; removing.
Christopher Allan Webber [Sun, 19 Jun 2011 01:15:46 +0000 (20:15 -0500)]
Preparing celery unit tests for new setup.
Instead of the previous passing in of dictionaries, we're actually
checking some example config files.
Christopher Allan Webber [Sun, 19 Jun 2011 01:14:51 +0000 (20:14 -0500)]
./bin/gmg commands upgraded to work with the new setup.
Christopher Allan Webber [Sun, 19 Jun 2011 01:14:33 +0000 (20:14 -0500)]
Nosetests should now be able to run using the new configobj / app init setup
Lots of changes:
- CELERY_CONFIG_FILE does not need to be set to the from_tests module
to run tests anymore, in fact it *should not be set at all* and is
specifically forbidden.
- moved around the configuration to the new 2-file format
- and generally adjusting the code appropriately.
Christopher Allan Webber [Sun, 19 Jun 2011 01:02:59 +0000 (20:02 -0500)]
Only kill the database if it's really set up.
Christopher Allan Webber [Sun, 19 Jun 2011 00:00:01 +0000 (19:00 -0500)]
It's a good idea for us to pass the application itself into mg_globals :)
Christopher Allan Webber [Sat, 18 Jun 2011 23:59:42 +0000 (18:59 -0500)]
Updating celery_setup.from_celery to use new config loading / app init
- The code for this is significantly simpler now. The app sets up
everything but celery, and from_celery finishes the job.
- There's no more specifying the mediagoblin section in the file,
which doesn't make sense anymore and was already confusing.
Christopher Allan Webber [Sat, 18 Jun 2011 23:31:56 +0000 (18:31 -0500)]
Removing option to set celery config section.
There's no real reason to support setting the celery config section;
so we'll just make it always ['celery'].
Christopher Allan Webber [Sat, 18 Jun 2011 23:30:14 +0000 (18:30 -0500)]
Removing type conversions from setup_celery_from_config.
These simply aren't needed any more, not now that the config validator
stuff does type conversion for us.
Also fixed the docstring to explain force_celery_always_eager.
Christopher Allan Webber [Sat, 18 Jun 2011 23:04:14 +0000 (18:04 -0500)]
Erk! Forgot to include the new mediagoblin.ini.
Christopher Allan Webber [Sat, 18 Jun 2011 22:59:38 +0000 (17:59 -0500)]
Move entire app structure over to using the new config system.
This is a huge change! This means several things.
- From the python point of view, launching the application is a heck
of a lot cleaner. You just need to pass in the config file path to
MediaGoblinApp's __init__() and whether or not this funtion should
setup celery and you're good.
- There are now two separate config files, separating the server
setup from the application setup.
- server.ini: the paste deploy config file, which configures the
applications and server setup but *NOT* the mediagoblin application
itself.
- mediagoblin.ini: where you configure mediagoblin (and possibly celery)
- Launching the application is now different. Instead of:
./bin/paster serve mediagoblin.ini --reload
We launch like:
./bin/paster serve server.ini --reload
Christopher Allan Webber [Sat, 18 Jun 2011 21:52:40 +0000 (16:52 -0500)]
Tests for mediagoblin.config functions
Tests for:
- read_mediagoblin_config()
- generate_validation_report()
Christopher Allan Webber [Sat, 18 Jun 2011 21:51:35 +0000 (16:51 -0500)]
CONFIG_SPEC_PATH should be config_spec here, fixing.
Christopher Allan Webber [Sat, 18 Jun 2011 20:29:16 +0000 (15:29 -0500)]
Removing unused pkg_resources import from test_celery_setup
Christopher Allan Webber [Sat, 18 Jun 2011 20:18:25 +0000 (15:18 -0500)]
Make REPORT_HEADER a unicode string also. Unicode everywhere, ideally!
Christopher Allan Webber [Sat, 18 Jun 2011 20:01:32 +0000 (15:01 -0500)]
Validation error reporting functionality.
Changed a few things so we can report errors to users properly in the
config loading system.
- We now return from read_mediagoblin_config both a loaded config and
the validation results
- We now have a helper function generate_validation_report that can
generate a proper validation report saying if there are errors in a
way that's useful to users.
- Moved conf->config in the read_mediagoblin_config function, which
looks nicer IMO.
Christopher Allan Webber [Sat, 18 Jun 2011 19:08:58 +0000 (14:08 -0500)]
Let's specifically import string_list()s in the config_spec.
Christopher Allan Webber [Sat, 18 Jun 2011 16:10:46 +0000 (11:10 -0500)]
Merge branch 'master' into configobj
Conflicts:
setup.py
Christopher Allan Webber [Fri, 17 Jun 2011 22:44:36 +0000 (17:44 -0500)]
We require lxml. Updating setup.py to reflect that.
Christopher Allan Webber [Fri, 17 Jun 2011 13:59:55 +0000 (08:59 -0500)]
Merge remote branch 'remotes/cmoylan/test_auth_views_364'
Chris Moylan [Fri, 17 Jun 2011 05:15:24 +0000 (00:15 -0500)]
logins are now somewhat tested
Chris Moylan [Fri, 17 Jun 2011 03:14:27 +0000 (22:14 -0500)]
added vim swapfiles to gitignore
Christopher Allan Webber [Fri, 17 Jun 2011 02:37:03 +0000 (21:37 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/is330'
cfdv [Thu, 16 Jun 2011 22:28:46 +0000 (17:28 -0500)]
adds link from gallery back to user page
cfdv [Sat, 11 Jun 2011 17:52:07 +0000 (12:52 -0500)]
adds link to user gallery in mediagoblin_header_right of user page
cfdv [Thu, 9 Jun 2011 05:30:42 +0000 (00:30 -0500)]
user_gallery controller calls render_to_reponse
cfdv [Tue, 7 Jun 2011 05:25:08 +0000 (00:25 -0500)]
adds routing.py and view.py changes
Caleb Forbes Davis V [Sat, 4 Jun 2011 01:36:51 +0000 (20:36 -0500)]
issue #330 - creates a user gallery template
Christopher Allan Webber [Thu, 16 Jun 2011 13:33:10 +0000 (08:33 -0500)]
Recommending --set-upstream when doing a git push to a feature branch.
This is nice because it means git will tell you when your branch is
ahead/behind by several commits, assuming you keep working on it.
Christopher Allan Webber [Thu, 16 Jun 2011 13:21:51 +0000 (08:21 -0500)]
Configuration file loading via ConfigObj.
Uses ConfigObj to open the config file. Also does validation via the
config spec, so defaults are provided, strings are interpolated, types
are converted.
Christopher Allan Webber [Thu, 16 Jun 2011 02:17:55 +0000 (21:17 -0500)]
Basic config "requirements" file.
Not used yet, but this will be used by ConfigObj to transform values,
set defaults, etc.
Christopher Allan Webber [Thu, 16 Jun 2011 02:14:00 +0000 (21:14 -0500)]
Require ConfigObj
Christopher Allan Webber [Tue, 14 Jun 2011 22:17:03 +0000 (17:17 -0500)]
Merge remote branch 'remotes/elrond/dev/workbench_class'
Elrond [Tue, 14 Jun 2011 18:39:14 +0000 (20:39 +0200)]
Move destroy_workbench to Workbench class
And add a lot of warnings, as the checks for "being part of
the main Manager" are all gone.
Elrond [Tue, 14 Jun 2011 18:01:39 +0000 (20:01 +0200)]
Drop WorkbenchManager.localized_file()
As Workbench has the localized_file() method, use this
everywhere and drop the wrapper method from
WorkbenchManager.
The processing code already did that.
Christopher Allan Webber [Tue, 14 Jun 2011 02:02:16 +0000 (21:02 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Tue, 14 Jun 2011 02:01:19 +0000 (21:01 -0500)]
A super strict HTML cleaner method with mediocre tests.
Will Kahn-Greene [Mon, 13 Jun 2011 16:31:23 +0000 (12:31 -0400)]
Adds local toc sections
* Some of our chapters are pretty long and this should make it much
easier for a user to find what they're looking for and jumping
to it. It's easier to read the section toc at the top of the
chapter, than it is to read it in the sidebar.
Will Kahn-Greene [Mon, 13 Jun 2011 16:24:52 +0000 (12:24 -0400)]
Updates version in docs
Christopher Allan Webber [Mon, 13 Jun 2011 14:08:18 +0000 (09:08 -0500)]
Already mentioned, but clarifying that branches should be localized to
a feature/bugfix/issue.
Will Kahn-Greene [Mon, 13 Jun 2011 02:46:25 +0000 (22:46 -0400)]
Tweaks git workflow structure
* minor tweaking of the headers of the git workflow to break
things up and organize them a bit better
Will Kahn-Greene [Mon, 13 Jun 2011 02:42:10 +0000 (22:42 -0400)]
Fixes git workflow
* overhauls the docs so they're (hopefully) clearer on the git
workflow
* adds text about putting things in bugfix branches, documenting
your work, and using the issue tracker
* adds a contrived example that uses aliens
Christopher Allan Webber [Sun, 12 Jun 2011 22:42:26 +0000 (17:42 -0500)]
Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'
Conflicts:
mediagoblin/process_media/__init__.py
Elrond [Sun, 12 Jun 2011 22:36:56 +0000 (00:36 +0200)]
Create a Workbench class and use it everywhere.
Some references to Workbench.dir look ugly, I'm happy to
hear suggestions there.
cfdv [Sun, 12 Jun 2011 22:35:07 +0000 (17:35 -0500)]
ensure color mode compatibility when making image thumbnails
Christopher Allan Webber [Sun, 12 Jun 2011 22:28:54 +0000 (17:28 -0500)]
First import of mg_globals as mgg, partly because I just wanted it to
be clear that it's okay to do by doing it *somewhere* :)
Christopher Allan Webber [Sun, 12 Jun 2011 22:27:37 +0000 (17:27 -0500)]
mediagoblin.globals->mediagoblin.mg_globals
Elrond [Sun, 12 Jun 2011 15:36:49 +0000 (17:36 +0200)]
Let setup_globals check for known globals
To avoid typos in calling setup_globals(), only allow
globals, which are already known to the system.
Plugins should have their own globals.
Christopher Allan Webber [Sun, 12 Jun 2011 14:16:12 +0000 (09:16 -0500)]
Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
Conflicts:
mediagoblin/celery_setup/from_celery.py
Christopher Allan Webber [Sun, 12 Jun 2011 14:11:39 +0000 (09:11 -0500)]
Merge remote branch 'remotes/elrond/idea/tests_kill_db'
Christopher Allan Webber [Sun, 12 Jun 2011 02:23:32 +0000 (21:23 -0500)]
possibly_localize_file->localized_file... a bit less terribly long.
Christopher Allan Webber [Sun, 12 Jun 2011 02:20:39 +0000 (21:20 -0500)]
Switch process_media over to using the workbench.
Christopher Allan Webber [Sun, 12 Jun 2011 02:20:26 +0000 (21:20 -0500)]
Don't bother returning whether or not we copied it or not, we can
figure that out by looking to see whether our storage is local or not.
Christopher Allan Webber [Sun, 12 Jun 2011 01:33:41 +0000 (20:33 -0500)]
Moving workbench out of process_media
Christopher Allan Webber [Sun, 12 Jun 2011 00:49:44 +0000 (19:49 -0500)]
Merge branch 'master' into workbench
Christopher Allan Webber [Sun, 12 Jun 2011 00:48:49 +0000 (19:48 -0500)]
Import mediagoblin.globals as mg_globals so we can be sure things are
set up in the right order.
Christopher Allan Webber [Sun, 12 Jun 2011 00:47:02 +0000 (19:47 -0500)]
Have the application set up instances of the WorkbenchManager.
Christopher Allan Webber [Sun, 12 Jun 2011 00:18:51 +0000 (19:18 -0500)]
test WorkbenchManager.possibly_localize_file()
Christopher Allan Webber [Sun, 12 Jun 2011 00:18:27 +0000 (19:18 -0500)]
We don't need this extra '.' in making the filename
Christopher Allan Webber [Sun, 12 Jun 2011 00:17:44 +0000 (19:17 -0500)]
Added a FakeRemoteStorage, for testing purposes
Christopher Allan Webber [Sat, 11 Jun 2011 23:52:48 +0000 (18:52 -0500)]
Make sure workbench won't kill directories out of scope.
Christopher Allan Webber [Sat, 11 Jun 2011 23:49:04 +0000 (18:49 -0500)]
Tests for creating/destroying workbenches
Christopher Allan Webber [Sat, 11 Jun 2011 22:28:58 +0000 (17:28 -0500)]
Wrote functions and documentation for all the WorkbenchManager
functions but haven't actually tested them yet. :)
Christopher Allan Webber [Sat, 11 Jun 2011 21:48:39 +0000 (16:48 -0500)]
Base structure of workbench manager
Christopher Allan Webber [Sat, 11 Jun 2011 17:04:30 +0000 (12:04 -0500)]
Adding a copy_locally() method to the StorageInterface and giving it a test.
Christopher Allan Webber [Sat, 11 Jun 2011 16:18:03 +0000 (11:18 -0500)]
Allow storage systems to be local and allow for a get_local_path
method if applicable.
Elrond [Fri, 10 Jun 2011 19:59:04 +0000 (21:59 +0200)]
Tests: Kill the whole testing database after all tests
nose allows setup and teardown functions at the package
level. So use this to drop the complete database after all
tests have finished.
Elrond [Fri, 10 Jun 2011 19:20:18 +0000 (21:20 +0200)]
celery_setup: drop param to setup_self and simplify OUR_MODULENAME
setup_self used to look like this:
setup_self(setup_globals_func=setup_globals)
The function isn't called with any param, so drop it.
Rewrite function as needed.
The module var OUR_MODULENAME just has the module's name in
it. This is available as __name__ anyway, so use this to
initialize the var.
Elrond [Wed, 8 Jun 2011 21:22:11 +0000 (23:22 +0200)]
Refactor filename generation in the public store
Just a small refactoring of the filename setup in the
public store. Very simple.
Christopher Allan Webber [Wed, 8 Jun 2011 01:39:51 +0000 (20:39 -0500)]
This attribute in quotes, too. :)
Christopher Allan Webber [Wed, 8 Jun 2011 01:38:05 +0000 (20:38 -0500)]
XML attributes must be in quotes!
Christopher Allan Webber [Tue, 7 Jun 2011 05:36:24 +0000 (00:36 -0500)]
Fixing check_filetype...
We need to check the first part of the guess_type returned tuple, and
also this try: except: doesn't belong here, so killing.
Christopher Allan Webber [Mon, 6 Jun 2011 12:57:05 +0000 (07:57 -0500)]
Added a comment to clarify that this shouldn't stay here.
Christopher Allan Webber [Mon, 6 Jun 2011 12:51:17 +0000 (07:51 -0500)]
Merge remote branch 'remotes/gandaro/324-bad-media-types'
Christopher Allan Webber [Mon, 6 Jun 2011 12:45:18 +0000 (07:45 -0500)]
A setup_fresh_app decorator which should make writing tests a bit easier.
Setting test_register_views() to use it also.
Christopher Allan Webber [Mon, 6 Jun 2011 12:44:12 +0000 (07:44 -0500)]
A clear_test_buckets() method
Christopher Allan Webber [Sun, 5 Jun 2011 23:16:31 +0000 (18:16 -0500)]
Docstring for test_register_views()
Christopher Allan Webber [Sun, 5 Jun 2011 23:14:48 +0000 (18:14 -0500)]
Make sure that two users with the same username can't register.
Christopher Allan Webber [Sun, 5 Jun 2011 22:49:43 +0000 (17:49 -0500)]
Email verification view test works
Christopher Allan Webber [Sun, 5 Jun 2011 22:39:47 +0000 (17:39 -0500)]
Make sure we can register, and then that we get the verification email
Christopher Allan Webber [Sun, 5 Jun 2011 22:35:20 +0000 (17:35 -0500)]
Use render_template utility so we can test whether or not this email
sends
Christopher Allan Webber [Sun, 5 Jun 2011 22:31:18 +0000 (17:31 -0500)]
Moved the verification url generation string template to a global variable
Christopher Allan Webber [Sun, 5 Jun 2011 21:43:25 +0000 (16:43 -0500)]
Make sure that get_test_app() really does wipe the database
Christopher Allan Webber [Sun, 5 Jun 2011 20:58:35 +0000 (15:58 -0500)]
Made a simple template rendering view and switched a bunch of code over to using it
Christopher Allan Webber [Sun, 5 Jun 2011 20:41:08 +0000 (15:41 -0500)]
I have a strong preference for aligning all parameters in a function call.
Christopher Allan Webber [Sun, 5 Jun 2011 20:36:51 +0000 (15:36 -0500)]
Merge remote branch 'remotes/elrond/idea/shortcuts'