Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] clash with require_all gem #90

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions lib/rx.rb
Original file line number Diff line number Diff line change
@@ -7,21 +7,23 @@
# path - The String relative path from here to the directory.
#
# Returns nothing.
def require_all(path)
glob = File.join(File.dirname(__FILE__), path, '*.rb')
Dir[glob].sort.each do |f|
require f
module RxRequireAll
def self.require_all(path)
glob = File.join(File.dirname(__FILE__), path, '*.rb')
Dir[glob].sort.each do |f|
require f
end
end
end

require_all 'rx/internal/'
require_all 'rx/concurrency/'
require_all 'rx/subscriptions/'
require_all 'rx/core/'
require_all 'rx/linq/'
require_all 'rx/linq/observable/'
require_all 'rx/operators/'
require_all 'rx/subjects/'
require_all 'rx/testing/'
require_all 'rx/joins/'
require_all 'rx/'
RxRequireAll.require_all 'rx/internal/'
RxRequireAll.require_all 'rx/concurrency/'
RxRequireAll.require_all 'rx/subscriptions/'
RxRequireAll.require_all 'rx/core/'
RxRequireAll.require_all 'rx/linq/'
RxRequireAll.require_all 'rx/linq/observable/'
RxRequireAll.require_all 'rx/operators/'
RxRequireAll.require_all 'rx/subjects/'
RxRequireAll.require_all 'rx/testing/'
RxRequireAll.require_all 'rx/joins/'
RxRequireAll.require_all 'rx/'