updated gemfiles

twalpole · Dec 17, 2011 · 995f1d0 · 995f1d0
1 parent bfb7b09
commit 995f1d0
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 39 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in compass-rails.gemspec
 gemspec
 
-gem 'compass', :path => '../compass'
+gem 'compass', '~> 0.12.alpha'
 
 group :test do
   gem 'mocha'
@@ -12,8 +12,8 @@ group :test do
 end
 
 unless ENV["CI"]
-  gem 'rb-fsevent'
-  gem 'ruby_gntp'
+  gem 'rb-fsevent', :require => false
+  gem 'ruby_gntp', :require => false
   gem 'guard'
   gem 'guard-test'
 end
diff --git a/gemfiles/rails2.gemfile b/gemfiles/rails2.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "compass", :path=>"../../compass"
-gem "rb-fsevent"
-gem "ruby_gntp"
+gem "compass", "~> 0.12.alpha"
+gem "rb-fsevent", :require=>false
+gem "ruby_gntp", :require=>false
 gem "guard"
 gem "guard-test"
 gem "rails", "2.3.14"

diff --git a/gemfiles/rails2.gemfile.lock b/gemfiles/rails2.gemfile.lock
@@ -1,11 +1,3 @@
-PATH
-  remote: ../../compass
-  specs:
-    compass (0.12.alpha.2.57dcbad)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 PATH
   remote: /Volumes/SSD/Work/compass-rails
   specs:
@@ -26,6 +18,10 @@ GEM
       activesupport (= 2.3.14)
     activesupport (2.3.14)
     chunky_png (1.2.5)
+    compass (0.12.alpha.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     fssm (0.2.7)
     guard (0.8.8)
       thor (~> 0.14.6)
@@ -51,7 +47,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass!
+  compass (~> 0.12.alpha)
   compass-rails!
   guard
   guard-test

diff --git a/gemfiles/rails3.gemfile b/gemfiles/rails3.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "compass", :path=>"../../compass"
-gem "rb-fsevent"
-gem "ruby_gntp"
+gem "compass", "~> 0.12.alpha"
+gem "rb-fsevent", :require=>false
+gem "ruby_gntp", :require=>false
 gem "guard"
 gem "guard-test"
 gem "rails", "3.0.11"

diff --git a/gemfiles/rails3.gemfile.lock b/gemfiles/rails3.gemfile.lock
@@ -1,11 +1,3 @@
-PATH
-  remote: ../../compass
-  specs:
-    compass (0.12.alpha.2.57dcbad)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 PATH
   remote: /Volumes/SSD/Work/compass-rails
   specs:
@@ -45,6 +37,10 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     chunky_png (1.2.5)
+    compass (0.12.alpha.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     fssm (0.2.7)
@@ -98,7 +94,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass!
+  compass (~> 0.12.alpha)
   compass-rails!
   guard
   guard-test

diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "compass", :path=>"../../compass"
-gem "rb-fsevent"
-gem "ruby_gntp"
+gem "compass", "~> 0.12.alpha"
+gem "rb-fsevent", :require=>false
+gem "ruby_gntp", :require=>false
 gem "guard"
 gem "guard-test"
 gem "rails", "3.1.3"

diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -1,11 +1,3 @@
-PATH
-  remote: ../../compass
-  specs:
-    compass (0.12.alpha.2.57dcbad)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 PATH
   remote: /Volumes/SSD/Work/compass-rails
   specs:
@@ -46,6 +38,10 @@ GEM
     arel (2.2.1)
     builder (3.0.0)
     chunky_png (1.2.5)
+    compass (0.12.alpha.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     erubis (2.7.0)
     fssm (0.2.7)
     guard (0.8.8)
@@ -109,7 +105,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass!
+  compass (~> 0.12.alpha)
   compass-rails!
   guard
   guard-test