cfoundry 0.5.3.rc2 → 0.5.3.rc3

data/Rakefile

@@ -6,33 +6,3 @@ require "cfoundry/version"
 
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
-
-namespace :deploy do
-  def last_staging_sha
-    `git rev-parse latest-staging`.strip
-  end
-
-  def last_release_sha
-    `git rev-parse latest-release`.strip
-  end
-
-  def last_staging_ref_was_released?
-    last_staging_sha == last_release_sha
-  end
-
-  task :staging, :version do |_, args|
-    sh "gem bump --push #{"--version #{args.version}" if args.version}" if last_staging_ref_was_released?
-    sh "git tag -f latest-staging"
-    sh "git push origin :latest-staging"
-    sh "git push origin latest-staging"
-  end
-
-  task :gem do
-    sh "git fetch"
-    sh "git checkout #{last_staging_sha}"
-    sh "gem release --tag"
-    sh "git tag -f latest-release"
-    sh "git push origin :latest-release"
-    sh "git push origin latest-release"
-  end
-end

data/lib/cc_api_stub/helper.rb

@@ -29,8 +29,12 @@ module CcApiStub
           to_return(response(400, error_attributes))
       end
 
-      def load_fixtures(fixtures_name, options = {})
-        path = File.join(File.dirname(__FILE__), "..", "..", "spec/fixtures/#{fixtures_name.to_s}.json")
+      def load_fixtures(fixture_name_or_path, options = {})
+        path = if options.delete(:use_local_fixture)
+          fixture_name_or_path
+        else
+          File.join(File.dirname(__FILE__), "..", "..", "spec/fixtures/#{fixture_name_or_path.to_s}.json")
+        end
         JSON.parse(File.read(path)).tap do |fixture|
           fixture["entity"].merge!(options.stringify_keys) if options.any?
         end

data/lib/cfoundry/upload_helpers.rb

@@ -59,46 +59,26 @@ module CFoundry
       elsif war_file = Dir.glob("#{path}/*.war").first
         CFoundry::Zip.unpack(war_file, to)
       else
-        check_unreachable_links(path)
-
         FileUtils.mkdir(to)
 
-        files = Dir.glob("#{path}/{*,.[^\.]*}")
-
         exclude = UPLOAD_EXCLUDE
         if File.exists?("#{path}/.vmcignore")
           exclude += File.read("#{path}/.vmcignore").split(/\n+/)
         end
 
-        # prevent initial copying if we can, remove sub-files later
-        files.reject! do |f|
-          exclude.any? do |e|
-            File.fnmatch(f.sub(path + "/", ""), e)
-          end
-        end
+        files = files_to_consider(path, exclude)
+
+        check_unreachable_links(files, path)
 
-        FileUtils.cp_r(files, to)
+        copy_tree(files, path, to)
 
         find_sockets(to).each do |s|
           File.delete s
         end
-
-        # remove ignored globs more thoroughly
-        #
-        # note that the above file list only includes toplevel
-        # files/directories for cp_r, so this is where sub-files/etc. are
-        # removed
-        exclude.each do |e|
-          Dir.glob("#{to}/#{e}").each do |f|
-            FileUtils.rm_rf(f)
-          end
-        end
       end
     end
 
-    def check_unreachable_links(path)
-      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
-
+    def check_unreachable_links(files, path)
       # only used for friendlier error message
       pwd = Pathname.pwd
 
@@ -118,9 +98,54 @@ module CFoundry
       end
     end
 
+    # TODO: handle negation
+    def files_to_consider(path, exclusions)
+      entries = all_files(path)
+
+      to_exclude = exclusions.dup
+      until to_exclude.empty?
+        exclude = to_exclude.shift
+
+        entries.reject! do |entry|
+          is_dir = File.directory?(entry)
+          excluded = glob_matches?(entry, path, exclude)
+
+          if is_dir && excluded
+            # if a directory was excluded, exclude its contents
+            to_exclude.unshift(entry.sub(path + "/", "/") + "/**")
+          end
+
+          excluded
+        end
+      end
+
+      entries
+    end
+
+    def glob_matches?(file, path, pattern)
+      name = file.sub("#{path}/", "/")
+      flags = File::FNM_DOTMATCH
+
+      # when pattern ends with /, match only directories
+      if pattern.end_with?("/") && File.directory?(file)
+        name = "#{name}/"
+      end
+
+      case pattern
+      # when pattern contains /, do a pathname match
+      when /\/./
+        flags |= File::FNM_PATHNAME
+
+      # otherwise, match any file path
+      else
+        pattern = "**/#{pattern}"
+      end
+
+      File.fnmatch(pattern, name, flags)
+    end
+
     def find_sockets(path)
-      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
-      files && files.select { |f| File.socket? f }
+      all_files(path).select { |f| File.socket? f }
     end
 
     def determine_resources(path)
@@ -150,14 +175,13 @@ module CFoundry
     # This ensures that directories containing empty directories
     # are also pruned.
     def prune_empty_directories(path)
-      all_files = Dir["#{path}/**/{*,.*}"]
-      all_files.reject! { |fn| fn =~ /\/\.+$/ }
+      all_files = all_files(path)
 
       directories = all_files.select { |x| File.directory?(x) }
       directories.sort! { |a, b| b.size <=> a.size }
 
       directories.each do |directory|
-        entries = Dir.entries(directory) - %w{. ..}
+        entries = all_files(directory)
         FileUtils.rmdir(directory) if entries.empty?
       end
     end
@@ -166,7 +190,7 @@ module CFoundry
       fingerprints = []
       total_size = 0
 
