Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/ajcollins/framework-examples
Browse files Browse the repository at this point in the history
  • Loading branch information
bret committed Jan 8, 2009
2 parents 8ffa208 + c4c7846 commit 0ebbb6b
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 86 deletions.
7 changes: 6 additions & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ Running tests

install ruby 186-26
gem update --system
gem install watir cucumber rspec win32console roo rasta taza
gem install watir cucumber rspec win32console roo rasta taza

In each test directory, run:
rake -f <Rakefile>
where <Rakefile> is replaced with the name of the Rakefile eg Rakefile, rakefile.rb etc

46 changes: 37 additions & 9 deletions depot/config/boot.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,45 @@
# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb

unless defined?(RAILS_ROOT)
root_path = File.join(File.dirname(__FILE__), '..')
unless RUBY_PLATFORM =~ /mswin32/

unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
require 'pathname'
root_path = Pathname.new(root_path).cleanpath.to_s
root_path = Pathname.new(root_path).cleanpath(true).to_s
end

RAILS_ROOT = root_path
end

if File.directory?("#{RAILS_ROOT}/vendor/rails")
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
else
require 'rubygems'
require 'initializer'
end
unless defined?(Rails::Initializer)
if File.directory?("#{RAILS_ROOT}/vendor/rails")
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
else
require 'rubygems'

environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
rails_gem_version = $1

Rails::Initializer.run(:set_load_path)
if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
# Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last

if rails_gem
gem "rails", "=#{rails_gem.version.version}"
require rails_gem.full_gem_path + '/lib/initializer'
else
STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
Install the missing gem with 'gem install -v=#{version} rails', or
change environment.rb to define RAILS_GEM_VERSION with your desired version.
)
exit 1
end
else
gem "rails"
require 'initializer'
end
end

Rails::Initializer.run(:set_load_path)
end
4 changes: 3 additions & 1 deletion depot/config/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# (Use only when you can't set environment variables through your web/app server)
# ENV['RAILS_ENV'] = 'production'

RAILS_GEM_VERSION = '1.2.3' unless defined? RAILS_GEM_VERSION

# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')

Expand Down Expand Up @@ -48,4 +50,4 @@
# inflect.uncountable %w( fish sheep )
# end

# Include your application configuration below
# Include your application configuration below
2 changes: 2 additions & 0 deletions depot/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@
# Install the default route as the lowest priority.
map.connect ':controller/:action/:id.:format'
map.connect ':controller/:action/:id'

map.connect '', :controller => 'store'
end
75 changes: 0 additions & 75 deletions depot/public/index.html

This file was deleted.

0 comments on commit 0ebbb6b

Please sign in to comment.