cf 4.2.9.rc5 → 4.2.10.rc1

data/spec/integration/push_flow_spec.rb

@@ -9,7 +9,6 @@ if ENV["CF_V2_RUN_INTEGRATION"]
     let(:app) { "hello-sinatra-#{run_id}" }
     let(:subdomain) { "hello-sinatra-subdomain-#{run_id}" }
     let(:service_name) { "dummy-service-#{run_id}" }
-    let(:user_provided_name) { "user-provided-#{run_id}"}
 
     before do
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
@@ -21,10 +20,6 @@ if ENV["CF_V2_RUN_INTEGRATION"]
     after do
       `#{cf_bin} unbind-service -f --no-script #{service_name} #{app}`
       `#{cf_bin} delete-service -f --no-script #{service_name}`
-
-      `#{cf_bin} unbind-service -f --no-script #{user_provided_name} #{app}`
-      `#{cf_bin} delete-service -f --no-script #{user_provided_name}`
-
       `#{cf_bin} delete #{app} -f --routes --no-script`
       logout
       Interact::Progress::Dots.stop!
@@ -90,27 +85,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
           expect(runner).not_to say "Which plan?>"
           runner.send_up_arrow
           expect(runner).not_to say "Which plan?>"
-          runner.send_keys "y"
-
-          # create a user-provided service here
-          expect(runner).to say "What kind?>"
-          runner.send_keys "user-provided"
-
-          expect(runner).to say "Name?>"
-          runner.send_keys user_provided_name
-
-          expect(runner).not_to say "Which plan?>"
-          expect(runner).to say "What credential parameters should applications use to connect to this service instance? (e.g. hostname, port, password)\nKeys>"
-          runner.send_keys "uri"
-
-          expect(runner).to say "uri>"
-          runner.send_keys "mysql://u:p@example.com:port/db"
-
-          expect(runner).to say /Creating service #{user_provided_name}.*OK/
-          expect(runner).to say /Binding .+ to .+ OK/
-
-          expect(runner).to say "Create another service?> n"
-          runner.send_keys "n"
+          runner.send_return
 
           if runner.expect "Bind other services to application?> n", 15
             runner.send_return

data/spec/manifests/manifests_spec.rb

@@ -65,29 +65,13 @@ describe CFManifests do
             :service_binding,
             :service_instance =>
               build(
-                :managed_service_instance,
+                :service_instance,
                 :name => "service-1",
                 :service_plan =>
                   build(
                     :service_plan,
                     :name => "P200",
-                    :service => build(:service,
-                      label: "managed",
-                      provider: "hamazon",
-                      version: "v3"
-                    )
-                  )
-              )
-          ),
-          build(
-            :service_binding,
-            :service_instance =>
-              build(
-                :user_provided_service_instance,
-                :name => "service-2",
-                :credentials => { uri: "mysql://example.com" }
-              )
-          )
+                    :service => build(:service))))
         ]
     end
 
@@ -103,18 +87,28 @@ describe CFManifests do
     its(["buildpack"]) { should eq "git://example.com/foo.git" }
 
     it "contains the service information" do
-      expect(subject["services"]).to eq(
-        "service-1" => {
-          "plan" => "P200",
-          "label" => "managed",
-          "provider" => "hamazon",
-          "version" => "v3",
-        },
-        "service-2" => {
-          "credentials" => {"uri" => "mysql://example.com"},
-          "label" => "user-provided"
-        },
-      )
+      expect(subject["services"]).to be_a Hash
+
+      services = subject["services"]
+      app.service_bindings.each do |b|
+        service = b.service_instance
+
+        expect(services).to include service.name
+
+        info = services[service.name]
+
+        plan = service.service_plan
+        offering = plan.service
+
+        {"plan" => plan.name,
+          "label" => offering.label,
+          "provider" => offering.provider,
+          "version" => offering.version
+        }.each do |attr, val|
+          expect(info).to include attr
+          expect(info[attr]).to eq val
+        end
+      end
     end
 
     context "with only minimum configuration" do
@@ -141,27 +135,12 @@ describe CFManifests do
       dont_allow_ask(anything, anything)
     end
 
