diff --git a/Gemfile b/Gemfile index 770a84a0..aef242a4 100644 --- a/Gemfile +++ b/Gemfile @@ -45,8 +45,8 @@ gem 'recurring_select' # we use the git version of acts_as_versioned, and need to include it in this Gemfile gem 'acts_as_versioned', github: 'technoweenie/acts_as_versioned' -gem 'foodsoft_wiki', path: 'lib/foodsoft_wiki' -gem 'foodsoft_messages', path: 'lib/foodsoft_messages' +gem 'foodsoft_wiki', path: 'plugins/wiki' +gem 'foodsoft_messages', path: 'plugins/messages' group :production do gem 'exception_notification' diff --git a/Gemfile.lock b/Gemfile.lock index 0e46c75c..2d47c431 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,14 +19,14 @@ GIT ice_cube (0.12.1) PATH - remote: lib/foodsoft_messages + remote: plugins/messages specs: foodsoft_messages (0.0.1) deface (~> 1.0.0) rails PATH - remote: lib/foodsoft_wiki + remote: plugins/wiki specs: foodsoft_wiki (0.0.1) acts_as_versioned diff --git a/lib/foodsoft_messages/README.md b/plugins/messages/README.md similarity index 100% rename from lib/foodsoft_messages/README.md rename to plugins/messages/README.md diff --git a/lib/foodsoft_messages/Rakefile b/plugins/messages/Rakefile similarity index 100% rename from lib/foodsoft_messages/Rakefile rename to plugins/messages/Rakefile diff --git a/lib/foodsoft_messages/app/controllers/messages_controller.rb b/plugins/messages/app/controllers/messages_controller.rb similarity index 100% rename from lib/foodsoft_messages/app/controllers/messages_controller.rb rename to plugins/messages/app/controllers/messages_controller.rb diff --git a/lib/foodsoft_messages/app/helpers/messages_helper.rb b/plugins/messages/app/helpers/messages_helper.rb similarity index 100% rename from lib/foodsoft_messages/app/helpers/messages_helper.rb rename to plugins/messages/app/helpers/messages_helper.rb diff --git a/lib/foodsoft_messages/app/mailers/messages_mailer.rb b/plugins/messages/app/mailers/messages_mailer.rb similarity index 100% rename from lib/foodsoft_messages/app/mailers/messages_mailer.rb rename to plugins/messages/app/mailers/messages_mailer.rb diff --git a/lib/foodsoft_messages/app/models/message.rb b/plugins/messages/app/models/message.rb similarity index 100% rename from lib/foodsoft_messages/app/models/message.rb rename to plugins/messages/app/models/message.rb diff --git a/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface b/plugins/messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface rename to plugins/messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/admin/ordergroups/show/new_message.html.haml.deface b/plugins/messages/app/overrides/admin/ordergroups/show/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/admin/ordergroups/show/new_message.html.haml.deface rename to plugins/messages/app/overrides/admin/ordergroups/show/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/admin/users/show/new_message.html.haml.deface b/plugins/messages/app/overrides/admin/users/show/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/admin/users/show/new_message.html.haml.deface rename to plugins/messages/app/overrides/admin/users/show/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/admin/workgroups/show/new_message.html.haml.deface b/plugins/messages/app/overrides/admin/workgroups/show/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/admin/workgroups/show/new_message.html.haml.deface rename to plugins/messages/app/overrides/admin/workgroups/show/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/foodcoop/ordergroups/_ordergroups/new_message.html.haml.deface b/plugins/messages/app/overrides/foodcoop/ordergroups/_ordergroups/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/foodcoop/ordergroups/_ordergroups/new_message.html.haml.deface rename to plugins/messages/app/overrides/foodcoop/ordergroups/_ordergroups/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/foodcoop/users/_users/new_message.html.haml.deface b/plugins/messages/app/overrides/foodcoop/users/_users/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/foodcoop/users/_users/new_message.html.haml.deface rename to plugins/messages/app/overrides/foodcoop/users/_users/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/foodcoop/workgroups/_workgroup/new_message.html.haml.deface b/plugins/messages/app/overrides/foodcoop/workgroups/_workgroup/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/foodcoop/workgroups/_workgroup/new_message.html.haml.deface rename to plugins/messages/app/overrides/foodcoop/workgroups/_workgroup/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/home/_start_nav/new_message.html.haml.deface b/plugins/messages/app/overrides/home/_start_nav/new_message.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/home/_start_nav/new_message.html.haml.deface rename to plugins/messages/app/overrides/home/_start_nav/new_message.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface b/plugins/messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface rename to plugins/messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface diff --git a/lib/foodsoft_messages/app/overrides/shared/_user_form_fields/add_messages_prefs.html.haml.deface b/plugins/messages/app/overrides/shared/_user_form_fields/add_messages_prefs.html.haml.deface similarity index 100% rename from lib/foodsoft_messages/app/overrides/shared/_user_form_fields/add_messages_prefs.html.haml.deface rename to plugins/messages/app/overrides/shared/_user_form_fields/add_messages_prefs.html.haml.deface diff --git a/lib/foodsoft_messages/app/views/messages/_messages.html.haml b/plugins/messages/app/views/messages/_messages.html.haml similarity index 100% rename from lib/foodsoft_messages/app/views/messages/_messages.html.haml rename to plugins/messages/app/views/messages/_messages.html.haml diff --git a/lib/foodsoft_messages/app/views/messages/index.html.haml b/plugins/messages/app/views/messages/index.html.haml similarity index 100% rename from lib/foodsoft_messages/app/views/messages/index.html.haml rename to plugins/messages/app/views/messages/index.html.haml diff --git a/lib/foodsoft_messages/app/views/messages/index.js.haml b/plugins/messages/app/views/messages/index.js.haml similarity index 100% rename from lib/foodsoft_messages/app/views/messages/index.js.haml rename to plugins/messages/app/views/messages/index.js.haml diff --git a/lib/foodsoft_messages/app/views/messages/new.haml b/plugins/messages/app/views/messages/new.haml similarity index 100% rename from lib/foodsoft_messages/app/views/messages/new.haml rename to plugins/messages/app/views/messages/new.haml diff --git a/lib/foodsoft_messages/app/views/messages/show.haml b/plugins/messages/app/views/messages/show.haml similarity index 100% rename from lib/foodsoft_messages/app/views/messages/show.haml rename to plugins/messages/app/views/messages/show.haml diff --git a/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml b/plugins/messages/app/views/messages_mailer/foodsoft_message.text.haml similarity index 100% rename from lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml rename to plugins/messages/app/views/messages_mailer/foodsoft_message.text.haml diff --git a/lib/foodsoft_messages/app/workers/message_notifier.rb b/plugins/messages/app/workers/message_notifier.rb similarity index 100% rename from lib/foodsoft_messages/app/workers/message_notifier.rb rename to plugins/messages/app/workers/message_notifier.rb diff --git a/lib/foodsoft_messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml similarity index 100% rename from lib/foodsoft_messages/config/locales/en.yml rename to plugins/messages/config/locales/en.yml diff --git a/lib/foodsoft_messages/config/routes.rb b/plugins/messages/config/routes.rb similarity index 100% rename from lib/foodsoft_messages/config/routes.rb rename to plugins/messages/config/routes.rb diff --git a/lib/foodsoft_messages/db/migrate/20090120184410_create_messages.rb.skip b/plugins/messages/db/migrate/20090120184410_create_messages.rb.skip similarity index 100% rename from lib/foodsoft_messages/db/migrate/20090120184410_create_messages.rb.skip rename to plugins/messages/db/migrate/20090120184410_create_messages.rb.skip diff --git a/lib/foodsoft_messages/foodsoft_messages.gemspec b/plugins/messages/foodsoft_messages.gemspec similarity index 100% rename from lib/foodsoft_messages/foodsoft_messages.gemspec rename to plugins/messages/foodsoft_messages.gemspec diff --git a/lib/foodsoft_messages/lib/foodsoft_messages.rb b/plugins/messages/lib/foodsoft_messages.rb similarity index 100% rename from lib/foodsoft_messages/lib/foodsoft_messages.rb rename to plugins/messages/lib/foodsoft_messages.rb diff --git a/lib/foodsoft_messages/lib/foodsoft_messages/engine.rb b/plugins/messages/lib/foodsoft_messages/engine.rb similarity index 100% rename from lib/foodsoft_messages/lib/foodsoft_messages/engine.rb rename to plugins/messages/lib/foodsoft_messages/engine.rb diff --git a/lib/foodsoft_messages/lib/foodsoft_messages/user_link.rb b/plugins/messages/lib/foodsoft_messages/user_link.rb similarity index 100% rename from lib/foodsoft_messages/lib/foodsoft_messages/user_link.rb rename to plugins/messages/lib/foodsoft_messages/user_link.rb diff --git a/lib/foodsoft_messages/lib/foodsoft_messages/version.rb b/plugins/messages/lib/foodsoft_messages/version.rb similarity index 100% rename from lib/foodsoft_messages/lib/foodsoft_messages/version.rb rename to plugins/messages/lib/foodsoft_messages/version.rb diff --git a/lib/foodsoft_wiki/README.md b/plugins/wiki/README.md similarity index 100% rename from lib/foodsoft_wiki/README.md rename to plugins/wiki/README.md diff --git a/lib/foodsoft_wiki/Rakefile b/plugins/wiki/Rakefile similarity index 100% rename from lib/foodsoft_wiki/Rakefile rename to plugins/wiki/Rakefile diff --git a/lib/foodsoft_wiki/app/assets/images/icons/feed-icon-14x14.png b/plugins/wiki/app/assets/images/icons/feed-icon-14x14.png similarity index 100% rename from lib/foodsoft_wiki/app/assets/images/icons/feed-icon-14x14.png rename to plugins/wiki/app/assets/images/icons/feed-icon-14x14.png diff --git a/lib/foodsoft_wiki/app/assets/images/icons/feed-icon-28x28.png b/plugins/wiki/app/assets/images/icons/feed-icon-28x28.png similarity index 100% rename from lib/foodsoft_wiki/app/assets/images/icons/feed-icon-28x28.png rename to plugins/wiki/app/assets/images/icons/feed-icon-28x28.png diff --git a/lib/foodsoft_wiki/app/controllers/pages_controller.rb b/plugins/wiki/app/controllers/pages_controller.rb similarity index 100% rename from lib/foodsoft_wiki/app/controllers/pages_controller.rb rename to plugins/wiki/app/controllers/pages_controller.rb diff --git a/lib/foodsoft_wiki/app/helpers/pages_helper.rb b/plugins/wiki/app/helpers/pages_helper.rb similarity index 100% rename from lib/foodsoft_wiki/app/helpers/pages_helper.rb rename to plugins/wiki/app/helpers/pages_helper.rb diff --git a/lib/foodsoft_wiki/app/models/page.rb b/plugins/wiki/app/models/page.rb similarity index 100% rename from lib/foodsoft_wiki/app/models/page.rb rename to plugins/wiki/app/models/page.rb diff --git a/lib/foodsoft_wiki/app/views/pages/_body.html.haml b/plugins/wiki/app/views/pages/_body.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/_body.html.haml rename to plugins/wiki/app/views/pages/_body.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/_form.html.haml b/plugins/wiki/app/views/pages/_form.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/_form.html.haml rename to plugins/wiki/app/views/pages/_form.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/_page_list_item.html.haml b/plugins/wiki/app/views/pages/_page_list_item.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/_page_list_item.html.haml rename to plugins/wiki/app/views/pages/_page_list_item.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/_recent_changes.html.haml b/plugins/wiki/app/views/pages/_recent_changes.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/_recent_changes.html.haml rename to plugins/wiki/app/views/pages/_recent_changes.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/_site_map.html.haml b/plugins/wiki/app/views/pages/_site_map.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/_site_map.html.haml rename to plugins/wiki/app/views/pages/_site_map.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/_title_list.html.haml b/plugins/wiki/app/views/pages/_title_list.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/_title_list.html.haml rename to plugins/wiki/app/views/pages/_title_list.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/all.html.haml b/plugins/wiki/app/views/pages/all.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/all.html.haml rename to plugins/wiki/app/views/pages/all.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/all.rss.builder b/plugins/wiki/app/views/pages/all.rss.builder similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/all.rss.builder rename to plugins/wiki/app/views/pages/all.rss.builder diff --git a/lib/foodsoft_wiki/app/views/pages/edit.html.haml b/plugins/wiki/app/views/pages/edit.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/edit.html.haml rename to plugins/wiki/app/views/pages/edit.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/new.html.haml b/plugins/wiki/app/views/pages/new.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/new.html.haml rename to plugins/wiki/app/views/pages/new.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/show.html.haml b/plugins/wiki/app/views/pages/show.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/show.html.haml rename to plugins/wiki/app/views/pages/show.html.haml diff --git a/lib/foodsoft_wiki/app/views/pages/version.html.haml b/plugins/wiki/app/views/pages/version.html.haml similarity index 100% rename from lib/foodsoft_wiki/app/views/pages/version.html.haml rename to plugins/wiki/app/views/pages/version.html.haml diff --git a/lib/foodsoft_wiki/config/locales/en.yml b/plugins/wiki/config/locales/en.yml similarity index 100% rename from lib/foodsoft_wiki/config/locales/en.yml rename to plugins/wiki/config/locales/en.yml diff --git a/lib/foodsoft_wiki/config/routes.rb b/plugins/wiki/config/routes.rb similarity index 100% rename from lib/foodsoft_wiki/config/routes.rb rename to plugins/wiki/config/routes.rb diff --git a/lib/foodsoft_wiki/db/migrate/20090325175756_create_pages.rb b/plugins/wiki/db/migrate/20090325175756_create_pages.rb similarity index 100% rename from lib/foodsoft_wiki/db/migrate/20090325175756_create_pages.rb rename to plugins/wiki/db/migrate/20090325175756_create_pages.rb diff --git a/lib/foodsoft_wiki/foodsoft_wiki.gemspec b/plugins/wiki/foodsoft_wiki.gemspec similarity index 100% rename from lib/foodsoft_wiki/foodsoft_wiki.gemspec rename to plugins/wiki/foodsoft_wiki.gemspec diff --git a/lib/foodsoft_wiki/lib/foodsoft_wiki.rb b/plugins/wiki/lib/foodsoft_wiki.rb similarity index 100% rename from lib/foodsoft_wiki/lib/foodsoft_wiki.rb rename to plugins/wiki/lib/foodsoft_wiki.rb diff --git a/lib/foodsoft_wiki/lib/foodsoft_wiki/engine.rb b/plugins/wiki/lib/foodsoft_wiki/engine.rb similarity index 100% rename from lib/foodsoft_wiki/lib/foodsoft_wiki/engine.rb rename to plugins/wiki/lib/foodsoft_wiki/engine.rb diff --git a/lib/foodsoft_wiki/lib/foodsoft_wiki/version.rb b/plugins/wiki/lib/foodsoft_wiki/version.rb similarity index 100% rename from lib/foodsoft_wiki/lib/foodsoft_wiki/version.rb rename to plugins/wiki/lib/foodsoft_wiki/version.rb