-      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH) do |filename|
+      all_files(path).each do |filename|
         next if File.directory?(filename)
 
         size = File.size(filename)
@@ -182,5 +206,25 @@ module CFoundry
 
       [fingerprints, total_size]
     end
+
+    def all_files(path)
+      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject! do |fn|
+        fn =~ /\.$/
+      end
+    end
+
+    def copy_tree(files, path, to)
+      files.each do |file|
+        dest = file.sub("#{path}/", "#{to}/")
+
+        if File.directory?(file)
+          FileUtils.mkdir_p(dest)
+        else
+          destdir = File.dirname(dest)
+          FileUtils.mkdir_p(destdir)
+          FileUtils.cp(file, dest)
+        end
+      end
+    end
   end
 end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.5.3.rc2".freeze
+  VERSION = "0.5.3.rc3".freeze
 end

data/spec/cfoundry/upload_helpers_spec.rb

@@ -95,12 +95,14 @@ describe CFoundry::UploadHelpers do
       subject
     end
 
-    it 'does not include files and directories specified in the vmcignore (including glob patterns)' do
+    it 'does not include files and directories specified in the vmcignore' do
       mock_zip do |src, _|
         files = relative_glob(src)
-        expect(files).not_to include "ignored_dir"
-        expect(files).not_to include "ignored_file.txt"
-        expect(files).not_to include "non_ignored_dir/ignored_file.txt" # glob pattern **/ignored_file.txt
+        expect(files).to match_array(%w[
+          .hidden_file .vmcignore non_ignored_dir ambiguous_ignored
+          non_ignored_dir/file_in_non_ignored_dir.txt non_ignored_file.txt
+          non_ignored_dir/toplevel_ignored.txt
+        ])
       end
       subject
     end
@@ -170,5 +172,23 @@ describe CFoundry::UploadHelpers do
         fake_model.upload(path)
       end
     end
+
+    context "when there is a symlink pointing outside of the root" do
+      let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_external_symlink" }
+
+      it "blows up" do
+        expect {
+          fake_model.upload(path)
+        }.to raise_error(CFoundry::Error, /contains links.*that point outside/)
+      end
+
+      context "and it is vmcignored" do
+        let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_ignored_external_symlink" }
+
+        it "ignores it" do
+          expect { fake_model.upload(path) }.to_not raise_error
+        end
+      end
+    end
   end
 end

data/spec/fixtures/apps/with_external_symlink/foo

@@ -0,0 +1 @@
+foo

data/spec/fixtures/apps/with_ignored_external_symlink/foo

@@ -0,0 +1 @@
+foo

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: -1906723574
+  hash: 1230613173
   prerelease: 6
   segments: 
   - 0
   - 5
   - 3
   - rc
-  - 2
-  version: 0.5.3.rc2
+  - 3
+  version: 0.5.3.rc3
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,10 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-07 00:00:00 Z
+date: 2013-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: multipart-post
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +33,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  prerelease: false
   type: :runtime
-  name: multipart-post
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: multi_json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +48,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  prerelease: false
   type: :runtime
-  name: multi_json
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rubyzip
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +63,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
   type: :runtime
-  name: rubyzip
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: cf-uaa-lib
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +79,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  prerelease: false
   type: :runtime
-  name: cf-uaa-lib
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +94,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
   type: :development
-  name: rake
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,12 +109,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
-  prerelease: false
   type: :development
-  name: rspec
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: webmock
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,12 +124,12 @@ dependencies:
         - 1
         - 9
         version: "1.9"
-  prerelease: false
   type: :development
-  name: webmock
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rr
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,12 +139,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   type: :development
-  name: rr
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: gem-release
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +153,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  name: gem-release
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: timecop
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -165,10 +167,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  name: timecop
-  requirement: *id010
+  version_requirements: *id010
 description: 
 email: 
 - vcap-dev@googlegroups.com
@@ -284,13 +284,18 @@ files:
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
 - spec/fixtures/apps/with_dotfiles/xyz
+- spec/fixtures/apps/with_external_symlink/foo
+- spec/fixtures/apps/with_ignored_external_symlink/foo
 - spec/fixtures/apps/with_nested_directories/foo/bar/baz/fizz
 - spec/fixtures/apps/with_nested_directories/xyz
+- spec/fixtures/apps/with_vmcignore/ambiguous_ignored
 - spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt
 - spec/fixtures/apps/with_vmcignore/ignored_file.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_dir/ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_dir/toplevel_ignored.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/toplevel_ignored.txt
 - spec/fixtures/empty_file
 - spec/fixtures/fake_cc_application.json
 - spec/fixtures/fake_cc_application_summary.json
@@ -405,13 +410,18 @@ test_files:
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
 - spec/fixtures/apps/with_dotfiles/xyz
+- spec/fixtures/apps/with_external_symlink/foo
+- spec/fixtures/apps/with_ignored_external_symlink/foo
 - spec/fixtures/apps/with_nested_directories/foo/bar/baz/fizz
 - spec/fixtures/apps/with_nested_directories/xyz
+- spec/fixtures/apps/with_vmcignore/ambiguous_ignored
 - spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt
 - spec/fixtures/apps/with_vmcignore/ignored_file.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_dir/ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_dir/toplevel_ignored.txt
 - spec/fixtures/apps/with_vmcignore/non_ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/toplevel_ignored.txt
 - spec/fixtures/empty_file
 - spec/fixtures/fake_cc_application.json
 - spec/fixtures/fake_cc_application_summary.json