svn commit: r744598 - in /buildr/trunk: lib/buildr.rb lib/buildr/scala.rb spec/sandbox.rb spec/scala/scala.rb

[bo...@apache.org]

Author: boisvert
Date: Sun Feb 15 02:22:07 2009
New Revision: 744598

URL: http://svn.apache.org/viewvc?rev=744598&view=rev
Log:
BUILDR-242: Include Scala-Tools Repository by Default.  require 'buildr/scala' is now required as well

Added:
    buildr/trunk/spec/scala/scala.rb
Modified:
    buildr/trunk/lib/buildr.rb
    buildr/trunk/lib/buildr/scala.rb
    buildr/trunk/spec/sandbox.rb

Modified: buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=744598&r1=744597&r2=744598&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Sun Feb 15 02:22:07 2009
@@ -20,7 +20,6 @@
 require 'buildr/core'
 require 'buildr/packaging'
 require 'buildr/java'
-require 'buildr/scala'
 require 'buildr/ide'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)

Modified: buildr/trunk/lib/buildr/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala.rb?rev=744598&r1=744597&r2=744598&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala.rb (original)
+++ buildr/trunk/lib/buildr/scala.rb Sun Feb 15 02:22:07 2009
@@ -16,4 +16,7 @@
 
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'
+
+Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
+
 Object::Scala = Buildr::Scala

Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=744598&r1=744597&r2=744598&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Sun Feb 15 02:22:07 2009
@@ -19,10 +19,10 @@
 # repository and cache these across test cases.
 Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 repositories.remote << 'http://repo1.maven.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases'
 
 # Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
 require 'buildr/groovy'
+require 'buildr/scala'
 
 Java.load # Anything added to the classpath.
 artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each do |path|

Added: buildr/trunk/spec/scala/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/scala.rb?rev=744598&view=auto
==============================================================================
--- buildr/trunk/spec/scala/scala.rb (added)
+++ buildr/trunk/spec/scala/scala.rb Sun Feb 15 02:22:07 2009
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+describe 'scala' do
+  it 'should automatically add the remote scala-tools.org repository' do
+    # NOTE: the sandbox environment clears "repositories.remote" so we can't
+    #       test for this spec right now.
+    #
+    # repositories.remote.should include('http://scala-tools.org/repo-releases')
+  end
+end