5251 Commits

Author SHA1 Message Date
Christopher Allan Webber
623bee73b1 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.
2011-06-18 20:14:33 -05:00
Christopher Allan Webber
908d045939 Only kill the database if it's really set up. 2011-06-18 20:02:59 -05:00
Christopher Allan Webber
becb77ee8c It's a good idea for us to pass the application itself into mg_globals :) 2011-06-18 19:00:01 -05:00
Christopher Allan Webber
924c586b72 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.
2011-06-18 18:59:42 -05:00
Jef van Schendel
76e21adbd8 Merge remote-tracking branch 'gitorious/master' 2011-06-19 01:44:26 +02:00
Christopher Allan Webber
52f20ff337 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'].
2011-06-18 18:31:56 -05:00
Christopher Allan Webber
d01744dd75 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.
2011-06-18 18:30:14 -05:00
Christopher Allan Webber
8d808c1fa1 Erk! Forgot to include the new mediagoblin.ini. 2011-06-18 18:04:14 -05:00
Christopher Allan Webber
3f5cf663c0 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
2011-06-18 17:59:38 -05:00
Christopher Allan Webber
d5234024b0 Tests for mediagoblin.config functions
Tests for:
  - read_mediagoblin_config()
  - generate_validation_report()
2011-06-18 16:52:40 -05:00
Christopher Allan Webber
e5aa1ec6b4 CONFIG_SPEC_PATH should be config_spec here, fixing. 2011-06-18 16:51:35 -05:00
cfdv
630b57a366 baby step towards enabling profile edits
adds
* url and bio fields to database
* form for editing the user profile
* route to the edit profile controller
* view for the profile editing page
* template for the profile editing page
* link to edit profile in the welcome page

still needs
* thorough inspection to see if it makes sense
* tests
* ?
2011-06-18 16:42:22 -05:00
Christopher Allan Webber
f2f3fe33e9 Removing unused pkg_resources import from test_celery_setup 2011-06-18 15:29:16 -05:00
Christopher Allan Webber
9dba44de84 Make REPORT_HEADER a unicode string also. Unicode everywhere, ideally! 2011-06-18 15:18:25 -05:00
Christopher Allan Webber
4fd487f72e 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.
2011-06-18 15:01:32 -05:00
cfdv
279d925e75 adds user bio and website url fields to the database 2011-06-18 15:00:05 -05:00
Christopher Allan Webber
efc8f1a0d0 Let's specifically import string_list()s in the config_spec. 2011-06-18 14:08:58 -05:00
Christopher Allan Webber
c897283849 Merge branch 'master' into configobj
Conflicts:
	setup.py
2011-06-18 11:10:46 -05:00
cfdv
e8fda91bc2 fixes uneven whitespace, and conforms to a strong preference for
less than 80 characters per line
2011-06-17 22:26:17 -05:00
cfdv
4869343739 adds global link to user's home page in the base.html template
Issue #315 (add bio and website to user page)
  * enable profile edits
  * provide place in user's home page for details to appear
2011-06-17 22:11:25 -05:00
Christopher Allan Webber
5a994e37c2 We require lxml. Updating setup.py to reflect that. 2011-06-17 17:44:36 -05:00
Jef van Schendel
d81b39da4c Merge remote-tracking branch 'gitorious/master' 2011-06-17 23:11:20 +02:00
Christopher Allan Webber
d4ff1606c3 Merge remote branch 'remotes/cmoylan/test_auth_views_364' 2011-06-17 08:59:55 -05:00
Chris Moylan
757690cc2e logins are now somewhat tested 2011-06-17 00:15:24 -05:00
Chris Moylan
8af8e3c1a9 added vim swapfiles to gitignore 2011-06-16 22:14:27 -05:00
Christopher Allan Webber
e307eb42b6 Merge remote branch 'remotes/gullydwarf-cfdv/is330' 2011-06-16 21:37:03 -05:00
cfdv
4cf2287a11 adds link from gallery back to user page 2011-06-16 17:28:46 -05:00
cfdv
850746677f adds link to user gallery in mediagoblin_header_right of user page 2011-06-16 13:00:41 -05:00
cfdv
4b5f5a08d3 user_gallery controller calls render_to_reponse 2011-06-16 13:00:11 -05:00
cfdv
184f2240cb adds routing.py and view.py changes 2011-06-16 12:59:48 -05:00
Caleb Forbes Davis V
d49cf0e29c issue #330 - creates a user gallery template 2011-06-16 12:51:26 -05:00
Christopher Allan Webber
595944d464 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.
2011-06-16 08:33:10 -05:00
Christopher Allan Webber
e2c6436e3e 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.
2011-06-16 08:21:51 -05:00
Christopher Allan Webber
0fcfff5a3a Basic config "requirements" file.
Not used yet, but this will be used by ConfigObj to transform values,
set defaults, etc.
2011-06-15 21:17:55 -05:00
Christopher Allan Webber
f970e6e5df Require ConfigObj 2011-06-15 21:14:00 -05:00
Jef van Schendel
bb770e295c Merge remote-tracking branch 'gitorious/master' 2011-06-15 23:25:47 +02:00
Joar Wandborg
44e51d3464 Made changes according to http://bugs.foocorp.net/issues/363#note-5 2011-06-15 23:07:54 +02:00
Joar Wandborg
9e883ed3b2 Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin 2011-06-15 22:18:24 +02:00
Christopher Allan Webber
0e9dd2a286 Merge remote branch 'remotes/elrond/dev/workbench_class' 2011-06-14 17:17:03 -05:00
Elrond
b67a983a02 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.
2011-06-14 20:39:14 +02:00
Elrond
8bfa533f8b 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.
2011-06-14 20:01:39 +02:00
Christopher Allan Webber
3fd659e0eb Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-06-13 21:02:16 -05:00
Christopher Allan Webber
a68ee5556e A super strict HTML cleaner method with mediocre tests. 2011-06-13 21:01:19 -05:00
Will Kahn-Greene
6729d65a32 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.
2011-06-13 12:31:23 -04:00
Will Kahn-Greene
03db7d6c74 Updates version in docs 2011-06-13 12:25:15 -04:00
Christopher Allan Webber
1e85d28e01 Already mentioned, but clarifying that branches should be localized to
a feature/bugfix/issue.
2011-06-13 09:08:18 -05:00
Will Kahn-Greene
fb6924170d Tweaks git workflow structure
* minor tweaking of the headers of the git workflow to break
  things up and organize them a bit better
2011-06-12 22:46:25 -04:00
Will Kahn-Greene
909c639d07 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
2011-06-12 22:43:19 -04:00
Christopher Allan Webber
48a7ba1e1c Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'
Conflicts:
	mediagoblin/process_media/__init__.py
2011-06-12 17:42:26 -05:00
Elrond
52426ae01f Create a Workbench class and use it everywhere.
Some references to Workbench.dir look ugly, I'm happy to
hear suggestions there.
2011-06-13 00:39:41 +02:00