From 1ad4dcaae80975f46177c16b572df38e59e4709a Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Tue, 26 Jul 2011 15:11:52 -0400 Subject: [PATCH] hoping this fixes the ci server issues --- Gemfile | 10 ++-------- Gemfile.lock | 29 ++++++----------------------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index c66fc392..242b7ea6 100644 --- a/Gemfile +++ b/Gemfile @@ -7,23 +7,17 @@ gem "rspec", "~>2.0.0" gem "rails", "~>3.0.0.rc" gem "compass-validator", "3.0.1" gem "css_parser", "~> 1.0.1" -gem "sass", "~>3.1" +gem "sass", "~> 3.1" gem "haml", "~> 3.1" gem "rcov", :platform => :mri gem "rubyzip" gem "livereload" gem "ruby-prof", :platform => :mri -gem 'autotest' -gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/ -gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'mocha' gem 'timecop' gem 'diff-lcs', '~> 1.1.2' gem 'rake', '0.8.7' -group :mac do - gem "rb-fsevent" -end - +#Warning becarful adding OS dependant gems to this file it will cause issues on the CI server \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 8881495a..f5ce76db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,7 @@ -GIT - remote: git://github.com/johnbintz/fakefs.git - revision: 7363b6f13bfcd9f583bbf7cd1e0d65c2dc656db7 - specs: - fakefs (0.3.1) - PATH remote: . specs: - compass (0.12.0.alpha.0.387a2ff) + compass (0.12.0.alpha.0.3f72a54) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -15,7 +9,6 @@ PATH GEM remote: http://rubygems.org/ specs: - ZenTest (4.5.0) abstract (1.0.0) actionmailer (3.0.9) actionpack (= 3.0.9) @@ -45,10 +38,6 @@ GEM activesupport (3.0.9) addressable (2.2.6) arel (2.0.10) - autotest (4.4.6) - ZenTest (>= 4.4.1) - autotest-fsevent (0.2.5) - sys-uname builder (2.1.2) chunky_png (1.2.0) compass-validator (3.0.1) @@ -106,9 +95,8 @@ GEM rdoc (~> 3.4) thor (~> 0.14.4) rake (0.8.7) - rb-fsevent (0.4.0) rcov (0.9.9) - rdoc (3.6.1) + rdoc (3.8) rspec (2.0.1) rspec-core (~> 2.0.1) rspec-expectations (~> 2.0.1) @@ -120,35 +108,30 @@ GEM rspec-core (~> 2.0.1) rspec-expectations (~> 2.0.1) ruby-json (1.1.2) - ruby-prof (0.10.7) + ruby-prof (0.10.8) rubyzip (0.9.4) - sass (3.1.3) - sys-uname (0.8.5) - term-ansicolor (1.0.5) + sass (3.1.5) + term-ansicolor (1.0.6) thor (0.14.6) timecop (0.3.5) treetop (1.4.9) polyglot (>= 0.3.1) - tzinfo (0.3.28) + tzinfo (0.3.29) PLATFORMS ruby DEPENDENCIES - autotest - autotest-fsevent compass! compass-validator (= 3.0.1) css_parser (~> 1.0.1) cucumber (~> 0.9.2) diff-lcs (~> 1.1.2) - fakefs! haml (~> 3.1) livereload mocha rails (~> 3.0.0.rc) rake (= 0.8.7) - rb-fsevent rcov rspec (~> 2.0.0) ruby-prof