nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace require_relative with compatible version

Browse source
This commit is contained in:
Michael Fellinger 2010-09-16 14:50:30 +09:00
parent c6f5b4ed16
commit ba058a39a8
7 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -107,7 +107,6 @@ GEM
net-sftp (>= 2.0.0) net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14) net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.0.0) net-ssh-gateway (>= 1.0.0)
columnize (0.3.1)
crack (0.1.8) crack (0.1.8)
daemons (1.1.0) daemons (1.1.0)
database_cleaner (0.5.2) database_cleaner (0.5.2)
@ -127,7 +126,6 @@ GEM
highline (1.6.1) highline (1.6.1)
i18n (0.4.1) i18n (0.4.1)
json (1.4.6) json (1.4.6)
linecache (0.43)
lsof (0.3.0) lsof (0.3.0)
mail (2.2.6.1) mail (2.2.6.1)
activesupport (>= 2.3.6) activesupport (>= 2.3.6)
@ -190,11 +188,6 @@ GEM
rspec-rails (2.0.0.beta.17) rspec-rails (2.0.0.beta.17)
rspec (>= 2.0.0.beta.14) rspec (>= 2.0.0.beta.14)
webrat (>= 0.7.0) webrat (>= 0.7.0)
ruby-debug (0.10.3)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.3.0)
ruby-debug-base (0.10.3)
linecache (>= 0.3)
saucelabs-adapter (0.8.12) saucelabs-adapter (0.8.12)
lsof (>= 0.3.0) lsof (>= 0.3.0)
net-ssh (>= 2.0.12) net-ssh (>= 2.0.12)
@ -253,7 +246,6 @@ DEPENDENCIES
roxml! roxml!
rspec (>= 2.0.0.beta.17) rspec (>= 2.0.0.beta.17)
rspec-rails (= 2.0.0.beta.17) rspec-rails (= 2.0.0.beta.17)
ruby-debug
saucelabs-adapter (= 0.8.12) saucelabs-adapter (= 0.8.12)
selenium-rc selenium-rc
sprinkle! sprinkle!

2
app/models/profile.rb
View file

@ -5,7 +5,7 @@
class Profile class Profile
include MongoMapper::EmbeddedDocument include MongoMapper::EmbeddedDocument
require_relative '../../lib/diaspora/webhooks' require File.expand_path('../../../lib/diaspora/webhooks', __FILE__)
include Diaspora::Webhooks include Diaspora::Webhooks
include ROXML include ROXML

6
app/models/user.rb
View file

@ -3,9 +3,9 @@
# the COPYRIGHT file. # the COPYRIGHT file.
require_relative '../../lib/diaspora/user/friending.rb' require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
require_relative '../../lib/diaspora/user/querying.rb' require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
require_relative '../../lib/salmon/salmon' require File.expand_path('../../../lib/salmon/salmon', __FILE__)
class User class User
include MongoMapper::Document include MongoMapper::Document

2
config/application.rb
View file

@ -13,7 +13,7 @@ require "active_resource/railtie"
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler) Bundler.require(:default, Rails.env) if defined?(Bundler)
require_relative '../lib/mongo_mapper/bson_id' require File.expand_path('../../lib/mongo_mapper/bson_id', __FILE__)
module Diaspora module Diaspora
class Application < Rails::Application class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here. # Settings in config/environments/* take precedence over those specified here.

2
config/environment.rb
View file

@ -5,7 +5,7 @@
# Load the rails application # Load the rails application
require_relative 'application' require File.expand_path('../application', __FILE__)
Haml::Template.options[:format] = :html5 Haml::Template.options[:format] = :html5
# Initialize the rails application # Initialize the rails application
Diaspora::Application.initialize! Diaspora::Application.initialize!

2
config/environments/development.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file. # the COPYRIGHT file.
require_relative '../../lib/mongo_mapper/clear_dev_memory' require File.expand_path('../../../lib/mongo_mapper/clear_dev_memory', __FILE__)
Diaspora::Application.configure do Diaspora::Application.configure do
# Settings specified here will take precedence over those in config/environment.rb # Settings specified here will take precedence over those in config/environment.rb

2
config/initializers/socket.rb
View file

@ -5,7 +5,7 @@
require 'em-websocket' require 'em-websocket'
require 'eventmachine' require 'eventmachine'
require_relative "../../lib/diaspora/websocket" require File.expand_path("../../../lib/diaspora/websocket", __FILE__)
EM.next_tick { EM.next_tick {
Diaspora::WebSocket.initialize_channels Diaspora::WebSocket.initialize_channels