cf 4.2.9.rc3 → 4.2.9.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55cc0d0ff989f6e5afc8b9404527c74f0390644
-  data.tar.gz: 6f896df4b514a8e2827aed83b7687b670233078a
+  metadata.gz: e4e2f3033d9d821a41f9ddc7f2dbeab8de538317
+  data.tar.gz: b6aa6ef1017ce73a108cac2dcf560a443c82882c
 SHA512:
-  metadata.gz: ac80ed0d9c5a7eef372b9f6e25dfcae8920fff2612582331ac83726ab586dcec5269bd48e872dd4bfe686b6f9584940c88df936703063ff9e2d00ffe92f3640f
-  data.tar.gz: 9f040edd92bfc646f5897b418aa365fc6037ad549ad82ebd9068226bfe09cef3db7e78e87131ce4ab2cf941a64a12a6edbf1ae94be6d47459253fd48e6d3ea92
+  metadata.gz: 5df73a8dd292d078af3679f56f1729415af83706513028997a7d9264fbef9dda9c96feae5422e1e138a93879e87621258a3128acd59b7574e7a9bff0f74d7329
+  data.tar.gz: 26a10354a3e832f2a395c18f2f7d090d09675ac648bd298e56220157f7aaf53308163611d74f6d856225bc3a1712a62bf8b7d332e684ff122fa27e7e283ecbfc

data/lib/cf/cli/service/create.rb

@@ -72,7 +72,8 @@ module CF::Service
         service_instance.name = input[:name, offering]
         finalize
 
-        service_instance.credentials = ask_credentials # input[:credentials]
+        # at this point there's no way input[:credentials] can work interactively...
+        service_instance.credentials = input[:credentials, nil] || ask_credentials
       else
         service_instance = client.managed_service_instance
         service_instance.name = input[:name, offering]

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.9.rc3".freeze
+  VERSION = "4.2.9.rc5".freeze
 end

data/lib/manifests/manifests.rb

@@ -1,5 +1,6 @@
 require "yaml"
 require "set"
+require "cf/cli/service/create"
 
 require "manifests/loader"
 
@@ -182,16 +183,23 @@ module CFManifests
     unless services.empty?
       meta["services"] = {}
 
-      services.each do |i|
-        p = i.service_plan
-        s = p.service
-
-        meta["services"][i.name] = {
-          "label" => s.label,
-          "provider" => s.provider,
-          "version" => s.version,
-          "plan" => p.name
-        }
+      services.each do |service_instance|
+        if service_instance.is_a?(CFoundry::V2::UserProvidedServiceInstance)
+          meta["services"][service_instance.name] = {
+            "label" => "user-provided",
+            "credentials" => service_instance.credentials.stringify_keys,
+          }
+        else
+          service_plan = service_instance.service_plan
+          service = service_plan.service
+
+          meta["services"][service_instance.name] = {
+            "label" => service.label,
+            "provider" => service.provider,
+            "version" => service.version,
+            "plan" => service_plan.name
+          }
+        end
       end
     end
 
@@ -292,25 +300,33 @@ module CFManifests
       if instance = client.service_instance_by_name(name)
         to_bind << instance
       else
-        offering = offerings.find { |o|
-          o.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
-            (!svc[:version] || o.version == svc[:version]) &&
-            (o.provider == (svc[:provider] || "core"))
-        }
+        if svc[:label] == "user-provided"
+          invoke :create_service,
+            name: name,
+            offering: CF::Service::UPDummy.new,
+            app: app,
+            credentials: svc[:credentials]
+        else
+          offering = offerings.find { |o|
+            o.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
+              (!svc[:version] || o.version == svc[:version]) &&
+              (o.provider == (svc[:provider] || "core"))
+          }
 
-        fail "Unknown service offering: #{svc.inspect}." unless offering
+          fail "Unknown service offering: #{svc.inspect}." unless offering
 
-        plan = offering.service_plans.find { |p|
-          p.name == (svc[:plan] || "D100")
-        }
+          plan = offering.service_plans.find { |p|
+            p.name == (svc[:plan] || "D100")
+          }
 
-        fail "Unknown service plan: #{svc[:plan]}." unless plan
+          fail "Unknown service plan: #{svc[:plan]}." unless plan
 
-        invoke :create_service,
-          :name => name,
-          :offering => offering,
-          :plan => plan,
-          :app => app
+          invoke :create_service,
+            :name => name,
+            :offering => offering,
+            :plan => plan,
+            :app => app
+        end
       end
     end
 

data/lib/tasks/gem_release.rake

@@ -10,7 +10,7 @@ namespace :gem do
     sh! "git add lib/cf/version.rb"
 
     print_with_purpose "Bumping to version #{gem_version}"
