Skip to content

Commit

Permalink
fixes issues with compass
Browse files Browse the repository at this point in the history
The receiving application must add compass support to its Gemfile
  • Loading branch information
raw1z committed Feb 20, 2012
1 parent 1a95a20 commit 1b706f9
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'http://rubygems.org'
gem "jquery-rails"
gem "haml-rails"
gem "sass-rails"
gem "compass", ">= 0.12.alpha.4"
gem "compass-rails"
gem "coffee-rails"
gem "execjs"
gem "paper_trail"
Expand Down
6 changes: 4 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
compass (0.12.alpha.4)
compass (0.12.rc.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.0.rc.3)
compass (~> 0.12.rc.0)
cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
Expand Down Expand Up @@ -196,7 +198,7 @@ DEPENDENCIES
bcrypt-ruby
capybara
coffee-rails
compass (>= 0.12.alpha.4)
compass-rails
cucumber
cucumber-rails
database_cleaner
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ cargo_wiki allows you to install a wiki in a Rails 3 application.

## Installation

Add the following line to you gem file:
Add cargo_wiki to your Gemfile:

~~~ruby
gem 'cargo_wiki'
~~~

The run:
cargo_wiki uses compass, and you must add compass support in the assets group of your Gemfile:

~~~ruby
group :assets do
gem 'compass-rails'
end
~~~

Then run:

~~~bash
bundle install
Expand Down
2 changes: 1 addition & 1 deletion cargo_wiki.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency "jquery-rails"
s.add_dependency "haml-rails"
s.add_dependency "sass-rails"
s.add_dependency "compass", ">= 0.12.alpha.4"
s.add_dependency "compass-rails"
s.add_dependency "coffee-rails"
s.add_dependency "execjs"
s.add_dependency "paper_trail"
Expand Down
2 changes: 1 addition & 1 deletion lib/cargo_wiki/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module CargoWiki
VERSION = "1.0.0"
VERSION = "1.0.1"
end

0 comments on commit 1b706f9

Please sign in to comment.