cf 5.0.0.rc1 → 5.0.0.rc3

data/spec/manifests/manifests_spec.rb

@@ -65,13 +65,29 @@ describe CFManifests do
             :service_binding,
             :service_instance =>
               build(
-                :service_instance,
+                :managed_service_instance,
                 :name => "service-1",
                 :service_plan =>
                   build(
                     :service_plan,
                     :name => "P200",
-                    :service => build(:service))))
+                    :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" }
+              )
+          )
         ]
     end
 
@@ -87,28 +103,18 @@ describe CFManifests do
     its(["buildpack"]) { should eq "git://example.com/foo.git" }
 
     it "contains the service information" do
-      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
+      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"
+        },
+      )
     end
 
     context "with only minimum configuration" do
@@ -135,12 +141,27 @@ 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(:service_instance, :name => "service-1") }
+      let(:service_1) { build(:managed_service_instance, :name => "service-1") }
       let(:plan_100) { build :service_plan, :name => "100" }
 
       let(:mysql) do

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require "webmock/rspec"
 require "ostruct"
 require "fakefs/safe"
 require "blue-shell"
+require_relative '../vendor/integration-test-support/support/integration_example_group.rb'
 
 TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
 
@@ -29,6 +30,10 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
+tmp_dir = File.expand_path('../tmp', File.dirname(__FILE__))
+FileUtils.mkdir_p(tmp_dir)
+IntegrationExampleGroup.tmp_dir = tmp_dir
+
 RSpec.configure do |c|
   c.include BlueShell::Matchers
 
@@ -41,9 +46,10 @@ RSpec.configure do |c|
   c.include InteractHelper
   c.include ConfigHelper
   c.include FeaturesHelper
+  c.include IntegrationExampleGroup, type: :integration, :example_group => {:file_path => /\/integration\//}
 
   c.before(:all) do
-    WebMock.disable_net_connect!
+    WebMock.disable_net_connect!(:allow_localhost => true)
   end
 
   c.before do

data/spec/support/features_helper.rb

@@ -28,9 +28,40 @@ module FeaturesHelper
     end
   end
 
-  def push_app(app_folder, deployed_app_name)
+  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 "What credential parameters should applications use to connect to this service instance?\n(e.g. hostname, port, password)>"
+        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]
+
     Dir.chdir("#{SPEC_ROOT}/assets/#{app_folder}") do
-      BlueShell::Runner.run("#{cf_bin} push --no-manifest") do |runner|
+      BlueShell::Runner.run(push_cmd) do |runner|
         expect(runner).to say "Name>"
         runner.send_keys deployed_app_name
 
@@ -59,7 +90,9 @@ module FeaturesHelper
           runner.send_return
         end
 
-        runner.wait_for_exit
+        expect(runner).to say "Push successful!"
+
+        runner.wait_for_exit opts[:timeout] || 30
       end
     end
   end

data/spec/support/matchers.rb

@@ -1,5 +1,16 @@
-RSpec::Matchers.define :has_label do |expected|
-  match do |actual|
-    actual.label == expected
+class HasLabelMatcher
+  def initialize(expected_label)
+    @expected = expected_label
   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,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.2.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.2.0.rc
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,86 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  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: nats
+  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: typhoeus
+  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: 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'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -321,6 +401,7 @@ files:
 - lib/admin/plugin.rb
 - lib/admin/README.md
 - lib/admin/service_auth_token.rb
+- lib/admin/service_broker/add.rb
 - lib/admin/set_quota.rb
 - lib/cf/cli/app/app.rb
 - lib/cf/cli/app/apps.rb
@@ -372,6 +453,7 @@ 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
@@ -433,7 +515,11 @@ files:
 - lib/tunnel/tunnel.rb
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
+- spec/admin/service_broker/add_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
@@ -520,6 +606,7 @@ 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
@@ -546,24 +633,28 @@ 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/delete_orphaned_service_spec.rb
 - spec/features/login_spec.rb
+- spec/features/manifests_spec.rb
 - spec/features/org_spec.rb
+- spec/features/push_flow_spec.rb
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
-- spec/integration/push_flow_spec.rb
+- spec/integration/service_broker_spec.rb
 - spec/manifests/errors_spec.rb
 - spec/manifests/loader/builder_spec.rb
 - spec/manifests/loader/normalizer_spec.rb
@@ -598,7 +689,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3163619912203413768
+      hash: 4338688848602713526
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -614,7 +705,11 @@ summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
+- spec/admin/service_broker/add_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
@@ -701,6 +796,7 @@ 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
@@ -727,24 +823,28 @@ 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/delete_orphaned_service_spec.rb
 - spec/features/login_spec.rb
+- spec/features/manifests_spec.rb
 - spec/features/org_spec.rb
+- spec/features/push_flow_spec.rb
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
-- spec/integration/push_flow_spec.rb
+- spec/integration/service_broker_spec.rb
 - spec/manifests/errors_spec.rb
 - spec/manifests/loader/builder_spec.rb
 - spec/manifests/loader/normalizer_spec.rb