Changeset 8994

Timestamp:

03/08/08 19:31:50 (4 months ago)

Author:

minam

Message:

allow :copy_exclude to work for both normal and cached copies

Files:

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

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

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

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

@@ -25 +25 @@
-  end
-
+  def test_deploy_with_exclusions_should_remove_patterns_from_destination
+    @config[:copy_exclude] = ".git"
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+
+    FileUtils.expects(:rm_rf).with("/temp/dir/1234567890/.git")
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
-  def test_deploy_with_export_should_use_tar_gz_and_export
-    Dir.expects(:tmpdir).returns("/temp/dir")
@@ -190 +201 @@
-    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
-
-
-
+
+
+
-    prepare_standard_compress_and_copy!
-    @strategy.deploy!
@@ -206 +218 @@
-
-      Dir.expects(:glob).with("app/*", File::FNM_DOTMATCH).returns(["app/.", "app/..", "app/bar.txt"])
-
-
-
-
+
+
-    end
-