cf 1.0.1.rc1 → 1.1.0

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

@@ -44,17 +44,13 @@ module CF::Service
         end
       end
 
-      until offerings.size < 2
-        # cast to Array since it might be given as a Service with #invoke
-        offerings = Array(input[:offering, offerings.sort_by(&:label)])
-        input.forget(:offering)
-      end
+      selected_offerings = offerings.any? ? Array(input[:offering, offerings.sort_by(&:label)]) : []
 
-      if offerings.empty?
+      if selected_offerings.empty?
         fail "Cannot find services matching the given criteria."
       end
 
-      offering = offerings.first
+      offering = selected_offerings.first
 
       service = client.service_instance
       service.name = input[:name, offering]

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "1.0.1.rc1".freeze
+  VERSION = "1.1.0".freeze
 end

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

@@ -0,0 +1,67 @@
+require "spec_helper"
+
+module CF::Service
+  describe Create do
+    before do
+      any_instance_of(CF::CLI) do |cli|
+        stub(cli).client { client }
+      end
+    end
+
+    describe "metadata" do
+      let(:command) { Mothership.commands[:create_service] }
+
+      describe "command" do
+        subject { command }
+        its(:description) { should eq "Create a service" }
+        it { expect(Mothership::Help.group(:services, :manage)).to include(subject) }
+      end
+
+      include_examples "inputs must have descriptions"
+
+      describe "arguments" do
+        subject { command.arguments }
+        it "has the correct argument order" do
+          should eq([{:type => :optional, :value => nil, :name => :offering}, {:type => :optional, :value => nil, :name => :name}])
+        end
+      end
+    end
+
+    context "when there are services" do
+      let(:service_plan) { fake(:service_plan, :name => "F20") }
+      let(:selected_service) { fake(:service, :label => "Foo Service", :service_plans => [service_plan]) }
+      let(:command) { Mothership.new.invoke(:create_service, {}, {}) }
+      let(:client) { fake_client(:services => services) }
+
+      describe "when there is at least one service" do
+        let(:services) { [selected_service] }
+
+        it "asks for the service" do
+          mock_ask("What kind?", anything) { selected_service }
+          mock_ask("Name?", anything) { selected_service.label }
+          mock_ask("Which plan?", anything) { service_plan }
+          any_instance_of(CFoundry::V2::ServiceInstance) do |service_instance|
+            stub(service_instance).create!
+          end
+
+          capture_output { command }
+        end
+      end
+
+      describe "when there are more than one services" do
+        let(:services) { [selected_service, fake(:service), fake(:service)] }
+
+        it "asks for the service" do
+          mock_ask("What kind?", anything) { selected_service }
+          mock_ask("Name?", anything) { selected_service.label }
+          mock_ask("Which plan?", anything) { service_plan }
+          any_instance_of(CFoundry::V2::ServiceInstance) do |service_instance|
+            stub(service_instance).create!
+          end
+
+          capture_output { command }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 1.0.1.rc1
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,10 +51,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.2.0
     - - <
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,10 +62,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.2.0
     - - <
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -477,6 +477,7 @@ files:
 - spec/cf/cli/route/map_spec.rb
 - spec/cf/cli/route/unmap_spec.rb
 - spec/cf/cli/service/bind_spec.rb
+- spec/cf/cli/service/create_spec.rb
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/rename_spec.rb
 - spec/cf/cli/service/service_spec.rb
@@ -534,16 +535,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1616370664200184088
+      hash: -4141716087622851168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
@@ -622,6 +623,7 @@ test_files:
 - spec/cf/cli/route/map_spec.rb
 - spec/cf/cli/route/unmap_spec.rb
 - spec/cf/cli/service/bind_spec.rb
+- spec/cf/cli/service/create_spec.rb
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/rename_spec.rb
 - spec/cf/cli/service/service_spec.rb