Skip to content

Commit

Permalink
Restructured require path and source folders.
Browse files Browse the repository at this point in the history
  • Loading branch information
user19153 committed Nov 6, 2008
1 parent e3a143b commit 43dd16f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Rakefile
Expand Up @@ -29,3 +29,6 @@ Dir['tasks/**/*.rake'].each { |t| load t }

# TODO - want other tests/tasks run by default? Add them to the list
# task :default => [:spec, :features]

desc 'Install the gem locally without documentation'
task :local => [:install_gem_no_doc]
2 changes: 1 addition & 1 deletion lib/red/nodes/call_nodes.rb
Expand Up @@ -85,7 +85,7 @@ def initialize(function_sexp, *arguments_array_sexp)
long_filename = File.join(@@red_filepath, dirname, basename)
unless @@red_required.include?(basename)
@@red_required |= [basename]
file = Dir.glob(short_filename)[0] || Dir.glob('%s.red' % short_filename)[0] || Dir.glob('%s.rb' % short_filename)[0] || Dir.glob(long_filename)[0] || Dir.glob('%s.red' % long_filename)[0] || Dir.glob('%s.rb' % long_filename)[0] || Dir.glob('%s/../../source/redshift/%s' % [File.dirname(__FILE__),basename])[0] || Dir.glob('%s/../../source/redshift/%s.red' % [File.dirname(__FILE__),basename])[0]
file = Dir.glob(short_filename)[0] || Dir.glob('%s.red' % short_filename)[0] || Dir.glob('%s.rb' % short_filename)[0] || Dir.glob(long_filename)[0] || Dir.glob('%s.red' % long_filename)[0] || Dir.glob('%s.rb' % long_filename)[0] || Dir.glob('%s/../../source/%s' % [File.dirname(__FILE__),basename])[0] || Dir.glob('%s/../../source/%s.red' % [File.dirname(__FILE__),basename])[0] || Dir.glob('%s/../../source/%s.rb' % [File.dirname(__FILE__),basename])[0]
stored_filepath = @@red_filepath
@@red_filepath = File.dirname(file)
self << hush_warnings { File.read(file).translate_to_sexp_array }.red!
Expand Down
1 change: 1 addition & 0 deletions lib/source/redshift.rb
@@ -0,0 +1 @@
require 'redshift/redshift'
1 change: 1 addition & 0 deletions lib/source/redspec.rb
@@ -0,0 +1 @@
require 'redspec/lib/red_spec/red_spec'

0 comments on commit 43dd16f

Please sign in to comment.