-    context "when user-provided services are defined in the manifest" do
-      let(:client) do
-        build(:client).tap { |client| client.stub(:services => [], :service_instances => []) }
-      end
-
-      let(:info) { {:services => {'moracle' => {:label => "user-provided", :credentials =>{"k" => "v"}}}}}
-
-      it "creates the service with label user-provided" do
-        cmd.should_receive(:invoke).with(:create_service,
-          :name => 'moracle', :offering => has_label("user-provided"), :app => app, :credentials => {"k" => "v"}
-        )
-        cmd.send("setup_services", app, info)
-      end
-    end
-
     context "when services are defined in the manifest" do
       let(:info) do
         {:services => {"service-1" => {:label => "mysql", :plan => "100"}}}
       end
 
-      let(:service_1) { build(:managed_service_instance, :name => "service-1") }
+      let(:service_1) { build(:service_instance, :name => "service-1") }
       let(:plan_100) { build :service_plan, :name => "100" }
 
       let(:mysql) do

data/spec/support/features_helper.rb

@@ -28,40 +28,9 @@ module FeaturesHelper
     end
   end
 
-  def create_service_instance(service_name, instance_name, opts = {})
-    plan_name = opts[:plan]
-    credentials = opts[:credentials]
-
-    BlueShell::Runner.run("#{cf_bin} create-service") do |runner|
-      expect(runner).to say "What kind?>"
-      runner.send_keys service_name
-
-      expect(runner).to say "Name?>"
-      runner.send_keys instance_name
-
-      if service_name == "user-provided"
-        expect(runner).to say "Keys"
-        runner.send_keys credentials.keys.join(", ")
-
-        credentials.each do |key, value|
-          expect(runner).to say key.to_s
-          runner.send_keys value.to_s
-        end
-      else
-        expect(runner).to say "Which plan?"
-        runner.send_keys plan_name
-      end
-
-      expect(runner).to say "Creating service #{instance_name}... OK"
-    end
-  end
-
-  def push_app(app_folder, deployed_app_name, opts = {})
-    push_cmd = "#{cf_bin} push --no-manifest"
-    push_cmd += " --command #{opts[:start_command]}" if opts[:start_command]
-
+  def push_app(app_folder, deployed_app_name)
     Dir.chdir("#{SPEC_ROOT}/assets/#{app_folder}") do
-      BlueShell::Runner.run(push_cmd) do |runner|
+      BlueShell::Runner.run("#{cf_bin} push --no-manifest") do |runner|
         expect(runner).to say "Name>"
         runner.send_keys deployed_app_name
 
@@ -90,9 +59,7 @@ module FeaturesHelper
           runner.send_return
         end
 
-        expect(runner).to say "Push successful!"
-
-        runner.wait_for_exit opts[:timeout] || 30
+        runner.wait_for_exit
       end
     end
   end

data/spec/support/matchers.rb

@@ -1,16 +1,5 @@
-class HasLabelMatcher
-  def initialize(expected_label)
-    @expected = expected_label
+RSpec::Matchers.define :has_label do |expected|
+  match do |actual|
+    actual.label == expected
   end
-  def failure_message_for_should
-    "#{actual} does not have label #{@expected}"
-  end
-  def ==(actual)
-    actual.label == @expected
-  end
-  alias_method :matches?, :==
-end
-
-def has_label(expected_label)
-  HasLabelMatcher.new(expected_label)
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.9.rc5
+  version: 4.2.10.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: caldecott-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,20 +47,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.4.rc2
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.4.rc2
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,6 +106,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +117,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +125,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +133,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +141,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +149,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,13 +157,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: anchorman
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +189,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +197,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +205,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +213,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -181,6 +221,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,6 +229,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -195,6 +237,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -202,6 +245,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,6 +253,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,6 +261,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -223,6 +269,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,6 +277,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -237,6 +285,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -244,6 +293,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -251,6 +301,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -258,6 +309,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -265,6 +317,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -335,7 +388,6 @@ files:
 - lib/cf/cli/service/delete.rb
 - lib/cf/cli/service/rename.rb
 - lib/cf/cli/service/service.rb
