garlic_example now handles the diffs between the master and rails-2.0…

…-2.1 branch

garlic_example.rb

@@ -17,42 +17,58 @@
 
   # 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"
-  # using own clone of rspec, until aliased-render-partial gets fixed.
-  repo 'rspec', :url => 'git://github.com/ianwhite/rspec' #, :local => "~/dev/ianwhite/spec"
-  repo 'rspec-rails', :url => 'git://github.com/ianwhite/rspec-rails'#, :local => "~/dev/ianwhite/spec"
+  repo 'rails', :url => 'git://github.com/rails/rails' ,  :local => "~/dev/vendor/rails"
+  repo 'rspec', :url => 'git://github.com/dchelimsky/rspec' , :local => "~/dev/vendor/spec"
+  repo 'rspec-rails', :url => 'git://github.com/dchelimsky/rspec-rails' , :local => "~/dev/vendor/spec"
+
+  # these are for testing rails-2.0-2.1 branch
+  repo 'ianwhite-rspec', :url => 'git://github.com/ianwhite/rspec' , :local => "~/dev/ianwhite/spec"
+  repo 'ianwhite-rspec-rails', :url => 'git://github.com/ianwhite/rspec-rails' , :local => "~/dev/ianwhite/spec"
+
   repo 'inherit_views', :path => '.'
 
   # for target, default repo is 'rails', default branch is 'master'
-  target 'edge' do
+  target 'edge', :branch => 'origin/master' do
     prepare do
-      plugin 'inherit_views', :clone => true
+      plugin 'inherit_views', :branch => 'origin/master', :clone => true
+      plugin 'rspec'
+      plugin 'rspec-rails' do
+        sh "script/generate rspec -f"
+      end
+      run do
+        cd "vendor/plugins/inherit_views" do
+          sh "rake spec:rcov:verify"
+        end
+      end
     end
   end
 
   target '2.0-stable', :branch => 'origin/2-0-stable' do
     prepare do
       plugin 'inherit_views', :branch => 'origin/rails-2.0-2.1', :clone => true
+      plugin 'ianwhite-rspec', :as => 'rspec'
+      plugin 'ianwhite-rspec-rails', :as => 'rspec-rails' do
+        sh "script/generate rspec -f"
+      end
+      run do
+        cd "vendor/plugins/inherit_views" do
+          sh "rake spec"
+        end
+      end
     end
   end
 
   target '2.1-stable', :branch => 'origin/2-1-stable' do
     prepare do
       plugin 'inherit_views', :branch => 'origin/rails-2.0-2.1', :clone => true
-    end
-  end
-
-  all_targets do
-    prepare do
-      plugin 'rspec'
-      plugin 'rspec-rails' do
+      plugin 'ianwhite-rspec', :as => 'rspec'
+      plugin 'ianwhite-rspec-rails', :as => 'rspec-rails' do
         sh "script/generate rspec -f"
       end
-    end
-
-    run do
-      cd "vendor/plugins/inherit_views" do
-        sh "rake spec:rcov:verify"
+      run do
+        cd "vendor/plugins/inherit_views" do
+          sh "rake spec"
+        end
       end
     end
   end