-    #generate_release_notes(old_version)
+    generate_release_notes(old_version)
     sh!("git commit -m 'Bumping to version #{gem_version}.'")
     sh!("git push")
     sh!("gem release --tag")
@@ -20,8 +20,8 @@ namespace :gem do
   def generate_release_notes(old_version)
     print_with_purpose "Generating release notes..."
     file_name = "release_#{gem_version}"
-    sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
-    sh!("git add release_notes")
+    #sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
+    #sh!("git add release_notes")
   end
 
   def sh!(cmd)

data/spec/assets/hello-sinatra/manifest.yml

@@ -0,0 +1,17 @@
+---
+applications:
+- name: hello-sinatra-1375741878_010056
+  memory: 256M
+  instances: 1
+  host: hello-sinatra-subdomain-1375741878_010056
+  domain: a1-app.cf-app.com
+  path: .
+  services:
+    user-provided-1375741878_010056:
+      label: user-provided
+      credentials:
+        username: abc123
+        password: sunshine
+        hostname: oracle.enterprise.com
+        port: 1234
+        name: myoracledb2

data/spec/cf/cli/service/create_spec.rb

@@ -124,6 +124,23 @@ module CF
             instance.credentials['host'].should == 'example.com'
             instance.credentials['port'].should == '8080'
           end
+
+          # lame, i know
+          context "when invoked from another command" do
+            let(:params) { {
+              :credentials => {"k" => "v"},
+              :name => "service-name",
+              :offering => UPDummy.new,
+            } }
+
+            it "creates a user-provided service" do
+              instance = client.user_provided_service_instance
+              client.should_receive(:user_provided_service_instance).and_return(instance)
+              instance.should_receive(:create!)
+
+              Mothership.new.invoke(:create_service, params, {})
+            end
+          end
         end
       end
     end

data/spec/features/manifests_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV["CF_V2_RUN_INTEGRATION"]
+  describe "A user pushing a new sinatra app" do
+
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-#{run_id}" }
+    let(:subdomain) { "hello-sinatra-subdomain-#{run_id}" }
+    let(:user_provided_name) { "user-provided-#{run_id}"}
+
+    before do
+      FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
+      WebMock.allow_net_connect!
+      login
+    end
+
+    after do
+      `#{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
+    end
+
+    context "with user-provided service" do
+      it "reads the manifest when pushing" do
+        Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+          FileUtils.rm("manifest.yml", force: true)
+          File.open("manifest.yml", "w") do |f|
+            f.write(<<-MANIFEST)
+---
+applications:
+- name: #{app}
+  memory: 256M
+  instances: 1
+  host: #{subdomain}
+  domain: a1-app.cf-app.com
+  path: .
+  services:
+    #{user_provided_name}:
+      label: user-provided
+      credentials:
+        username: abc123
+        password: sunshine
+        hostname: oracle.enterprise.com
+        port: 1234
+        name: myoracledb2
+            MANIFEST
+          end
+
+          BlueShell::Runner.run("#{cf_bin} push") do |runner|
+            expect(runner).to say "Using manifest file manifest.yml"
+            expect(runner).to say "Creating #{app}... OK"
+
+            expect(runner).to say(/Creating route #{subdomain}\..*\.\.\. OK/)
+            expect(runner).to say(/Binding #{subdomain}\..* to #{app}\.\.\. OK/)
+
+            expect(runner).to say /Creating service #{user_provided_name}.*OK/
+            expect(runner).to say /Binding #{user_provided_name} to #{app}... OK/
+
+            expect(runner).to say "Uploading #{app}... OK", 180
+            expect(runner).to say "Preparing to start #{app}... OK", 180
+            expect(runner).to say "Checking status of app '#{app}'...", 180
+            expect(runner).to say "1 of 1 instances running"
+            expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.a1-app.cf-app.com", 30
+          end
+        end
+
+        BlueShell::Runner.run("#{cf_bin} services") do |runner|
+          expect(runner).to say /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+          expect(runner).to say /#{user_provided_name}\s+ # name
+            user-provided\s+                        # service
+            n\/a\s+                              # provider
+            n\/a\s+                             # version
+            n\/a\s+                             # plan
+            #{app}                              # bound apps
+          /x
+        end
+      end
+    end
+
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
+end

data/spec/integration/push_flow_spec.rb

@@ -21,6 +21,10 @@ 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!

data/spec/manifests/manifests_spec.rb

@@ -71,7 +71,23 @@ describe CFManifests do
                   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,6 +141,21 @@ 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"}}}

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: 4.2.9.rc3
+  version: 4.2.9.rc5
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -406,6 +406,7 @@ files:
 - 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
@@ -528,6 +529,7 @@ files:
 - 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
@@ -588,6 +590,7 @@ test_files:
 - 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
@@ -710,6 +713,7 @@ test_files:
 - 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