Skip to content
This repository
Browse code

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...
commit a15c83d4555889b9e26235bd5eb1b0ef6b114c2f 2 parents c44bed2 + 3b1cfc9
Igal Koshevoy igal authored
13 CHANGES.md
Source Rendered
@@ -16,6 +16,19 @@ Changes
16 16
17 17 List of Calagator stable releases and changes, with the latest at the top:
18 18
  19 + * v0.20111021
  20 + * [!] This should be the final release based on Ruby on Rails 2.x, all future releases will be based on Rails 3.x.
  21 + * [DEPENDENCY] Upgraded to Rails 2.3.12.
  22 + * [MIGRATION] Added venue details so organizers can specify per-event information like room number, access code, etc.
  23 + * [THEME] Added mobile CSS stylesheet for friendlier experience on smaller screens.
  24 + * Updated Upcoming importer to work around invalid UTC dates emitted by current API.
  25 + * Updated Plancast importer to use the new, official JSONP API.
  26 + * Updated Meetup importer to use the new, official API if a key is available. See instructions in `INSTALL.md` file.
  27 + * Update robot exclusion rules to allow Google Calendar to subscribe to filtered searches.
  28 + * Updated iCalendar exporter to include venue address and source URL.
  29 + * Added "opensearch" to let browsers use Calagator as a search provider.
  30 + * Added Vagrant support, allowing easy setup of a development environment. See instructions in `VAGRANT.md` file.
  31 +
19 32 * v0.20110603
20 33 * [DEPENDENCY] Added `bundler` for installing dependencies and isolating from unwanted versions of gems. See `INSTALL.md` for usage information.
21 34 * [MIGRATION] Added fields to Venues: access notes, "has public wifi" flag, and "is closed" flag.
4 app/views/events/_feed_item.html.erb
@@ -46,9 +46,7 @@
46 46 <% unless event.tags.blank? %>
47 47 <div class="tags">
48 48 <h3>Tags</h3>
49   - <p>
50   - <%= tag_links_for event %>
51   - </p>
  49 + <p><%= tag_links_for event %></p>
52 50 </div>
53 51 <% end %>
54 52
21 vagrant/cookbooks/vagrant/recipes/default.rb
@@ -39,6 +39,23 @@
39 39 package name
40 40 end
41 41
  42 +# Install PostgreSQL
  43 +for name in %w[postgresql libpq-dev]
  44 + package name
  45 +end
  46 +
  47 +# Fix PostgreSQL encoding -- WARNING: this drops all data in all databases if they're not using UTF8
  48 +execute "fix-postgresql-encoding" do
  49 + command %{pg_dropcluster --stop 8.4 main; pg_createcluster --start --locale=en_US.UTF-8 8.4 main}
  50 + not_if %{su postgres -l -c 'psql -l | egrep "template0.+UTF8"'}
  51 +end
  52 +
  53 +# Create PostgreSQL user
  54 +execute "create-postgresql-user" do
  55 + command %{su postgres -l -c 'createuser --superuser #{USER}'}
  56 + not_if %{su postgres -l -c 'psql -c "\\du" | grep #{USER}'}
  57 +end
  58 +
42 59 # Install gems
43 60 gem_package "bundler"
44 61 gem_package "rake" do
@@ -57,11 +74,11 @@
57 74 # Install bundle
58 75 execute "install-bundle" do
59 76 cwd APPDIR
60   - command "su vagrant -l -c 'bundle check || bundle --local || bundle'"
  77 + command "su #{USER} -l -c 'bundle check || bundle --local || bundle'"
61 78 end
62 79
63 80 # Setup database
64 81 execute "setup-db" do
65 82 cwd APPDIR
66   - command "su vagrant -l -c 'bundle exec rake db:create:all db:migrate db:test:prepare'"
  83 + command "su #{USER} -l -c 'bundle exec rake db:create:all db:migrate db:test:prepare'"
67 84 end

0 comments on commit a15c83d

Please sign in to comment.
Something went wrong with that request. Please try again.