Merge pull request #330 from foodcoops/feature/plugin-move

Move plugins to separate directory.
2014-12-02 23:37:22 +01:00 · 2014-12-02 23:37:22 +01:00 · a278004c11
parent e63a34edd3 6aa8ee7968
commit a278004c11
59 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -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'
--- 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
--- a/lib/foodsoft_messages/README.md
+++ b/lib/foodsoft_messages/README.md
--- a/lib/foodsoft_messages/Rakefile
+++ b/lib/foodsoft_messages/Rakefile
--- a/lib/foodsoft_messages/app/controllers/messages_controller.rb
+++ b/lib/foodsoft_messages/app/controllers/messages_controller.rb
--- a/lib/foodsoft_messages/app/helpers/messages_helper.rb
+++ b/lib/foodsoft_messages/app/helpers/messages_helper.rb
--- a/lib/foodsoft_messages/app/mailers/messages_mailer.rb
+++ b/lib/foodsoft_messages/app/mailers/messages_mailer.rb
--- a/lib/foodsoft_messages/app/models/message.rb
+++ b/lib/foodsoft_messages/app/models/message.rb
--- a/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/admin/ordergroups/show/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/admin/ordergroups/show/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/admin/users/show/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/admin/users/show/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/admin/workgroups/show/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/admin/workgroups/show/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/foodcoop/ordergroups/_ordergroups/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/foodcoop/ordergroups/_ordergroups/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/foodcoop/users/_users/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/foodcoop/users/_users/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/foodcoop/workgroups/_workgroup/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/foodcoop/workgroups/_workgroup/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/home/_start_nav/new_message.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/home/_start_nav/new_message.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface
--- a/lib/foodsoft_messages/app/overrides/shared/_user_form_fields/add_messages_prefs.html.haml.deface
+++ b/lib/foodsoft_messages/app/overrides/shared/_user_form_fields/add_messages_prefs.html.haml.deface
--- a/lib/foodsoft_messages/app/views/messages/_messages.html.haml
+++ b/lib/foodsoft_messages/app/views/messages/_messages.html.haml
--- a/lib/foodsoft_messages/app/views/messages/index.html.haml
+++ b/lib/foodsoft_messages/app/views/messages/index.html.haml
--- a/lib/foodsoft_messages/app/views/messages/index.js.haml
+++ b/lib/foodsoft_messages/app/views/messages/index.js.haml
--- a/lib/foodsoft_messages/app/views/messages/new.haml
+++ b/lib/foodsoft_messages/app/views/messages/new.haml
--- a/lib/foodsoft_messages/app/views/messages/show.haml
+++ b/lib/foodsoft_messages/app/views/messages/show.haml
--- a/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml
+++ b/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml
--- a/lib/foodsoft_messages/app/workers/message_notifier.rb
+++ b/lib/foodsoft_messages/app/workers/message_notifier.rb
--- a/lib/foodsoft_messages/config/locales/en.yml
+++ b/lib/foodsoft_messages/config/locales/en.yml
--- a/lib/foodsoft_messages/config/routes.rb
+++ b/lib/foodsoft_messages/config/routes.rb
--- a/lib/foodsoft_messages/db/migrate/20090120184410_create_messages.rb.skip
+++ b/lib/foodsoft_messages/db/migrate/20090120184410_create_messages.rb.skip
--- a/lib/foodsoft_messages/foodsoft_messages.gemspec
+++ b/lib/foodsoft_messages/foodsoft_messages.gemspec
--- a/lib/foodsoft_messages/lib/foodsoft_messages.rb
+++ b/lib/foodsoft_messages/lib/foodsoft_messages.rb
--- a/lib/foodsoft_messages/lib/foodsoft_messages/engine.rb
+++ b/lib/foodsoft_messages/lib/foodsoft_messages/engine.rb
--- a/lib/foodsoft_messages/lib/foodsoft_messages/user_link.rb
+++ b/lib/foodsoft_messages/lib/foodsoft_messages/user_link.rb
--- a/lib/foodsoft_messages/lib/foodsoft_messages/version.rb
+++ b/lib/foodsoft_messages/lib/foodsoft_messages/version.rb
--- a/lib/foodsoft_wiki/README.md
+++ b/lib/foodsoft_wiki/README.md
--- a/lib/foodsoft_wiki/Rakefile
+++ b/lib/foodsoft_wiki/Rakefile
--- a/lib/foodsoft_wiki/app/assets/images/icons/feed-icon-14x14.png
+++ b/lib/foodsoft_wiki/app/assets/images/icons/feed-icon-14x14.png
--- a/lib/foodsoft_wiki/app/assets/images/icons/feed-icon-28x28.png
+++ b/lib/foodsoft_wiki/app/assets/images/icons/feed-icon-28x28.png
--- a/lib/foodsoft_wiki/app/controllers/pages_controller.rb
+++ b/lib/foodsoft_wiki/app/controllers/pages_controller.rb
--- a/lib/foodsoft_wiki/app/helpers/pages_helper.rb
+++ b/lib/foodsoft_wiki/app/helpers/pages_helper.rb
--- a/lib/foodsoft_wiki/app/models/page.rb
+++ b/lib/foodsoft_wiki/app/models/page.rb
--- a/lib/foodsoft_wiki/app/views/pages/_body.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/_body.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/_form.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/_form.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/_page_list_item.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/_page_list_item.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/_recent_changes.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/_recent_changes.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/_site_map.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/_site_map.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/_title_list.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/_title_list.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/all.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/all.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/all.rss.builder
+++ b/lib/foodsoft_wiki/app/views/pages/all.rss.builder
--- a/lib/foodsoft_wiki/app/views/pages/edit.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/edit.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/new.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/new.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/show.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/show.html.haml
--- a/lib/foodsoft_wiki/app/views/pages/version.html.haml
+++ b/lib/foodsoft_wiki/app/views/pages/version.html.haml
--- a/lib/foodsoft_wiki/config/locales/en.yml
+++ b/lib/foodsoft_wiki/config/locales/en.yml
--- a/lib/foodsoft_wiki/config/routes.rb
+++ b/lib/foodsoft_wiki/config/routes.rb
--- a/lib/foodsoft_wiki/db/migrate/20090325175756_create_pages.rb
+++ b/lib/foodsoft_wiki/db/migrate/20090325175756_create_pages.rb
--- a/lib/foodsoft_wiki/foodsoft_wiki.gemspec
+++ b/lib/foodsoft_wiki/foodsoft_wiki.gemspec
--- a/lib/foodsoft_wiki/lib/foodsoft_wiki.rb
+++ b/lib/foodsoft_wiki/lib/foodsoft_wiki.rb
--- a/lib/foodsoft_wiki/lib/foodsoft_wiki/engine.rb
+++ b/lib/foodsoft_wiki/lib/foodsoft_wiki/engine.rb
--- a/lib/foodsoft_wiki/lib/foodsoft_wiki/version.rb
+++ b/lib/foodsoft_wiki/lib/foodsoft_wiki/version.rb