svn commit: r703844 - in /incubator/buildr/trunk: doc/pages/packaging.textile lib/buildr/core/test.rb lib/buildr/packaging/artifact.rb lib/buildr/packaging/package.rb

[la...@apache.org]

Author: lacton
Date: Sun Oct 12 09:30:57 2008
New Revision: 703844

URL: http://svn.apache.org/viewvc?rev=703844&view=rev
Log:
'deploy' task has been renamed to 'upload' for version 1.2.0

Modified:
    incubator/buildr/trunk/doc/pages/packaging.textile
    incubator/buildr/trunk/lib/buildr/core/test.rb
    incubator/buildr/trunk/lib/buildr/packaging/artifact.rb
    incubator/buildr/trunk/lib/buildr/packaging/package.rb

Modified: incubator/buildr/trunk/doc/pages/packaging.textile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/pages/packaging.textile?rev=703844&r1=703843&r2=703844&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/packaging.textile (original)
+++ incubator/buildr/trunk/doc/pages/packaging.textile Sun Oct 12 09:30:57 2008
@@ -384,7 +384,7 @@
 
 {{{!ruby
 # We'll let some other task decide how to create 'docs'
-task 'deploy'=>'docs' do
+task 'upload'=>'docs' do
   uri = URI("sftp://#{username}:#{password}@var/www/docs")
   uri.upload file('docs')
 end

Modified: incubator/buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/test.rb?rev=703844&r1=703843&r2=703844&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/test.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/test.rb Sun Oct 12 09:30:57 2008
@@ -629,9 +629,9 @@
     # Use this method to return the integration tests task, or enhance it with a block to execute.
     #
     # There is one integration tests task you can execute directly, or as a result of running the package
-    # task (or tasks that depend on it, like install and deploy). It contains all the tests marked with
+    # task (or tasks that depend on it, like install and upload). It contains all the tests marked with
     # :integration=>true, all other tests are considered unit tests and run by the test task before packaging.
-    # So essentially: build=>test=>packaging=>integration=>install/deploy.
+    # So essentially: build=>test=>packaging=>integration=>install/upload.
     #
     # You add new tests from projects that define integration tests using the regular test task,
     # but with the following addition:
@@ -658,7 +658,7 @@
   class Options
 
     # Runs tests after the build when true (default). This forces tests to execute
-    # after the build, including when running build related tasks like install, deploy and release.
+    # after the build, including when running build related tasks like install, upload and release.
     #
     # Set to false to not run any tests. Set to :all to run all tests, ignoring failures.
     #

Modified: incubator/buildr/trunk/lib/buildr/packaging/artifact.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=703844&r1=703843&r2=703844&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ incubator/buildr/trunk/lib/buildr/packaging/artifact.rb Sun Oct 12 09:30:57 2008
@@ -312,7 +312,7 @@
     # Use this when you want to install or upload an artifact from a given file, for example:
     #   test = artifact('group:id:jar:1.0').from('test.jar')
     #   install test
-    # See also Buildr#install and Buildr#deploy.
+    # See also Buildr#install and Buildr#upload.
     def from(path)
       path = File.expand_path(path.to_s)
       enhance [path] do

Modified: incubator/buildr/trunk/lib/buildr/packaging/package.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/packaging/package.rb?rev=703844&r1=703843&r2=703844&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/packaging/package.rb (original)
+++ incubator/buildr/trunk/lib/buildr/packaging/package.rb Sun Oct 12 09:30:57 2008
@@ -35,7 +35,7 @@
       Project.local_task('uninstall') { |name| "Uninstalling packages from #{name}" }
       desc 'Upload packages created by the project'
       Project.local_task('upload'=>'package') { |name| "Deploying packages from #{name}" }
-      # Anything that comes after local packaging (install, deploy) executes the integration tests,
+      # Anything that comes after local packaging (install, upload) executes the integration tests,
       # which do not conflict with integration invoking the project's own packaging (package=>
       # integration=>foo:package is not circular, just confusing to debug.)
       task 'package' do