Skip to content

Commit

Permalink
Merge branch 'master' into 2.0-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
ianwhite committed May 22, 2008
2 parents 86d21ff + 6243c1b commit a56c8d3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -24,7 +24,7 @@ namespace :spec do
t.spec_files = FileList['spec/**/*_spec.rb']
t.rcov = true
t.rcov_dir = 'doc/coverage'
t.rcov_opts = ['--text-report', '--exclude', "spec/,#{File.expand_path(File.join(File.dirname(__FILE__),'../../..'))}"]
t.rcov_opts = ['--text-report', '--exclude', "spec/,rcov.rb,#{File.expand_path(File.join(File.dirname(__FILE__),'../../..'))}"]
end

namespace :rcov do
Expand Down
18 changes: 15 additions & 3 deletions garlic_example.rb
Expand Up @@ -17,9 +17,9 @@

# repo, give a url, specify :local to use a local repo (faster
# and will still update from the origin url)
repo 'rails', :url => 'git://github.com/rails/rails' #, :local => "~/dev/vendor/rails"
repo 'rspec', :url => 'git://github.com/dchelimsky/rspec' #, :local => "~/dev/vendor/rspec"
repo 'rspec-rails', :url => 'git://github.com/dchelimsky/rspec-rails' #, :local => "~/dev/vendor/rspec-rails"
repo 'rails', :url => 'git://github.com/rails/rails', :local => "~/dev/vendor/rails"
repo 'rspec', :url => 'git://github.com/dchelimsky/rspec', :local => "~/dev/vendor/rspec"
repo 'rspec-rails', :url => 'git://github.com/dchelimsky/rspec-rails', :local => "~/dev/vendor/rspec-rails"
repo 'response_for', :path => '.'

# for target, default repo is 'rails', default branch is 'master'
Expand All @@ -29,6 +29,12 @@
end
end

target '2.1-RC1' do
prepare do
plugin 'response_for', :clone => true
end
end

target '2.0-stable', :branch => 'origin/2-0-stable' do
prepare do
plugin 'response_for', :branch => 'origin/2.0-stable', :clone => true
Expand All @@ -40,6 +46,12 @@
plugin 'response_for', :branch => 'origin/2.0-stable', :clone => true
end
end

target '2.0.3', :tag => 'v2.0.3' do
prepare do
plugin 'response_for', :branch => 'origin/2.0-stable', :clone => true
end
end

all_targets do
prepare do
Expand Down

0 comments on commit a56c8d3

Please sign in to comment.