cfoundry 0.6.0.rc4 → 0.6.0.rc5

data/lib/cc_api_stub/login.rb

@@ -13,7 +13,7 @@ module CcApiStub
         WebMock::API.stub_request(:post, %r{uaa.localhost/oauth/authorize}).
           to_return(
             :status => 302,
-            :headers => {"Location" => "https://uaa.localhost/redirect/vmc#access_token=sre-admin-access-token&token_type=bearer"}
+            :headers => {"Location" => "https://uaa.localhost/redirect/cf#access_token=sre-admin-access-token&token_type=bearer"}
           )
       end
     end

data/lib/cfoundry/uaaclient.rb

@@ -5,7 +5,7 @@ module CFoundry
   class UAAClient
     attr_accessor :target, :client_id, :token, :trace
 
-    def initialize(target = "https://uaa.cloudfoundry.com", client_id = "vmc")
+    def initialize(target = "https://uaa.cloudfoundry.com", client_id = "cf")
       @target = target
       @client_id = client_id
       CF::UAA::Misc.symbolize_keys = true

data/lib/cfoundry/upload_helpers.rb

@@ -20,7 +20,7 @@ module CFoundry
     #   A path pointing to either a directory, or a .jar, .war, or .zip
     #   file.
     #
-    #   If a .vmcignore file is detected under the given path, it will be used
+    #   If a .cfignore file is detected under the given path, it will be used
     #   to exclude paths from the payload, similar to a .gitignore.
     #
     # [check_resources]
@@ -34,7 +34,7 @@ module CFoundry
       end
 
       zipfile = "#{Dir.tmpdir}/#{@guid}.zip"
-      tmpdir = "#{Dir.tmpdir}/.vmc_#{@guid}_files"
+      tmpdir = "#{Dir.tmpdir}/.cf_#{@guid}_files"
 
       FileUtils.rm_f(zipfile)
       FileUtils.rm_rf(tmpdir)
@@ -56,14 +56,14 @@ module CFoundry
     def prepare_package(path, to)
       if path =~ /\.(jar|war|zip)$/
         CFoundry::Zip.unpack(path, to)
-      elsif war_file = Dir.glob("#{path}/*.war").first
+      elsif (war_file = Dir.glob("#{path}/*.war").first)
         CFoundry::Zip.unpack(war_file, to)
       else
         FileUtils.mkdir(to)
 
         exclude = UPLOAD_EXCLUDE
-        if File.exists?("#{path}/.vmcignore")
-          exclude += File.read("#{path}/.vmcignore").split(/\n+/)
+        if File.exists?("#{path}/.cfignore")
+          exclude += File.read("#{path}/.cfignore").split(/\n+/)
         end
 
         files = files_to_consider(path, exclude)

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.6.0.rc4".freeze
+  VERSION = "0.6.0.rc5".freeze
 end

data/spec/cfoundry/uaaclient_spec.rb

@@ -68,7 +68,7 @@ EOF
     let(:password) { "test" }
     let(:creds) { {:username => username, :password => password} }
     let(:state) { 'somestate' }
-    let(:redirect_uri) { 'https://uaa.cloudfoundry.com/redirect/vmc' }
+    let(:redirect_uri) { 'https://uaa.cloudfoundry.com/redirect/cf' }
     let(:auth) { Object.new }
     let(:issuer) { Object.new }
 

data/spec/cfoundry/upload_helpers_spec.rb

@@ -4,7 +4,7 @@ describe CFoundry::UploadHelpers do
   describe '#upload' do
     let(:base) { Object.new }
     let(:guid) { "123" }
-    let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_vmcignore" }
+    let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_cfignore" }
     let(:check_resources) { false }
     let(:tmpdir) { "#{SPEC_ROOT}/tmp/fake_tmpdir" }
 
@@ -95,11 +95,11 @@ describe CFoundry::UploadHelpers do
       subject
     end
 
-    it 'does not include files and directories specified in the vmcignore' do
+    it 'does not include files and directories specified in the cfignore' do
       mock_zip do |src, _|
         files = relative_glob(src)
         expect(files).to match_array(%w[
-          .hidden_file .vmcignore non_ignored_dir ambiguous_ignored
+          .hidden_file .cfignore non_ignored_dir ambiguous_ignored
           non_ignored_dir/file_in_non_ignored_dir.txt non_ignored_file.txt
           non_ignored_dir/toplevel_ignored.txt
         ])
@@ -140,7 +140,7 @@ describe CFoundry::UploadHelpers do
 
           stub(base).resource_match(anything) do
             %w{ xyz foo/bar/baz/fizz }.map do |path|
-              { :fn => "#{tmpdir}/.vmc_#{guid}_files/#{path}" }
+              { :fn => "#{tmpdir}/.cf_#{guid}_files/#{path}" }
             end
           end
 
@@ -161,7 +161,7 @@ describe CFoundry::UploadHelpers do
 
         stub(base).resource_match(anything) do
           %w{ xyz }.map do |path|
-            { :fn => "#{tmpdir}/.vmc_#{guid}_files/#{path}" }
+            { :fn => "#{tmpdir}/.cf_#{guid}_files/#{path}" }
           end
         end
 
@@ -182,7 +182,7 @@ describe CFoundry::UploadHelpers do
         }.to raise_error(CFoundry::Error, /contains links.*that point outside/)
       end
 
-      context "and it is vmcignored" do
+      context "and it is cfignored" do
         let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_ignored_external_symlink" }
 
         it "ignores it" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 1687798527
+  hash: 2837035787
   prerelease: 6
   segments: 
   - 0
   - 6
   - 0
   - rc
-  - 4
-  version: 0.6.0.rc4
+  - 5
+  version: 0.6.0.rc5
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 Z
+date: 2013-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -283,19 +283,19 @@ files:
 - spec/fakes/service_plan_fake.rb
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
+- spec/fixtures/apps/with_cfignore/ambiguous_ignored
+- spec/fixtures/apps/with_cfignore/ignored_dir/file_in_ignored_dir.txt
+- spec/fixtures/apps/with_cfignore/ignored_file.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_dir/file_in_non_ignored_dir.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_dir/ignored_file.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_dir/toplevel_ignored.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_file.txt
+- spec/fixtures/apps/with_cfignore/toplevel_ignored.txt
 - 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
@@ -413,19 +413,19 @@ test_files:
 - spec/fakes/service_plan_fake.rb
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
+- spec/fixtures/apps/with_cfignore/ambiguous_ignored
+- spec/fixtures/apps/with_cfignore/ignored_dir/file_in_ignored_dir.txt
+- spec/fixtures/apps/with_cfignore/ignored_file.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_dir/file_in_non_ignored_dir.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_dir/ignored_file.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_dir/toplevel_ignored.txt
+- spec/fixtures/apps/with_cfignore/non_ignored_file.txt
+- spec/fixtures/apps/with_cfignore/toplevel_ignored.txt
 - 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