Changeset 9005

Timestamp:

03/10/08 21:08:57 (4 months ago)

Author:

minam

Message:

for cached local copies, do the exclude and the copy in the same step, it is much faster

Files:

• tools/capistrano/lib/capistrano/recipes/deploy/strategy/copy.rb (modified) (2 diffs)
• tools/capistrano/test/deploy/strategy/copy_test.rb (modified) (2 diffs)

tools/capistrano/lib/capistrano/recipes/deploy/strategy/copy.rb

@@ -61 +61 @@
-                item = queue.shift
-                name = File.basename(item)
+
-                next if name == "." || name == ".."
+                next if copy_exclude.any? { |pattern| File.fnmatch(pattern, item) }
+
-                if File.directory?(item)
-                  queue += Dir.glob("#{item}/*", File::FNM_DOTMATCH)
@@ -73 +76 @@
-            logger.debug "getting (via #{copy_strategy}) revision #{revision} to #{destination}"
-            system(command)
-
-
-if copy_exclude.any?
-logger.debug "processing exclusions..."
-copy_exclude.each { |pattern| FileUtils.rm_rf(File.join(destination, pattern)) }
+
+
+    logger.debug "processing exclusions..."
+  copy_exclude.each { |pattern| FileUtils.rm_rf(File.join(destination, pattern)) }
+end
-          end
-

tools/capistrano/test/deploy/strategy/copy_test.rb

@@ -201 +201 @@
-    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
-
-
-
-
+
+
-    prepare_standard_compress_and_copy!
-    @strategy.deploy!
@@ -218 +217 @@
-
-      Dir.expects(:glob).with("app/*", File::FNM_DOTMATCH).returns(["app/.", "app/..", "app/bar.txt"])
-
-
+
+
+
+
+
-    end
-