Permalink
Browse files

Gem updates. Bye-bye MetricFu.

Because of gem conflicts and other annoyances, I’ve dropped MetricFu, for now. I may try to re-add some of it’s components.

Got a little more restrictive on some of the gem versions (using `~>` rather than `>=` in some cases).

Also regrouped many of the gems that were in the `:development` & `:test` group to just the `:test` group.
  • Loading branch information...
1 parent f54c4dc commit b339d227f7f73f5f8e4adcfbaf9e0aa113370a4d @grantneufeld committed Jan 31, 2012
Showing with 91 additions and 142 deletions.
  1. +28 −19 Gemfile
  2. +51 −112 Gemfile.lock
  3. +6 −6 Rakefile
  4. +6 −5 preflight
View
47 Gemfile
@@ -11,35 +11,44 @@ gem 'sqlite3', '>= 1.3.3'
gem 'capistrano', :require => false #, '2.5.21'
gem 'bcrypt-ruby' #, '2.1.4'
-gem 'omniauth', '>= 0.2.4'
-gem 'omniauth-facebook'
-gem 'omniauth-twitter'
+gem 'omniauth', '~> 1.0.2'
+gem 'omniauth-facebook', '~> 1.2.0'
+gem 'omniauth-twitter', '>= 0.0.7'
gem 'rake', '>= 0.9.2'
group :development, :test do
- gem 'capybara'
- gem 'chronic', '>= 0.2.3'
- gem 'cucumber', '>= 1.0.0'
- gem 'cucumber-rails', '>= 1.0.0'
- gem 'database_cleaner', '>= 0.6.7'
- gem 'launchy' # for opening saved html files in browser for review
- gem 'metric_fu', '>= 2.0.1', :require => false
- gem 'pickle' #, '0.4.7', :require => false # additions for Cucumber
- gem 'rails_best_practices', '>= 0.8.1', :require => false
- gem 'rspec' #, '2.5.0' # core testing framework
- gem 'rspec-rails' #, '2.5.0'
+ gem 'chronic', '>= 0.6.6'
+ # metric_fu dropped because of messy dependencies interfering with some other gems
+ #gem 'metric_fu', '>= 2.0.1', :require => false
+ gem 'rails_best_practices', '>= 1.7.2', :require => false
+ # FIXME: ruby-debug19 breaks under ruby 1.9.3. There is apparently a fix for the gem, but it’s not yet on the gem servers. The following are some commented-out attempts I made to get this working. Until this is fixed, we’re stuck with ruby 1.9.3, or no debugging.
+ ## FIXME: using a manually installed linecache19 0.5.13 from http://rubyforge.org/frs/?group_id=8883
+ #gem 'linecache19', '0.5.13', :require => 'linecache19', :path => 'vendor/gems'
+ ## :git => 'git://github.com/mark-moseley/linecache.git'
+ #gem 'ruby-debug-base19x', '0.11.30.pre7', :require => 'ruby-debug-base'
+ ## FIXME: using a manually installed ruby-debug19 0.11.26 from http://rubyforge.org/frs/?group_id=8883
+ #gem 'ruby-debug19', '0.11.26', :require => 'ruby-debug', :path => 'vendor/gems'
+ ## :git => 'git://github.com/mark-moseley/ruby-debug.git'
gem 'ruby-debug19', '>= 0.11.6', :require => 'ruby-debug'
- gem 'simplecov', '>= 0.4.1', :require => false
- gem 'simplecov-html', '>= 0.4.3', :require => false
- gem 'ZenTest', '>= 4.5.0', :require => false
end
group :test do
gem 'autotest-fsevent', '>= 0.2.4'
gem 'autotest-growl', '>= 0.2.9'
gem 'autotest-rails', '>= 4.1.0'
- gem 'factory_girl', '>= 2.3.2'
- gem 'factory_girl_rails', '>= 1.4.0'
+ gem 'capybara'
+ gem 'cucumber', '>= 1.0.0'
+ gem 'cucumber-rails', '~> 1.2.1'
+ gem 'database_cleaner', '~> 0.7.1'
+ gem 'launchy' # for opening saved html files in browser for review
+ gem 'factory_girl', '~> 2.5.0'
+ gem 'factory_girl_rails', '~> 1.6.0'
+ gem 'pickle' #, '0.4.7', :require => false # additions for Cucumber
+ gem 'rspec', '~> 2.8.0' #, '2.5.0' # core testing framework
+ gem 'rspec-rails', '~> 2.8.1' #, '2.5.0'
+ gem 'simplecov', '>= 0.4.1', :require => false
+ gem 'simplecov-html', '>= 0.4.3', :require => false
gem 'timecop', '>= 0.3.5'
+ gem 'ZenTest', '>= 4.6.2', :require => false
end
View
@@ -1,8 +1,7 @@
GEM
remote: http://rubygems.org/
specs:
- Saikuro (1.1.0)
- ZenTest (4.5.0)
+ ZenTest (4.6.2)
abstract (1.0.0)
actionmailer (3.0.11)
actionpack (= 3.0.11)
@@ -33,12 +32,11 @@ GEM
addressable (2.2.6)
archive-tar-minitar (0.5.2)
arel (2.0.10)
- arrayfields (4.7.4)
autotest-fsevent (0.2.7)
sys-uname
autotest-growl (0.2.16)
- autotest-rails (4.1.1)
- ZenTest (= 4.5)
+ autotest-rails (4.1.0)
+ ZenTest
bcrypt-ruby (3.0.1)
builder (2.1.2)
capistrano (2.9.0)
@@ -54,26 +52,9 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.3)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
- chronic (0.3.0)
- churn (0.0.15)
- arrayfields (= 4.7.4)
- chronic (>= 0.2.3)
- chronic (>= 0.2.3)
- fattr (= 2.2.0)
- hirb (= 0.5.0)
- hirb
- jeweler (= 1.6.4)
- json (= 1.6.1)
- json_pure
- main
- main (>= 4.6.0)
- map (= 4.3.0)
- ruby_parser (= 2.3.1)
- ruby_parser (~> 2.3)
- sexp_processor (= 3.0.7)
- sexp_processor (~> 3.0.3)
+ chronic (0.6.6)
colored (1.2)
columnize (0.3.6)
cucumber (1.1.4)
@@ -86,40 +67,26 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
- database_cleaner (0.7.0)
+ database_cleaner (0.7.1)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- factory_girl (2.3.2)
+ factory_girl (2.5.0)
activesupport
- factory_girl_rails (1.4.0)
- factory_girl (~> 2.3.0)
+ factory_girl_rails (1.6.0)
+ factory_girl (~> 2.5.0)
railties (>= 3.0.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
- rack (>= 1.1.0, < 2)
- fattr (2.2.0)
+ faraday (0.7.6)
+ addressable (~> 2.2)
+ multipart-post (~> 1.1)
+ rack (~> 1.1)
ffi (1.0.11)
- flay (1.4.3)
- ruby_parser (~> 2.0)
- sexp_processor (~> 3.0)
- flog (2.5.3)
- ruby_parser (~> 2.0)
- sexp_processor (~> 3.0)
- gherkin (2.7.1)
+ gherkin (2.7.6)
json (>= 1.4.6)
- git (1.2.5)
hashie (1.2.0)
- highline (1.6.9)
- hirb (0.5.0)
+ highline (1.6.11)
i18n (0.5.0)
- jeweler (1.6.4)
- bundler (~> 1.0)
- git (>= 1.2.5)
- rake
- json (1.6.1)
- json_pure (1.6.4)
+ json (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
linecache19 (0.5.12)
@@ -129,39 +96,25 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- main (4.7.1)
- map (4.3.0)
- metric_fu (2.1.1)
- Saikuro (>= 1.1.0)
- activesupport (>= 2.0.0)
- chronic (~> 0.3.0)
- churn (>= 0.0.7)
- flay (>= 1.2.1)
- flog (>= 2.3.0)
- rails_best_practices (>= 0.6.4)
- rcov (>= 0.8.3.3)
- reek (>= 1.2.6)
- roodi (>= 2.1.0)
- syntax
mime-types (1.17.2)
multi_json (1.0.4)
multipart-post (1.1.4)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.2.1)
+ net-ssh (2.3.0)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
oauth (0.4.5)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
- omniauth (1.0.1)
+ oauth2 (0.5.2)
+ faraday (~> 0.7)
+ multi_json (~> 1.0)
+ omniauth (1.0.2)
hashie (~> 1.2)
rack
- omniauth-facebook (1.1.0)
+ omniauth-facebook (1.2.0)
omniauth-oauth2 (~> 1.0.0)
omniauth-oauth (1.0.0)
oauth
@@ -176,7 +129,7 @@ GEM
rake
polyglot (0.3.3)
progressbar (0.9.2)
- rack (1.2.4)
+ rack (1.2.5)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
@@ -189,7 +142,7 @@ GEM
activesupport (= 3.0.11)
bundler (~> 1.0)
railties (= 3.0.11)
- rails_best_practices (1.7.1)
+ rails_best_practices (1.7.2)
activesupport
colored
erubis
@@ -203,28 +156,21 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2.2)
- rcov (0.9.11)
rdoc (3.12)
json (~> 1.4)
- reek (1.2.8)
- ruby2ruby (~> 1.2)
- ruby_parser (~> 2.0)
- sexp_processor (~> 3.0)
- roodi (2.1.0)
- ruby_parser
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -233,26 +179,20 @@ GEM
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
- ruby2ruby (1.3.1)
- ruby_parser (~> 2.0)
- sexp_processor (~> 3.0)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- ruby_parser (2.3.1)
- sexp_processor (~> 3.0)
rubyzip (0.9.5)
- selenium-webdriver (2.15.0)
- childprocess (>= 0.2.1)
+ selenium-webdriver (2.18.0)
+ childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
- sexp_processor (3.0.7)
+ sexp_processor (3.0.10)
simplecov (0.5.4)
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
sqlite3 (1.3.5)
- syntax (1.0.0)
sys-uname (0.9.0)
ffi (>= 1.0.0)
term-ansicolor (1.0.7)
@@ -269,30 +209,29 @@ PLATFORMS
ruby
DEPENDENCIES
- ZenTest (>= 4.5.0)
+ ZenTest (>= 4.6.2)
autotest-fsevent (>= 0.2.4)
autotest-growl (>= 0.2.9)
autotest-rails (>= 4.1.0)
bcrypt-ruby
capistrano
capybara
- chronic (>= 0.2.3)
+ chronic (>= 0.6.6)
cucumber (>= 1.0.0)
- cucumber-rails (>= 1.0.0)
- database_cleaner (>= 0.6.7)
- factory_girl (>= 2.3.2)
- factory_girl_rails (>= 1.4.0)
+ cucumber-rails (~> 1.2.1)
+ database_cleaner (~> 0.7.1)
+ factory_girl (~> 2.5.0)
+ factory_girl_rails (~> 1.6.0)
launchy
- metric_fu (>= 2.0.1)
- omniauth (>= 0.2.4)
- omniauth-facebook
- omniauth-twitter
+ omniauth (~> 1.0.2)
+ omniauth-facebook (~> 1.2.0)
+ omniauth-twitter (>= 0.0.7)
pickle
rails (= 3.0.11)
- rails_best_practices (>= 0.8.1)
+ rails_best_practices (>= 1.7.2)
rake (>= 0.9.2)
- rspec
- rspec-rails
+ rspec (~> 2.8.0)
+ rspec-rails (~> 2.8.1)
ruby-debug19 (>= 0.11.6)
simplecov (>= 0.4.1)
simplecov-html (>= 0.4.3)
View
@@ -4,11 +4,11 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'
-require 'metric_fu'
-MetricFu::Configuration.run do |config|
- # remove rcov because it doesn’t work with ruby 1.9
- config.metrics -= [:rcov]
- config.verbose = true
-end
+#require 'metric_fu'
+#MetricFu::Configuration.run do |config|
+# # remove rcov because it doesn’t work with ruby 1.9
+# config.metrics -= [:rcov]
+# config.verbose = true
+#end
Wayground::Application.load_tasks
View
@@ -37,11 +37,12 @@ else
exit 1
fi
-# report on the code quality
-echo "Generating Metric Fu reports..."
-bundle exec rake metrics:all
-open tmp/metric_fu/output/index.html
-echo ""
+# # report on the code quality
+# echo "Generating Metric Fu reports..."
+# bundle exec rake metrics:all
+# open tmp/metric_fu/output/index.html
+# echo ""
+# FIXME: bring in some of the individual Metric Fu components, such as rails_best_practices.
# report the git status
echo "Checking version control status..."

0 comments on commit b339d22

Please sign in to comment.