Permalink
Browse files

Merge branch 'master' into with_ruby192

* master:
  Add PostgreSQL support to Vagrant environment.
  Bump version to v0.20111021.
  Fix events#feed_item to include tag links.
  • Loading branch information...
2 parents c44bed2 + 3b1cfc9 commit a15c83d4555889b9e26235bd5eb1b0ef6b114c2f @igal igal committed Oct 25, 2011
Showing with 33 additions and 5 deletions.
  1. +13 −0 CHANGES.md
  2. +1 −3 app/views/events/_feed_item.html.erb
  3. +19 −2 vagrant/cookbooks/vagrant/recipes/default.rb
View
@@ -16,6 +16,19 @@ Changes
List of Calagator stable releases and changes, with the latest at the top:
+ * v0.20111021
+ * [!] This should be the final release based on Ruby on Rails 2.x, all future releases will be based on Rails 3.x.
+ * [DEPENDENCY] Upgraded to Rails 2.3.12.
+ * [MIGRATION] Added venue details so organizers can specify per-event information like room number, access code, etc.
+ * [THEME] Added mobile CSS stylesheet for friendlier experience on smaller screens.
+ * Updated Upcoming importer to work around invalid UTC dates emitted by current API.
+ * Updated Plancast importer to use the new, official JSONP API.
+ * Updated Meetup importer to use the new, official API if a key is available. See instructions in `INSTALL.md` file.
+ * Update robot exclusion rules to allow Google Calendar to subscribe to filtered searches.
+ * Updated iCalendar exporter to include venue address and source URL.
+ * Added "opensearch" to let browsers use Calagator as a search provider.
+ * Added Vagrant support, allowing easy setup of a development environment. See instructions in `VAGRANT.md` file.
+
* v0.20110603
* [DEPENDENCY] Added `bundler` for installing dependencies and isolating from unwanted versions of gems. See `INSTALL.md` for usage information.
* [MIGRATION] Added fields to Venues: access notes, "has public wifi" flag, and "is closed" flag.
@@ -46,9 +46,7 @@
<% unless event.tags.blank? %>
<div class="tags">
<h3>Tags</h3>
- <p>
- <%= tag_links_for event %>
- </p>
+ <p><%= tag_links_for event %></p>
</div>
<% end %>
@@ -39,6 +39,23 @@
package name
end
+# Install PostgreSQL
+for name in %w[postgresql libpq-dev]
+ package name
+end
+
+# Fix PostgreSQL encoding -- WARNING: this drops all data in all databases if they're not using UTF8
+execute "fix-postgresql-encoding" do
+ command %{pg_dropcluster --stop 8.4 main; pg_createcluster --start --locale=en_US.UTF-8 8.4 main}
+ not_if %{su postgres -l -c 'psql -l | egrep "template0.+UTF8"'}
+end
+
+# Create PostgreSQL user
+execute "create-postgresql-user" do
+ command %{su postgres -l -c 'createuser --superuser #{USER}'}
+ not_if %{su postgres -l -c 'psql -c "\\du" | grep #{USER}'}
+end
+
# Install gems
gem_package "bundler"
gem_package "rake" do
@@ -57,11 +74,11 @@
# Install bundle
execute "install-bundle" do
cwd APPDIR
- command "su vagrant -l -c 'bundle check || bundle --local || bundle'"
+ command "su #{USER} -l -c 'bundle check || bundle --local || bundle'"
end
# Setup database
execute "setup-db" do
cwd APPDIR
- command "su vagrant -l -c 'bundle exec rake db:create:all db:migrate db:test:prepare'"
+ command "su #{USER} -l -c 'bundle exec rake db:create:all db:migrate db:test:prepare'"
end

0 comments on commit a15c83d

Please sign in to comment.