-- lib/cf/cli/service/service_instance_helper.rb
 - lib/cf/cli/service/services.rb
 - lib/cf/cli/service/unbind.rb
 - lib/cf/cli/space/base.rb
@@ -398,15 +450,11 @@ files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
 - spec/admin/set_quota_spec.rb
-- spec/assets/env/env_test.rb
-- spec/assets/env/Gemfile
-- spec/assets/env/Gemfile.lock
 - spec/assets/hello-sinatra/config.ru
 - spec/assets/hello-sinatra/fat-cat-makes-app-larger.png
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
-- spec/assets/hello-sinatra/manifest.yml
 - spec/assets/rails328_ruby187_app/app/assets/images/rails.png
 - spec/assets/rails328_ruby187_app/app/assets/javascripts/application.js
 - spec/assets/rails328_ruby187_app/app/assets/stylesheets/application.css
@@ -488,7 +536,6 @@ files:
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/help_spec.rb
 - spec/cf/cli/service/rename_spec.rb
-- spec/cf/cli/service/service_instance_helper_spec.rb
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
@@ -515,21 +562,19 @@ files:
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
 - spec/factories/cfoundry/v2/domains_factory.rb
-- spec/factories/cfoundry/v2/managed_service_instances_factory.rb
 - spec/factories/cfoundry/v2/organizations_factory.rb
 - spec/factories/cfoundry/v2/quota_definitions.rb
 - spec/factories/cfoundry/v2/routes_factory.rb
 - spec/factories/cfoundry/v2/service_bindings_factory.rb
+- spec/factories/cfoundry/v2/service_instances_factory.rb
 - spec/factories/cfoundry/v2/service_plans_factory.rb
 - spec/factories/cfoundry/v2/services_factory.rb
 - spec/factories/cfoundry/v2/spaces_factory.rb
 - spec/factories/cfoundry/v2/stacks_factory.rb
-- spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb
 - spec/factories/cfoundry/v2/users_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
-- spec/features/manifests_spec.rb
 - spec/features/org_spec.rb
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
@@ -557,40 +602,40 @@ files:
 homepage: http://github.com/cloudfoundry/cf
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1557605910592806796
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 2.0.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
 - spec/admin/set_quota_spec.rb
-- spec/assets/env/env_test.rb
-- spec/assets/env/Gemfile
-- spec/assets/env/Gemfile.lock
 - spec/assets/hello-sinatra/config.ru
 - spec/assets/hello-sinatra/fat-cat-makes-app-larger.png
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
-- spec/assets/hello-sinatra/manifest.yml
 - spec/assets/rails328_ruby187_app/app/assets/images/rails.png
 - spec/assets/rails328_ruby187_app/app/assets/javascripts/application.js
 - spec/assets/rails328_ruby187_app/app/assets/stylesheets/application.css
@@ -672,7 +717,6 @@ test_files:
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/help_spec.rb
 - spec/cf/cli/service/rename_spec.rb
-- spec/cf/cli/service/service_instance_helper_spec.rb
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
@@ -699,21 +743,19 @@ test_files:
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
 - spec/factories/cfoundry/v2/domains_factory.rb
-- spec/factories/cfoundry/v2/managed_service_instances_factory.rb
 - spec/factories/cfoundry/v2/organizations_factory.rb
 - spec/factories/cfoundry/v2/quota_definitions.rb
 - spec/factories/cfoundry/v2/routes_factory.rb
 - spec/factories/cfoundry/v2/service_bindings_factory.rb
+- spec/factories/cfoundry/v2/service_instances_factory.rb
 - spec/factories/cfoundry/v2/service_plans_factory.rb
 - spec/factories/cfoundry/v2/services_factory.rb
 - spec/factories/cfoundry/v2/spaces_factory.rb
 - spec/factories/cfoundry/v2/stacks_factory.rb
-- spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb
 - spec/factories/cfoundry/v2/users_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
-- spec/features/manifests_spec.rb
 - spec/features/org_spec.rb
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb