Skip to content

Commit

Permalink
Release cleanup, closes #3620
Browse files Browse the repository at this point in the history
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
  • Loading branch information
jhass committed Sep 30, 2012
1 parent 4c8e08e commit 5c7a9c1
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 302 deletions.
18 changes: 17 additions & 1 deletion Changelog.md
Expand Up @@ -21,4 +21,20 @@ The new configuration system allows all possible settings to be overriden by env
* SINGLE_PROCESS_MODE -> ENVIRONMENT_SINGLE_PROCESS_MODE
* SINGLE_PROCESS -> ENVIRONMENT_SINGLE_PROCESS_MODE
* NO_SSL -> ENVIRONMENT_REQUIRE_SSL
* ASSET_HOST -> ENVIRONMENT_ASSETS_HOST
* ASSET_HOST -> ENVIRONMENT_ASSETS_HOST


## Removed Gems

The following gems and their related files were removed as they aren't widely enough used to justify maintenance for them by the core developers. If you use them please maintain them in your fork.

* airbrake
* newrelic_rpm
* rpm_contrib
* heroku_san

The following gems were removed because their are neither used in daily development or are just CLI tools that aren't required to be loaded from the code:

* heroku
* oink
* yard
7 changes: 0 additions & 7 deletions Gemfile
Expand Up @@ -30,9 +30,6 @@ gem 'twitter', '2.0.2'

gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
gem 'messagebus_ruby_api', '1.0.3'
gem 'airbrake', '3.1.0'
gem 'newrelic_rpm', '3.3.5'
gem "rpm_contrib", '2.1.11'

group :production do # we don't install these on travis to speed up test runs
gem 'rails_admin', '0.1.1'
Expand Down Expand Up @@ -170,8 +167,4 @@ group :development do
gem 'capistrano', '2.12.0', :require => false
gem 'capistrano_colors', '0.5.5', :require => false
gem 'capistrano-ext', '1.2.1', :require => false
gem 'yard', '0.8.2.1', :require => false

# for tracing AR object instantiation and memory usage per request
gem 'oink', '0.9.3'
end
17 changes: 0 additions & 17 deletions Gemfile.lock
Expand Up @@ -54,9 +54,6 @@ GEM
activesupport (>= 3.0.0)
rack (>= 1.1.0)
addressable (2.3.2)
airbrake (3.1.0)
activesupport
builder
arel (3.0.2)
asset_sync (0.5.0)
activemodel
Expand Down Expand Up @@ -181,7 +178,6 @@ GEM
hashie (1.2.0)
highline (1.6.12)
hike (1.2.1)
hodel_3000_compliant_logger (0.1.0)
http_accept_language (1.0.2)
httpauth (0.1)
i18n (0.6.1)
Expand Down Expand Up @@ -238,16 +234,12 @@ GEM
jruby-pageant (>= 1.1.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
newrelic_rpm (3.3.5)
nokogiri (1.5.5)
oauth (0.4.6)
oauth2 (0.6.1)
faraday (~> 0.7)
httpauth (~> 0.1)
multi_json (~> 1.3)
oink (0.9.3)
activerecord
hodel_3000_compliant_logger
omniauth (1.1.1)
hashie (~> 1.2)
rack
Expand Down Expand Up @@ -338,9 +330,6 @@ GEM
vegas (~> 0.1.2)
resque-timeout (1.0.0)
resque (~> 1.0)
rpm_contrib (2.1.11)
newrelic_rpm (>= 3.1.1)
newrelic_rpm (>= 3.1.1)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
Expand Down Expand Up @@ -415,7 +404,6 @@ GEM
will_paginate (3.0.3)
xpath (0.1.4)
nokogiri (~> 1.3)
yard (0.8.2.1)

PLATFORMS
ruby
Expand All @@ -425,7 +413,6 @@ DEPENDENCIES
acts-as-taggable-on (= 2.3.3)
acts_as_api (= 0.4.1)
addressable (= 2.3.2)
airbrake (= 3.1.0)
asset_sync (= 0.5.0)
bootstrap-sass (= 2.1.0.0)
bundler (> 1.1.0)
Expand Down Expand Up @@ -464,9 +451,7 @@ DEPENDENCIES
mini_magick (= 3.4)
mobile-fu (= 1.1.0)
mysql2 (= 0.3.11)
newrelic_rpm (= 3.3.5)
nokogiri (= 1.5.5)
oink (= 0.9.3)
omniauth (= 1.1.1)
omniauth-facebook (= 1.3.0)
omniauth-tumblr (= 1.1)
Expand All @@ -485,7 +470,6 @@ DEPENDENCIES
resque (= 1.22.0)
resque-timeout (= 1.0.0)
roxml!
rpm_contrib (= 2.1.11)
rspec-instafail (= 0.2.4)
rspec-rails (= 2.11.0)
ruby-oembed (= 0.8.7)
Expand All @@ -500,4 +484,3 @@ DEPENDENCIES
unicorn (= 4.3.1)
webmock (= 1.8.10)
will_paginate (= 3.0.3)
yard (= 0.8.2.1)
2 changes: 1 addition & 1 deletion config/database.yml.example
Expand Up @@ -42,7 +42,7 @@ production:
database: diaspora_production
test:
<<: *common
database: "diaspora_test<%= ENV['TEST_ENV_NUMBER'] %>"
database: "diaspora_test"
integration1:
<<: *common
database: diaspora_integration1
Expand Down
6 changes: 0 additions & 6 deletions config/defaults.yml
Expand Up @@ -81,12 +81,6 @@ defaults:
admins:
account:
inline_resque_web: true
monitoring:
airbrake_api_key:
new_relic:
enable: false
app_name:
license_key:

development:
environment:
Expand Down
10 changes: 0 additions & 10 deletions config/diaspora.yml.example
Expand Up @@ -268,16 +268,6 @@ configuration:
## or not to inline it into Diaspora.
#inline_resque_web: true

monitoring:
## If you use Airbrake provide your API key here:
#airbrake_api_key: 'abcdef'

## If you use NewRelic provide your credentials here:
new_relic:
#enable: true
#app_name: 'foo'
#license_key: 'abcdef'

## Here you can make overides to settings defined above if you need
## to have them different in different environments.
production:
Expand Down
12 changes: 0 additions & 12 deletions config/initializers/airbrake.rb

This file was deleted.

7 changes: 0 additions & 7 deletions config/initializers/newrelic.rb

This file was deleted.

12 changes: 0 additions & 12 deletions config/initializers/oink.rb

This file was deleted.

0 comments on commit 5c7a9c1

Please sign in to comment.