Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'missing-hidden-files' of https://github.com/jfarrell/vc…

…ap-staging into jfarrell-missing-hidden-files

Conflicts:
	lib/vcap/staging/plugin/play/plugin.rb
	spec/unit/php_spec.rb
  • Loading branch information...
commit a48968468262a67b874ed056d86b3bf08334845f 2 parents 456b85a + 9342664
Maria Shaldibina and Mark Rushakoff authored
View
2  lib/vcap/staging/plugin/staging_plugin.rb
@@ -208,7 +208,7 @@ def create_startup_script
def copy_source_files(dest = nil)
dest ||= app_dir
- system "cp -a #{File.join(source_directory, "*")} #{dest}"
+ system "cp -a #{File.join(source_directory, ".")} #{dest}"
end
def bound_services
View
4 spec/fixtures/apps/app_with_procfile/source/.hidden
@@ -0,0 +1,4 @@
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteRule ^oldpage\.html$ newpage.html
+</IfModule>
View
4 spec/fixtures/apps/app_without_procfile/source/.hidden
@@ -0,0 +1,4 @@
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteRule ^oldpage\.html$ newpage.html
+</IfModule>
View
4 spec/fixtures/apps/invalid_procfile/source/.hidden
@@ -0,0 +1,4 @@
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteRule ^oldpage\.html$ newpage.html
+</IfModule>
View
8 spec/unit/buildpack_spec.rb
@@ -62,6 +62,14 @@
EXPECTED
end
end
+
+ it "is packaged without missing dot files like .hidden" do
+ stage staging_env do |staged_dir|
+ app_dir = File.join(staged_dir, 'app')
+ app_files = Dir.entries(app_dir)
+ app_files.should include('.hidden')
+ end
+ end
end
let(:staging_env) { buildpack_staging_env }
Please sign in to comment.
Something went wrong with that request. Please try again.